From 61da203324125f1969da086cb297c1ecd76350a6 Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Sun, 12 Apr 2020 15:04:02 +0200 Subject: [PATCH 01/89] boot.initrd.luks: remove x86_64/i586 AES modules Commit 1d2c3279311e4f03fcf164e1366f2fda9f4bfccf in the upstream kernel repository removed support for the scalar x86_64 and i586 AES assembly implementations, since the generic AES implementation generated by the compiler is faster for both platforms. Remove the modules from the cryptoModules list. This causes a regression for kernel versions >=5.4 which include the removal. This should have no negative impact on AES performance on older kernels since the generic implementation should be faster there as well since the implementation was hardly touched from its initial submission. Fixes #84842 --- nixos/modules/system/boot/luksroot.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 31f1e22cda3..7e406f37c13 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -467,8 +467,6 @@ in [ "aes" "aes_generic" "blowfish" "twofish" "serpent" "cbc" "xts" "lrw" "sha1" "sha256" "sha512" "af_alg" "algif_skcipher" - - (if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then "aes_x86_64" else "aes_i586") ]; description = '' A list of cryptographic kernel modules needed to decrypt the root device(s). From bdbffbe91b7d66649c3710c535c6f1268e5d5a00 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Wed, 6 May 2020 00:45:01 -0400 Subject: [PATCH 02/89] hwdata: 0.316 -> 0.335 --- pkgs/os-specific/linux/hwdata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 2f6e6cd5cc9..9b54f404f72 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwdata"; - version = "0.316"; + version = "0.335"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - sha256 = "0k3fypykbq9943cnxlmmpk0xp9nhhf46pfdhkgm99iaa27b8s1gb"; + sha256 = "0f8ikwfrs6xd5sywypd9rq9cln8a0rf3vj6nm0adwzn1p8mgmrb2"; }; preConfigure = "patchShebangs ./configure"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0g2w4jr4p1hykracp2za7jb0rcr51kks1m43pzcaf7g99x8669ww"; + outputHash = "101lppd1805drwd038b4njr5czzjnqqxf3xlf6v3l22wfwr2cn3l"; meta = { homepage = "https://github.com/vcrhonek/hwdata"; From d782c3daed3caf6bfeddec547c8161e1b06171dc Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sat, 13 Jun 2020 08:34:56 +0300 Subject: [PATCH 03/89] cdetheme: small adjustments --- pkgs/data/themes/{cde-motif-theme => cdetheme}/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) rename pkgs/data/themes/{cde-motif-theme => cdetheme}/default.nix (95%) diff --git a/pkgs/data/themes/cde-motif-theme/default.nix b/pkgs/data/themes/cdetheme/default.nix similarity index 95% rename from pkgs/data/themes/cde-motif-theme/default.nix rename to pkgs/data/themes/cdetheme/default.nix index cc83047e3cc..ae738604751 100644 --- a/pkgs/data/themes/cde-motif-theme/default.nix +++ b/pkgs/data/themes/cdetheme/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2Packages }: stdenv.mkDerivation rec { - pname = "cde-motif-theme"; + pname = "cdetheme"; version = "1.3"; src = fetchFromGitHub { @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ gnidorah ]; + hydraPlatforms = []; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26a5e269629..3f74c5ef317 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17885,7 +17885,7 @@ in cascadia-code = callPackage ../data/fonts/cascadia-code { }; - cde-gtk-theme = callPackage ../data/themes/cde-motif-theme { }; + cde-gtk-theme = callPackage ../data/themes/cdetheme { }; charis-sil = callPackage ../data/fonts/charis-sil { }; From 5c4f17c50eae8a95db71295d16785f42abc8002e Mon Sep 17 00:00:00 2001 From: puzzlewolf Date: Tue, 16 Jun 2020 10:27:30 +0200 Subject: [PATCH 04/89] sequoia: 0.16.0 -> 0.17.0 --- pkgs/tools/security/sequoia/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index e6081fbf472..1eb941e852e 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -9,16 +9,16 @@ assert pythonSupport -> pythonPackages != null; rustPlatform.buildRustPackage rec { pname = "sequoia"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = pname; rev = "v${version}"; - sha256 = "0iwzi2ylrwz56s77cd4vcf89ig6ipy4w6kp2pfwqvd2d00x54dhk"; + sha256 = "1rf9q67qmjfkgy6r3mz1h9ibfmc04r4j8nzacqv2l75x4mwvf6xb"; }; - cargoSha256 = "0jsmvs6hr9mhapz3a74wpfgkjkq3w10014j3z30bm659mxqrknha"; + cargoSha256 = "074bbr7dfk8cqdarrjy4sm37f5jmv2l5gwwh3zcmy2wrfg7vi1h6"; nativeBuildInputs = [ pkgconfig From c26c77b5a33c13af80fd533f2712b7dd7a587dfc Mon Sep 17 00:00:00 2001 From: puzzlewolf Date: Wed, 17 Jun 2020 12:44:24 +0200 Subject: [PATCH 05/89] sequoia: exclude tests for 'sequoia-store' Tests for 'sequoia-store' often error with 'Too many open filehandles' on ofBorg and Hydra. Exclude them until a better solution can be found. --- pkgs/tools/security/sequoia/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index 1eb941e852e..0700988adbd 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -56,6 +56,10 @@ rustPlatform.buildRustPackage rec { LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + # Please check if this is still needed when updating. + # Exlude tests for sequoia-store, they often error with 'Too many open files' Hydra. + CARGO_TEST_ARGS = " --all --exclude sequoia-store"; + postPatch = '' # otherwise, the check fails because we delete the `.git` in the unpack phase substituteInPlace openpgp-ffi/Makefile \ From 2a9765e26522900f5c2e0a97a93d7284b9a38c52 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 3 Jul 2020 22:28:55 +0200 Subject: [PATCH 06/89] unifiStable: 5.13.29 -> 5.13.32 --- pkgs/servers/unifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index a6e055dd063..29975ef5ba8 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -49,7 +49,7 @@ in { }; unifiStable = generic { - version = "5.13.29"; - sha256 = "0j1spid9q41l57gyphg8smn92iy52z4x4wy236a2a15p731gllh8"; + version = "5.13.32"; + sha256 = "0r1lz73hn4pl5jygmmfngr8sr0iybirsqlkcdkq31a36vcr567i8"; }; } From 3e7d650bcca2fb18cc05468878cbccfb06096f7b Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 15 May 2020 13:41:19 +0200 Subject: [PATCH 07/89] nixos/unifi: restart service on package update Currently the service doesn't detect if on of the packages is updated and doesn't restart. By manually adding a trigger we make sure the service restarts if any of the involved packages update. --- nixos/modules/services/networking/unifi.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 4bdfa8143dc..62bcf7a1497 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -162,6 +162,8 @@ in unitConfig.RequiresMountsFor = stateDir; # This a HACK to fix missing dependencies of dynamic libs extracted from jars environment.LD_LIBRARY_PATH = with pkgs.stdenv; "${cc.cc.lib}/lib"; + # Make sure package upgrades trigger a service restart + restartTriggers = [ cfg.unifiPackage cfg.mongodbPackage ]; serviceConfig = { Type = "simple"; From 56191821ea755a7e1cdd3985a89298d6ddfb8559 Mon Sep 17 00:00:00 2001 From: Imran Hossain Date: Sun, 5 Jul 2020 16:25:06 -0400 Subject: [PATCH 08/89] restic: Wrap binary with rclone --- pkgs/tools/backup/restic/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index f366533f9bf..33cac4ad229 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, installShellFiles, nixosTests}: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, installShellFiles, makeWrapper +, nixosTests, rclone }: buildGoPackage rec { pname = "restic"; @@ -15,11 +16,13 @@ buildGoPackage rec { subPackages = [ "cmd/restic" ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; passthru.tests.restic = nixosTests.restic; - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = '' + wrapProgram $out/bin/restic --prefix PATH : '${rclone}/bin' + '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' $out/bin/restic generate \ --bash-completion restic.bash \ --zsh-completion restic.zsh \ From 384586db9503f3e6e88eda8a3805941b07aecc2f Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Mon, 6 Jul 2020 14:47:18 +0200 Subject: [PATCH 09/89] mixxx: 2.2.3 -> 2.2.4 https://github.com/mixxxdj/mixxx/releases/tag/release-2.2.4 --- pkgs/applications/audio/mixxx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index f889d9e1e8d..e1d1585cacc 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -19,13 +19,13 @@ let in mkDerivation rec { pname = "mixxx"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "mixxx"; rev = "release-${version}"; - sha256 = "1h7q25fv62c5m74d4cn1m6mpanmqpbl2wqbch4qvn488jb2jw1dv"; + sha256 = "1dj9li8av9b2kbm76jvvbdmihy1pyrw0s4xd7dd524wfhwr1llxr"; }; nativeBuildInputs = [ scons.py2 ]; From 7dd656a037fa7f9581cab66764034edcca3de6f9 Mon Sep 17 00:00:00 2001 From: Imran Hossain Date: Sun, 5 Jul 2020 16:25:33 -0400 Subject: [PATCH 10/89] nixos/restic: Add options for rclone repositories --- nixos/modules/services/backup/restic.nix | 66 +++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index 2388f1d6ca1..c38fd361d35 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -31,6 +31,59 @@ in ''; }; + rcloneOptions = mkOption { + type = with types; nullOr (attrsOf (oneOf [ str bool ])); + default = null; + description = '' + Options to pass to rclone to control its behavior. + See for + available options. When specifying option names, strip the + leading --. To set a flag such as + --drive-use-trash, which does not take a value, + set the value to the Boolean true. + ''; + example = { + bwlimit = "10M"; + drive-use-trash = "true"; + }; + }; + + rcloneConfig = mkOption { + type = with types; nullOr (attrsOf (oneOf [ str bool ])); + default = null; + description = '' + Configuration for the rclone remote being used for backup. + See the remote's specific options under rclone's docs at + . When specifying + option names, use the "config" name specified in the docs. + For example, to set --b2-hard-delete for a B2 + remote, use hard_delete = true in the + attribute set. + Warning: Secrets set in here will be world-readable in the Nix + store! Consider using the rcloneConfigFile + option instead to specify secret values separately. Note that + options set here will override those set in the config file. + ''; + example = { + type = "b2"; + account = "xxx"; + key = "xxx"; + hard_delete = true; + }; + }; + + rcloneConfigFile = mkOption { + type = with types; nullOr path; + default = null; + description = '' + Path to the file containing rclone configuration. This file + must contain configuration for the remote specified in this backup + set and also must be readable by root. Options set in + rcloneConfig will override those set in this + file. + ''; + }; + repository = mkOption { type = types.str; description = '' @@ -170,11 +223,22 @@ in ( resticCmd + " forget --prune " + (concatStringsSep " " backup.pruneOpts) ) ( resticCmd + " check" ) ]; + # Helper functions for rclone remotes + rcloneRemoteName = builtins.elemAt (splitString ":" backup.repository) 1; + rcloneAttrToOpt = v: "RCLONE_" + toUpper (builtins.replaceStrings [ "-" ] [ "_" ] v); + rcloneAttrToConf = v: "RCLONE_CONFIG_" + toUpper (rcloneRemoteName + "_" + v); + toRcloneVal = v: if lib.isBool v then lib.boolToString v else v; in nameValuePair "restic-backups-${name}" ({ environment = { RESTIC_PASSWORD_FILE = backup.passwordFile; RESTIC_REPOSITORY = backup.repository; - }; + } // optionalAttrs (backup.rcloneOptions != null) (mapAttrs' (name: value: + nameValuePair (rcloneAttrToOpt name) (toRcloneVal value) + ) backup.rcloneOptions) // optionalAttrs (backup.rcloneConfigFile != null) { + RCLONE_CONFIG = backup.rcloneConfigFile; + } // optionalAttrs (backup.rcloneConfig != null) (mapAttrs' (name: value: + nameValuePair (rcloneAttrToConf name) (toRcloneVal value) + ) backup.rcloneConfig); path = [ pkgs.openssh ]; restartIfChanged = false; serviceConfig = { From 9b80955720a9a3aec891f4de058631f80d8e31b5 Mon Sep 17 00:00:00 2001 From: Imran Hossain Date: Sun, 5 Jul 2020 16:25:57 -0400 Subject: [PATCH 11/89] nixos/tests: Add rclone repository to restic test --- nixos/tests/restic.nix | 55 +++++++++++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 14 deletions(-) diff --git a/nixos/tests/restic.nix b/nixos/tests/restic.nix index 67bb7f1933d..dad5bdfff27 100644 --- a/nixos/tests/restic.nix +++ b/nixos/tests/restic.nix @@ -4,33 +4,50 @@ import ./make-test-python.nix ( let password = "some_password"; repository = "/tmp/restic-backup"; - passwordFile = pkgs.writeText "password" "correcthorsebatterystaple"; + rcloneRepository = "rclone:local:/tmp/restic-rclone-backup"; + + passwordFile = "${pkgs.writeText "password" "correcthorsebatterystaple"}"; + initialize = true; + paths = [ "/opt" ]; + pruneOpts = [ + "--keep-daily 2" + "--keep-weekly 1" + "--keep-monthly 1" + "--keep-yearly 99" + ]; in { name = "restic"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ bbigras ]; + maintainers = [ bbigras i077 ]; }; nodes = { server = - { ... }: + { pkgs, ... }: { services.restic.backups = { remotebackup = { - inherit repository; - passwordFile = "${passwordFile}"; - initialize = true; - paths = [ "/opt" ]; - pruneOpts = [ - "--keep-daily 2" - "--keep-weekly 1" - "--keep-monthly 1" - "--keep-yearly 99" - ]; + inherit repository passwordFile initialize paths pruneOpts; + }; + rclonebackup = { + repository = rcloneRepository; + rcloneConfig = { + type = "local"; + one_file_system = true; + }; + + # This gets overridden by rcloneConfig.type + rcloneConfigFile = pkgs.writeText "rclone.conf" '' + [local] + type=ftp + ''; + inherit passwordFile initialize paths pruneOpts; }; }; + + environment.sessionVariables.RCLONE_CONFIG_LOCAL_TYPE = "local"; }; }; @@ -38,25 +55,35 @@ import ./make-test-python.nix ( server.start() server.wait_for_unit("dbus.socket") server.fail( - "${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots" + "${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots", + "${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots", ) server.succeed( "mkdir -p /opt", "touch /opt/some_file", + "mkdir -p /tmp/restic-rclone-backup", "timedatectl set-time '2016-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", + "systemctl start restic-backups-rclonebackup.service", '${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"', + '${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"', "timedatectl set-time '2017-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", + "systemctl start restic-backups-rclonebackup.service", "timedatectl set-time '2018-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", + "systemctl start restic-backups-rclonebackup.service", "timedatectl set-time '2018-12-14 13:45'", "systemctl start restic-backups-remotebackup.service", + "systemctl start restic-backups-rclonebackup.service", "timedatectl set-time '2018-12-15 13:45'", "systemctl start restic-backups-remotebackup.service", + "systemctl start restic-backups-rclonebackup.service", "timedatectl set-time '2018-12-16 13:45'", "systemctl start restic-backups-remotebackup.service", + "systemctl start restic-backups-rclonebackup.service", '${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots -c | grep -e "^4 snapshot"', + '${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots -c | grep -e "^4 snapshot"', ) ''; } From 918d5cfb33b99874cf5849ee1e9b226c43ec5b69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 7 Jul 2020 07:23:02 +0200 Subject: [PATCH 12/89] python3Packages.tokenizers: 0.8.0 -> 0.8.1.rc1 Changelog: https://github.com/huggingface/tokenizers/releases/tag/python-v0.8.1.rc1 --- pkgs/development/python-modules/tokenizers/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index 348df4ae95e..e3578cbf8d2 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -32,16 +32,16 @@ let }; in rustPlatform.buildRustPackage rec { pname = "tokenizers"; - version = "0.8.0"; + version = "0.8.1.rc1"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "python-v${version}"; - sha256 = "0f5r1wm5ybyk3jvihj1g98y7ihq0iklg0pwkaa11pk1gv0k869w3"; + sha256 = "1bzvfffnjjskx8zlq1qsqfd47570my2wnbq4ip8i1hkz10q900qv"; }; - cargoSha256 = "131bvf35q5n65mq6zws1rp5fn2qkfwfg9sbxi5y6if24n8fpdz4m"; + cargoSha256 = "0s5z3g1njb7wlyb32ba6xas4zc62c3zhmp1mrvghmaxpvljp6k7b"; sourceRoot = "source/bindings/python"; From 80a7a4295a72ac2b0a1752b32464036da7b06b37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20S=C3=B8holm?= Date: Tue, 30 Jun 2020 23:25:48 +0200 Subject: [PATCH 13/89] nixos/jupyter: add package and command options --- .../services/development/jupyter/default.nix | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/development/jupyter/default.nix b/nixos/modules/services/development/jupyter/default.nix index e598b018645..6a5fd6b2940 100644 --- a/nixos/modules/services/development/jupyter/default.nix +++ b/nixos/modules/services/development/jupyter/default.nix @@ -6,10 +6,7 @@ let cfg = config.services.jupyter; - # NOTE: We don't use top-level jupyter because we don't - # want to pass in JUPYTER_PATH but use .environment instead, - # saving a rebuild. - package = pkgs.python3.pkgs.notebook; + package = cfg.package; kernels = (pkgs.jupyter-kernel.create { definitions = if cfg.kernels != null @@ -37,6 +34,27 @@ in { ''; }; + package = mkOption { + type = types.package; + # NOTE: We don't use top-level jupyter because we don't + # want to pass in JUPYTER_PATH but use .environment instead, + # saving a rebuild. + default = pkgs.python3.pkgs.notebook; + description = '' + Jupyter package to use. + ''; + }; + + command = mkOption { + type = types.str; + default = "jupyter-notebook"; + example = "jupyter-lab"; + description = '' + Which command the service runs. Note that not all jupyter packages + have all commands, e.g. jupyter-lab isn't present in the default package. + ''; + }; + port = mkOption { type = types.int; default = 8888; @@ -157,7 +175,7 @@ in { serviceConfig = { Restart = "always"; - ExecStart = ''${package}/bin/jupyter-notebook \ + ExecStart = ''${package}/bin/${cfg.command} \ --no-browser \ --ip=${cfg.ip} \ --port=${toString cfg.port} --port-retries 0 \ From a8b68fc49f4edeacad1919bd14443dead792fccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20S=C3=B8holm?= Date: Tue, 30 Jun 2020 23:26:49 +0200 Subject: [PATCH 14/89] evcxr: wrap evcxr_jupyter binary evcxr_jupyter needs the same wrapper as the main binary to work. --- pkgs/development/interpreters/evcxr/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 4430298beb5..5d3d3de85dd 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -17,6 +17,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optional stdenv.isDarwin Security; postInstall = '' wrapProgram $out/bin/evcxr --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]} + wrapProgram $out/bin/evcxr_jupyter --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]} rm $out/bin/testing_runtime ''; From 5a56be781f4709b5c52d3525cb9f8e1fe75a1809 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 8 Jul 2020 16:31:08 +0000 Subject: [PATCH 15/89] syncthing-discovery: 1.6.1 -> 1.7.0 --- pkgs/applications/networking/syncthing/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 9d5ce848e33..5f23fa0e022 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,17 +3,17 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.6.1"; + version = "1.7.0"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "1lhbx1mh2hdjjwks3s17i8y9vbl3fnapc1czaf42pp7nf8245q3j"; + sha256 = "0jz1xfbs5ql9z7zdldyxc6wr0y5b0pf3vg8vzva5ml9aiqjcs9fg"; }; - vendorSha256 = "12g63a6jsshzqjgww792xmvybhfbkjx5aza4xnyljjsp453iky7k"; + vendorSha256 = "1gmdv0g0gymq6khrwvplw6yfp146kg5ar8vqdp5dlp0myxfzi22b"; patches = [ ./add-stcli-target.patch From f9ea9c7299b9e5a181a7a99990d14ae069609eb1 Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Wed, 8 Jul 2020 21:43:12 -0400 Subject: [PATCH 16/89] nixos/systemd: add options for hardware watchdog management --- nixos/modules/system/boot/systemd.nix | 52 +++++++++++++++++++++++++++ nixos/tests/systemd.nix | 22 ++++++++++++ 2 files changed, 74 insertions(+) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index a8e51fc0901..020cf38ea3f 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -818,6 +818,45 @@ in ''; }; + systemd.watchdog.device = mkOption { + type = types.path; + example = "/dev/watchdog"; + description = '' + The path to a hardware watchdog device which will be managed by systemd. + If not specified, systemd will default to /dev/watchdog. + ''; + }; + + systemd.watchdog.runtimeTime = mkOption { + type = types.str; + example = "30s"; + description = '' + The amount of time which can elapse before a watchdog hardware device + will automatically reboot the system. Valid time units include "ms", + "s", "min", "h", "d", and "w". + ''; + }; + + systemd.watchdog.rebootTime = mkOption { + type = types.str; + example = "10m"; + description = '' + The amount of time which can elapse after a reboot has been triggered + before a watchdog hardware device will automatically reboot the system. + Valid time units include "ms", "s", "min", "h", "d", and "w". + ''; + }; + + systemd.watchdog.kexecTime = mkOption { + type = types.str; + example = "10m"; + description = '' + The amount of time which can elapse when kexec is being executed before + a watchdog hardware device will automatically reboot the system. This + option should only be enabled if reloadTime is also enabled. Valid + time units include "ms", "s", "min", "h", "d", and "w". + ''; + }; }; @@ -889,6 +928,19 @@ in DefaultIPAccounting=yes ''} DefaultLimitCORE=infinity + ${optionalString (config.systemd.watchdog.device != "") '' + WatchdogDevice=${config.systemd.watchdog.device} + ''} + ${optionalString (config.systemd.watchdog.runtimeTime != "") '' + RuntimeWatchdogSec=${config.systemd.watchdog.runtimeTime} + ''} + ${optionalString (config.systemd.watchdog.rebootTime != "") '' + RebootWatchdogSec=${config.systemd.watchdog.rebootTime} + ''} + ${optionalString (config.systemd.watchdog.kexecTime != "") '' + KExecWatchdogSec=${config.systemd.watchdog.kexecTime} + ''} + ${config.systemd.extraConfig} ''; diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix index ca2e36a443e..ce950be4846 100644 --- a/nixos/tests/systemd.nix +++ b/nixos/tests/systemd.nix @@ -50,6 +50,13 @@ import ./make-test-python.nix ({ pkgs, ... }: { fi ''; }; + + systemd.watchdog = { + device = "/dev/watchdog"; + runtimeTime = "30s"; + rebootTime = "10min"; + kexecTime = "5min"; + }; }; testScript = '' @@ -117,5 +124,20 @@ import ./make-test-python.nix ({ pkgs, ... }: { retcode, output = machine.execute("systemctl status testservice1.service") assert retcode in [0, 3] # https://bugs.freedesktop.org/show_bug.cgi?id=77507 assert "CPU:" in output + + # Test systemd is configured to manage a watchdog + with subtest("systemd manages hardware watchdog"): + machine.wait_for_unit("multi-user.target") + + # It seems that the device's path doesn't appear in 'systemctl show' so + # check it separately. + assert "WatchdogDevice=/dev/watchdog" in machine.succeed( + "cat /etc/systemd/system.conf" + ) + + output = machine.succeed("systemctl show | grep Watchdog") + assert "RuntimeWatchdogUSec=30s" in output + assert "RebootWatchdogUSec=10m" in output + assert "KExecWatchdogUSec=5m" in output ''; }) From 98ba751a359a750892006283fc5cb2983711ecae Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Thu, 9 Jul 2020 14:38:43 +0200 Subject: [PATCH 17/89] colorlogs: 10.0 -> 14.0 --- pkgs/development/python-modules/coloredlogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coloredlogs/default.nix b/pkgs/development/python-modules/coloredlogs/default.nix index 219e48ad664..6ef440da0ac 100644 --- a/pkgs/development/python-modules/coloredlogs/default.nix +++ b/pkgs/development/python-modules/coloredlogs/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "coloredlogs"; - version = "10.0"; + version = "14.0"; src = fetchFromGitHub { owner = "xolox"; repo = "python-coloredlogs"; rev = version; - sha256 = "0rdvp4dfvzhx7z7s2jdl3fv7x1hazgpy5gc7bcf05bnbv2iia54a"; + sha256 = "0rnmxwrim4razlv4vi3krxk5lc5ksck6h5374j8avqwplika7q2x"; }; # patch by risicle From 30a2f403367b8acf3b50d42127cc91d229170fcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Fri, 10 Jul 2020 00:18:53 +0200 Subject: [PATCH 18/89] redo-c: Initial 0.2 --- .../tools/build-managers/redo-c/Makefile | 10 ++++++++ .../tools/build-managers/redo-c/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 36 insertions(+) create mode 100644 pkgs/development/tools/build-managers/redo-c/Makefile create mode 100644 pkgs/development/tools/build-managers/redo-c/default.nix diff --git a/pkgs/development/tools/build-managers/redo-c/Makefile b/pkgs/development/tools/build-managers/redo-c/Makefile new file mode 100644 index 00000000000..f2c43cc5003 --- /dev/null +++ b/pkgs/development/tools/build-managers/redo-c/Makefile @@ -0,0 +1,10 @@ +CFLAGS=-Os + +all: redo links + +links: + sh links.do + +install: + mkdir -p "$(out)/bin" + cp --no-dereference redo redo-* "$(out)/bin" diff --git a/pkgs/development/tools/build-managers/redo-c/default.nix b/pkgs/development/tools/build-managers/redo-c/default.nix new file mode 100644 index 00000000000..1480f32a50f --- /dev/null +++ b/pkgs/development/tools/build-managers/redo-c/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub }: +stdenv.mkDerivation rec { + pname = "redo-c"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "leahneukirchen"; + repo = pname; + rev = "v${version}"; + sha256 = "11wc2sgw1ssdm83cjdc6ndnp1bv5mzhbw7njw47mk7ri1ic1x51b"; + }; + + postPatch = '' + cp '${./Makefile}' Makefile + ''; + + meta = with stdenv.lib; { + description = "An implementation of the redo build system in portable C with zero dependencies"; + homepage = "https://github.com/leahneukirchen/redo-c"; + license = licenses.cc0; + platforms = platforms.all; + maintainers = with maintainers; [ ck3d ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5eb8d0c45ed..be55e801220 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11020,6 +11020,8 @@ in redo-apenwarr = callPackage ../development/tools/build-managers/redo-apenwarr { }; + redo-c = callPackage ../development/tools/build-managers/redo-c { }; + redo-sh = callPackage ../development/tools/build-managers/redo-sh { }; reno = callPackage ../development/tools/reno { }; From d15d77abd314041155810a99f5898d90265bfc9b Mon Sep 17 00:00:00 2001 From: Matt Votava Date: Thu, 9 Jul 2020 05:18:52 -0700 Subject: [PATCH 19/89] python3Packages.zigpy: 0.11.0 -> 0.22.0 --- pkgs/development/python-modules/zigpy/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index dfe1a5c547d..8c9a41cdb34 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -1,25 +1,24 @@ { stdenv, buildPythonPackage, fetchPypi -, aiohttp, crccheck, pycryptodome, pycrypto +, aiohttp, crccheck, pycryptodome, pycrypto, voluptuous , pytest, pytest-asyncio, asynctest }: buildPythonPackage rec { - pname = "zigpy-homeassistant"; - version = "0.19.0"; + pname = "zigpy"; + version = "0.22.0"; - nativeBuildInputs = [ pytest pytest-asyncio asynctest ]; - buildInputs = [ aiohttp pycryptodome ]; - propagatedBuildInputs = [ crccheck pycrypto ]; + propagatedBuildInputs = [ aiohttp crccheck pycrypto pycryptodome voluptuous ]; + checkInputs = [ pytest pytest-asyncio asynctest ]; src = fetchPypi { inherit pname version; - sha256 = "779cff7affb86b7141aa641c188342b22be0ec766adee0d180c93e74e2b10adc"; + sha256 = "1y8n96g5g6qsx8s2z028f1cyp2w8y7kksi8k2yyzpqvmanbxyjhc"; }; meta = with stdenv.lib; { description = "Library implementing a ZigBee stack"; homepage = "https://github.com/zigpy/zigpy"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ etu ]; + maintainers = with maintainers; [ etu mvnetbiz ]; platforms = platforms.linux; }; } From 63e59c6d1001852356e9b6652442028419bfd98b Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 24 Mar 2020 21:43:25 +0100 Subject: [PATCH 20/89] python3Packages.pure-pcapy3: init at 1.0.1 --- .../python-modules/pure-pcapy3/default.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/python-modules/pure-pcapy3/default.nix diff --git a/pkgs/development/python-modules/pure-pcapy3/default.nix b/pkgs/development/python-modules/pure-pcapy3/default.nix new file mode 100644 index 00000000000..71673da7abe --- /dev/null +++ b/pkgs/development/python-modules/pure-pcapy3/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pure-pcapy3"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "14panfklap6wwi9avw46gvd7wg9mkv9xbixvbvmi1m2adpqlb7mr"; + }; + + meta = with stdenv.lib; { + description = "Pure Python reimplementation of pcapy. This package is API compatible and a drop-in replacement."; + homepage = "http://bitbucket.org/viraptor/pure-pcapy"; + license = licenses.bsd2; + maintainers = with maintainers; [ etu ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4340f6a30ee..e9eaacfcf09 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7446,6 +7446,8 @@ in { pulp = callPackage ../development/python-modules/pulp { }; + pure-pcapy3 = callPackage ../development/python-modules/pure-pcapy3 { }; + behave = callPackage ../development/python-modules/behave { }; pyhamcrest = if isPy3k then From 2c004e0c536b0119244fd915a0fb5c7ed4bd20c4 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 24 Mar 2020 22:13:54 +0100 Subject: [PATCH 21/89] python3Packages.bellows: init at 0.17.0 --- .../python-modules/bellows/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/bellows/default.nix diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix new file mode 100644 index 00000000000..32ac3e8bd19 --- /dev/null +++ b/pkgs/development/python-modules/bellows/default.nix @@ -0,0 +1,37 @@ +{ stdenv, buildPythonPackage, fetchPypi +, click, click-log, pure-pcapy3 +, pyserial, pyserial-asyncio, voluptuous, zigpy +, asynctest, pytest, pytest-asyncio }: + +let + pname = "bellows"; + version = "0.17.0"; + +in buildPythonPackage rec { + inherit pname version; + + src = fetchPypi { + inherit pname version; + sha256 = "03gckhrxji8lgjsi6xr8yql405kfanii5hjrmakk1328bmq9g5f6"; + }; + + propagatedBuildInputs = [ + click click-log pure-pcapy3 pyserial pyserial-asyncio voluptuous zigpy + ]; + + checkInputs = [ + asynctest pytest pytest-asyncio + ]; + + prePatch = '' + substituteInPlace setup.py \ + --replace "click-log==0.2.0" "click-log>=0.2.0" + ''; + + meta = with stdenv.lib; { + description = "A Python 3 project to implement EZSP for EmberZNet devices"; + homepage = "https://github.com/zigpy/bellows"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ etu mvnetbiz ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e9eaacfcf09..c9059be64c6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7450,6 +7450,8 @@ in { behave = callPackage ../development/python-modules/behave { }; + bellows = callPackage ../development/python-modules/bellows { }; + pyhamcrest = if isPy3k then callPackage ../development/python-modules/pyhamcrest { } else From 29b377db2714e138621cbcd69e82d166ce9e9438 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 23 May 2020 21:53:09 +0200 Subject: [PATCH 22/89] python3Packages.zigpy-cc: init at 0.4.4 --- .../python-modules/zigpy-cc/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/zigpy-cc/default.nix diff --git a/pkgs/development/python-modules/zigpy-cc/default.nix b/pkgs/development/python-modules/zigpy-cc/default.nix new file mode 100644 index 00000000000..7223800caa9 --- /dev/null +++ b/pkgs/development/python-modules/zigpy-cc/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pyserial, pyserial-asyncio, zigpy +, asynctest, pytest, pytest-asyncio }: + +buildPythonPackage rec { + pname = "zigpy-cc"; + version = "0.4.4"; + + propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ]; + checkInputs = [ asynctest pytest pytest-asyncio ]; + + src = fetchPypi { + inherit pname version; + sha256 = "117a9xak4y5nksfk9rgvzd6l7hscvzspl1wf3gydyq2lc7b3ggnl"; + }; + + meta = with stdenv.lib; { + description = "A library which communicates with Texas Instruments CC2531 radios for zigpy"; + homepage = "http://github.com/sanyatuning/zigpy-cc"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ etu mvnetbiz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c9059be64c6..acfcf3ef36a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2689,6 +2689,8 @@ in { zigpy = callPackage ../development/python-modules/zigpy { }; + zigpy-cc = callPackage ../development/python-modules/zigpy-cc { }; + zigpy-deconz = callPackage ../development/python-modules/zigpy-deconz { }; digital-ocean = callPackage ../development/python-modules/digitalocean { }; From f10f300f01c62b7a7fd8146d9a0a94b43a5f6074 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 23 May 2020 22:13:54 +0200 Subject: [PATCH 23/89] python3Packages.zigpy-xbee: init at 0.12.1 --- .../python-modules/zigpy-xbee/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/zigpy-xbee/default.nix diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix new file mode 100644 index 00000000000..70266644801 --- /dev/null +++ b/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pyserial, pyserial-asyncio, zigpy +, pytest }: + +buildPythonPackage rec { + pname = "zigpy-xbee"; + version = "0.12.1"; + + buildInputs = [ pyserial pyserial-asyncio zigpy ]; + checkInputs = [ pytest ]; + + src = fetchPypi { + inherit pname version; + sha256 = "09488hl27qjv8shw38iiyzvzwcjkc0k4n00l2bfn1ac443xzw0vh"; + }; + + meta = with stdenv.lib; { + description = "A library which communicates with XBee radios for zigpy"; + homepage = "http://github.com/zigpy/zigpy-xbee"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ etu mvnetbiz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index acfcf3ef36a..66b5c09173e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2693,6 +2693,8 @@ in { zigpy-deconz = callPackage ../development/python-modules/zigpy-deconz { }; + zigpy-xbee = callPackage ../development/python-modules/zigpy-xbee { }; + digital-ocean = callPackage ../development/python-modules/digitalocean { }; digi-xbee = callPackage ../development/python-modules/digi-xbee { }; From 2b04280575124322b0e7262e21670e8ca8ce155c Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 23 May 2020 22:24:21 +0200 Subject: [PATCH 24/89] python3Packages.zigpy-zigate: init at 0.6.1 --- .../python-modules/zigpy-zigate/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/zigpy-zigate/default.nix diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix new file mode 100644 index 00000000000..43f291841ff --- /dev/null +++ b/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pyserial, pyserial-asyncio, zigpy +, pytest }: + +buildPythonPackage rec { + pname = "zigpy-zigate"; + version = "0.6.1"; + + buildInputs = [ pyserial pyserial-asyncio zigpy ]; + checkInputs = [ pytest ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0xxqv65drrr96b9ncwsx9ayd369lpwimj1jjb0d7j6l9lil0wmf5"; + }; + + meta = with stdenv.lib; { + description = "A library which communicates with ZiGate radios for zigpy"; + homepage = "http://github.com/doudz/zigpy-zigate"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ etu mvnetbiz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 66b5c09173e..3115c41e162 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2695,6 +2695,8 @@ in { zigpy-xbee = callPackage ../development/python-modules/zigpy-xbee { }; + zigpy-zigate = callPackage ../development/python-modules/zigpy-zigate { }; + digital-ocean = callPackage ../development/python-modules/digitalocean { }; digi-xbee = callPackage ../development/python-modules/digi-xbee { }; From 97805ff98999d876632a4fc37cee8db1d6bec02a Mon Sep 17 00:00:00 2001 From: Matt Votava Date: Thu, 9 Jul 2020 08:05:37 -0700 Subject: [PATCH 25/89] python3Packages.zigpy-deconz: fix dependencies --- pkgs/development/python-modules/zigpy-deconz/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index 80667cf6ec5..af52e942530 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -1,14 +1,13 @@ { stdenv, buildPythonPackage, fetchPypi -, aiohttp, crccheck, pyserial, pyserial-asyncio, pycryptodome, zigpy -, pytest }: +, pyserial, pyserial-asyncio, zigpy +, pytest, pytest-asyncio, asynctest }: buildPythonPackage rec { pname = "zigpy-deconz"; version = "0.9.2"; - nativeBuildInputs = [ pytest ]; - buildInputs = [ aiohttp crccheck pycryptodome ]; propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ]; + checkInputs = [ pytest pytest-asyncio asynctest ]; src = fetchPypi { inherit pname version; @@ -19,7 +18,7 @@ buildPythonPackage rec { description = "Library which communicates with Deconz radios for zigpy"; homepage = "https://github.com/zigpy/zigpy-deconz"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ etu ]; + maintainers = with maintainers; [ etu mvnetbiz ]; platforms = platforms.linux; }; } From 9fb7c8e5d90d5b0e0462710f93ef547685b4d929 Mon Sep 17 00:00:00 2001 From: Matt Votava Date: Thu, 9 Jul 2020 07:42:46 -0700 Subject: [PATCH 26/89] home-assistant: Update component packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 02bada50023..44aba8299a5 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -934,7 +934,7 @@ "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf]; "zerproc" = ps: with ps; [ ]; # missing inputs: pyzerproc "zestimate" = ps: with ps; [ xmltodict]; - "zha" = ps: with ps; [ pyserial zha-quirks zigpy-deconz]; # missing inputs: bellows zigpy-cc zigpy-xbee zigpy-zigate zigpy + "zha" = ps: with ps; [ bellows pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy]; "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac "ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl "zone" = ps: with ps; [ ]; From c2e1c9175ff646bf15e27598816c0633c73d03e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 7 Jul 2020 07:23:29 +0200 Subject: [PATCH 27/89] python3Packages.transformers: 3.0.1 -> 3.0.2 Changelog: https://github.com/huggingface/transformers/releases/tag/v3.0.2 --- pkgs/development/python-modules/transformers/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 33cb5e04959..1f1451c5f0c 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "transformers"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "v${version}"; - sha256 = "1l8l82zi021sq5dnzlbjx3wx0n4yy7k96n3m2fr893y9lfkhhd8z"; + sha256 = "0rdlikh2qilwd0s9f3zif51p1q7sp3amxaccqic8p5qm6dqpfpz6"; }; propagatedBuildInputs = [ @@ -44,7 +44,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "tokenizers == 0.8.0-rc4" "tokenizers>=0.8,<0.9" + --replace "tokenizers == 0.8.1.rc1" "tokenizers>=0.8" ''; preCheck = '' From 33873dab2262559955f6505528b97513c3fee7c2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 10 Jul 2020 04:20:00 -0500 Subject: [PATCH 28/89] python27Packages.pillow: fix build on darwin --- pkgs/development/python-modules/pillow/6.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pillow/6.nix b/pkgs/development/python-modules/pillow/6.nix index ad69f4f2345..64f162c24eb 100644 --- a/pkgs/development/python-modules/pillow/6.nix +++ b/pkgs/development/python-modules/pillow/6.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck - python -m pytest -v -x -W always + python -m pytest -v -x -W always${stdenv.lib.optionalString stdenv.isDarwin " --deselect=Tests/test_file_icns.py::TestFileIcns::test_save --deselect=Tests/test_imagegrab.py::TestImageGrab::test_grab"} runHook postCheck ''; From 9deee366491368dc2f3c5e5ae901ac0e8ba38d39 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 8 Jul 2020 13:09:29 +0200 Subject: [PATCH 29/89] matrix-synapse: 1.15.2 -> 1.16.1 https://github.com/matrix-org/synapse/releases/tag/v1.16.0 https://github.com/matrix-org/synapse/releases/tag/v1.16.1 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 4af80e27711..3b7c1655ea8 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -9,11 +9,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.15.2"; + version = "1.16.1"; src = fetchPypi { inherit pname version; - sha256 = "1qsrpzq6i2zakpi9sa5sjnjd4bk92n7zgkpcmpaa4sd9ya1wqifb"; + sha256 = "0kkja67h5ky94q5zj3790zx0nw5r8qksndvdg6gk6h0s1xb74iqa"; }; patches = [ From 12cf86fd196f22ffc8a17961c42f60e4617d6626 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 10 Jul 2020 20:10:47 +0000 Subject: [PATCH 30/89] python37Packages.voluptuous-serialize: 2.3.0 -> 2.4.0 --- .../python-modules/voluptuous-serialize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/voluptuous-serialize/default.nix b/pkgs/development/python-modules/voluptuous-serialize/default.nix index f310148d75d..383eed03a4e 100644 --- a/pkgs/development/python-modules/voluptuous-serialize/default.nix +++ b/pkgs/development/python-modules/voluptuous-serialize/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "voluptuous-serialize"; - version = "2.3.0"; + version = "2.4.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1xcjyp1190z6a226fg0clvhf43gjsbyn60amblsg7w7cw86d033l"; + sha256 = "1r7avibzf009h5rlh7mbh1fc01daligvi2axjn5qxh810g5igfn6"; }; propagatedBuildInputs = [ From 017f120e5042b7303b86d31110f242080856f9ef Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 10 Jul 2020 22:22:42 +0000 Subject: [PATCH 31/89] randomx: 1.1.7 -> 1.1.8 --- pkgs/development/libraries/randomx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/randomx/default.nix b/pkgs/development/libraries/randomx/default.nix index 5b0c2b8a657..6de7ecdfef3 100644 --- a/pkgs/development/libraries/randomx/default.nix +++ b/pkgs/development/libraries/randomx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "randomX"; - version = "1.1.7"; + version = "1.1.8"; nativeBuildInputs = [ cmake ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "tevador"; repo = pname; rev = "v${version}"; - sha256 = "1d42dw4zrd7mzfqs6gwk27jj6lsh6pwv85p1ckx9dxy8mw3m52ah"; + sha256 = "13h2cw8drq7xn3v8fbpxrlsl8zq3fs8gd2pc1pv28ahr9qqjz1gc"; }; meta = with stdenv.lib; { From a7c3c39bf36074f08d90cffc48b4efc29501b8cf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Jul 2020 03:22:42 +0000 Subject: [PATCH 32/89] stig: 0.11.0a -> 0.11.2a0 --- pkgs/applications/networking/p2p/stig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix index 98fd41e8bcd..276cabfa2aa 100644 --- a/pkgs/applications/networking/p2p/stig/default.nix +++ b/pkgs/applications/networking/p2p/stig/default.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "stig"; # This project has a different concept for pre release / alpha, # Read the project's README for details: https://github.com/rndusr/stig#stig - version = "0.11.0a"; + version = "0.11.2a0"; src = fetchFromGitHub { owner = "rndusr"; repo = "stig"; rev = "v${version}"; - sha256 = "192v8f80jfly12bqzsslpxlvm72kdqm3jl40x1az5czpg4ab3lb7"; + sha256 = "05dn6mr86ly65gdqarl16a2jk1bwiw5xa6r4kyag3s6lqsv66iw8"; }; # urwidtrees 1.0.3 is requested by the developer because 1.0.2 (which is packaged From 40f4cbbd7c07444938517243da426d59b32e9b22 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Sat, 11 Jul 2020 02:10:54 -0600 Subject: [PATCH 33/89] lazygit: 0.20.4 -> 0.20.5 new version released with a small improvement https://github.com/jesseduffield/lazygit/releases/tag/v0.20.5 --- pkgs/development/tools/lazygit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index c3ae1eb30e8..097858fa6f2 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "lazygit"; - version = "0.20.4"; + version = "0.20.5"; goPackagePath = "github.com/jesseduffield/lazygit"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "134f04ybzgghm7ghyxair111aflmkjrbfj0bkxfp1w0a3jm6sfsk"; + sha256 = "0968aww43gvc4wx2nyjyavclyspls7rbdlpzq6k5z7pgf4mgganw"; }; meta = with stdenv.lib; { From 56784484ff3dd701071f49d87b9e2234fccc8812 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 11 Jul 2020 04:20:00 -0500 Subject: [PATCH 34/89] jetbrains-mono: 1.0.6 -> 2.000 --- pkgs/data/fonts/jetbrains-mono/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/jetbrains-mono/default.nix b/pkgs/data/fonts/jetbrains-mono/default.nix index 718b6b218df..4f4f80dbeba 100644 --- a/pkgs/data/fonts/jetbrains-mono/default.nix +++ b/pkgs/data/fonts/jetbrains-mono/default.nix @@ -1,14 +1,14 @@ { lib, fetchzip }: let - version = "1.0.6"; + version = "2.000"; in -fetchzip rec { +fetchzip { name = "JetBrainsMono-${version}"; - url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip"; + url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrains.Mono.${version}.zip"; - sha256 = "1198k5zw91g85h6n7rg3y7wcj1nrbby9zlr6zwlmiq0nb37n0d3g"; + sha256 = "1kmb0fckiwaphqxw08xd5fbfjrwnwxz48bidj16ixw8lgcr29b8g"; postFetch = '' mkdir -p $out/share/fonts From 8618e44f46aaac0c6a9afbd349e18379e98c6a5a Mon Sep 17 00:00:00 2001 From: Simon Lackerbauer Date: Wed, 1 Jul 2020 21:30:09 +0200 Subject: [PATCH 35/89] atlassian-jira: 8.9.0 -> 8.10.0 --- pkgs/servers/atlassian/jira.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index fd35ef8735a..81bb6a0e5d2 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "atlassian-jira"; - version = "8.9.0"; + version = "8.10.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "1rpibkp57nw084yd018924g1mdcqk8gnj99m85fmmhpppgbh9ca9"; + sha256 = "1l0kxh4cwqyciylbccd4vfmsvq9cr5sfd0v2gbs3lz41av79mlwa"; }; buildPhase = '' From 2968735bbce9ba2706332487362522400e5458d8 Mon Sep 17 00:00:00 2001 From: David McKay Date: Sat, 11 Jul 2020 13:45:02 +0100 Subject: [PATCH 36/89] gnomeExtensions.dash-to-panel: 31 -> 38 --- pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix index 4e9c4c025cd..a41719f2b9b 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-dash-to-panel"; - version = "31"; + version = "38"; src = fetchFromGitHub { owner = "home-sweet-gnome"; repo = "dash-to-panel"; rev = "v${version}"; - sha256 = "0vh36mdncjvfp1jbinifznj5dw3ahsswwm3m9sjw5gydsbx6vh83"; + sha256 = "1kvybb49l1vf0fvh8d0c6xkwnry8m330scamf5x40y63d4i213j1"; }; buildInputs = [ From ef4f6dba945a0e44a1ee7c571e0bc501a7ac12ad Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 11 Jul 2020 14:46:29 +0200 Subject: [PATCH 37/89] php73: 7.3.19 -> 7.3.20 Changelog: https://www.php.net/ChangeLog-7.php#7.3.20 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index b930e54fa4c..340f61eca6a 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -276,8 +276,8 @@ let }); php73base = callPackage generic (_args // { - version = "7.3.19"; - sha256 = "199l1lr7ima92icic7b1bqlb036md78m305lc3v6zd4zw8qix70d"; + version = "7.3.20"; + sha256 = "1pl9bjwvdva2yx4sh465z9cr4bnr8mvv008w71sy1kqsj6a7ivf6"; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; From 86ed3bf5780d1d089617866b3886f79611245b39 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 11 Jul 2020 14:49:37 +0200 Subject: [PATCH 38/89] php72: 7.2.31 -> 7.2.32 Changelog: https://www.php.net/ChangeLog-7.php#7.2.32 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index b930e54fa4c..ec351936664 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -268,8 +268,8 @@ let }; php72base = callPackage generic (_args // { - version = "7.2.31"; - sha256 = "0057x1s43f9jidmrl8daka6wpxclxc1b1pm5cjbz616p8nbmb9qv"; + version = "7.2.32"; + sha256 = "19wqbpvsd6c6iaad00h0m0xnx4r8fj56pwfhki2cw5xdfi10lp3i"; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php72-darwin-isfinite.patch; From 49316cca663f4258381b731afdd2bc99737d9d37 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 11 Jul 2020 14:41:01 +0200 Subject: [PATCH 39/89] php74: 7.4.7 -> 7.4.8 Changelog: https://www.php.net/ChangeLog-7.php#7.4.8 --- pkgs/development/interpreters/php/default.nix | 4 ++-- pkgs/top-level/php-packages.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index b930e54fa4c..4c244bb3c9c 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -284,8 +284,8 @@ let }); php74base = callPackage generic (_args // { - version = "7.4.7"; - sha256 = "0ynq4fz54jpzh9nxvbgn3vrdad2clbac0989ai0yrj2ryc0hs3l0"; + version = "7.4.8"; + sha256 = "0ql01sfg8l7y2bfwmnjxnfw9irpibnz57ssck24b00y00nkd6j3a"; }); defaultPhpExtensions = { all, ... }: with all; ([ diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 1e6430df983..668ea8c67ed 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -1014,6 +1014,7 @@ in +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | '') + ] ++ lib.optional (lib.versionOlder php.version "7.4.8") [ (pkgs.writeText "mysqlnd_fix_compression.patch" '' --- a/ext/mysqlnd/mysqlnd.h +++ b/ext/mysqlnd/mysqlnd.h From 1bff502065370a2ce2e7c967fafd681a1f02bcf3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 11 Jul 2020 15:23:47 +0200 Subject: [PATCH 40/89] =?UTF-8?q?ocamlPackages.lambdasoup:=200.6.3=20?= =?UTF-8?q?=E2=86=92=200.7.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/lambdasoup/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/lambdasoup/default.nix b/pkgs/development/ocaml-modules/lambdasoup/default.nix index b4980240c90..f535ee78fef 100644 --- a/pkgs/development/ocaml-modules/lambdasoup/default.nix +++ b/pkgs/development/ocaml-modules/lambdasoup/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "lambdasoup"; - version = "0.6.3"; # NB: double-check the license when updating + version = "0.7.1"; src = fetchFromGitHub { owner = "aantron"; repo = pname; rev = version; - sha256 = "1w4zp3vswijzvrx0c3fv269ncqwnvvrzc46629nnwm9shwv07vmv"; + sha256 = "14lndpsnzjjg58sdwxqpsv7kz77mnwn5658lya9jyaclj8azmaks"; }; propagatedBuildInputs = [ markup ]; @@ -16,7 +16,7 @@ buildDunePackage rec { meta = { description = "Functional HTML scraping and rewriting with CSS in OCaml"; homepage = "https://aantron.github.io/lambdasoup/"; - license = lib.licenses.bsd2; + license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; }; From bda43779f6a1c90b9733faa046396b59250001e0 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 11 Jul 2020 15:33:23 +0200 Subject: [PATCH 41/89] minetest: 5.2.0 -> 5.3.0 --- pkgs/games/minetest/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index db36b43ea29..f49ec1f4a82 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -39,7 +39,7 @@ let ] ++ optionals buildClient [ "-DOpenGL_GL_PREFERENCE=GLVND" ]; - + NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 nativeBuildInputs = [ cmake doxygen graphviz ]; @@ -47,7 +47,7 @@ let buildInputs = [ irrlicht luajit jsoncpp gettext freetype sqlite curl bzip2 ncurses gmp libspatialindex - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.isDarwin [ libiconv OpenGL OpenAL Carbon Cocoa ] ++ optionals buildClient [ libpng libjpeg libGLU libGL openal libogg libvorbis xorg.libX11 libXxf86vm @@ -76,9 +76,9 @@ let }; v5 = { - version = "5.2.0"; - sha256 = "0pj9hkxwc1vzng2khbixi79557sbawf6mqkzl589jciyqa7jqkv1"; - dataSha256 = "1kjz7x3xiqqnpyrd6339a139pbdxx31c4qpg8pmns410hsm8i358"; + version = "5.3.0"; + sha256 = "03ga3j3cg38w4lg4d4qxasmnjdl8n3lbizidrinanvyfdyvznyh6"; + dataSha256 = "1liciwlh013z5h08ib0psjbwn5wkvlr937ir7kslfk4vly984cjx"; }; in { From 512637e1d09d8fcc540d4eab41b96c8a077756e4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Jul 2020 05:44:22 +0000 Subject: [PATCH 42/89] gnome3.tali: 3.36.1 -> 3.36.4 --- pkgs/desktops/gnome-3/games/tali/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix index 62df1cd1e3d..2fd1d034db3 100644 --- a/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/pkgs/desktops/gnome-3/games/tali/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "tali"; - version = "3.36.1"; + version = "3.36.4"; src = fetchurl { url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1klnxk49rr1m2lr4zj1wvfl0iaxzdh2k8ngrcmfmcq39vlxnn94y"; + sha256 = "12h6783m4634zzprlk31j0dmvgzrfjklhl0z49fdwcziw5bszr3c"; }; passthru = { From 4a2327e7f1982a4740e412189ff7feb68554f757 Mon Sep 17 00:00:00 2001 From: uosis Date: Thu, 9 Jul 2020 16:47:22 -0600 Subject: [PATCH 43/89] loop: unstable-2018-12-04 -> unstable-2020-07-08 --- pkgs/tools/misc/loop/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix index 73907e233ab..3cc0466d80a 100644 --- a/pkgs/tools/misc/loop/default.nix +++ b/pkgs/tools/misc/loop/default.nix @@ -1,16 +1,17 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage { - name = "loop-unstable-2018-12-04"; + pname = "loop"; + version = "unstable-2020-07-08"; src = fetchFromGitHub { owner = "Miserlou"; repo = "Loop"; - rev = "598ccc8e52bb13b8aff78b61cfe5b10ff576cecf"; - sha256 = "0f33sc1slg97q1aisdrb465c3p7fgdh2swv8k3yphpnja37f5nl4"; + rev = "944df766ddecd7a0d67d91cc2dfda8c197179fb0"; + sha256 = "0v61kahwk1kdy8pb40rjnzcxby42nh02nyg9jqqpx3vgdrpxlnix"; }; - cargoSha256 = "1ydd0sd4lvl6fdl4b13ncqcs03sbxb6v9dwfyqi64zihqzpblshv"; + cargoSha256 = "0a3l580ca23vx8isd1qff870ci3p7wf4qrm53jl7nhfjh7rg5a4w"; meta = with stdenv.lib; { description = "UNIX's missing `loop` command"; From 05c65878bad487dddf90342797df804ce57e7fa5 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Sat, 11 Jul 2020 15:56:48 +0000 Subject: [PATCH 44/89] ipfs-migrator: 1.5.1 -> 1.6.3 --- pkgs/applications/networking/ipfs-migrator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix index 7a9d8f63970..c4c893f699c 100644 --- a/pkgs/applications/networking/ipfs-migrator/default.nix +++ b/pkgs/applications/networking/ipfs-migrator/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ipfs-migrator"; - version = "1.5.1"; + version = "1.6.3"; src = fetchFromGitHub { owner = "ipfs"; repo = "fs-repo-migrations"; rev = "v${version}"; - sha256 = "18pjxkxfbsbbj4hs4xyzfmmz991h31785ldx41dll6wa9zx4lsnm"; + sha256 = "13ah5jk8n3wznvag6dda1ssgpqsdr9pdgvqm9gcsb7zzls89j9x5"; }; vendorSha256 = null; @@ -22,4 +22,4 @@ buildGoModule rec { platforms = platforms.unix; maintainers = with maintainers; [ elitak ]; }; -} \ No newline at end of file +} From ca343e539804dfa1ba9c4a7f0f615a47db52a3d1 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sat, 11 Jul 2020 18:26:40 +0200 Subject: [PATCH 45/89] cargo-inspect: 0.10.1 -> 0.10.3 --- pkgs/development/tools/rust/cargo-inspect/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-inspect/default.nix b/pkgs/development/tools/rust/cargo-inspect/default.nix index f16a5d5727a..8626ae243b8 100644 --- a/pkgs/development/tools/rust/cargo-inspect/default.nix +++ b/pkgs/development/tools/rust/cargo-inspect/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "cargo-inspect"; - version = "0.10.1"; + version = "0.10.3"; src = fetchFromGitHub { owner = "mre"; repo = pname; rev = version; - sha256 = "0rjy8jlar939fkl7wi8a6zxsrl4axz2nrhv745ny8x38ii4sfbzr"; + sha256 = "026vc8d0jkc1d7dlp3ldmwks7svpvqzl0k5niri8a12cl5w5b9hj"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0v7g9rkw7axy99vcfi7sy2pw7wnpq424jvd8xchcv8ghh8yw9lyc"; + cargoSha256 = "1ryi5qi1zz2yljyj4rn84q9zkzafc9w4nw3zc01hlzpnb1sjw5sw"; meta = with lib; { description = "See what Rust is doing behind the curtains"; From 0877879d0c6230cded88713d26e3b23aa1ecf89e Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sat, 11 Jul 2020 19:46:49 +0300 Subject: [PATCH 46/89] jetbrains.jdk: 11.0.6-b774 -> 11.0.7-b64 (#92837) --- pkgs/development/compilers/jetbrains-jdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 1502b243d88..fd3270fa0d0 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -2,12 +2,12 @@ openjdk11.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk"; - version = "11.0.6-b774"; + version = "11.0.7-b64"; src = fetchFromGitHub { owner = "JetBrains"; repo = "JetBrainsRuntime"; rev = "jb${stdenv.lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0lx3h74jwa14kr8ybwxbzc4jsjj6xnymvckdsrhqhvrciya7bxzw"; + sha256 = "1gxqi6dkyriv9j29ppan638w1ns2g9m4q1sq7arf9kwqr05zim90"; }; patches = []; meta = with stdenv.lib; { From 38c590a7defc713bca3bd54203695497fbbbabcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sat, 11 Jul 2020 18:50:21 +0200 Subject: [PATCH 47/89] coreboot-utils: 4.11 -> 4.12 --- pkgs/tools/misc/coreboot-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index e769cb25a73..533b4eefc2a 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }: let - version = "4.11"; + version = "4.12"; meta = with stdenv.lib; { description = "Various coreboot-related tools"; @@ -16,7 +16,7 @@ let src = fetchurl { url = "https://coreboot.org/releases/coreboot-${version}.tar.xz"; - sha256 = "11xdm2c1blaqb32j98085sak78jldsw0xhrkzqs5b8ir9jdqbzcp"; + sha256 = "1qibds9lsk22wf1sxwg0jg32fgcvc9an39vf74y1hwwvxq0d1jpd"; }; enableParallelBuilding = true; From 553859d1420d0d67752f94e245cd5615860aa497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sat, 11 Jul 2020 18:54:34 +0200 Subject: [PATCH 48/89] mumble: 1.3.1 -> 1.3.2 --- pkgs/applications/networking/mumble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index b83e98a558c..8490c0509a1 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -128,14 +128,14 @@ let } source; source = rec { - version = "1.3.1"; + version = "1.3.2"; # Needs submodules src = fetchFromGitHub { owner = "mumble-voip"; repo = "mumble"; rev = version; - sha256 = "1xsla9g7xbq6xniwcsjik5hbjh0xahv44qh4z9hjn7p70b8vgnwc"; + sha256 = "1ljn7h7dr9iyhvq7rdh0prl7hzn9d2hhnxv0ni6dha6f7d9qbfy6"; fetchSubmodules = true; }; }; From f23acc03cf69baadc31b867627d086678fbed592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sat, 11 Jul 2020 19:01:19 +0200 Subject: [PATCH 49/89] tipp10: 3.1.0 -> 3.2.0 --- pkgs/applications/misc/tipp10/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/tipp10/default.nix b/pkgs/applications/misc/tipp10/default.nix index 8316fd918ab..4782b90b4a1 100644 --- a/pkgs/applications/misc/tipp10/default.nix +++ b/pkgs/applications/misc/tipp10/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "tipp10"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitLab { - owner = "a_a"; + owner = "tipp10"; repo = pname; rev = "v${version}"; - sha256 = "1mksga1zyqz1y2s524nkw86irg36zpjwz7ff87n2ygrlysczvnx1"; + sha256 = "0fav5jlw6lw78iqrj7a65b8vd50hhyyaqyzmfrvyxirpsqhjk1v7"; }; nativeBuildInputs = [ cmake qttools ]; From 915d2fa8cb9771287b9198cd09d93489d39b79c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sat, 11 Jul 2020 19:05:46 +0200 Subject: [PATCH 50/89] uci: unstable-2020-01-27 -> unstable-2020-04-27 --- pkgs/development/libraries/uci/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/uci/default.nix b/pkgs/development/libraries/uci/default.nix index e3bdea8c889..aa2a88653bb 100644 --- a/pkgs/development/libraries/uci/default.nix +++ b/pkgs/development/libraries/uci/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "uci"; - version = "unstable-2020-01-27"; + version = "unstable-2020-04-27"; src = fetchgit { url = "https://git.openwrt.org/project/uci.git"; - rev = "e8d83732f9eb571dce71aa915ff38a072579610b"; - sha256 = "1si8dh8zzw4j6m7387qciw2akfvl7c4779s8q5ns2ys6dn4sz6by"; + rev = "ec8d3233948603485e1b97384113fac9f1bab5d6"; + sha256 = "0p765l8znvwhzhgkq7dp36w62k5rmzav59vgdqmqq1bjmlz1yyi6"; }; hardeningDisable = [ "all" ]; From 67504da51e8333cc855b03b4671c3f0d06fd31c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sat, 11 Jul 2020 19:08:35 +0200 Subject: [PATCH 51/89] netifd: unstable-2020-01-18 -> unstable-2020-07-11 --- pkgs/tools/networking/netifd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netifd/default.nix b/pkgs/tools/networking/netifd/default.nix index 38591f38fcf..36d1ec7a423 100644 --- a/pkgs/tools/networking/netifd/default.nix +++ b/pkgs/tools/networking/netifd/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "netifd"; - version = "unstable-2020-01-18"; + version = "unstable-2020-07-11"; src = fetchgit { url = "https://git.openwrt.org/project/netifd.git"; - rev = "1321c1bd8fe921986c4eb39c3783ddd827b79543"; - sha256 = "178pckyf1cydi6zzr4bmhksv8vyaks91zv9lqqd2z5nkmccl6vf3"; + rev = "3d9bd73e8c2d8a1f78effbe92dd2495bbd2552c4"; + sha256 = "085sx1gsigbi1jr19l387rc5p6ja1np6q2gb84khjd4pyiqwk840"; }; buildInputs = [ libnl libubox uci ubus json_c ]; From a9438c28b3634fe7fcacf4d4d7ee55205bacc6c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sat, 11 Jul 2020 19:57:48 +0200 Subject: [PATCH 52/89] jetbrains: update --- .../editors/jetbrains/default.nix | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 7d5a2f79585..bfdf320aeb9 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -294,12 +294,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2020.1.3"; /* updated by script */ + version = "2020.1.4"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0pqwj4gc23gf10xqciwndimb4ml7djmx8m5rh52c07m77y4aniyn"; /* updated by script */ + sha256 = "1wgcc1faqn0y9brxikh53s6ly7zvpdmpg7m5gvp5437isbllisbl"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -307,12 +307,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2020.1.2"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "07gfqyp6blbf7v8p106ngpq7c5p0llcjahi205yg2jgzkhshn7ld"; /* updated by script */ + sha256 = "1aycsy2pg8nw5il8p2r6bhim9y47g5rfga63f0p435mpjmzpll0s"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -320,12 +320,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2020.1.2"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "13qj8n5daz0z0pjizyfsvbbr1gxp5479ar3a68ygi0vrpmbdbssd"; /* updated by script */ + sha256 = "188wkqcv67kizq4w6v4vg9jpr3qfgbg9x5jc77s4ki4nafkbfxas"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -333,12 +333,12 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2019.2"; + version = "2020.1.2"; /* updated by script */ description = "Create your own domain-specific language"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/mps/2019.2/MPS-${version}.tar.gz"; - sha256 = "0rph3bibj74ddbyrn0az1npn4san4g1alci8nlq4gaqdlcz6zx22"; + url = "https://download.jetbrains.com/mps/2020.1/MPS-${version}.tar.gz"; + sha256 = "0ygk31l44bxcv64h6lnqxssmx5prcb5b5xdm3qxmrv7xz1qv59c1"; /* updated by script */ }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -346,12 +346,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2020.1.2"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "00c8vlp125j56v9g9d4rc5g4dhgvl1bhi6qrzvpaf6x77jbq4fv4"; /* updated by script */ + sha256 = "0cw2rx68rl6mrnizpb69ahz4hrh8blry70cv4rjnkw19d4x877m8"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -359,12 +359,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2020.1.2"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1s04b9w7sydix1sjqzmby63nwcvzs6iw28wz7441kxgryl9qg0qw"; /* updated by script */ + sha256 = "1290k17nihiih8ipxfqax1xlx320h1vkwbcc5hc50psvpsfgiall"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -372,12 +372,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2020.1.2"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1ysj00qbn5ik6i5953b9mln4g456fmn3phdln9m5jmcb0126y235"; /* updated by script */ + sha256 = "1ag8jrfs38f0q11pyil4pvddi8lv46b0jxd3mcbmidn3p1z29f9x"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -385,12 +385,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2020.1.3"; /* updated by script */ + version = "2020.1.4"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "1zzkd3b5j3q6jqrvibxz33a4fcm7pgqfx91bqjs615v3499ncng7"; /* updated by script */ + sha256 = "0vicgwgsbllfw6fz4l82x4vbka3agf541576ix9akyvsskwbaxj9"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -398,12 +398,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2020.1.2"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "1ycwml7fyhjajjfy1fhggmx0mcdcjidkxll7357rv2z51r0yhc9h"; /* updated by script */ + sha256 = "1z6z2c31aq29hzi1cifc77zz9vnw48h2jvw4w61lvgskcnzrw9vn"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -411,12 +411,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2020.1.2"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1szgiccimfk99z9x1k99lgic6ix81fdahf1k3a88rddl8hhncjwv"; /* updated by script */ + sha256 = "19zqac77fkw1czf86s39ggnd24r9ljr80gj422ch4fdkz4qy832q"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; From 7b4e73294f36ab896ee0397e0e13c4b0d90596ba Mon Sep 17 00:00:00 2001 From: Simon Lackerbauer Date: Sat, 11 Jul 2020 20:37:25 +0200 Subject: [PATCH 53/89] atlassian-confluence: 7.5.1 -> 7.6.0 (#92923) * confluence: 7.5.1 -> 7.5.2 * atlassian-confluence: 7.5.2 -> 7.6.0 --- pkgs/servers/atlassian/confluence.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index 64ecd981fc4..1460daa95ee 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null); stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.5.1"; + version = "7.6.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "0lxvff0sn1kxsm599lq72hw11qnwjn2da3mz1h8mqz0rn2adhg07"; + sha256 = "1s69b19kz8z8dbac3dsj9yvkvynlygzgnlpm72fbnqg6knp95fyz"; }; buildPhase = '' From 3970e7a1c07c0c17e5e6b1ab93b27d7f9e9570af Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 11 Jul 2020 20:55:55 +0200 Subject: [PATCH 54/89] gitea: 1.12.1 -> 1.12.2 https://github.com/go-gitea/gitea/releases/tag/v1.12.2 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index aaae2a4a257..0c60c10fb76 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.12.1"; + version = "1.12.2"; src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "0n92msf5pbgb5q6pa2p0nj9lnzs4y0qis62c5mp4hp8rc1j22wlb"; + sha256 = "12zzb1c4cl07ccxaravkmia8vdyw5ffxrlx9v95ampvv6a0swpb9"; }; unpackPhase = '' From 8076db33e9c636c1d0b92fdaafe1a78ba3240149 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Thu, 9 Jul 2020 14:39:31 +0200 Subject: [PATCH 55/89] ocrmypdf: 9.8.2 -> 10.2.0 --- pkgs/tools/text/ocrmypdf/default.nix | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index 874dc59c7fd..84e0bfb78d1 100644 --- a/pkgs/tools/text/ocrmypdf/default.nix +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -29,14 +29,14 @@ let in buildPythonApplication rec { pname = "ocrmypdf"; - version = "9.8.2"; + version = "10.2.0"; disabled = ! python3Packages.isPy3k; src = fetchFromGitHub { owner = "jbarlow83"; repo = "OCRmyPDF"; rev = "v${version}"; - sha256 = "0zff9gsbfaf72p8zbjamn6513czpr7papyh1jy0fz1z2a9h7ya0g"; + sha256 = "1dkxhy3bjl48948jj2k6d684sd76xw1q427qc4hmxncr0wxj0ljp"; }; nativeBuildInputs = with python3Packages; [ @@ -49,8 +49,10 @@ buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ cffi chardet + coloredlogs img2pdf pdfminer + pluggy pikepdf pillow reportlab @@ -66,7 +68,7 @@ buildPythonApplication rec { pytestcov pytestrunner python-xmp-toolkit - setuptools + pytestCheckHook ] ++ runtimeDeps; patches = [ @@ -76,25 +78,6 @@ buildPythonApplication rec { }) ]; - # The tests take potentially 20+ minutes, depending on machine - doCheck = false; - - # These tests fail and it might be upstream problem... or packaging. :) - # development is happening on macos and the pinned test versions are - # significantly newer than nixpkgs has. Program still works... - # (to the extent I've used it) -- Kiwi - checkPhase = '' - export HOME=$TMPDIR - pytest -k 'not test_force_ocr_on_pdf_with_no_images \ - and not test_tesseract_crash \ - and not test_tesseract_crash_autorotate \ - and not test_ghostscript_pdfa_failure \ - and not test_gs_render_failure \ - and not test_gs_raster_failure \ - and not test_bad_utf8 \ - and not test_old_unpaper' - ''; - makeWrapperArgs = [ "--prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript jbig2enc pngquant qpdf tesseract4 unpaper ]}" ]; meta = with stdenv.lib; { From df8552e534c6c89074f21c89a79eac709ac701bf Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 11 Jul 2020 21:18:48 +0200 Subject: [PATCH 56/89] home-assistant: Fix dependency restriction --- .../home-assistant/0001-setup.py-relax-dependencies.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch b/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch index e5718e084a7..7009a036137 100644 --- a/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch +++ b/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch @@ -20,5 +20,6 @@ index 4e46f63217..b1aafee59d 100755 + "requests>=2.23.0", + "ruamel.yaml>=0.15.100", "voluptuous==0.11.7", - "voluptuous-serialize==2.3.0", +- "voluptuous-serialize==2.3.0", ++ "voluptuous-serialize>=2.3.0", ] From 060c1ef6a5771778919a638048aae614c3998823 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 11 Jul 2020 15:27:23 -0400 Subject: [PATCH 57/89] qgroundcontrol: 4.0.8 -> 4.0.9 --- .../science/robotics/qgroundcontrol/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 63247bcff72..ff299cbb0bf 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchgit, SDL2 +{ lib, mkDerivation, fetchFromGitHub, SDL2 , qtbase, qtcharts, qtlocation, qtserialport, qtsvg, qtquickcontrols2 , qtgraphicaleffects, qtspeech, qtx11extras, qmake, qttools , gst_all_1, wayland, pkgconfig @@ -6,7 +6,7 @@ mkDerivation rec { pname = "qgroundcontrol"; - version = "4.0.8"; + version = "4.0.9"; qtInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 @@ -58,10 +58,11 @@ mkDerivation rec { ''; # TODO: package mavlink so we can build from a normal source tarball - src = fetchgit { - url = "https://github.com/mavlink/qgroundcontrol.git"; + src = fetchFromGitHub { + owner = "mavlink"; + repo = pname; rev = "v${version}"; - sha256 = "0jr9jpjqdwizsvh9zm0fdp8k2r4536m40dxrn30fbr3ba8vnzkgq"; + sha256 = "0fwibgb9wmxk2zili5vsibi2q6pk1gna21870y5abx4scbvhgq68"; fetchSubmodules = true; }; From 248d460d6f60b157961245ceeb931a5e0f188e4a Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 11 Jul 2020 15:28:54 -0400 Subject: [PATCH 58/89] console-bridge: 1.0.0 -> 1.0.1 --- pkgs/development/libraries/console-bridge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/console-bridge/default.nix b/pkgs/development/libraries/console-bridge/default.nix index e02f43fd148..e2370ecce64 100644 --- a/pkgs/development/libraries/console-bridge/default.nix +++ b/pkgs/development/libraries/console-bridge/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "console-bridge"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "ros"; repo = "console_bridge"; rev = version; - sha256 = "14f5i2qgp5clwkm8jjlvv7kxvwx52a607mnbc63x61kx9h6ymxlk"; + sha256 = "18qycrjnf7v8n5bipij91jsv7ap98z5dsp93w2gz9rah4lfjb80q"; }; nativeBuildInputs = [ cmake validatePkgConfig ]; From 18c8866f7740c717b66558649a44c9e40816c38a Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 11 Jul 2020 16:06:08 -0400 Subject: [PATCH 59/89] stdenv: correctly make `stdenv.system` refer to the host platform This was supposed to be done in 773233ca771a, but was not due to a small mistake. --- pkgs/stdenv/generic/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index e17b41eab32..b5798978690 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -138,8 +138,11 @@ let is32bit is64bit isAarch32 isAarch64 isMips isBigEndian; - # The derivation's `system` is `buildPlatform.system`. - inherit (buildPlatform) system; + # Override `system` so that packages can get the system of the host + # platform through `stdenv.system`. `system` is originally set to the + # build platform within the derivation above so that Nix directs the build + # to correct type of machine. + inherit (hostPlatform) system; inherit (import ./make-derivation.nix { inherit lib config stdenv; From e8fe2e631f2539acdd3dc9753c8bfc416538abde Mon Sep 17 00:00:00 2001 From: Matt Huszagh Date: Tue, 7 Jul 2020 16:02:09 -0700 Subject: [PATCH 60/89] python3Packages.fx2: unstable-2020-01-25 -> 0.9 --- pkgs/development/python-modules/fx2/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix index acbaf93a4ea..bcc7a4b5c98 100644 --- a/pkgs/development/python-modules/fx2/default.nix +++ b/pkgs/development/python-modules/fx2/default.nix @@ -7,15 +7,15 @@ , crcmod }: -buildPythonPackage { +buildPythonPackage rec { pname = "fx2"; - version = "unstable-2020-01-25"; + version = "0.9"; src = fetchFromGitHub { owner = "whitequark"; repo = "libfx2"; - rev = "d3e37f640d706aac5e69ae4476f6cd1bd0cd6a4e"; - sha256 = "1dsyknjpgf4wjkfr64lln1lcy7qpxdx5x3qglidrcswzv9b3i4fg"; + rev = version; + sha256 = "sha256-Uk+K7ym92JX4fC3PyTNxd0UvBzoNZmtbscBYjSWChuk="; }; nativeBuildInputs = [ sdcc ]; From 3a8c2f71a08e4d964fe5e4040df2b89ef0a9520b Mon Sep 17 00:00:00 2001 From: Matt Huszagh Date: Tue, 7 Jul 2020 16:02:52 -0700 Subject: [PATCH 61/89] python3Packages.glasgow: unstable-2020-02-08 -> unstable-2020-06-29 Includes new analyzer applet. --- pkgs/development/python-modules/glasgow/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/glasgow/default.nix b/pkgs/development/python-modules/glasgow/default.nix index 6a32364fdf3..8a63f78728e 100644 --- a/pkgs/development/python-modules/glasgow/default.nix +++ b/pkgs/development/python-modules/glasgow/default.nix @@ -18,15 +18,15 @@ buildPythonPackage rec { pname = "glasgow"; - version = "unstable-2020-02-08"; + version = "unstable-2020-06-29"; # python software/setup.py --version realVersion = "0.1.dev1352+g${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "GlasgowEmbedded"; repo = "glasgow"; - rev = "2a8bfc981b90ba5d86c310911dbd6ffe71acd498"; - sha256 = "01v5269bv09ggvmq6lqyhr5am51hzmwya1p5n62h84b7rdwd8q9m"; + rev = "f885790d7927b893e631c33744622d6ebc18b5e3"; + sha256 = "sha256-fSorSEa5K09aPEOk4XPWOFRxYl1KGVy29jOBqIvs2hk="; }; nativeBuildInputs = [ setuptools_scm sdcc ]; From 23e259cf7d7bffd8be21687367fcbad1a9b4d8d4 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Sat, 11 Jul 2020 13:48:26 +0000 Subject: [PATCH 62/89] nixos/users-groups: fix mkChangedOptionModule for root password hash --- nixos/modules/config/users-groups.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 12d9be94663..7e5f3582ae8 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -430,9 +430,9 @@ in { (mkChangedOptionModule [ "security" "initialRootPassword" ] [ "users" "users" "root" "initialHashedPassword" ] - (cfg: if cfg.security.initialHashedPassword == "!" + (cfg: if cfg.security.initialRootPassword == "!" then null - else cfg.security.initialHashedPassword)) + else cfg.security.initialRootPassword)) ]; ###### interface From 386ebbccf001d8c5bab8681f9a2b936fe099634b Mon Sep 17 00:00:00 2001 From: misuzu Date: Sun, 12 Jul 2020 07:16:20 +0300 Subject: [PATCH 63/89] pythonPackages.maxminddb: 1.5.2 -> 1.5.4 (#92793) --- pkgs/development/python-modules/maxminddb/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/maxminddb/default.nix b/pkgs/development/python-modules/maxminddb/default.nix index beddba84fbc..a5ec28f3448 100644 --- a/pkgs/development/python-modules/maxminddb/default.nix +++ b/pkgs/development/python-modules/maxminddb/default.nix @@ -1,4 +1,6 @@ -{ buildPythonPackage, lib, fetchPypi +{ stdenv, lib, buildPythonPackage, pythonAtLeast +, fetchPypi +, libmaxminddb , ipaddress , mock , nose @@ -13,10 +15,15 @@ buildPythonPackage rec { sha256 = "f4d28823d9ca23323d113dc7af8db2087aa4f657fafc64ff8f7a8afda871425b"; }; + buildInputs = [ libmaxminddb ]; + propagatedBuildInputs = [ ipaddress ]; checkInputs = [ nose mock ]; + # Tests are broken for macOS on python38 + doCheck = !(stdenv.isDarwin && pythonAtLeast "3.8"); + meta = with lib; { description = "Reader for the MaxMind DB format"; homepage = "https://www.maxmind.com/en/home"; From d0816b2c0f7cfd9e5f4fb9314b94ebf90fb15068 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Jul 2020 05:17:21 +0000 Subject: [PATCH 64/89] fluxctl: 1.19.0 -> 1.20.0 --- pkgs/applications/networking/cluster/fluxctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index 4354d72a5bd..45480e8c30f 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "1w6ndp0nrpps6pkxnq38hikbnzwahi6j9gn8l0bxd0qkf7cjc5w0"; + sha256 = "0bfib5pg2cbip6fw45slb0h3a7qpikxsfpclzr86bcnjq60pshl1"; }; - vendorSha256 = "0w5l1lkzx4frllflkbilj8qqwf54wkz7hin7q8xn1vflkv3lxcnp"; + vendorSha256 = "0a5sv11pb2i6r0ffwaiqdhc0m7gz679yfmqw6ix9imk4ybhf4jp9"; subPackages = [ "cmd/fluxctl" ]; From 8062c276a85a2340f172710d41ff8ad5eb37e02a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Jul 2020 05:24:35 +0000 Subject: [PATCH 65/89] font-manager: 0.7.7 -> 0.7.8 --- pkgs/applications/misc/font-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 008e59eebee..b2001c21bf7 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "font-manager"; - version = "0.7.7"; + version = "0.7.8"; src = fetchFromGitHub { owner = "FontManager"; repo = "master"; rev = version; - sha256 = "1bzqvspplp1zj0n0869jqbc60wgbjhf0vdrn5bj8dfawxynh8s5f"; + sha256 = "0s1l30y55l45rrqd9lygvp2gzrqw25rmjgnnja6s5rzs79gc668c"; }; nativeBuildInputs = [ From 4c40111f1d0dfb61d27a4faaf1c6aa74c81cfc2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 30 Jun 2020 08:15:02 +0200 Subject: [PATCH 66/89] maturin: 0.8.1 -> 0.8.2 The changelog is not updated, so this has to do: https://github.com/PyO3/maturin/compare/v0.8.1...v0.8.2 --- pkgs/development/tools/rust/maturin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 72b22dba104..9eee570f67e 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -5,16 +5,16 @@ let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { name = "maturin-${version}"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - sha256 = "16bxxa261k2l6mpdd55gyzl1mx756i0zbvqp15glpzlcwhb9bm2m"; + sha256 = "1y6bxqbv7k8xvqjzgpf6n2n3yad4qxr2dwwlw8cb0knd7cfl2a2n"; }; - cargoSha256 = "1s1brfnhwl42jb37qqz4d8mxpyq2ck60jnmjfllkga3mhwm4r8px"; + cargoSha256 = "1f12k6n58ycv79bv416566fnsnsng8jk3f6fy5j78py1qgy30swm"; nativeBuildInputs = [ pkgconfig ]; From 2aa2ce332b742f68f8853fd3f14de265df236269 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Jul 2020 05:38:38 +0000 Subject: [PATCH 67/89] fsmon: 1.7.0 -> 1.8.1 --- pkgs/tools/misc/fsmon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fsmon/default.nix b/pkgs/tools/misc/fsmon/default.nix index 5e59d34fe4a..668fa463adb 100644 --- a/pkgs/tools/misc/fsmon/default.nix +++ b/pkgs/tools/misc/fsmon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fsmon"; - version = "1.7.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "nowsecure"; repo = "fsmon"; rev = version; - sha256 = "18p80nmax8lniza324kvwq06r4w2yxcq90ypk2kqym3bnv0jm938"; + sha256 = "0i7irqs4100j0g19jh64p2plbwipl6p3ld6w4sscc7n8lwkxmj03"; }; installPhase = '' From 2611e96bf3cc798f30b86871718db5855469cda8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 7 Jul 2020 15:15:46 +0200 Subject: [PATCH 68/89] python3Packages.pytorch: create separate lib output At some point pytorch.dev was added to expose the libtorch headers and libraries to non-Python users of libtorch. However, this output currently has two disadvantages: 1. An application that compiles against the dev output will also have the libtorch header files in its closure. This is not so nice when e.g. building Docker images of applications that use libtorch. 2. The dev output has a large transitive closure with many dependencies that are not necessary when compiling against libtorch. This change adds the `lib` output so that applications that only link against libtorch libraries have a small closure. Before this change, the libtorch dependency adds 746MiB: % nix path-info -S `realpath result-dev` /nix/store/10rmy81bjk628sfpbj2szxlws6brq1xn-python3.8-pytorch-1.5.1-dev 782203848 With this change it is reduced to 196MiB: % nix path-info -S `realpath result-lib` /nix/store/bck65lf0z7gdhcf89w1zs5nz333lhgwa-python3.8-pytorch-1.5.1-lib 205865056 --- pkgs/development/python-modules/pytorch/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index a746d4c7dfb..efe6400fcbd 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -110,7 +110,8 @@ in buildPythonPackage rec { outputs = [ "out" # output standard python package - "dev" # output libtorch only + "dev" # output libtorch headers + "lib" # output libtorch libraries ]; src = fetchFromGitHub { @@ -239,9 +240,11 @@ in buildPythonPackage rec { ]; postInstall = '' mkdir $dev - cp -r $out/${python.sitePackages}/torch/lib $dev/lib cp -r $out/${python.sitePackages}/torch/include $dev/include cp -r $out/${python.sitePackages}/torch/share $dev/share + + mkdir $lib + cp -r $out/${python.sitePackages}/torch/lib $lib/lib ''; postFixup = stdenv.lib.optionalString stdenv.isDarwin '' From 880e8452e50732d1eff120df19b46cc32784b30e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Jul 2020 06:44:39 +0000 Subject: [PATCH 69/89] iconpack-jade: 1.22 -> 1.23 --- pkgs/data/icons/iconpack-jade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/iconpack-jade/default.nix b/pkgs/data/icons/iconpack-jade/default.nix index 1bfa8092a32..619fd0205b5 100644 --- a/pkgs/data/icons/iconpack-jade/default.nix +++ b/pkgs/data/icons/iconpack-jade/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "iconpack-jade"; - version = "1.22"; + version = "1.23"; src = fetchFromGitHub { owner = "madmaxms"; repo = pname; rev = "v${version}"; - sha256 = "1piypv8wdxnfiy6kgh7i3wi52m4fh4x874kh01qjmymssyirn17x"; + sha256 = "1q29ikfssn1vmwws3dry4ssq6b44afd9sb7dwv3rdqg0frabpj1m"; }; nativeBuildInputs = [ gtk3 ]; From d5f88bfafa2a3249c143d075ea58abdddb5af674 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Jul 2020 07:17:25 +0000 Subject: [PATCH 70/89] kepubify: 3.1.2 -> 3.1.3 --- pkgs/tools/misc/kepubify/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix index 46d75e5086e..30c648ba124 100644 --- a/pkgs/tools/misc/kepubify/default.nix +++ b/pkgs/tools/misc/kepubify/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kepubify"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "geek1011"; repo = pname; rev = "v${version}"; - sha256 = "13d3fl53v9pqlm555ly1dm9vc58xwkyik0qmsg173q78ysy2p4q5"; + sha256 = "1fd7w9cmdca6ivppmpn5bkqxmz50xgihrm2pbz6h8jf92i485md0"; }; - vendorSha256 = "04qpxl4j6v6w25i7r6wghd9xi7jzpy7dynhs9ni35wflq0rlczax"; + vendorSha256 = "1gzlxdbmrqqnrjx83g65yn7n93w13ci4vr3mpywasxfad866gc24"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; From 721d304103db3f19aad74ab1663d5be5f6449aa2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Jul 2020 07:33:20 +0000 Subject: [PATCH 71/89] leatherman: 1.12.0 -> 1.12.1 --- pkgs/development/libraries/leatherman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 95226504495..4623e5ca70e 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { - sha256 = "00qigglp67a14ki4dhjxd3j540a80rkmzhysx7hra8v2rgbsqgj8"; + sha256 = "1mgd7jqfg6f0y2yrh2m1njlwrpd15kas88776jdd5fsl7gvb5khn"; rev = version; repo = "leatherman"; owner = "puppetlabs"; From e1867b4e5c8327aafd7a5ce4f1cfc0862c3e62f7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Jul 2020 08:36:33 +0000 Subject: [PATCH 72/89] logrotate: 3.16.0 -> 3.17.0 --- pkgs/tools/system/logrotate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index 3e357d37d83..4c891e3e5b3 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "logrotate"; - version = "3.16.0"; + version = "3.17.0"; src = fetchFromGitHub { owner = "logrotate"; repo = "logrotate"; rev = version; - sha256 = "0dsz9cfh9glicrnh1rc3jrc176mimnasslihqnj0aknkv8ajq1jh"; + sha256 = "133k4y24p918v4dva6dh70bdfv13jvwl2vlhq0mybrs3ripvnh4h"; }; # Logrotate wants to access the 'mail' program; to be done. From 3b2b3f7c535006f8a6a1c79a2a41601f68ba7e6b Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 12 Jul 2020 12:14:16 +0200 Subject: [PATCH 73/89] nixos/systemd: add missing defaults, make options nullable Otherwise evaluation will fail if these are not set. --- nixos/modules/system/boot/systemd.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 020cf38ea3f..01ecf1d0292 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -819,7 +819,8 @@ in }; systemd.watchdog.device = mkOption { - type = types.path; + type = types.nullOr types.path; + default = null; example = "/dev/watchdog"; description = '' The path to a hardware watchdog device which will be managed by systemd. @@ -828,7 +829,8 @@ in }; systemd.watchdog.runtimeTime = mkOption { - type = types.str; + type = types.nullOr types.str; + default = null; example = "30s"; description = '' The amount of time which can elapse before a watchdog hardware device @@ -838,7 +840,8 @@ in }; systemd.watchdog.rebootTime = mkOption { - type = types.str; + type = types.nullOr types.str; + default = null; example = "10m"; description = '' The amount of time which can elapse after a reboot has been triggered @@ -848,7 +851,8 @@ in }; systemd.watchdog.kexecTime = mkOption { - type = types.str; + type = types.nullOr types.str; + default = null; example = "10m"; description = '' The amount of time which can elapse when kexec is being executed before @@ -928,16 +932,16 @@ in DefaultIPAccounting=yes ''} DefaultLimitCORE=infinity - ${optionalString (config.systemd.watchdog.device != "") '' + ${optionalString (config.systemd.watchdog.device != null) '' WatchdogDevice=${config.systemd.watchdog.device} ''} - ${optionalString (config.systemd.watchdog.runtimeTime != "") '' + ${optionalString (config.systemd.watchdog.runtimeTime != null) '' RuntimeWatchdogSec=${config.systemd.watchdog.runtimeTime} ''} - ${optionalString (config.systemd.watchdog.rebootTime != "") '' + ${optionalString (config.systemd.watchdog.rebootTime != null) '' RebootWatchdogSec=${config.systemd.watchdog.rebootTime} ''} - ${optionalString (config.systemd.watchdog.kexecTime != "") '' + ${optionalString (config.systemd.watchdog.kexecTime != null) '' KExecWatchdogSec=${config.systemd.watchdog.kexecTime} ''} From eeab7d4a2f49a34507f7f4e4aaaffc472dcb380c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Jul 2020 04:08:51 -0700 Subject: [PATCH 74/89] vaapiIntel: 2.4.0 -> 2.4.1 (#89983) --- pkgs/development/libraries/vaapi-intel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index c61429324ed..44b92fc8fa4 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "intel-vaapi-driver"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "intel"; repo = "intel-vaapi-driver"; rev = version; - sha256 = "019w0hvjc9l85yqhy01z2bvvljq208nkb43ai2v377l02krgcrbl"; + sha256 = "1cidki3av9wnkgwi7fklxbg3bh6kysf8w3fk2qadjr05a92mx3zp"; }; patchPhase = '' From 359f2345c03819fc3085103da940511b0b0bad8b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 12 Jul 2020 14:21:08 +0300 Subject: [PATCH 75/89] hplip: Remove all python related gcc references Use in stripDebugList python sitePackages directory used by the build, and don't hard code python3.7's sitePackages path. --- pkgs/misc/drivers/hplip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 98ced28b877..afd1f8f6fe4 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -230,7 +230,7 @@ python3Packages.buildPythonApplication { # There are some binaries there, which reference gcc-unwrapped otherwise. stripDebugList = [ - "share/hplip" "lib/cups/backend" "lib/cups/filter" "lib/python3.7/site-packages" "lib/sane" + "share/hplip" "lib/cups/backend" "lib/cups/filter" python3Packages.python.sitePackages "lib/sane" ]; meta = with stdenv.lib; { From fc2a4610a190e951f243215cfa50f60e4d0d275e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 12 Jul 2020 14:29:18 +0200 Subject: [PATCH 76/89] vaapiIntel: Refactor and improve the build expression (#92996) This doesn't cause any changes to the contents of the output path (apart from the $out reference changing due to the modified expression). --- .../libraries/vaapi-intel/default.nix | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index 44b92fc8fa4..81edb9caea0 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkgconfig, python2 +{ stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkg-config, python3 , intel-gpu-tools, libdrm, libva, libX11, libGL, wayland, libXext , enableHybridCodec ? false, vaapi-intel-hybrid }: @@ -14,25 +14,19 @@ stdenv.mkDerivation rec { sha256 = "1cidki3av9wnkgwi7fklxbg3bh6kysf8w3fk2qadjr05a92mx3zp"; }; - patchPhase = '' - patchShebangs ./src/shaders/gpp.py - ''; - - preConfigure = '' - sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure - ''; + # Set the correct install path: + LIBVA_DRIVERS_PATH = "${placeholder "out"}/lib/dri"; postInstall = stdenv.lib.optionalString enableHybridCodec '' ln -s ${vaapi-intel-hybrid}/lib/dri/* $out/lib/dri/ ''; configureFlags = [ - "--enable-drm" "--enable-x11" "--enable-wayland" ] ++ stdenv.lib.optional enableHybridCodec "--enable-hybrid-codec"; - nativeBuildInputs = [ autoreconfHook gnum4 pkgconfig python2 ]; + nativeBuildInputs = [ autoreconfHook gnum4 pkg-config python3 ]; buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext libGL wayland ] ++ stdenv.lib.optional enableHybridCodec vaapi-intel-hybrid; @@ -42,8 +36,18 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://01.org/linuxmedia"; license = licenses.mit; - description = "Intel driver for the VAAPI library"; - platforms = platforms.unix; - maintainers = with maintainers; [ ]; + description = "VA-API user mode driver for Intel GEN Graphics family"; + longDescription = '' + This VA-API video driver backend provides a bridge to the GEN GPUs through + the packaging of buffers and commands to be sent to the i915 driver for + exercising both hardware and shader functionality for video decode, + encode, and processing. + VA-API is an open-source library and API specification, which provides + access to graphics hardware acceleration capabilities for video + processing. It consists of a main library and driver-specific acceleration + backends for each supported hardware vendor. + ''; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = with maintainers; [ primeos ]; }; } From 42b7f16c149dc78670e4bf921e0a6e2c6906ee1c Mon Sep 17 00:00:00 2001 From: Fabian Geiselhart Date: Sun, 12 Jul 2020 16:21:46 +0200 Subject: [PATCH 77/89] wofi: Package manpages --- pkgs/applications/misc/wofi/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index 37b991e6d47..d466384e66c 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchhg, fetchpatch, pkg-config, meson, ninja, wayland, gtk3, wrapGAppsHook }: +{ stdenv, lib, fetchhg, fetchpatch, pkg-config, meson, ninja, wayland, gtk3, wrapGAppsHook, installShellFiles }: stdenv.mkDerivation rec { pname = "wofi"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "086j5wshawjbwdmmmldivfagc2rr7g5a2gk11l0snqqslm294xsn"; }; - nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ]; buildInputs = [ wayland gtk3 ]; # Fixes icon bug on NixOS. @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { }) ]; + postInstall = '' + installManPage man/wofi* + ''; + meta = with lib; { description = "A launcher/menu program for wlroots based wayland compositors such as sway"; homepage = "https://hg.sr.ht/~scoopta/wofi"; From 0b5bc84571ba8162cc30885d089bc1a5856025bb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Jul 2020 14:25:54 +0000 Subject: [PATCH 78/89] traefik: 2.2.1 -> 2.2.4 --- pkgs/servers/traefik/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index db310061927..7b21ed5951c 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "2.2.1"; + version = "2.2.4"; src = fetchFromGitHub { owner = "containous"; repo = "traefik"; rev = "v${version}"; - sha256 = "0byi2h1lma95l77sdj8jkidmwb12ryjqwxa0zz6vwjg07p5ps3k4"; + sha256 = "1zxifwbrhxaj2pl6kwyk1ivr4in0wd0q01x9ynxzbf6w2yx4xkw2"; }; - vendorSha256 = "0rbwp0cxqfv4v5sii6kavdj73a0q0l4fnvxincvyy698qzx716kf"; + vendorSha256 = "0kz7y64k07vlybzfjg6709fdy7krqlv1gkk01nvhs84sk8bnrcvn"; subPackages = [ "cmd/traefik" ]; nativeBuildInputs = [ go-bindata ]; From 6d46aee695f5f2ac00ae0b9f45597b67f3c25860 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 12 Jul 2020 18:07:08 +0200 Subject: [PATCH 79/89] mutt: 1.14.5 -> 1.14.6 Sorry that the update took so long this time, I had a party-weekend when the release came out. Signed-off-by: Matthias Beyer --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index a6acea9d1cb..ec4778cd4ab 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "1.14.5"; + version = "1.14.6"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "0p1xiqzmkqlzy5yi4l0dh0lacdq300zdj48zk0fir8j1pp512sri"; + sha256 = "0i0q6vwhnb1grimsrpmz8maw255rh9k0laijzxkry6xqa80jm5s7"; }; patches = optional smimeSupport (fetchpatch { From bab982e5ec42ad2900d6981148dc780bc0525109 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 7 Jun 2020 20:51:16 +0200 Subject: [PATCH 80/89] gns3-{gui,server}: 2.2.8 -> 2.2.9 Note: This update is pretty delayed as it was initially blocked by sentry-sdk being too old and breaking Python changes from staging. --- pkgs/applications/networking/gns3/default.nix | 6 +++--- pkgs/applications/networking/gns3/gui.nix | 2 +- pkgs/applications/networking/gns3/server.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 6cfc5ed3a99..6b289b7cdb6 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage }: let - stableVersion = "2.2.8"; + stableVersion = "2.2.9"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -25,8 +25,8 @@ let }; mkGui = args: callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "1qgzad9hdbvkdalzdnlg5gnlzn2f9qlpd1aj8djmi6w1mmdkf9q7"; - serverSrcHash = "1kg38dh0xk4yvi7hz0d5dq9k0wany0sfd185l0zxs3nz78zd23an"; + guiSrcHash = "0xbkzd43zzy1xlwwz7jvjjq21iqy6b08pbs37r6g8jciwiyqrcbd"; + serverSrcHash = "1jaap1sxkh4yivrp8z0izypl9n6ss4540n22xkf5fnkv91k0mr5n"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index bc5f78d104f..adc31463b02 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -23,7 +23,7 @@ in python.pkgs.buildPythonPackage rec { }; propagatedBuildInputs = with python.pkgs; [ - raven psutil jsonschema # tox for check + sentry-sdk psutil jsonschema # tox for check # Runtime dependencies sip (pyqt5.override { withWebSockets = true; }) distro setuptools pkgs.qt5Full diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 26553b9aed2..55d6a7626c5 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -31,7 +31,7 @@ in python.pkgs.buildPythonPackage { propagatedBuildInputs = with python.pkgs; [ aiohttp-cors yarl aiohttp multidict setuptools - jinja2 psutil zipstream raven jsonschema distro async_generator aiofiles + jinja2 psutil zipstream sentry-sdk jsonschema distro async_generator aiofiles prompt_toolkit py-cpuinfo ]; From 99ab9545b294de6be2fd7ee9efef91de738c81b9 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 12 Jul 2020 19:16:40 +0200 Subject: [PATCH 81/89] gns3-{gui,server}: 2.2.9 -> 2.2.11 --- pkgs/applications/networking/gns3/default.nix | 13 +++++++------ pkgs/applications/networking/gns3/gui.nix | 2 -- pkgs/applications/networking/gns3/server.nix | 17 +++++++++++++---- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 6b289b7cdb6..d8125e21d1b 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage }: let - stableVersion = "2.2.9"; + stableVersion = "2.2.11"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -15,18 +15,19 @@ let src = oldAttrs.src.override { inherit version sha256; }; - doCheck = oldAttrs.doCheck && (attrname != "psutil"); }); }; commonOverrides = [ - (mkOverride "psutil" "5.6.6" - "1rs6z8bfy6bqzw88s4i5zllrx3i18hnkv4akvmw7bifngcgjh8dd") + (mkOverride "psutil" "5.7.0" + "03jykdi3dgf1cdal9bv4fq9zjvzj9l9bs99gi5ar81sdl5nc2pk8") + (mkOverride "jsonschema" "3.2.0" + "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68") ]; }; mkGui = args: callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "0xbkzd43zzy1xlwwz7jvjjq21iqy6b08pbs37r6g8jciwiyqrcbd"; - serverSrcHash = "1jaap1sxkh4yivrp8z0izypl9n6ss4540n22xkf5fnkv91k0mr5n"; + guiSrcHash = "1carwhp49l9zx2p6i3in03x6rjzn0x6ls2svwazd643rmrl4y7gn"; + serverSrcHash = "0acbxay1pwq62yq9q67hid44byyi6rb6smz5wa8br3vka7z31iqf"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index adc31463b02..7cdc74dfd48 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -4,8 +4,6 @@ let defaultOverrides = commonOverrides ++ [ - (mkOverride "jsonschema" "3.2.0" - "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68") ]; python = python3.override { diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 55d6a7626c5..1ee204b0691 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -4,10 +4,19 @@ let defaultOverrides = commonOverrides ++ [ - (mkOverride "jsonschema" "3.2.0" - "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68") - (mkOverride "aiofiles" "0.4.0" - "1vmvq9qja3wahv8m1adkyk00zm7j0x64pk3f2ry051ja66xa07h2") + (mkOverride "aiofiles" "0.5.0" + "98e6bcfd1b50f97db4980e182ddd509b7cc35909e903a8fe50d8849e02d815af") + (self: super: { + py-cpuinfo = super.py-cpuinfo.overridePythonAttrs (oldAttrs: rec { + version = "6.0.0"; + src = fetchFromGitHub { + owner = "workhorsy"; + repo = "py-cpuinfo"; + rev = "v${version}"; + sha256 = "0595gjkd7gzmn9cfpgjw3ia2sl1y8mmw7ajyscibjx59m5mqcki5"; + }; + }); + }) ]; python = python3.override { From 3518436b9291b9233fe7ca1ec1453a59a69152e2 Mon Sep 17 00:00:00 2001 From: Fabian Geiselhart Date: Sat, 11 Jul 2020 23:39:52 +0200 Subject: [PATCH 82/89] bpm-tools: Specify dependencies and wrap executables --- pkgs/tools/audio/bpm-tools/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/audio/bpm-tools/default.nix b/pkgs/tools/audio/bpm-tools/default.nix index 035fbf09533..6207cbeb9fe 100644 --- a/pkgs/tools/audio/bpm-tools/default.nix +++ b/pkgs/tools/audio/bpm-tools/default.nix @@ -1,8 +1,17 @@ { stdenv, fetchurl, + gnuplot, + sox, + flac, + id3v2, + vorbis-tools, + makeWrapper }: +let + path = stdenv.lib.makeBinPath [ gnuplot sox flac id3v2 vorbis-tools ]; +in stdenv.mkDerivation rec { pname = "bpm-tools"; version = "0.3"; @@ -12,15 +21,17 @@ stdenv.mkDerivation rec { sha256 = "151vfbs8h3cibs7kbdps5pqrsxhpjv16y2iyfqbxzsclylgfivrp"; }; - patchPhase = '' - patchShebangs bpm-tag - patchShebangs bpm-graph - ''; + nativeBuildInputs = [ makeWrapper ]; installFlags = [ "PREFIX=${placeholder "out"}" ]; + postFixup = '' + wrapProgram $out/bin/bpm-tag --prefix PATH : "${path}" + wrapProgram $out/bin/bpm-graph --prefix PATH : "${path}" + ''; + meta = with stdenv.lib; { homepage = "http://www.pogo.org.uk/~mark/bpm-tools/"; description = "Automatically calculate BPM (tempo) of music files"; From 6c70cee85a263f654ccf86850e959db07a5f450e Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Sun, 12 Jul 2020 11:50:04 -0600 Subject: [PATCH 83/89] lazygit: 0.20.5 -> 0.20.6 new version released with some improvements and a couple fixes: https://github.com/jesseduffield/lazygit/releases/tag/v0.20.6 --- pkgs/development/tools/lazygit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index 097858fa6f2..9d37dcfd5d2 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "lazygit"; - version = "0.20.5"; + version = "0.20.6"; goPackagePath = "github.com/jesseduffield/lazygit"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "0968aww43gvc4wx2nyjyavclyspls7rbdlpzq6k5z7pgf4mgganw"; + sha256 = "0zim9ipwh2vkw2g41rw3p35i8fz208hyr71npfn4as8f1nl4gi4i"; }; meta = with stdenv.lib; { From 9efcb767dac243702aca7be58bae3f0e49b8700e Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 16 Jan 2020 23:50:40 +0100 Subject: [PATCH 84/89] webtorrent_desktop: 0.20.0 -> 0.21.0 Fix build This reverts commit c255b0fa45adfde495931fae3d44515fae11c715. --- .../video/webtorrent_desktop/default.nix | 54 +++++++++++-------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix index 24c17daa759..ef50dad86bc 100644 --- a/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -1,14 +1,16 @@ { - alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fontconfig, freetype, - gdk-pixbuf, glib, gnome2, libX11, libXScrnSaver, libXcomposite, libXcursor, + alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fetchzip, fontconfig, freetype, + gdk-pixbuf, glib, gnome3, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, - libxcb, nspr, nss, stdenv, udev + libxcb, nspr, nss, stdenv, udev, libuuid, pango, at-spi2-atk, at-spi2-core }: let rpath = stdenv.lib.makeLibraryPath ([ alsaLib atk + at-spi2-core + at-spi2-atk cairo cups dbus @@ -17,9 +19,9 @@ freetype gdk-pixbuf glib - gnome2.GConf - gnome2.gtk - gnome2.pango + gnome3.gtk + pango + libuuid libX11 libXScrnSaver libXcomposite @@ -39,29 +41,33 @@ ]); in stdenv.mkDerivation rec { pname = "webtorrent-desktop"; - version = "0.20.0"; + version = "0.21.0"; src = if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://github.com/webtorrent/webtorrent-desktop/releases/download/v0.20.0/webtorrent-desktop_${version}-1_amd64.deb"; - sha256 = "1kkrnbimiip5pn2nwpln35bbdda9gc3cgrjwphq4fqasbjf2781k"; + fetchzip { + url = "https://github.com/webtorrent/webtorrent-desktop/releases/download/v${version}/WebTorrent-v${version}-linux.zip"; + sha256 = "13gd8isq2l10kibsc1bsc15dbgpnwa7nw4cwcamycgx6pfz9a852"; } else throw "Webtorrent is not currently supported on ${stdenv.hostPlatform.system}"; + desktopFile = fetchurl { + url = "https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/v${version}/static/linux/share/applications/webtorrent-desktop.desktop"; + sha256 = "1v16dqbxqds3cqg3xkzxsa5fyd8ssddvjhy9g3i3lz90n47916ca"; + }; + icon256File = fetchurl { + url = "https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/v${version}/static/linux/share/icons/hicolor/256x256/apps/webtorrent-desktop.png"; + sha256 = "1dapxvvp7cx52zhyaby4bxm4rll9xc7x3wk8k0il4g3mc7zzn3yk"; + }; + icon48File = fetchurl { + url = "https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/v${version}/static/linux/share/icons/hicolor/48x48/apps/webtorrent-desktop.png"; + sha256 = "00y96w9shbbrdbf6xcjlahqd08154kkrxmqraik7qshiwcqpw7p4"; + }; phases = [ "unpackPhase" "installPhase" ]; nativeBuildInputs = [ dpkg ]; - unpackPhase = "dpkg-deb -x $src ."; installPhase = '' - mkdir -p $out - cp -R opt $out - - mv ./usr/share $out/share - mv $out/opt/webtorrent-desktop $out/libexec - chmod +x $out/libexec/WebTorrent - rmdir $out/opt - - chmod -R g-w $out + mkdir -p $out/share/{applications,icons/hicolor/{48x48,256x256}/apps} + cp -R . $out/libexec # Patch WebTorrent patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ @@ -71,9 +77,11 @@ mkdir -p $out/bin ln -s $out/libexec/WebTorrent $out/bin/WebTorrent - # Fix the desktop link - substituteInPlace $out/share/applications/webtorrent-desktop.desktop \ - --replace /opt/webtorrent-desktop $out/bin + cp $icon48File $out/share/icons/hicolor/48x48/apps/webtorrent-desktop.png + cp $icon256File $out/share/icons/hicolor/256x256/apps/webtorrent-desktop.png + ## Fix the desktop link + substitute $desktopFile $out/share/applications/webtorrent-desktop.desktop \ + --replace /opt/webtorrent-desktop $out/libexec ''; meta = with stdenv.lib; { From 34f096d0126aec902c96aec73696e6ea1a6b471b Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Sun, 12 Jul 2020 14:09:11 -0400 Subject: [PATCH 85/89] diskonaut: 0.3.0 -> 0.9.0 remove special handling for checkPhase Diskonaut now measures file sizes consistently and tests can be run without modification discussion: https://github.com/imsnif/diskonaut/issues/50 implementation: https://github.com/imsnif/diskonaut/pull/66 --- pkgs/tools/misc/diskonaut/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/diskonaut/default.nix b/pkgs/tools/misc/diskonaut/default.nix index b0a413da8c0..dd9490b4267 100644 --- a/pkgs/tools/misc/diskonaut/default.nix +++ b/pkgs/tools/misc/diskonaut/default.nix @@ -2,21 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "diskonaut"; - version = "0.3.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "imsnif"; repo = "diskonaut"; rev = version; - sha256 = "0vnmch2cac0j9b44vlcpqnayqhfdfdwvfa01bn7lwcyrcln5cd0z"; + sha256 = "125ba9qwh7j8bz74w2zbw729s1wfnjg6dg8yicqrp6559x9k7gq5"; }; - cargoSha256 = "03hqdg6pnfxnhwk0xwhwmbrk4dicjpjllbbai56a3391xac5wmi6"; - - # some tests fail due to non-portable (in terms of filesystems) measurements of block sizes - # try to re-enable tests once actual-file-size is added - # see https://github.com/imsnif/diskonaut/issues/50 for more info - doCheck = false; + cargoSha256 = "0vvbrlmviyn9w8i416767vhvd1gqm3qjvia730m0rs0w5h8khiqf"; meta = with stdenv.lib; { description = "Terminal disk space navigator"; From d6c63c7bcda71473b4c0103095f9b883c49d2f39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Sun, 12 Jul 2020 23:34:36 +0200 Subject: [PATCH 86/89] minecraft: 2.1.15166 -> 2.1.15852 --- pkgs/games/minecraft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 8770ec08b22..ac09b5078af 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -87,11 +87,11 @@ in stdenv.mkDerivation rec { pname = "minecraft-launcher"; - version = "2.1.15166"; + version = "2.1.15852"; src = fetchurl { url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz"; - sha256 = "14q41zk370zvzz2jbynhfw11r98l9x49142lqf2izfl42fhv8yhw"; + sha256 = "06k3npsk878dh93r7fws5r438hwll3x3kxi0zslb10z634marn2x"; }; icon = fetchurl { From 45325b1d24f4f91df5181881093af3c7412c7488 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Mon, 13 Jul 2020 02:16:43 +0200 Subject: [PATCH 87/89] install-grub.pl: Fix GRUB always reinstalling. (#92756) See https://github.com/NixOS/nixpkgs/pull/92520#issuecomment-655157990. In #85895 I accidentally introduced a comparison between an array reference and an array, which can never be true. Fixed by dereferencing. --- nixos/modules/system/boot/loader/grub/install-grub.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 9af799184b6..5d7f58e7c73 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -652,7 +652,7 @@ my @deviceTargets = getList('devices'); my $prevGrubState = readGrubState(); my @prevDeviceTargets = split/,/, $prevGrubState->devices; my @extraGrubInstallArgs = getList('extraGrubInstallArgs'); -my @prevExtraGrubInstallArgs = $prevGrubState->extraGrubInstallArgs; +my @prevExtraGrubInstallArgs = @{$prevGrubState->extraGrubInstallArgs}; my $devicesDiffer = scalar (List::Compare->new( '-u', '-a', \@deviceTargets, \@prevDeviceTargets)->get_symmetric_difference()); my $extraGrubInstallArgsDiffer = scalar (List::Compare->new( '-u', '-a', \@extraGrubInstallArgs, \@prevExtraGrubInstallArgs)->get_symmetric_difference()); From 2de809d3276e3a5e873bbb2b39ff238325125ac8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 9 Jul 2020 08:51:39 +0000 Subject: [PATCH 88/89] gnome3.gnome-taquin: 3.36.3 -> 3.36.4 --- pkgs/desktops/gnome-3/games/gnome-taquin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index fb609bbb978..99bdffe16ad 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-taquin"; - version = "3.36.3"; + version = "3.36.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "149bv8q2a44i9msyshhh57nxwf5a43hankbndbvjqvq95yqlnhv4"; + sha256 = "0awfssqpswsyla4gn80ifj53biwq34hcadxlknnlm7jpz0z38cp0"; }; passthru = { From 0260f04fe257f56b7221dccc427dc104de1e6d77 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 9 Jul 2020 09:21:01 +0000 Subject: [PATCH 89/89] gnome3.gnome-initial-setup: 3.36.3 -> 3.36.4 --- pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix index ff7463b940e..ff7b1f45e45 100644 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "3.36.3"; + version = "3.36.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11f2yj8q844gks3jkfbi4ap448snz1wjflqbq4y2kk12r3w37afq"; + sha256 = "17szzz2a5wpi7kwjnhimiwf8vg0bfliyk3k0adgv1pw2mcfpxp5s"; }; nativeBuildInputs = [