diff --git a/lib/licenses.nix b/lib/licenses.nix
index 6eeba6588be13..1408eda523d4c 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -103,6 +103,11 @@ in mkLicense lset) ({
fullName = "Apache License 2.0";
};
+ bola11 = {
+ url = "https://blitiri.com.ar/p/bola/";
+ fullName = "Buena Onda License Agreement 1.1";
+ };
+
boost = {
spdxId = "BSL-1.0";
fullName = "Boost Software License 1.0";
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0f736ea4bc087..5e51f26416777 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5494,6 +5494,13 @@
githubId = 25618740;
name = "Vincent Cui";
};
+ houstdav000 = {
+ email = "houstdav000@gmail.com";
+ github = "houstdav000";
+ githubId = 17628961;
+ matrix = "@houstdav000:gh0st.ems.host";
+ name = "David Houston";
+ };
hoverbear = {
email = "operator+nix@hoverbear.org";
matrix = "@hoverbear:matrix.org";
@@ -13676,6 +13683,12 @@
githubId = 9870613;
name = "Hubert Mühlhans";
};
+ trobert = {
+ email = "thibaut.robert@gmail.com";
+ github = "trobert";
+ githubId = 504580;
+ name = "Thibaut Robert";
+ };
troydm = {
email = "d.geurkov@gmail.com";
github = "troydm";
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
index a28d9045c23a2..bfe04d89fa83b 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
@@ -142,6 +142,13 @@
OpenSSL now defaults to OpenSSL 3, updated from 1.1.1.
+
+
+ An image configuration and generator has been added for Linode
+ images, largely based on the present GCE configuration and
+ image.
+
+
hardware.nvidia has a new option
@@ -285,6 +292,13 @@
services.dolibarr.
+
+
+ FreshRSS, a
+ free, self-hostable RSS feed aggregator. Available as
+ services.freshrss.
+
+
expressvpn,
@@ -640,6 +654,12 @@
guide on how to migrate your Neo4j instance.
+
+
+ The networking.wireguard module now can set
+ the mtu on interfaces and tag its packets with an fwmark.
+
+
The services.matrix-synapse systemd unit
diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md
index 9f8c8408e038e..dcbe545a626cf 100644
--- a/nixos/doc/manual/release-notes/rl-2211.section.md
+++ b/nixos/doc/manual/release-notes/rl-2211.section.md
@@ -57,6 +57,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- OpenSSL now defaults to OpenSSL 3, updated from 1.1.1.
+- An image configuration and generator has been added for Linode images, largely based on the present GCE configuration and image.
+
- `hardware.nvidia` has a new option `open` that can be used to opt in the opensource version of NVIDIA kernel driver. Note that the driver's support for GeForce and Workstation GPUs is still alpha quality, see [NVIDIA Releases Open-Source GPU Kernel Modules](https://developer.nvidia.com/blog/nvidia-releases-open-source-gpu-kernel-modules/) for the official announcement.
@@ -100,6 +102,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [Dolibarr](https://www.dolibarr.org/), an enterprise resource planning and customer relationship manager. Enable using [services.dolibarr](#opt-services.dolibarr.enable).
+- [FreshRSS](https://freshrss.org/), a free, self-hostable RSS feed aggregator. Available as [services.freshrss](#opt-services.freshrss.enable).
+
- [expressvpn](https://www.expressvpn.com), the CLI client for ExpressVPN. Available as [services.expressvpn](#opt-services.expressvpn.enable).
- [go-autoconfig](https://github.com/L11R/go-autoconfig), IMAP/SMTP autodiscover server. Available as [services.go-autoconfig](#opt-services.go-autoconfig.enable).
@@ -215,6 +219,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
- Neo4j was updated from version 3 to version 4. See this [migration guide](https://neo4j.com/docs/upgrade-migration-guide/current/) on how to migrate your Neo4j instance.
+- The `networking.wireguard` module now can set the mtu on interfaces and tag its packets with an fwmark.
+
- The `services.matrix-synapse` systemd unit has been hardened.
- Matrix Synapse now requires entries in the `state_group_edges` table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was restored multiple times). If your Synapse database already has duplicate rows in this table, this could fail with an error and require manual remediation.
diff --git a/nixos/lib/make-system-tarball.nix b/nixos/lib/make-system-tarball.nix
index dab168f4a4813..325792f97e8f3 100644
--- a/nixos/lib/make-system-tarball.nix
+++ b/nixos/lib/make-system-tarball.nix
@@ -22,7 +22,7 @@
# Extra tar arguments
, extraArgs ? ""
# Command used for compression
-, compressCommand ? "pixz"
+, compressCommand ? "pixz -t"
# Extension for the compressed tarball
, compressionExtension ? ".xz"
# extra inputs, like the compressor to use
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 9f3cad3978661..dec66e395aade 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1074,6 +1074,7 @@
./services/web-apps/engelsystem.nix
./services/web-apps/ethercalc.nix
./services/web-apps/fluidd.nix
+ ./services/web-apps/freshrss.nix
./services/web-apps/galene.nix
./services/web-apps/gerrit.nix
./services/web-apps/gotify-server.nix
diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index 23b3008f02d01..6a5d7c6b04103 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -137,6 +137,33 @@ let
See [documentation](https://www.wireguard.com/netns/).
'';
};
+
+ fwMark = mkOption {
+ default = null;
+ type = with types; nullOr str;
+ example = "0x6e6978";
+ description = lib.mdDoc ''
+ Mark all wireguard packets originating from
+ this interface with the given firewall mark. The firewall mark can be
+ used in firewalls or policy routing to filter the wireguard packets.
+ This can be useful for setup where all traffic goes through the
+ wireguard tunnel, because the wireguard packets need to be routed
+ differently.
+ '';
+ };
+
+ mtu = mkOption {
+ default = null;
+ type = with types; nullOr int;
+ example = 1280;
+ description = lib.mdDoc ''
+ Set the maximum transmission unit in bytes for the wireguard
+ interface. Beware that the wireguard packets have a header that may
+ add up to 80 bytes to the mtu. By default, the MTU is (1500 - 80) =
+ 1420. However, if the MTU of the upstream network is lower, the MTU
+ of the wireguard network has to be adjusted as well.
+ '';
+ };
};
};
@@ -398,6 +425,7 @@ let
${ipPreMove} link add dev "${name}" type wireguard
${optionalString (values.interfaceNamespace != null && values.interfaceNamespace != values.socketNamespace) ''${ipPreMove} link set "${name}" netns "${ns}"''}
+ ${optionalString (values.mtu != null) ''${ipPreMove} link set "${name}" mtu ${toString values.mtu}''}
${concatMapStringsSep "\n" (ip:
''${ipPostMove} address add "${ip}" dev "${name}"''
@@ -406,6 +434,7 @@ let
${concatStringsSep " " (
[ ''${wg} set "${name}" private-key "${privKey}"'' ]
++ optional (values.listenPort != null) ''listen-port "${toString values.listenPort}"''
+ ++ optional (values.fwMark != null) ''fwmark "${values.fwMark}"''
)}
${ipPostMove} link set up dev "${name}"
diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix
new file mode 100644
index 0000000000000..68780a3fe9dd1
--- /dev/null
+++ b/nixos/modules/services/web-apps/freshrss.nix
@@ -0,0 +1,274 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+ cfg = config.services.freshrss;
+
+ poolName = "freshrss";
+in
+{
+ meta.maintainers = with maintainers; [ etu stunkymonkey ];
+
+ options.services.freshrss = {
+ enable = mkEnableOption (mdDoc "FreshRSS feed reader");
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.freshrss;
+ defaultText = lib.literalExpression "pkgs.freshrss";
+ description = mdDoc "Which FreshRSS package to use.";
+ };
+
+ defaultUser = mkOption {
+ type = types.str;
+ default = "admin";
+ description = mdDoc "Default username for FreshRSS.";
+ example = "eva";
+ };
+
+ passwordFile = mkOption {
+ type = types.path;
+ description = mdDoc "Password for the defaultUser for FreshRSS.";
+ example = "/run/secrets/freshrss";
+ };
+
+ baseUrl = mkOption {
+ type = types.str;
+ description = mdDoc "Default URL for FreshRSS.";
+ example = "https://freshrss.example.com";
+ };
+
+ language = mkOption {
+ type = types.str;
+ default = "en";
+ description = mdDoc "Default language for FreshRSS.";
+ example = "de";
+ };
+
+ database = {
+ type = mkOption {
+ type = types.enum [ "sqlite" "pgsql" "mysql" ];
+ default = "sqlite";
+ description = mdDoc "Database type.";
+ example = "pgsql";
+ };
+
+ host = mkOption {
+ type = types.nullOr types.str;
+ default = "localhost";
+ description = mdDoc "Database host for FreshRSS.";
+ };
+
+ port = mkOption {
+ type = with types; nullOr port;
+ default = null;
+ description = mdDoc "Database port for FreshRSS.";
+ example = 3306;
+ };
+
+ user = mkOption {
+ type = types.nullOr types.str;
+ default = "freshrss";
+ description = mdDoc "Database user for FreshRSS.";
+ };
+
+ passFile = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = mdDoc "Database password file for FreshRSS.";
+ example = "/run/secrets/freshrss";
+ };
+
+ name = mkOption {
+ type = types.nullOr types.str;
+ default = "freshrss";
+ description = mdDoc "Database name for FreshRSS.";
+ };
+
+ tableprefix = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = mdDoc "Database table prefix for FreshRSS.";
+ example = "freshrss";
+ };
+ };
+
+ dataDir = mkOption {
+ type = types.str;
+ default = "/var/lib/freshrss";
+ description = mdDoc "Default data folder for FreshRSS.";
+ example = "/mnt/freshrss";
+ };
+
+ virtualHost = mkOption {
+ type = types.nullOr types.str;
+ default = "freshrss";
+ description = mdDoc ''
+ Name of the nginx virtualhost to use and setup. If null, do not setup any virtualhost.
+ '';
+ };
+
+ pool = mkOption {
+ type = types.str;
+ default = poolName;
+ description = mdDoc ''
+ Name of the phpfpm pool to use and setup. If not specified, a pool will be created
+ with default values.
+ '';
+ };
+ };
+
+
+ config =
+ let
+ systemd-hardening = {
+ CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
+ DeviceAllow = "";
+ LockPersonality = true;
+ NoNewPrivileges = true;
+ PrivateDevices = true;
+ PrivateTmp = true;
+ PrivateUsers = true;
+ ProcSubset = "pid";
+ ProtectClock = true;
+ ProtectControlGroups = true;
+ ProtectHome = true;
+ ProtectHostname = true;
+ ProtectKernelLogs = true;
+ ProtectKernelModules = true;
+ ProtectKernelTunables = true;
+ ProtectProc = "invisible";
+ ProtectSystem = "strict";
+ RemoveIPC = true;
+ RestrictNamespaces = true;
+ RestrictRealtime = true;
+ RestrictSUIDSGID = true;
+ SystemCallArchitectures = "native";
+ SystemCallFilter = [ "@system-service" "~@resources" "~@privileged" ];
+ UMask = "0007";
+ };
+ in
+ mkIf cfg.enable {
+ # Set up a Nginx virtual host.
+ services.nginx = mkIf (cfg.virtualHost != null) {
+ enable = true;
+ virtualHosts.${cfg.virtualHost} = {
+ root = "${cfg.package}/p";
+
+ locations."~ ^.+?\.php(/.*)?$".extraConfig = ''
+ fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket};
+ fastcgi_split_path_info ^(.+\.php)(/.*)$;
+ include ${pkgs.nginx}/conf/fastcgi_params;
+ include ${pkgs.nginx}/conf/fastcgi.conf;
+ '';
+
+ locations."/" = {
+ tryFiles = "$uri $uri/ index.php";
+ index = "index.php index.html index.htm";
+ };
+ };
+ };
+
+ # Set up phpfpm pool
+ services.phpfpm.pools = mkIf (cfg.pool == poolName) {
+ ${poolName} = {
+ user = "freshrss";
+ settings = {
+ "listen.owner" = "nginx";
+ "listen.group" = "nginx";
+ "listen.mode" = "0600";
+ "pm" = "dynamic";
+ "pm.max_children" = 32;
+ "pm.max_requests" = 500;
+ "pm.start_servers" = 2;
+ "pm.min_spare_servers" = 2;
+ "pm.max_spare_servers" = 5;
+ "catch_workers_output" = true;
+ };
+ phpEnv = {
+ FRESHRSS_DATA_PATH = "${cfg.dataDir}";
+ };
+ };
+ };
+
+ users.users.freshrss = {
+ description = "FreshRSS service user";
+ isSystemUser = true;
+ group = "freshrss";
+ };
+ users.groups.freshrss = { };
+
+ systemd.services.freshrss-config =
+ let
+ settingsFlags = concatStringsSep " \\\n "
+ (mapAttrsToList (k: v: "${k} ${toString v}") {
+ "--default_user" = ''"${cfg.defaultUser}"'';
+ "--auth_type" = ''"form"'';
+ "--base_url" = ''"${cfg.baseUrl}"'';
+ "--language" = ''"${cfg.language}"'';
+ "--db-type" = ''"${cfg.database.type}"'';
+ # The following attributes are optional depending on the type of
+ # database. Those that evaluate to null on the left hand side
+ # will be omitted.
+ ${if cfg.database.name != null then "--db-base" else null} = ''"${cfg.database.name}"'';
+ ${if cfg.database.passFile != null then "--db-password" else null} = ''"$(cat ${cfg.database.passFile})"'';
+ ${if cfg.database.user != null then "--db-user" else null} = ''"${cfg.database.user}"'';
+ ${if cfg.database.tableprefix != null then "--db-prefix" else null} = ''"${cfg.database.tableprefix}"'';
+ ${if cfg.database.host != null && cfg.database.port != null then "--db-host" else null} = ''"${cfg.database.host}:${toString cfg.database.port}"'';
+ });
+ in
+ {
+ description = "Set up the state directory for FreshRSS before use";
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ Type = "oneshot";
+ User = "freshrss";
+ Group = "freshrss";
+ StateDirectory = "freshrss";
+ WorkingDirectory = cfg.package;
+ } // systemd-hardening;
+ environment = {
+ FRESHRSS_DATA_PATH = cfg.dataDir;
+ };
+
+ script = ''
+ # create files with correct permissions
+ mkdir -m 755 -p ${cfg.dataDir}
+
+ # do installation or reconfigure
+ if test -f ${cfg.dataDir}/config.php; then
+ # reconfigure with settings
+ ${pkgs.php}/bin/php ./cli/reconfigure.php ${settingsFlags}
+ ${pkgs.php}/bin/php ./cli/update-user.php --user ${cfg.defaultUser} --password "$(cat ${cfg.passwordFile})"
+ else
+ # Copy the user data template directory
+ cp -r ./data ${cfg.dataDir}
+
+ # check correct folders in data folder
+ ${pkgs.php}/bin/php ./cli/prepare.php
+ # install with settings
+ ${pkgs.php}/bin/php ./cli/do-install.php ${settingsFlags}
+ ${pkgs.php}/bin/php ./cli/create-user.php --user ${cfg.defaultUser} --password "$(cat ${cfg.passwordFile})"
+ fi
+ '';
+ };
+
+ systemd.services.freshrss-updater = {
+ description = "FreshRSS feed updater";
+ after = [ "freshrss-config.service" ];
+ wantedBy = [ "multi-user.target" ];
+ startAt = "*:0/5";
+ environment = {
+ FRESHRSS_DATA_PATH = cfg.dataDir;
+ };
+ serviceConfig = {
+ Type = "oneshot";
+ User = "freshrss";
+ Group = "freshrss";
+ StateDirectory = "freshrss";
+ WorkingDirectory = cfg.package;
+ ExecStart = "${pkgs.php}/bin/php ./app/actualize_script.php";
+ } // systemd-hardening;
+ };
+ };
+}
diff --git a/nixos/modules/virtualisation/linode-config.nix b/nixos/modules/virtualisation/linode-config.nix
new file mode 100644
index 0000000000000..d664e8269f411
--- /dev/null
+++ b/nixos/modules/virtualisation/linode-config.nix
@@ -0,0 +1,75 @@
+{ config, lib, pkgs, ... }:
+with lib;
+{
+ imports = [ ../profiles/qemu-guest.nix ];
+
+ services.openssh = {
+ enable = true;
+
+ permitRootLogin = "prohibit-password";
+ passwordAuthentication = mkDefault false;
+ };
+
+ networking = {
+ usePredictableInterfaceNames = false;
+ useDHCP = false;
+ interfaces.eth0 = {
+ useDHCP = true;
+
+ # Linode expects IPv6 privacy extensions to be disabled, so disable them
+ # See: https://www.linode.com/docs/guides/manual-network-configuration/#static-vs-dynamic-addressing
+ tempAddress = "disabled";
+ };
+ };
+
+ # Install diagnostic tools for Linode support
+ environment.systemPackages = with pkgs; [
+ inetutils
+ mtr
+ sysstat
+ ];
+
+ fileSystems."/" = {
+ fsType = "ext4";
+ device = "/dev/sda";
+ autoResize = true;
+ };
+
+ swapDevices = mkDefault [{ device = "/dev/sdb"; }];
+
+ # Enable LISH and Linode Booting w/ GRUB
+ boot = {
+ # Add Required Kernel Modules
+ # NOTE: These are not documented in the install guide
+ initrd.availableKernelModules = [
+ "virtio_pci"
+ "virtio_scsi"
+ "ahci"
+ "sd_mod"
+ ];
+
+ # Set Up LISH Serial Connection
+ kernelParams = [ "console=ttyS0,19200n8" ];
+ kernelModules = [ "virtio_net" ];
+
+ loader = {
+ # Increase Timeout to Allow LISH Connection
+ # NOTE: The image generator tries to set a timeout of 0, so we must force
+ timeout = lib.mkForce 10;
+
+ grub = {
+ enable = true;
+ version = 2;
+ forceInstall = true;
+ device = "nodev";
+
+ # Allow serial connection for GRUB to be able to use LISH
+ extraConfig = ''
+ serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1;
+ terminal_input serial;
+ terminal_output serial
+ '';
+ };
+ };
+ };
+}
diff --git a/nixos/modules/virtualisation/linode-image.nix b/nixos/modules/virtualisation/linode-image.nix
new file mode 100644
index 0000000000000..f8d212d9cda05
--- /dev/null
+++ b/nixos/modules/virtualisation/linode-image.nix
@@ -0,0 +1,66 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+ cfg = config.virtualisation.linodeImage;
+ defaultConfigFile = pkgs.writeText "configuration.nix" ''
+ _: {
+ imports = [
+
+ ];
+ }
+ '';
+in
+{
+ imports = [ ./linode-config.nix ];
+
+ options = {
+ virtualisation.linodeImage.diskSize = mkOption {
+ type = with types; either (enum (singleton "auto")) ints.positive;
+ default = "auto";
+ example = 1536;
+ description = ''
+ Size of disk image in MB.
+ '';
+ };
+
+ virtualisation.linodeImage.configFile = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = ''
+ A path to a configuration file which will be placed at `/etc/nixos/configuration.nix`
+ and be used when switching to a new configuration.
+ If set to `null`, a default configuration is used, where the only import is
+ ``
+ '';
+ };
+
+ virtualisation.linodeImage.compressionLevel = mkOption {
+ type = types.ints.between 1 9;
+ default = 6;
+ description = ''
+ GZIP compression level of the resulting disk image (1-9).
+ '';
+ };
+ };
+
+ config = {
+ system.build.linodeImage = import ../../lib/make-disk-image.nix {
+ name = "linode-image";
+ # NOTE: Linode specifically requires images to be `gzip`-ed prior to upload
+ # See: https://www.linode.com/docs/products/tools/images/guides/upload-an-image/#requirements-and-considerations
+ postVM = ''
+ ${pkgs.gzip}/bin/gzip -${toString cfg.compressionLevel} -c -- $diskImage > \
+ $out/nixos-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.img.gz
+ rm $diskImage
+ '';
+ format = "raw";
+ partitionTableType = "none";
+ configFile = if cfg.configFile == null then defaultConfigFile else cfg.configFile;
+ inherit (cfg) diskSize;
+ inherit config lib pkgs;
+ };
+ };
+
+ meta.maintainers = with maintainers; [ houstdav000 ];
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 16f23c74ef863..ed09aa9e8e4c8 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -208,6 +208,7 @@ in {
fluidd = handleTest ./fluidd.nix {};
fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix {};
freeswitch = handleTest ./freeswitch.nix {};
+ freshrss = handleTest ./freshrss.nix {};
frr = handleTest ./frr.nix {};
fsck = handleTest ./fsck.nix {};
ft2-clone = handleTest ./ft2-clone.nix {};
@@ -649,6 +650,9 @@ in {
user-home-mode = handleTest ./user-home-mode.nix {};
uwsgi = handleTest ./uwsgi.nix {};
v2ray = handleTest ./v2ray.nix {};
+ varnish60 = handleTest ./varnish.nix { package = pkgs.varnish60; };
+ varnish71 = handleTest ./varnish.nix { package = pkgs.varnish71; };
+ varnish72 = handleTest ./varnish.nix { package = pkgs.varnish72; };
vault = handleTest ./vault.nix {};
vault-dev = handleTest ./vault-dev.nix {};
vault-postgresql = handleTest ./vault-postgresql.nix {};
diff --git a/nixos/tests/freshrss.nix b/nixos/tests/freshrss.nix
new file mode 100644
index 0000000000000..7bdbf29e9230b
--- /dev/null
+++ b/nixos/tests/freshrss.nix
@@ -0,0 +1,19 @@
+import ./make-test-python.nix ({ lib, pkgs, ... }: {
+ name = "freshrss";
+ meta.maintainers = with lib.maintainers; [ etu stunkymonkey ];
+
+ nodes.machine = { pkgs, ... }: {
+ services.freshrss = {
+ enable = true;
+ baseUrl = "http://localhost";
+ passwordFile = pkgs.writeText "password" "secret";
+ };
+ };
+
+ testScript = ''
+ machine.wait_for_unit("multi-user.target")
+ machine.wait_for_open_port(80)
+ response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://127.0.0.1:80/i/")
+ assert 'Login · FreshRSS' in response, "Login page didn't load successfully"
+ '';
+})
diff --git a/nixos/tests/varnish.nix b/nixos/tests/varnish.nix
new file mode 100644
index 0000000000000..9dcdeec9d8c8f
--- /dev/null
+++ b/nixos/tests/varnish.nix
@@ -0,0 +1,55 @@
+{
+ system ? builtins.currentSystem
+, pkgs ? import ../.. { inherit system; }
+, package
+}:
+import ./make-test-python.nix ({ pkgs, ... }: let
+ testPath = pkgs.hello;
+in {
+ name = "varnish";
+ meta = with pkgs.lib.maintainers; {
+ maintainers = [ ajs124 ];
+ };
+
+ nodes = {
+ varnish = { config, pkgs, ... }: {
+ services.nix-serve = {
+ enable = true;
+ };
+
+ services.varnish = {
+ inherit package;
+ enable = true;
+ http_address = "0.0.0.0:80";
+ config = ''
+ vcl 4.0;
+
+ backend nix-serve {
+ .host = "127.0.0.1";
+ .port = "${toString config.services.nix-serve.port}";
+ }
+ '';
+ };
+
+ networking.firewall.allowedTCPPorts = [ 80 ];
+ system.extraDependencies = [ testPath ];
+ };
+
+ client = { lib, ... }: {
+ nix.settings = {
+ require-sigs = false;
+ substituters = lib.mkForce [ "http://varnish" ];
+ };
+ };
+ };
+
+ testScript = ''
+ start_all()
+ varnish.wait_for_open_port(80)
+
+ client.wait_until_succeeds("curl -f http://varnish/nix-cache-info");
+
+ client.wait_until_succeeds("nix-store -r ${testPath}");
+ client.succeed("${testPath}/bin/hello");
+ '';
+})
diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix
index 19cc4107fa424..31a197071045e 100644
--- a/pkgs/applications/audio/tauon/default.nix
+++ b/pkgs/applications/audio/tauon/default.nix
@@ -9,9 +9,11 @@
, librsvg
, gobject-introspection
, gtk3
+, kissfft
, libnotify
, libsamplerate
, libvorbis
+, miniaudio
, mpg123
, libopenmpt
, opusfile
@@ -23,15 +25,23 @@
stdenv.mkDerivation rec {
pname = "tauon";
- version = "7.3.1";
+ version = "7.4.1";
src = fetchFromGitHub {
owner = "Taiko2k";
repo = "TauonMusicBox";
rev = "v${version}";
- sha256 = "sha256-g3mRVPOXU3N+MApLaHAAIIsVuVv2GeB1Nj//8tuS0oI=";
+ sha256 = "sha256-cHuEmRQG40p04MXcwmYMm7Jih+mYre9IBnOPMx1/k7k=";
};
+ postUnpack = ''
+ rmdir source/src/phazor/kissfft
+ ln -s ${kissfft.src} source/src/phazor/kissfft
+
+ rmdir source/src/phazor/miniaudio
+ ln -s ${miniaudio.src} source/src/phazor/miniaudio
+ '';
+
postPatch = ''
substituteInPlace tauon.py \
--replace 'install_mode = False' 'install_mode = True' \
diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix
index f4d24c0187864..bcb7e066bfc64 100644
--- a/pkgs/applications/editors/ghostwriter/default.nix
+++ b/pkgs/applications/editors/ghostwriter/default.nix
@@ -14,13 +14,13 @@
mkDerivation rec {
pname = "ghostwriter";
- version = "2.1.5";
+ version = "2.2.0";
src = fetchFromGitHub {
- owner = "wereturtle";
+ owner = "KDE";
repo = pname;
rev = version;
- hash = "sha256-YmZrT/KZUa34A0mMDM423GL99BDLrqrio7gNEW833SI=";
+ hash = "sha256-8JtCO5jrkbZ4uEM7SALg64L4HSzdzzh7r1pldxzaXeI=";
};
nativeBuildInputs = [ qmake pkg-config qttools ];
@@ -33,8 +33,8 @@ mkDerivation rec {
meta = with lib; {
description = "A cross-platform, aesthetic, distraction-free Markdown editor";
- homepage = src.meta.homepage;
- changelog = "https://github.com/wereturtle/ghostwriter/blob/${src.rev}/CHANGELOG.md";
+ homepage = "https://kde.github.io/ghostwriter";
+ changelog = "https://github.com/KDE/ghostwriter/blob/${src.rev}/CHANGELOG.md";
license = licenses.gpl3Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ dotlambda erictapen ];
diff --git a/pkgs/applications/editors/sublime/4/packages.nix b/pkgs/applications/editors/sublime/4/packages.nix
index 0742ee42b2154..5d03b20837281 100644
--- a/pkgs/applications/editors/sublime/4/packages.nix
+++ b/pkgs/applications/editors/sublime/4/packages.nix
@@ -11,9 +11,9 @@ in
} {};
sublime4-dev = common {
- buildVersion = "4136";
+ buildVersion = "4137";
dev = true;
- x64sha256 = "6cSaF8seS3XpXpoaROO5tpVuwJzE+z1kzwxNlOUadj0=";
- aarch64sha256 = "Mtib8i29FCFutRXmWPQSp9h/FcLD7+wv+tGAjwf9d3w=";
+ x64sha256 = "oGBPoqVwTIQfIzh/8fEOOrZkrbzT0tG23ASeHbN/OMk=";
+ aarch64sha256 = "7mqYSoggfrcRoDh+QfA4rW0qvF2ZpiUY5yVxhxZKsfE=";
} {};
}
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 8463d7066f6c4..fb23a791ab5cd 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -18,6 +18,7 @@
, clojure-lsp
, alejandra
, millet
+, shfmt
}:
let
@@ -1088,6 +1089,14 @@ let
version = "7.1.0";
sha256 = "09z72mdr5bfdcb67xyzlv7lb9vyjlc3k9ackj4jgixfk40c68cnj";
};
+
+ nativeBuildInputs = [ jq moreutils ];
+
+ postInstall = ''
+ cd "$out/$installPrefix"
+ jq '.contributes.configuration.properties."shellformat.path".default = "${shfmt}/bin/shfmt"' package.json | sponge package.json
+ '';
+
meta = with lib; {
downloadPage = "https://marketplace.visualstudio.com/items?itemName=foxundermoon.shell-format";
homepage = "https://github.com/foxundermoon/vs-shell-format";
diff --git a/pkgs/applications/graphics/gnome-decoder/default.nix b/pkgs/applications/graphics/gnome-decoder/default.nix
new file mode 100644
index 0000000000000..7ae618736ca19
--- /dev/null
+++ b/pkgs/applications/graphics/gnome-decoder/default.nix
@@ -0,0 +1,76 @@
+{ lib
+, clangStdenv
+, fetchFromGitLab
+, libclang
+, rustPlatform
+, meson
+, ninja
+, pkg-config
+, glib
+, gtk4
+, libadwaita
+, zbar
+, sqlite
+, pipewire
+, gstreamer
+, gst-plugins-base
+, gst-plugins-bad
+, wrapGAppsHook4
+, appstream-glib
+, desktop-file-utils
+}:
+
+clangStdenv.mkDerivation rec {
+ pname = "gnome-decoder";
+ version = "0.3.1";
+
+ src = fetchFromGitLab {
+ domain = "gitlab.gnome.org";
+ owner = "World";
+ repo = "decoder";
+ rev = version;
+ hash = "sha256-WJIOaYSesvLmOzF1Q6o6aLr4KJanXVaNa+r+2LlpKHQ=";
+ };
+
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src;
+ name = "${pname}-${version}";
+ hash = "sha256-RMHVrv/0q42qFUXyd5BSymzx+BxiyqTX0Jzmxnlhyr4=";
+ };
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkg-config
+ wrapGAppsHook4
+ appstream-glib
+ desktop-file-utils
+ ] ++ (with rustPlatform; [
+ rust.cargo
+ rust.rustc
+ cargoSetupHook
+ ]);
+
+ buildInputs = [
+ glib
+ gtk4
+ libadwaita
+ zbar
+ sqlite
+ pipewire
+ gstreamer
+ gst-plugins-base
+ gst-plugins-bad
+ ];
+
+ LIBCLANG_PATH = "${libclang.lib}/lib";
+
+ meta = with lib; {
+ description = "Scan and Generate QR Codes";
+ homepage = "https://gitlab.gnome.org/World/decoder";
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ mainProgram = "decoder";
+ maintainers = with maintainers; [ zendo ];
+ };
+}
diff --git a/pkgs/applications/misc/1password-gui/beta.nix b/pkgs/applications/misc/1password-gui/beta.nix
index f004fbd988dbe..d90b3e46f50cb 100644
--- a/pkgs/applications/misc/1password-gui/beta.nix
+++ b/pkgs/applications/misc/1password-gui/beta.nix
@@ -2,6 +2,7 @@
, stdenv
, fetchurl
, makeWrapper
+, wrapGAppsHook
, alsa-lib
, at-spi2-atk
, at-spi2-core
@@ -58,11 +59,13 @@ in stdenv.mkDerivation rec {
sha256 = "sha256-xBfpBkYff1X26Iu0Ee03lIiR6UdJOiaG+kZMVotG0Hc=";
};
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
+ buildInputs = [ glib ];
dontConfigure = true;
dontBuild = true;
dontPatchELF = true;
+ dontWrapGApps = true;
installPhase =
let rpath = lib.makeLibraryPath [
@@ -123,17 +126,21 @@ in stdenv.mkDerivation rec {
patchelf --set-rpath ${rpath}:$out/share/1password $file
done
- # Electron is trying to open udev via dlopen()
- # and for some reason that doesn't seem to be impacted from the rpath.
- # Adding udev to LD_LIBRARY_PATH fixes that.
- # Make xdg-open overrideable at runtime.
- makeWrapper $out/share/1password/1password $out/bin/1password \
- --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
- --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}
-
runHook postInstall
'';
+ preFixup = ''
+ # Electron is trying to open udev via dlopen()
+ # and for some reason that doesn't seem to be impacted from the rpath.
+ # Adding udev to LD_LIBRARY_PATH fixes that.
+ # Make xdg-open overrideable at runtime.
+ makeWrapper $out/share/1password/1password $out/bin/1password \
+ ''${gappsWrapperArgs[@]} \
+ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
+ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}
+ '';
+
+
meta = with lib; {
description = "Multi-platform password manager";
homepage = "https://1password.com/";
diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix
index b1d01e7b32ea0..46480a0325987 100644
--- a/pkgs/applications/misc/1password-gui/default.nix
+++ b/pkgs/applications/misc/1password-gui/default.nix
@@ -2,6 +2,7 @@
, stdenv
, fetchurl
, makeWrapper
+, wrapGAppsHook
, alsa-lib
, at-spi2-atk
, at-spi2-core
@@ -58,11 +59,13 @@ in stdenv.mkDerivation rec {
sha256 = "sha256-Smq0gOGfBTjIOMwF1AI+TJwXaIiTi/YP9mGIqcjsCNQ=";
};
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
+ buildInputs = [ glib ];
dontConfigure = true;
dontBuild = true;
dontPatchELF = true;
+ dontWrapGApps = true;
installPhase =
let rpath = lib.makeLibraryPath [
@@ -123,17 +126,20 @@ in stdenv.mkDerivation rec {
patchelf --set-rpath ${rpath}:$out/share/1password $file
done
- # Electron is trying to open udev via dlopen()
- # and for some reason that doesn't seem to be impacted from the rpath.
- # Adding udev to LD_LIBRARY_PATH fixes that.
- # Make xdg-open overrideable at runtime.
- makeWrapper $out/share/1password/1password $out/bin/1password \
- --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
- --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}
-
runHook postInstall
'';
+ preFixup = ''
+ # Electron is trying to open udev via dlopen()
+ # and for some reason that doesn't seem to be impacted from the rpath.
+ # Adding udev to LD_LIBRARY_PATH fixes that.
+ # Make xdg-open overrideable at runtime.
+ makeWrapper $out/share/1password/1password $out/bin/1password \
+ ''${gappsWrapperArgs[@]} \
+ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
+ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}
+ '';
+
meta = with lib; {
description = "Multi-platform password manager";
homepage = "https://1password.com/";
diff --git a/pkgs/applications/misc/conduktor/default.nix b/pkgs/applications/misc/conduktor/default.nix
new file mode 100644
index 0000000000000..32d9e527dd49c
--- /dev/null
+++ b/pkgs/applications/misc/conduktor/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, lib, fetchurl, fetchzip, jdk11, unzip, makeWrapper, makeDesktopItem, copyDesktopItems }:
+
+stdenv.mkDerivation rec {
+ pname = "conduktor";
+ version = "2.15.1";
+
+ src = fetchzip {
+ url = "https://github.com/conduktor/builds/releases/download/v${version}/Conduktor-linux-${version}.zip";
+ sha256 = "1kr5yh9piqbl6njsnxgh6jzf3vifw8ja5x4qm4znmzi3r49sw0gx";
+ };
+
+ nativeBuildInputs = [ makeWrapper copyDesktopItems ];
+
+ desktopItems = makeDesktopItem {
+ type = "Application";
+ name = pname;
+ desktopName = "Conduktor";
+ genericName = meta.description;
+ exec = pname;
+ icon = fetchurl {
+ url = "https://github.com/conduktor/builds/raw/v${version}/.github/resources/Conduktor.png";
+ sha256 = "0s7p74qclvac8xj2m22gfxx5m2c7cf0nqpk5sb049p2wvryhn2j4";
+ };
+ comment = "A beautiful and fully-featured desktop client for Apache Kafka";
+ };
+
+ dontConfigure = true;
+ dontBuild = true;
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/share/applications
+ mv * $out
+ wrapProgram "$out/bin/conduktor" --set JAVA_HOME "${jdk11.home}"
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Apache Kafka Desktop Client";
+ longDescription = ''
+ Conduktor is a GUI over the Kafka ecosystem, to make the development
+ and management of Apache Kafka clusters as easy as possible.
+ '';
+ homepage = "https://www.conduktor.io/";
+ changelog = "https://www.conduktor.io/changelog/#${version}";
+ license = licenses.unfree;
+ maintainers = with maintainers; [ trobert ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index 14361ffeb7a4a..474bdd0b6427b 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -74,13 +74,13 @@ let
self: super: {
octoprint = self.buildPythonPackage rec {
pname = "OctoPrint";
- version = "1.8.3";
+ version = "1.8.4";
src = fetchFromGitHub {
owner = "OctoPrint";
repo = "OctoPrint";
rev = version;
- hash = "sha256-uLQUVYxy7diOJl69sQ+7eshK0fsG34Fto+Zzih1MeVE=";
+ hash = "sha256-oYP+K7WBkYP7gajXZdbZso17u+GeyrIgEbhNjwRXbAo=";
};
propagatedBuildInputs = with super; [
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 6406187e16237..0d0c25dc3e526 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -45,19 +45,19 @@
}
},
"ungoogled-chromium": {
- "version": "105.0.5195.127",
- "sha256": "1q15i5vcb7q20awib7csh2v7mzjnppb4pqgqzgqiixs9wj710j3m",
+ "version": "106.0.5249.62",
+ "sha256": "1nm6hxr0gk5263v2ypmyc72dj1xb5r3r335vjvhvcqscgpikvnhq",
"sha256bin64": null,
"deps": {
"gn": {
- "version": "2022-07-11",
+ "version": "2022-08-11",
"url": "https://gn.googlesource.com/gn",
- "rev": "9ef321772ecc161937db69acb346397e0ccc484d",
- "sha256": "0j85kgf8c1psys6kfsq5mph8n80hcbzhr7d2blqiiysmjj0wc6ng"
+ "rev": "0bcd37bd2b83f1a9ee17088037ebdfe6eab6d31a",
+ "sha256": "13zks2z65kg7fzzsysq4mswd4bhhy3h7ycdrpxfilcvixx2n2gac"
},
"ungoogled-patches": {
- "rev": "105.0.5195.127-1",
- "sha256": "0iinags8lvfiw0l55fc3ldq92qw6p01a62zs8q2av0srzpx0xd0b"
+ "rev": "106.0.5249.62-1",
+ "sha256": "0lm7brj3sx8rkq2nzz9w0by5mk9qp0ax1wsp68b2wcwcx6nrzjw4"
}
}
}
diff --git a/pkgs/applications/networking/instant-messengers/schildichat/pin.json b/pkgs/applications/networking/instant-messengers/schildichat/pin.json
index 9ad6237af2dff..77cedc68b42df 100644
--- a/pkgs/applications/networking/instant-messengers/schildichat/pin.json
+++ b/pkgs/applications/networking/instant-messengers/schildichat/pin.json
@@ -1,9 +1,9 @@
{
- "version": "1.11.4-sc.1",
- "rev": "v1.11.4-sc.1",
- "srcHash": "05h7zcgnq8xi1hs5wqhjbm173y56zyz8g9l6ii8nbkzjrggif37w",
- "webYarnHash": "1yji94xcigz54bbhvssj2pgncw9fgal7mzw9h9bfwmny0pjh8c4p",
- "jsSdkYarnHash": "11yaii6srq6fysipsr083g4ac3k1rxhclprj4q60xwk39fl4qfpb",
- "reactSdkYarnHash": "0riz037rigpqybyf1jnfchzxyalajfc37l6xwdn5zb9avf730bms",
- "desktopYarnHash": "0m0zzq2wbk7h7anjmj586089j2qgsd5cj99rmi2hmsmssq63fmwk"
+ "version": "1.11.8-sc.1",
+ "rev": "v1.11.8-sc.1",
+ "srcHash": "1a4flbdc18whphxldk0nxqhw0zddsj7zw5js4fpyrr6h85h8qxcp",
+ "webYarnHash": "1q05r2shv1c3kghwksjzrh9rl25ins6r2y46ng7smdml4f9vdcc0",
+ "jsSdkYarnHash": "0z6qqif7kccbvbzr9fw92vs4affm4vw8rgs08rqig8pqpk52lwi2",
+ "reactSdkYarnHash": "0mx9iaciy965jr6vd0gnmyc3jiila9mmh36rv5vm60rx9aw02dv6",
+ "desktopYarnHash": "105xj2xwc9g8cfiby0x93gy8w8w5c76mzzxck5mgvawcc6qpvmrc"
}
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index d340bfba92cae..5c9caf3b67d57 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -9,7 +9,7 @@
stdenv.mkDerivation rec {
pname = "signal-desktop";
- version = "5.60.0"; # Please backport all updates to the stable channel.
+ version = "5.61.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
- sha256 = "sha256-fKbBrAohb/X7pehWfP3FVwfq0Grand2HlfOa6RE2Z6w=";
+ sha256 = "sha256-1EPOuvul/Dh/gFwgCy7Wme6GYIP1Mi3TofTrIF3kU3g=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix
index bea7fad805e27..558fe7e385f0f 100644
--- a/pkgs/applications/networking/p2p/ncdc/default.nix
+++ b/pkgs/applications/networking/p2p/ncdc/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "ncdc";
- version = "1.23";
+ version = "1.23.1";
src = fetchurl {
url = "https://dev.yorhel.nl/download/ncdc-${version}.tar.gz";
- hash = "sha256-gEq65B/MqWnof2UEg65+OiN0Gdq70yCJfiX+iFHwoss=";
+ hash = "sha256-lYgSFAd6Wzwk+7rwIK2g0ITuO1lqfDzB4OaKqsTJteY=";
};
nativeBuildInputs = [ perl pkg-config ];
diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix
index fe481d3f51b44..a7b5a39d72f6b 100644
--- a/pkgs/applications/office/jabref/default.nix
+++ b/pkgs/applications/office/jabref/default.nix
@@ -13,25 +13,27 @@
}:
stdenv.mkDerivation rec {
- version = "5.6";
+ version = "5.7";
pname = "jabref";
src = fetchFromGitHub {
owner = "JabRef";
repo = "jabref";
rev = "v${version}";
- hash = "sha256-w3F1td7KmdSor/2vKar3w17bChe1yH7JMobOaCjZqd4=";
+ hash = "sha256-wzBaAaxGsMPh64uW+bBOiycYfVCW9H5FCn06r6XdxeE=";
};
desktopItems = [
(makeDesktopItem {
comment = meta.description;
- name = "jabref";
+ name = "JabRef %U";
desktopName = "JabRef";
genericName = "Bibliography manager";
categories = [ "Office" ];
icon = "jabref";
- exec = "jabref";
+ exec = "JabRef";
+ startupWMClass = "org.jabref.gui.JabRefMain";
+ mimeTypes = [ "text/x-bibtex" ];
})
];
@@ -39,12 +41,6 @@ stdenv.mkDerivation rec {
pname = "${pname}-deps";
inherit src version;
- postPatch = ''
- sed -i -e '/testImplementation/d' -e '/testRuntimeOnly/d' build.gradle
- echo 'dependencyLocking { lockAllConfigurations() }' >> build.gradle
- cp ${./gradle.lockfile} ./
- '';
-
nativeBuildInputs = [ gradle perl ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
@@ -60,8 +56,8 @@ stdenv.mkDerivation rec {
forceShare = [ "dummy" ];
outputHashMode = "recursive";
outputHash = {
- x86_64-linux = "sha256-ySGXZM9LCJUjGCrKMc+5I6duEbmSsp3tU3t/o5nM+5M=";
- aarch64-linux = "sha256-mfWyGGBqjRQ8q9ddR57O2rwtby2T1H6Ra2m0JGVZ1Zs=";
+ x86_64-linux = "sha256-OicHJVFxHGPE76bEDoLhkEhVcAJmplqjoh2I3nnVaLA=";
+ aarch64-linux = "sha256-8QWmweptL/+pSO6DhfBLaLcBrfKd4TDsDoXs4TgXvew=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system ${stdenv.hostPlatform.system}");
};
@@ -95,11 +91,14 @@ stdenv.mkDerivation rec {
--no-daemon \
-PprojVersion="${version}" \
-PprojVersionInfo="${version} NixOS" \
+ -Dorg.gradle.java.home=${jdk} \
assemble
runHook postBuild
'';
+ dontWrapGApps = true;
+
installPhase = ''
runHook preInstall
@@ -109,8 +108,6 @@ stdenv.mkDerivation rec {
# script to support browser extensions
install -Dm755 buildres/linux/jabrefHost.py $out/lib/jabrefHost.py
- # This can be removed in the next version
- sed -i -e "/importBibtex/s/{}/'{}'/" $out/lib/jabrefHost.py
install -Dm644 buildres/linux/native-messaging-host/firefox/org.jabref.jabref.json $out/lib/mozilla/native-messaging-hosts/org.jabref.jabref.json
sed -i -e "s|/opt/jabref|$out|" $out/lib/mozilla/native-messaging-hosts/org.jabref.jabref.json
@@ -119,31 +116,30 @@ stdenv.mkDerivation rec {
# workaround for https://github.com/NixOS/nixpkgs/issues/162064
tar xf build/distributions/JabRef-${version}.tar -C $out --strip-components=1
- unzip $out/lib/javafx-web-18-linux${lib.optionalString stdenv.isAarch64 "-aarch64"}.jar libjfxwebkit.so -d $out/lib/
+ unzip $out/lib/javafx-web-*-linux${lib.optionalString stdenv.isAarch64 "-aarch64"}.jar libjfxwebkit.so -d $out/lib/
+
+ DEFAULT_JVM_OPTS=$(sed -n -E "s/^DEFAULT_JVM_OPTS='(.*)'$/\1/p" $out/bin/JabRef | sed -e "s|\$APP_HOME|$out|g" -e 's/"//g')
+ rm $out/bin/*
+
+ makeWrapper ${jdk}/bin/java $out/bin/JabRef \
+ "''${gappsWrapperArgs[@]}" \
+ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
+ --add-flags "-Djava.library.path=$out/lib/ --patch-module org.jabref=$out/share/java/jabref/resources/main" \
+ --add-flags "$DEFAULT_JVM_OPTS"
# lowercase alias (for convenience and required for browser extensions)
ln -sf $out/bin/JabRef $out/bin/jabref
- rm $out/bin/JabRef.bat
-
runHook postInstall
'';
- preFixup = ''
- gappsWrapperArgs+=(
- --suffix PATH : ${lib.makeBinPath [ xdg-utils ]}
- --set JAVA_HOME "${jdk}"
- --set JAVA_OPTS "-Djava.library.path=$out/lib/ --patch-module org.jabref=$out/share/java/jabref/resources/main"
- )
- '';
-
meta = with lib; {
description = "Open source bibliography reference manager";
homepage = "https://www.jabref.org";
sourceProvenance = with sourceTypes; [
fromSource
- binaryBytecode # source bundles dependencies as jars
- binaryNativeCode # source bundles dependencies as jars
+ binaryBytecode # source bundles dependencies as jars
+ binaryNativeCode # source bundles dependencies as jars
];
license = licenses.gpl2;
platforms = [ "x86_64-linux" "aarch64-linux" ];
diff --git a/pkgs/applications/office/jabref/gradle.lockfile b/pkgs/applications/office/jabref/gradle.lockfile
deleted file mode 100644
index 560420fb6ef26..0000000000000
--- a/pkgs/applications/office/jabref/gradle.lockfile
+++ /dev/null
@@ -1,180 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-classworlds:classworlds:1.1-alpha-2=modernizer
-com.fasterxml.jackson.core:jackson-annotations:2.13.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.fasterxml.jackson.core:jackson-core:2.13.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.fasterxml.jackson.core:jackson-databind:2.13.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.fasterxml.jackson:jackson-bom:2.13.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.tomtung:latex2unicode_2.12:0.2.6=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.code.findbugs:jsr305:3.0.2=checkstyle
-com.google.code.gson:gson:2.9.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.11.0=checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.guava:failureaccess:1.0.1=checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:31.1-jre=checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:1.3=checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.googlecode.javaewah:JavaEWAH:1.1.13=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.h2database:h2-mvstore:2.1.212=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.ibm.icu:icu4j-charset:70.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.ibm.icu:icu4j:69.1=antlr4
-com.ibm.icu:icu4j:70.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.jfoenix:jfoenix:9.0.10=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.konghq:unirest-java:3.13.8=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.microsoft.azure:applicationinsights-core:2.4.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.microsoft.azure:applicationinsights-logging-log4j2:2.4.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.oracle.ojdbc:ojdbc10:19.3.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.oracle.ojdbc:ons:19.3.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.oracle.ojdbc:osdt_cert:19.3.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.oracle.ojdbc:osdt_core:19.3.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.oracle.ojdbc:simplefan:19.3.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.oracle.ojdbc:ucp:19.3.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.puppycrawl.tools:checkstyle:10.1=checkstyle
-com.sun.activation:jakarta.activation:2.0.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,xjc
-com.sun.istack:istack-commons-runtime:4.0.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,xjc
-com.sun.istack:istack-commons-tools:4.0.1=xjc
-com.sun.xml.bind.external:relaxng-datatype:3.0.2=xjc
-com.sun.xml.bind.external:rngom:3.0.2=xjc
-com.sun.xml.dtd-parser:dtd-parser:1.4.5=xjc
-com.tobiasdiez:easybind:2.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.vladsch.flexmark:flexmark-ext-gfm-tasklist:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.vladsch.flexmark:flexmark-util-ast:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.vladsch.flexmark:flexmark-util-builder:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.vladsch.flexmark:flexmark-util-collection:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.vladsch.flexmark:flexmark-util-data:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.vladsch.flexmark:flexmark-util-dependency:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.vladsch.flexmark:flexmark-util-format:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.vladsch.flexmark:flexmark-util-html:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.vladsch.flexmark:flexmark-util-misc:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.vladsch.flexmark:flexmark-util-options:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.vladsch.flexmark:flexmark-util-sequence:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.vladsch.flexmark:flexmark-util-visitor:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.vladsch.flexmark:flexmark-util:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.vladsch.flexmark:flexmark:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-commons-beanutils:commons-beanutils:1.9.4=checkstyle
-commons-cli:commons-cli:1.5.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-commons-codec:commons-codec:1.11=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-commons-collections:commons-collections:3.2.2=checkstyle
-commons-io:commons-io:2.11.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-commons-logging:commons-logging:1.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-de.saxsys:mvvmfx-validation:1.9.0-SNAPSHOT=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-de.saxsys:mvvmfx:1.8.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-de.undercouch:citeproc-java:3.0.0-alpha.6=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-eu.lestard:doc-annotations:0.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-info.debatty:java-string-similarity:2.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-info.picocli:picocli:4.6.3=checkstyle
-io.github.java-diff-utils:java-diff-utils:4.11=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-jakarta.annotation:jakarta.annotation-api:1.3.5=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-jakarta.xml.bind:jakarta.xml.bind-api:3.0.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,xjc
-junit:junit:3.8.1=modernizer
-net.harawata:appdirs:1.2.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.java.dev.jna:jna-platform:5.6.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.java.dev.jna:jna:5.6.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.jcip:jcip-annotations:1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.jodah:typetools:0.6.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.sf.jopt-simple:jopt-simple:4.6=jmh,jmhCompileClasspath,jmhRuntimeClasspath
-net.sf.saxon:Saxon-HE:10.6=checkstyle
-org.abego.treelayout:org.abego.treelayout.core:1.0.3=antlr4
-org.antlr:ST4:4.3.1=antlr3,antlr4
-org.antlr:antlr-runtime:3.5.2=antlr4,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.antlr:antlr-runtime:3.5.3=antlr3
-org.antlr:antlr4-runtime:4.9.3=antlr4,checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.antlr:antlr4:4.9.3=antlr4
-org.antlr:antlr:3.5.3=antlr3
-org.apache.commons:commons-csv:1.9.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.commons:commons-lang3:3.12.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.commons:commons-math3:3.2=jmh,jmhCompileClasspath,jmhRuntimeClasspath
-org.apache.commons:commons-text:1.9=compile,jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
-org.apache.httpcomponents:httpasyncclient:4.1.5=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.httpcomponents:httpclient:4.5.13=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.httpcomponents:httpcore-nio:4.4.13=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.httpcomponents:httpcore:4.4.13=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.httpcomponents:httpmime:4.5.13=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.lucene:lucene-analysis-common:9.1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.lucene:lucene-core:9.1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.lucene:lucene-highlighter:9.1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.lucene:lucene-memory:9.1.0=compile,jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
-org.apache.lucene:lucene-queries:9.1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.lucene:lucene-queryparser:9.1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.lucene:lucene-sandbox:9.1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.maven.wagon:wagon-provider-api:1.0-beta-2=modernizer
-org.apache.maven:maven-artifact-manager:2.0.9=modernizer
-org.apache.maven:maven-artifact:2.0.9=modernizer
-org.apache.maven:maven-model:2.0.9=modernizer
-org.apache.maven:maven-plugin-api:2.0=modernizer
-org.apache.maven:maven-plugin-registry:2.0.9=modernizer
-org.apache.maven:maven-profile:2.0.9=modernizer
-org.apache.maven:maven-project:2.0.9=modernizer
-org.apache.maven:maven-repository-metadata:2.0.9=modernizer
-org.apache.maven:maven-settings:2.0.9=modernizer
-org.apache.pdfbox:fontbox:3.0.0-RC1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.pdfbox:pdfbox:3.0.0-RC1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.pdfbox:xmpbox:3.0.0-RC1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.tika:tika-core:2.3.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.bouncycastle:bcprov-jdk15on:1.70=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.checkerframework:checker-qual:3.12.0=checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1=modernizer
-org.controlsfx:controlsfx:11.1.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jgit:org.eclipse.jgit:6.1.0.202203080745-r=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.fxmisc.flowless:flowless:0.6.9=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.fxmisc.richtext:richtextfx:0.10.9=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.fxmisc.undo:undofx:2.1.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.fxmisc.wellbehaved:wellbehavedfx:0.3.3=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.gaul:modernizer-maven-annotations:2.3.0=modernizer
-org.gaul:modernizer-maven-plugin:2.3.0=modernizer
-org.glassfish.hk2.external:jakarta.inject:2.6.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.glassfish.jaxb:codemodel:3.0.2=xjc
-org.glassfish.jaxb:jaxb-core:3.0.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,xjc
-org.glassfish.jaxb:jaxb-runtime:3.0.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,xjc
-org.glassfish.jaxb:jaxb-xjc:3.0.2=xjc
-org.glassfish.jaxb:txw2:3.0.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,xjc
-org.glassfish.jaxb:xsom:3.0.2=xjc
-org.glassfish:javax.json:1.0.4=antlr4
-org.jacoco:org.jacoco.agent:0.8.7=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.7=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.7=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.7=jacocoAnt
-org.javassist:javassist:3.28.0-GA=checkstyle
-org.jbibtex:jbibtex:1.0.19=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.jetbrains:annotations:15.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.jsoup:jsoup:1.14.3=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.kordamp.ikonli:ikonli-core:12.3.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.kordamp.ikonli:ikonli-javafx:12.3.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.kordamp.ikonli:ikonli-materialdesign2-pack:12.3.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.libreoffice:libreoffice:7.3.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.libreoffice:unoloader:7.3.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.mariadb.jdbc:mariadb-java-client:2.7.5=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.openjdk.jmh:jmh-core:1.25=jmh,jmhCompileClasspath,jmhRuntimeClasspath
-org.openjdk.jmh:jmh-generator-asm:1.25=jmh,jmhCompileClasspath,jmhRuntimeClasspath
-org.openjdk.jmh:jmh-generator-bytecode:1.25=jmh,jmhCompileClasspath,jmhRuntimeClasspath
-org.openjdk.jmh:jmh-generator-reflection:1.25=jmh,jmhCompileClasspath,jmhRuntimeClasspath
-org.openjfx:javafx-base:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.openjfx:javafx-controls:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.openjfx:javafx-fxml:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.openjfx:javafx-graphics:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.openjfx:javafx-media:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.openjfx:javafx-swing:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.openjfx:javafx-web:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.ow2.asm:asm-analysis:9.1=jacocoAnt
-org.ow2.asm:asm-analysis:9.2=modernizer
-org.ow2.asm:asm-commons:9.1=jacocoAnt
-org.ow2.asm:asm-commons:9.2=modernizer
-org.ow2.asm:asm-tree:9.1=jacocoAnt
-org.ow2.asm:asm-tree:9.2=modernizer
-org.ow2.asm:asm:5.0.3=jmh,jmhCompileClasspath,jmhRuntimeClasspath
-org.ow2.asm:asm:9.1=jacocoAnt
-org.ow2.asm:asm:9.2=modernizer
-org.postgresql:postgresql:42.3.3=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.reactfx:reactfx:2.0-M5=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.reflections:reflections:0.10.2=checkstyle
-org.scala-lang:scala-library:2.12.8=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.slf4j:slf4j-api:2.0.0-alpha7=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.tinylog:slf4j-tinylog:2.4.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.tinylog:tinylog-api:2.4.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.tinylog:tinylog-impl:2.4.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.yaml:snakeyaml:1.30=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-empty=annotationProcessor,jmhAnnotationProcessor,testAnnotationProcessor
diff --git a/pkgs/applications/science/math/pagsuite/default.nix b/pkgs/applications/science/math/pagsuite/default.nix
new file mode 100644
index 0000000000000..e8ae3318eebad
--- /dev/null
+++ b/pkgs/applications/science/math/pagsuite/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, stdenv
+, fetchzip
+, cmake
+, gmp
+, scalp
+}:
+
+stdenv.mkDerivation rec {
+ pname = "pagsuite";
+ version = "1.80";
+
+ src = fetchzip {
+ url = "https://gitlab.com/kumm/pagsuite/-/raw/master/releases/pagsuite_${lib.replaceStrings ["."] ["_"] version}.zip";
+ sha256 = "sha256-JuRuDPhKKBGz8jUBkZcZW5s2berOewjsPNR/n7kuofY=";
+ stripRoot = false;
+ postFetch = ''
+ mv $out/pagsuite*/* $out
+ '';
+ };
+
+ nativeBuildInputs = [
+ cmake
+ ];
+
+ buildInputs = [
+ gmp
+ scalp
+ ];
+
+ meta = with lib; {
+ description = "Optimization tools for the (P)MCM problem";
+ homepage = "https://gitlab.com/kumm/pagsuite";
+ maintainers = with maintainers; [ wegank ];
+ license = licenses.unfree;
+ };
+}
diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix
index 7c529cd9cb9c7..02c546d9dd427 100644
--- a/pkgs/applications/virtualization/nixpacks/default.nix
+++ b/pkgs/applications/virtualization/nixpacks/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "nixpacks";
- version = "0.7.1";
+ version = "0.7.2";
src = fetchFromGitHub {
owner = "railwayapp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-d38PocmvGRvyKMCNMhE8IFNGOn6r42ODLPVo/Ak3q/8=";
+ sha256 = "sha256-tiAz8nrUq47AgafoXx/6KNl7Q3y1/Z4ITOtznU3hQAw=";
};
- cargoSha256 = "sha256-74FIlSV/prlxuMxqVx27M0ltXY3m0ddUVyHTltQLnuM=";
+ cargoSha256 = "sha256-6o254VH5fwtcTFPEFfPdLQOLk8YGbEi9ZeDfdHhVCn0=";
# skip test due FHS dependency
doCheck = false;
diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix
index 557243e2be5f4..0f0d8518e9262 100644
--- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix
@@ -49,7 +49,6 @@
, vte
, glib-networking
, qemu-utils
-, qemu
}:
stdenv.mkDerivation rec {
@@ -126,7 +125,7 @@ stdenv.mkDerivation rec {
];
preFixup = ''
- gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ mtools cdrkit libcdio qemu-utils qemu ]}")
+ gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ mtools cdrkit libcdio qemu-utils ]}")
'';
postPatch = ''
diff --git a/pkgs/development/compilers/go/1.17.nix b/pkgs/development/compilers/go/1.17.nix
index 77b3fd9d0b91a..41464699a0988 100644
--- a/pkgs/development/compilers/go/1.17.nix
+++ b/pkgs/development/compilers/go/1.17.nix
@@ -229,7 +229,12 @@ stdenv.mkDerivation rec {
'';
postBuild = ''
- (cd src && ./make.bash)
+ # Invoke the bash interpreter directly on make.bash script to allow using overrideAttrs with
+ # dontPatch set to true (disables postPatch that runs patchShebangs) and doCheck set to false
+ # (since Go test suite assumes that the environment is not sandboxed) as a workaround for
+ # https://github.com/NixOS/nixpkgs/issues/125198 until necessary changes are implemented in
+ # upstream Go source tree.
+ (cd src && bash make.bash)
'';
doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin;
@@ -242,9 +247,6 @@ stdenv.mkDerivation rec {
preInstall = ''
rm -r pkg/obj
- # Contains the wrong perl shebang when cross compiling,
- # since it is not used for anything we can deleted as well.
- rm src/regexp/syntax/make_perl_groups.pl
'' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then ''
mv bin/*_*/* bin
rmdir bin/*_*
diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix
index 7b208da598824..47263c1bdb86b 100644
--- a/pkgs/development/compilers/go/1.18.nix
+++ b/pkgs/development/compilers/go/1.18.nix
@@ -130,17 +130,19 @@ stdenv.mkDerivation rec {
''}
ulimit -a
+ # Invoke the bash interpreter directly on make.bash script to allow using overrideAttrs with
+ # dontPatch set to true (disables postPatch that runs patchShebangs) as a workaround for
+ # https://github.com/NixOS/nixpkgs/issues/125198 until necessary changes are implemented in
+ # upstream Go source tree.
pushd src
- ./make.bash
+ bash make.bash
popd
+
runHook postBuild
'';
preInstall = ''
rm -r pkg/obj
- # Contains the wrong perl shebang when cross compiling,
- # since it is not used for anything we can deleted as well.
- rm src/regexp/syntax/make_perl_groups.pl
'' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then ''
mv bin/*_*/* bin
rmdir bin/*_*
diff --git a/pkgs/development/compilers/go/1.19.nix b/pkgs/development/compilers/go/1.19.nix
index 34d4c0d9d2c25..4af267c6fae09 100644
--- a/pkgs/development/compilers/go/1.19.nix
+++ b/pkgs/development/compilers/go/1.19.nix
@@ -130,17 +130,19 @@ stdenv.mkDerivation rec {
''}
ulimit -a
+ # Invoke the bash interpreter directly on make.bash script to allow using overrideAttrs with
+ # dontPatch set to true (disables postPatch that runs patchShebangs) as a workaround for
+ # https://github.com/NixOS/nixpkgs/issues/125198 until necessary changes are implemented in
+ # upstream Go source tree.
pushd src
- ./make.bash
+ bash make.bash
popd
+
runHook postBuild
'';
preInstall = ''
rm -r pkg/obj
- # Contains the wrong perl shebang when cross compiling,
- # since it is not used for anything we can deleted as well.
- rm src/regexp/syntax/make_perl_groups.pl
'' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then ''
mv bin/*_*/* bin
rmdir bin/*_*
diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix
index 26d1692b109c9..9cc3503acd6e2 100644
--- a/pkgs/development/libraries/drogon/default.nix
+++ b/pkgs/development/libraries/drogon/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "drogon";
- version = "1.8.0";
+ version = "1.8.1";
src = fetchFromGitHub {
owner = "drogonframework";
repo = "drogon";
rev = "v${version}";
- sha256 = "sha256-rpn1TaEdiD/tM8F0Uc7yjF3EFGpu3/hAS0CITraLkMU=";
+ sha256 = "sha256-XzSJABYuZaYlNL12bi0ykQ1OyNsvB1AQiSTBPWiTNYU=";
fetchSubmodules = true;
};
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index 38f27ab23fcde..5ae0c2b7edb0f 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -12,7 +12,12 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib ];
propagatedBuildInputs = [ libzen ];
- postPatch = "cd Project/GNU/Library";
+ sourceRoot = "MediaInfoLib/Project/GNU/Library";
+
+ postPatch = lib.optionalString (stdenv.cc.targetPrefix != "") ''
+ substituteInPlace configure.ac \
+ --replace "pkg-config " "${stdenv.cc.targetPrefix}pkg-config "
+ '';
configureFlags = [ "--enable-shared" ];
diff --git a/pkgs/development/libraries/miniaudio/default.nix b/pkgs/development/libraries/miniaudio/default.nix
new file mode 100644
index 0000000000000..3b8be7b149c66
--- /dev/null
+++ b/pkgs/development/libraries/miniaudio/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+}:
+stdenv.mkDerivation rec {
+ pname = "miniaudio";
+ version = "unstable-2020-04-20";
+
+ src = fetchFromGitHub {
+ owner = "mackron";
+ repo = "miniaudio";
+ rev = "4d813cfe23c28db165cce6785419fee9d2399766";
+ sha256 = "sha256-efZLZTmkLtvcysd25olDE/QqunU5YTYwSVmUZXPKGIY=";
+ };
+
+ installPhase = ''
+ mkdir -p $out
+ cp -r $src/* $out/
+ '';
+
+ meta = with lib; {
+ description = "Single header audio playback and capture library written in C.";
+ homepage = "https://github.com/mackron/miniaudio";
+ license = licenses.unlicense;
+ maintainers = [ maintainers.jansol ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/octave-modules/symbolic/default.nix b/pkgs/development/octave-modules/symbolic/default.nix
index 5138265399292..1d3715b3d73b6 100644
--- a/pkgs/development/octave-modules/symbolic/default.nix
+++ b/pkgs/development/octave-modules/symbolic/default.nix
@@ -1,27 +1,26 @@
{ buildOctavePackage
, lib
, fetchFromGitHub
-# Octave's Python (Python 3)
+ # Octave's Python (Python 3)
, python
}:
let
pythonEnv = python.withPackages (ps: [
- ps.sympy
- ps.mpmath
- ]);
+ ps.sympy
+ ps.mpmath
+ ]);
-in buildOctavePackage rec {
+in
+buildOctavePackage rec {
pname = "symbolic";
- version = "unstable-2021-10-16";
+ version = "3.0.1";
- # https://github.com/cbm755/octsympy/issues/1023 has been resolved, however
- # a new release has not been made
src = fetchFromGitHub {
owner = "cbm755";
repo = "octsympy";
- rev = "5b58530f4ada78c759829ae703a0e5d9832c32d4";
- sha256 = "sha256-n6P1Swjl4RfgxfLY0ZuN3pcL8PcoknA6yxbnw96OZ2k=";
+ rev = "v${version}";
+ hash = "sha256-FJb5uazqEiyNI6TL9WVewMoQnC3CutcHENl+umNZeto=";
};
propagatedBuildInputs = [ pythonEnv ];
diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index 67decf5ced074..5f7f2f1e85491 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
- version = "10.13.0";
+ version = "10.14.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "esphome";
repo = pname;
rev = "refs/tags/v${version}";
- sha256 = "sha256-ZaNrSkRH9pFhzZncCs37k1M0w5svPfrY0WxePUnUlms=";
+ sha256 = "sha256-ASFErnWUNcq/30AOYM596w+j0FOYGuQ3Tj4OdczWanM=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/django-formtools/default.nix b/pkgs/development/python-modules/django-formtools/default.nix
index c85d5d3fcc75e..11a1fb0716967 100644
--- a/pkgs/development/python-modules/django-formtools/default.nix
+++ b/pkgs/development/python-modules/django-formtools/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "django-formtools";
- version = "2.3";
+ version = "2.4";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "9663b6eca64777b68d6d4142efad8597fe9a685924673b25aa8a1dcff4db00c3";
+ sha256 = "sha256-3rkyvlWx2UGeN9xNZd+/640we3HIwR/VLxWaul/A3u0=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/easydict/default.nix b/pkgs/development/python-modules/easydict/default.nix
index e1898d3fc9e45..fd1ebf8d9f3da 100644
--- a/pkgs/development/python-modules/easydict/default.nix
+++ b/pkgs/development/python-modules/easydict/default.nix
@@ -1,15 +1,23 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
buildPythonPackage rec {
pname = "easydict";
- version = "1.9";
+ version = "1.10";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "3f3f0dab07c299f0f4df032db1f388d985bb57fa4c5be30acd25c5f9a516883b";
+ sha256 = "sha256-Edyywgqqu/7kwYi0vBQ+9r4ESzTb8M5aWTJCwmlaCA8=";
};
- docheck = false; # No tests in archive
+ doCheck = false; # No tests in archive
+
+ pythonImportsCheck = [
+ "easydict"
+ ];
meta = with lib; {
homepage = "https://github.com/makinacorpus/easydict";
diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix
index a995e56b1da60..f9fccbde09282 100644
--- a/pkgs/development/python-modules/humanize/default.nix
+++ b/pkgs/development/python-modules/humanize/default.nix
@@ -11,7 +11,7 @@
}:
buildPythonPackage rec {
- version = "4.3.0";
+ version = "4.4.0";
pname = "humanize";
format = "pyproject";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "python-humanize";
repo = pname;
rev = version;
- hash = "sha256-sccv3HtCgG/znZs/sfmeeOHK3xchv9zRrNX/SxyEbCQ=";
+ hash = "sha256-XxlmOs3sfHOLTkrKGsHRiBWpuCIPJua2VkKxDmjOeWE=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix
index f657f73a7e418..235e93ab8750e 100644
--- a/pkgs/development/python-modules/imageio/default.nix
+++ b/pkgs/development/python-modules/imageio/default.nix
@@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "imageio";
- version = "2.19.3";
+ version = "2.22.0";
disabled = isPy27;
src = fetchPypi {
- sha256 = "sha256-DJ34DkLy7mi+qSAB5/z2EqoUmRDv4EDrdX9c4yMlCuE=";
+ sha256 = "sha256-ozLRJ+w4ey09ypZ/0GWpDxwaS6I0NXCwP+LOu27QZOo=";
inherit pname version;
};
@@ -65,6 +65,6 @@ buildPythonPackage rec {
description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats";
homepage = "http://imageio.github.io/";
license = licenses.bsd2;
- maintainers = with maintainers; [ ];
+ maintainers = with maintainers; [ Luflosi ];
};
}
diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix
index 69b8599db5d7a..0e6a156a4a9e9 100644
--- a/pkgs/development/python-modules/nbxmpp/default.nix
+++ b/pkgs/development/python-modules/nbxmpp/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "nbxmpp";
- version = "3.2.1";
+ version = "3.2.2";
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "gajim";
repo = "python-nbxmpp";
rev = version;
- sha256 = "sha256-BBDCk/vWm9Y2oGw0aujqlueaB+ww7F2YP2cw5VqIzfQ=";
+ sha256 = "sha256-WVE8evbfWdQNsuDEQF7WfEYDQEKGKXElKQBkUn7bJ1I=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix
index b3ffc2aa34a4f..5b271667e0289 100644
--- a/pkgs/development/python-modules/readme_renderer/default.nix
+++ b/pkgs/development/python-modules/readme_renderer/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "readme-renderer";
- version = "37.0";
+ version = "37.2";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "readme_renderer";
inherit version;
- sha256 = "sha256-B7fqI04D5Y93zCIuIG5qu49MBDW+zOUQR5TuWR+TAcU=";
+ sha256 = "sha256-6K0lKTyY94HbwsWjajCZKTkACfkC+Z4XmMdhqvBKeSM=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix
index 55feba377d5e3..26b50d1cb7731 100644
--- a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix
@@ -1,45 +1,52 @@
-{ stdenv
-, lib
+{ lib
+, astroid
, buildPythonPackage
, fetchPypi
-, pythonOlder
-, astroid
, jinja2
-, sphinx
+, mock
+, pytestCheckHook
+, pythonOlder
, pyyaml
+, sphinx
+, stdenv
, unidecode
-, mock
-, pytest
}:
buildPythonPackage rec {
pname = "sphinx-autoapi";
version = "1.9.0";
- disabled = pythonOlder "3.6";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-yJfqM33xatDN4wfL3+K+ziB3iN3hWH+k/IuFfR/F3Lo=";
+ hash = "sha256-yJfqM33xatDN4wfL3+K+ziB3iN3hWH+k/IuFfR/F3Lo=";
};
- propagatedBuildInputs = [ astroid jinja2 pyyaml sphinx unidecode ];
+ propagatedBuildInputs = [
+ astroid
+ jinja2
+ pyyaml
+ sphinx
+ unidecode
+ ];
checkInputs = [
mock
- pytest
+ pytestCheckHook
];
- checkPhase = ''
- pytest
- '';
+ pythonImportsCheck = [
+ "autoapi"
+ ];
meta = with lib; {
- broken = stdenv.isDarwin;
homepage = "https://github.com/readthedocs/sphinx-autoapi";
description = "Provides 'autodoc' style documentation";
longDescription = "Sphinx AutoAPI provides 'autodoc' style documentation for multiple programming languages without needing to load, run, or import the project being documented.";
license = licenses.mit;
maintainers = with maintainers; [ karolchmist ];
+ broken = stdenv.isDarwin;
};
-
}
diff --git a/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix b/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix
new file mode 100644
index 0000000000000..0a283dd81a4d5
--- /dev/null
+++ b/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, sphinx
+, mscgen
+}:
+
+buildPythonPackage rec {
+ pname = "sphinxcontrib-mscgen";
+ version = "0.6";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ hash = "sha256-AXfSWRq3CepT/jNOgHxiYT7vkdKZejPu/LeUqxZ8T5A=";
+ };
+
+ propagatedBuildInputs = [
+ mscgen
+ sphinx
+ ];
+
+ # There are no unit tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "sphinxcontrib.mscgen"
+ ];
+
+ meta = with lib; {
+ description = "Sphinx extension using mscgen to render diagrams";
+ homepage = "https://github.com/sphinx-contrib/mscgen";
+ license = licenses.bola11;
+ maintainers = with maintainers; [ drupol ];
+ };
+}
diff --git a/pkgs/development/tools/analysis/makefile2graph/default.nix b/pkgs/development/tools/analysis/makefile2graph/default.nix
index 5c286e6295476..dea310ede42e7 100644
--- a/pkgs/development/tools/analysis/makefile2graph/default.nix
+++ b/pkgs/development/tools/analysis/makefile2graph/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "makefile2graph";
- version = "unstable-2018-01-03";
+ version = "2021.11.06";
src = fetchFromGitHub {
owner = "lindenb";
repo = "makefile2graph";
- rev = "61fb95a5ba91c20236f5e4deb11127c34b47091f";
- sha256 = "07hq40bl48i8ka35fcciqcafpd8k9rby1wf4vl2p53v0665xaghr";
+ rev = "refs/tags/${version}";
+ hash = "sha256-4jyftC0eCJ13X/L4uEWhT5FA5/UXUmSHSoba89GSySQ=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix
index 1b78b3aba9ad5..8bd5a2c1e1c05 100644
--- a/pkgs/development/tools/build-managers/sbt-extras/default.nix
+++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix
@@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
pname = "sbt-extras";
- rev = "79d05c5dce595536263f337ab04b2868cb72604f";
- version = "2022-07-12";
+ rev = "ddc1c0a9e9df598ad60edbd004e5abb51b32e42c";
+ version = "2022-09-23";
src = fetchFromGitHub {
owner = "paulp";
repo = "sbt-extras";
inherit rev;
- sha256 = "GQue3n2oUTDz2QGf46T2ePJ0fD5XPFZ/36SWlT+DBTM=";
+ sha256 = "SsqxDipM6B2w1kT1yuNc+PXYDE8qpUSwaXqItYuCgRU=";
};
dontBuild = true;
diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix
index d401af96ef88d..ace6886dc2532 100644
--- a/pkgs/development/tools/cloud-nuke/default.nix
+++ b/pkgs/development/tools/cloud-nuke/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cloud-nuke";
- version = "0.19.0";
+ version = "0.19.1";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-NZFjocmmrOFGnGvLcgJPuUpzfG27FM+CnjUCjxI4l7M=";
+ sha256 = "sha256-509kDq2didjtsMbEkDzTh37P8bY6pIcNr51fccxqrPg=";
};
vendorSha256 = "sha256-DJmN7KAOgKYIzcsOyW3v7PTbuNgFaH0JSdRPDqi0q+w=";
diff --git a/pkgs/development/tools/konf/default.nix b/pkgs/development/tools/konf/default.nix
index dd7e4d2a97b03..a00e66474bd09 100644
--- a/pkgs/development/tools/konf/default.nix
+++ b/pkgs/development/tools/konf/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "konf";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "SimonTheLeg";
repo = "konf-go";
rev = "v${version}";
- hash = "sha256-n8WJyihpbtci8Q6zUapwrpTrVZVAS53OpnwAsv6w1FY=";
+ hash = "sha256-8TXr/jYMl3NLERtLkm7qG97IL/idz4xxP0g0LEy4/j8=";
};
vendorHash = "sha256-sB3j19HrTtaRqNcooqNy8vBvuzxxyGDa7MOtiGoVgN8=";
diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix
index 421076e5c6d50..9246fb9b8a08f 100644
--- a/pkgs/development/tools/ktlint/default.nix
+++ b/pkgs/development/tools/ktlint/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, makeWrapper, jre_headless }:
+{ lib, stdenv, fetchurl, makeWrapper, jre_headless, gnused }:
stdenv.mkDerivation rec {
pname = "ktlint";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
'';
postFixup = ''
- wrapProgram $out/bin/ktlint --prefix PATH : "${jre_headless}/bin"
+ wrapProgram $out/bin/ktlint --prefix PATH : "${lib.makeBinPath [ jre_headless gnused ]}"
'';
meta = with lib; {
diff --git a/pkgs/development/tools/misc/rsass/default.nix b/pkgs/development/tools/misc/rsass/default.nix
new file mode 100644
index 0000000000000..8ce2e3c58137d
--- /dev/null
+++ b/pkgs/development/tools/misc/rsass/default.nix
@@ -0,0 +1,23 @@
+{ lib, rustPlatform, fetchCrate }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "rsass";
+ version = "0.26.0";
+
+ src = fetchCrate {
+ inherit pname version;
+ sha256 = "sha256-Ksub+VYTbaWbFpHJFrMr6Dnx6LOnEOUlI2qHhCfbS40=";
+ };
+
+ cargoSha256 = "sha256-ugG4ivQ2NzLJeZss7h9TME2Aipurl1LZBgxt1cYaK2E=";
+
+ buildFeatures = [ "commandline" ];
+
+ meta = with lib; {
+ description = "Sass reimplemented in rust with nom";
+ homepage = "https://github.com/kaj/rsass";
+ changelog = "https://github.com/kaj/rsass/blob/v${version}/CHANGELOG.md";
+ license = with licenses; [ mit /* or */ asl20 ];
+ maintainers = with maintainers; [ figsoda ];
+ };
+}
diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix
index e4c93d7a041d7..6eb44d4129e1e 100644
--- a/pkgs/development/tools/rust/cargo-make/default.nix
+++ b/pkgs/development/tools/rust/cargo-make/default.nix
@@ -13,11 +13,11 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-make";
- version = "0.36.0";
+ version = "0.36.1";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-Kh6llGiSzzrd4V2wBRe7FW1cq1JaMv+A0VUy8FLi5J0=";
+ sha256 = "sha256-kezwewPdHGcATPaU7wvbunVQ9a2Orf5CuVCue8Ux84I=";
};
nativeBuildInputs = [ pkg-config ];
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ];
- cargoSha256 = "sha256-FKmr590pwscWxQZYakkc6zFVLO2nGK9OMDhLiZxnELs=";
+ cargoSha256 = "sha256-ZGNR2xAGsdv4lNnGckB/n5mhzetz6Gn3z2TpAvnvsjU=";
# Some tests fail because they need network access.
# However, Travis ensures a proper build.
diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix
index aab92c6bb44e7..ca7753aa56e1f 100644
--- a/pkgs/development/web/insomnia/default.nix
+++ b/pkgs/development/web/insomnia/default.nix
@@ -15,12 +15,12 @@ let
];
in stdenv.mkDerivation rec {
pname = "insomnia";
- version = "2022.5.1";
+ version = "2022.6.0";
src = fetchurl {
url =
"https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb";
- sha256 = "sha256-ExdfXfpimM6E/S6xiLTHdq3f4/ydtyfZ2+9o32z87gc=";
+ sha256 = "sha256-ARGIcNHnqQEyp1JVNV59FvvYv9JTSS55R+lTHl0IrWk=";
};
nativeBuildInputs = [
diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix
index 57018e04904c6..4437a5d26995b 100644
--- a/pkgs/games/0ad/data.nix
+++ b/pkgs/games/0ad/data.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz";
- sha256 = "1c9zrddmjxvvacismld6fbwbw9vrdbq6g6d3424p8w5p6xg5wlwy";
+ sha256 = "sgDkhVj4goB5EOPGhlZ7ajliSNnUGAROz94JCwV3LX0=";
};
installPhase = ''
diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index e51aab519a490..23e906703f433 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -2,7 +2,7 @@
, pkg-config, spidermonkey_78, boost, icu, libxml2, libpng, libsodium
, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
, openal, libGLU, libGL, xorgproto, libX11, libXcursor, nspr, SDL2
-, gloox, nvidia-texture-tools
+, gloox, nvidia-texture-tools, freetype
, withEditor ? true, wxGTK
}:
@@ -26,11 +26,11 @@ let
in
stdenv.mkDerivation rec {
pname = "0ad";
- version = "0.0.25b";
+ version = "0.0.26";
src = fetchurl {
url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz";
- sha256 = "1p9fa8f7sjb9c5wl3mawzyfqvgr614kdkhrj2k4db9vkyisws3fp";
+ sha256 = "Lhxt9+MxLnfF+CeIZkz/w6eNO/YGBsAAOSdeHRPA7ks=";
};
nativeBuildInputs = [ python3 perl pkg-config ];
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
spidermonkey_78_6 boost icu libxml2 libpng libjpeg
zlib curl libogg libvorbis enet miniupnpc openal libidn
libGLU libGL xorgproto libX11 libXcursor nspr SDL2 gloox
- nvidia-texture-tools libsodium fmt
+ nvidia-texture-tools libsodium fmt freetype
] ++ lib.optional withEditor wxGTK;
NIX_CFLAGS_COMPILE = toString [
@@ -50,14 +50,7 @@ stdenv.mkDerivation rec {
"-I${fmt.dev}/include"
];
- patches = [
- ./rootdir_env.patch
- (fetchpatch {
- # fix build with gcc11 and glibc 2.35
- url = "https://github.com/0ad/0ad/commit/7df614338cbd41f5e254ce75f649490b2637e1d0.patch";
- hash = "sha256-QZvcNm8Zni3aJnMPueft0OITf8zeMDXWBjOLYoirJs0=";
- })
- ];
+ patches = [ ./rootdir_env.patch ];
configurePhase = ''
# Delete shipped libraries which we don't need.
diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix
index 29cfa25b8c34a..543d79e429be5 100644
--- a/pkgs/games/ddnet/default.nix
+++ b/pkgs/games/ddnet/default.nix
@@ -30,13 +30,13 @@
stdenv.mkDerivation rec {
pname = "ddnet";
- version = "16.3.2";
+ version = "16.4";
src = fetchFromGitHub {
owner = "ddnet";
repo = pname;
rev = version;
- sha256 = "sha256-VvMcb3Im071MZmOvTOu7zRNKcp5dSJGS3kMvTLD/sFQ=";
+ sha256 = "sha256-8t4UKytYmkELEMQ06jIj7C9cdOc5L22AnigwkGBzx20=";
};
nativeBuildInputs = [ cmake ninja pkg-config ];
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index 793ee917966c7..b797951e41122 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
pname = "clickhouse";
- version = "22.3.2.2";
+ version = "22.8.5.29";
broken = stdenv.buildPlatform.is32bit; # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
repo = "ClickHouse";
rev = "v${version}-lts";
fetchSubmodules = true;
- sha256 = "0rhzgm0gvwpx4h5xyr7y393y7s9slcr4a7grw9316f5m70frxg2v";
+ sha256 = "sha256-JRdZb5YgaumTnjJEYIXh9o3NSv67DAdl9gizVKvGTJI=";
};
nativeBuildInputs = [ cmake libtool llvm-bintools ninja ];
@@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DENABLE_TESTS=OFF"
+ "-DENABLE_CCACHE=0"
"-DENABLE_EMBEDDED_COMPILER=ON"
"-USE_INTERNAL_LLVM_LIBRARY=OFF"
];
@@ -66,7 +67,7 @@ stdenv.mkDerivation rec {
passthru.tests.clickhouse = nixosTests.clickhouse;
meta = with lib; {
- homepage = "https://clickhouse.tech/";
+ homepage = "https://clickhouse.com";
description = "Column-oriented database management system";
license = licenses.asl20;
maintainers = with maintainers; [ orivej ];
diff --git a/pkgs/servers/http/dufs/default.nix b/pkgs/servers/http/dufs/default.nix
new file mode 100644
index 0000000000000..c89ccb8c7b136
--- /dev/null
+++ b/pkgs/servers/http/dufs/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, fetchFromGitHub, rustPlatform, Security, openssl, pkg-config }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "dufs";
+ version = "0.30.0";
+
+ src = fetchFromGitHub {
+ owner = "sigoden";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-UJ93yUJqxkP+PyUrhKkjV90vr55MemC1zRbzh/gFqPU=";
+ };
+
+ cargoSha256 = "sha256-dyn0wj11MC9NYwULsR6ytYUl+8wsRkVLBIwcgM5mMNQ=";
+
+ nativeBuildInputs = lib.optionals stdenv.isLinux [
+ pkg-config
+ ];
+
+ buildInputs = lib.optionals stdenv.isLinux [
+ openssl
+ ] ++ lib.optionals stdenv.isDarwin [
+ Security
+ ];
+
+ meta = with lib; {
+ description = "A file server that supports static serving, uploading, searching, accessing control, webdav";
+ homepage = "https://github.com/sigoden/dufs";
+ license = with licenses; [ asl20 /* or */ mit ];
+ maintainers = [ maintainers.holymonson ];
+ };
+}
diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix
index c7c50edb466c3..346555cf5d7a1 100644
--- a/pkgs/servers/irc/ircd-hybrid/default.nix
+++ b/pkgs/servers/irc/ircd-hybrid/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ircd-hybrid";
- version = "8.2.42";
+ version = "8.2.43";
src = fetchurl {
url = "mirror://sourceforge/ircd-hybrid/ircd-hybrid-${version}.tgz";
- sha256 = "sha256-aS0he/x+o3xOQ5H7hrCpJ4C8MusUT2liM0lyF1W4H2o=";
+ sha256 = "sha256-vQNzx4DjCMGm9piQFf8o4cIpme92S3toY2tihXPCUe8=";
};
buildInputs = [ openssl zlib ];
diff --git a/pkgs/servers/jellyfin/node-deps.nix b/pkgs/servers/jellyfin/node-deps.nix
index 6801dbfbdde89..f9cbb664bfdae 100644
--- a/pkgs/servers/jellyfin/node-deps.nix
+++ b/pkgs/servers/jellyfin/node-deps.nix
@@ -11817,8 +11817,8 @@ let
args = {
name = "jellyfin-web";
packageName = "jellyfin-web";
- version = "10.8.4";
- src = ../../../../../../../nix/store/xhax6fynqk44hhwd647im3jd31dbaw4n-source;
+ version = "10.8.5";
+ src = ../../../../../../../../../nix/store/ab0b3ia5gcmwb7p5kz6dvw456qrdbz91-source;
dependencies = [
sources."@ampproject/remapping-2.1.2"
(sources."@apideck/better-ajv-errors-0.3.3" // {
diff --git a/pkgs/servers/jellyfin/web.nix b/pkgs/servers/jellyfin/web.nix
index 7b82bf35221ed..a6aa8d55bf718 100644
--- a/pkgs/servers/jellyfin/web.nix
+++ b/pkgs/servers/jellyfin/web.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "jellyfin-web";
- version = "10.8.4";
+ version = "10.8.5";
src = fetchFromGitHub {
owner = "jellyfin";
repo = "jellyfin-web";
rev = "v${version}";
- sha256 = "3A2eBwO0Vg0Qgwm0Y04jheu42JpbxL6XtJRkrxSUkGo=";
+ sha256 = "KNIxqZSTO1330KFW8y+4nVFiCM1KEEwEM0Vdei26gVI=";
};
nativeBuildInputs = [
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 6f34c2ebab83f..26ab8ac6d8d39 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, fetchpatch, pcre, pcre2, jemalloc, libxslt, groff, ncurses, pkg-config, readline, libedit
-, coreutils, python3, makeWrapper }:
+, coreutils, python3, makeWrapper, nixosTests }:
let
common = { version, hash, extraNativeBuildInputs ? [] }:
@@ -12,8 +12,6 @@ let
inherit hash;
};
- passthru.python = python3;
-
nativeBuildInputs = with python3.pkgs; [ pkg-config docutils sphinx makeWrapper];
buildInputs = [
libxslt groff ncurses readline libedit python3
@@ -37,6 +35,11 @@ let
outputs = [ "out" "dev" "man" ];
+ passthru = {
+ python = python3;
+ tests = nixosTests."varnish${builtins.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor version)}";
+ };
+
meta = with lib; {
broken = stdenv.isDarwin;
description = "Web application accelerator also known as a caching HTTP reverse proxy";
@@ -48,12 +51,19 @@ let
};
in
{
+ # EOL TBA
varnish60 = common {
version = "6.0.10";
hash = "sha256-a4W/dI7jeaoI43UE+G6tS6fgzEDqsXI8CUv+Wh4HJus=";
};
+ # EOL 2023-03-15. TODO: remove ahead of 22.11 release? if not, remove for 23.05
varnish71 = common {
version = "7.1.1";
hash = "sha256-LK++JZDn1Yp7rIrZm+kuRA/k04raaBbdiDbyL6UToZA=";
};
+ # EOL 2023-09-15
+ varnish72 = common {
+ version = "7.2.0";
+ hash = "sha256-HaipftX3t9TV4E/FyW/JqFyzog0HbrorGJUfSzBsloY=";
+ };
}
diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix
index 4922907f920f2..018127c96913f 100644
--- a/pkgs/servers/varnish/modules.nix
+++ b/pkgs/servers/varnish/modules.nix
@@ -41,8 +41,8 @@ in
version = "0.15.1";
sha256 = "1lwgjhgr5yw0d17kbqwlaj5pkn70wvaqqjpa1i0n459nx5cf5pqj";
};
- modules19 = common {
- version = "0.19.0";
- sha256 = "0qq5g6bbd1a1ml1wk8jj9z39a899jzqbf7aizr3pvyz0f4kz8mis";
+ modules20 = common {
+ version = "0.20.0";
+ sha256 = "sha256-3eH3qCa24rWqYXsTTDmm/9LjBMxcxUuozuRzZ3e8cUo=";
};
}
diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix
index 60141b1382965..fa5ec507d406a 100644
--- a/pkgs/servers/varnish/packages.nix
+++ b/pkgs/servers/varnish/packages.nix
@@ -1,4 +1,4 @@
-{ callPackages, callPackage, varnish60, varnish71, fetchFromGitHub }: {
+{ callPackages, callPackage, varnish60, varnish71, varnish72, fetchFromGitHub }: {
varnish60Packages = rec {
varnish = varnish60;
modules = (callPackages ./modules.nix { inherit varnish; }).modules15;
@@ -15,7 +15,7 @@
};
varnish71Packages = rec {
varnish = varnish71;
- modules = (callPackages ./modules.nix { inherit varnish; }).modules19;
+ modules = (callPackages ./modules.nix { inherit varnish; }).modules20;
digest = callPackage ./digest.nix {
inherit varnish;
version = "6.6";
@@ -27,4 +27,8 @@
sha256 = "1g53zblyxi1jivwppmpdqhi5xnzapsfib453sxyqbc5dfs7fijxr";
};
};
+ varnish72Packages = rec {
+ varnish = varnish72;
+ modules = (callPackages ./modules.nix { inherit varnish; }).modules20;
+ };
}
diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix
new file mode 100644
index 0000000000000..c627ae4d16925
--- /dev/null
+++ b/pkgs/servers/web-apps/freshrss/default.nix
@@ -0,0 +1,38 @@
+{ stdenvNoCC, lib, fetchFromGitHub, nixosTests, pkgs }:
+
+stdenvNoCC.mkDerivation rec {
+ pname = "FreshRSS";
+ version = "1.20.0";
+
+ src = fetchFromGitHub {
+ owner = "FreshRSS";
+ repo = "FreshRSS";
+ rev = version;
+ hash = "sha256-mzhEw2kFv77SmeuEx66n9ujWMscZO3+03tHimk1/vk4=";
+ };
+
+ passthru.tests = nixosTests.freshrss;
+
+ # There's nothing to build.
+ dontBuild = true;
+
+ # the data folder is no in this package and thereby declared by an env-var
+ overrideConfig = pkgs.writeText "constants.local.php" ''
+