From 6d5f7805bd78e72b225256c13b7cc2a2c9393ce4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Aug 2021 23:54:45 +0000 Subject: [PATCH 01/54] sigil: 1.5.1 -> 1.7.0 --- pkgs/applications/editors/sigil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index d3d6e97f3fe2..adbbc05ccce5 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "sigil"; - version = "1.5.1"; + version = "1.7.0"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; rev = version; - sha256 = "sha256-BqNaIsUJE0KmFcmTjJERbclzaRe1dMjareWxUye2se0="; + sha256 = "sha256-a1gstR7qHbzQ3GZ0g/lxUxcHeZ5QgJIvhCV37tqlVfA="; }; pythonPath = with python3Packages; [ lxml ]; From 778b764a5b0cfcebf45fe92eb3aeb82918411c48 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Aug 2021 20:19:36 +0000 Subject: [PATCH 02/54] whatsapp-for-linux: 1.2.0 -> 1.2.1 --- .../instant-messengers/whatsapp-for-linux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix index 0405dddf7cdc..298a22409744 100644 --- a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "whatsapp-for-linux"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "eneshecan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dB+NsoUEYM3cT0cg5ZOkBGW7ozRGFWSsYQMja3CjaHM="; + sha256 = "sha256-dEJRufOqlY+DnJdUaG5WP9hR1qO7KxR6MjKWq1SJB8A="; }; nativeBuildInputs = [ From 0d73fb2c6696e6d66e27b8a1adf4588ad7be1ef3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 09:52:50 +0000 Subject: [PATCH 03/54] oq: 1.2.1 -> 1.3.0 --- pkgs/development/tools/oq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/oq/default.nix b/pkgs/development/tools/oq/default.nix index 499398c5c5d8..1ae81793b56d 100644 --- a/pkgs/development/tools/oq/default.nix +++ b/pkgs/development/tools/oq/default.nix @@ -8,13 +8,13 @@ crystal.buildCrystalPackage rec { pname = "oq"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "Blacksmoke16"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RJVAEbNLlYNnOL/RDG0R9f8fHhNWtR+IMnnjtLK4e34="; + sha256 = "sha256-oLy8Ts+wnI0LxtAH6vVqhS7nqNkaLs0/vK9GxfG4vU8="; }; nativeBuildInputs = [ makeWrapper ]; From c6c39b5944d1ebc7f294ea9b78350beec67b21a8 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 30 Aug 2021 12:34:28 +0100 Subject: [PATCH 04/54] apr: add patch for CVE-2021-35940 --- pkgs/development/libraries/apr/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index dd88cf7b1d49..19adfb08cfa0 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "apr"; @@ -9,7 +9,15 @@ stdenv.mkDerivation rec { sha256 = "1spp6r2a3xcl5yajm9safhzyilsdzgagc2dadif8x6z9nbq4iqg2"; }; - patches = lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ]; + patches = [ + (fetchpatch { + name = "CVE-2021-35940.patch"; + url = "https://dist.apache.org/repos/dist/release/apr/patches/apr-1.7.0-CVE-2021-35940.patch"; + sha256 = "1qd511dyqa1b7bj89iihrlbaavbzl6yyblqginghmcnhw8adymbs"; + # convince fetchpatch to restore missing `a/`, `b/` to paths + extraPrefix = ""; + }) + ] ++ lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ]; # This test needs the net postPatch = '' From 5821e35edff4fe617daa2cfdcb930bd33bac0969 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 6 Sep 2021 08:50:33 -0400 Subject: [PATCH 05/54] taplo-lsp: 0.2.4 -> 0.2.5 --- pkgs/development/tools/taplo-lsp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/taplo-lsp/default.nix b/pkgs/development/tools/taplo-lsp/default.nix index 9db148a9ad26..caa7facc0b5f 100644 --- a/pkgs/development/tools/taplo-lsp/default.nix +++ b/pkgs/development/tools/taplo-lsp/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "taplo-lsp"; - version = "0.2.4"; + version = "0.2.5"; src = fetchCrate { inherit pname version; - sha256 = "1a5v0x60iicv9snsr0a3lqbziyh38iqhiw11s2lqnr6l1hmp69jy"; + sha256 = "0a8y2fdkflc7lq0q40j7dr80hbj56bbsc585isbd7lk6xavg7cvi"; }; - cargoSha256 = "0ak70cwxcviv86b4zrcgqaxhdm6fxsji03mnacvp4pwlwv84ikkc"; + cargoSha256 = "133p5kmcfq5ksrri2f8jvnc1ljmsczq49gh3k0gmgby45yvy6xa1"; # excludes test_tcp since it fails cargoTestFlags = [ "test_stdio" ]; From b00d2a8f3e716dcb619ea8168098ffc8786fe007 Mon Sep 17 00:00:00 2001 From: Matthew Kenigsberg Date: Tue, 7 Sep 2021 11:36:11 -0500 Subject: [PATCH 06/54] nixos/testing: remove unused function runInMachine runInMachine and runInMachineWithX are not used for any tests and can be removed --- nixos/lib/testing-python.nix | 105 +++------------------------------ nixos/tests/all-tests.nix | 1 - nixos/tests/run-in-machine.nix | 23 -------- 3 files changed, 9 insertions(+), 120 deletions(-) delete mode 100644 nixos/tests/run-in-machine.nix diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 43b4f9b159b2..7c8c64211f18 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -257,105 +257,18 @@ rec { inherit test driver driverInteractive nodes; }; - runInMachine = - { drv - , machine - , preBuild ? "" - , postBuild ? "" - , qemu_pkg ? pkgs.qemu_test - , ... # ??? - }: - let - build-vms = import ./build-vms.nix { - inherit system pkgs minimal specialArgs extraConfigurations; - }; - vm = build-vms.buildVM { } - [ - machine - { - key = "run-in-machine"; - networking.hostName = "client"; - nix.readOnlyStore = false; - virtualisation.writableStore = false; - } - ]; + abortForFunction = functionName: abort ''The ${functionName} function was + removed because it is not an essential part of the NixOS testing + infrastructure. It had no usage in NixOS or Nixpkgs and it had no designated + maintainer. You are free to reintroduce it by documenting it in the manual + and adding yourself as maintainer. It was removed in + https://github.com/NixOS/nixpkgs/pull/137013 + ''; - buildrunner = writeText "vm-build" '' - source $1 - - ${coreutils}/bin/mkdir -p $TMPDIR - cd $TMPDIR - - exec $origBuilder $origArgs - ''; - - testScript = '' - start_all() - client.wait_for_unit("multi-user.target") - ${preBuild} - client.succeed("env -i ${bash}/bin/bash ${buildrunner} /tmp/xchg/saved-env >&2") - ${postBuild} - client.succeed("sync") # flush all data before pulling the plug - ''; - - testDriver = pythonTestDriver { inherit qemu_pkg; }; - - vmRunCommand = writeText "vm-run" '' - xchg=vm-state-client/xchg - ${coreutils}/bin/mkdir $out - ${coreutils}/bin/mkdir -p $xchg - - for i in $passAsFile; do - i2=''${i}Path - _basename=$(${coreutils}/bin/basename ''${!i2}) - ${coreutils}/bin/cp ''${!i2} $xchg/$_basename - eval $i2=/tmp/xchg/$_basename - ${coreutils}/bin/ls -la $xchg - done - - unset i i2 _basename - export | ${gnugrep}/bin/grep -v '^xchg=' > $xchg/saved-env - unset xchg - - export tests='${testScript}' - ${testDriver}/bin/nixos-test-driver --keep-vm-state ${vm.config.system.build.vm}/bin/run-*-vm - ''; # */ - - in - lib.overrideDerivation drv (attrs: { - requiredSystemFeatures = [ "kvm" ]; - builder = "${bash}/bin/sh"; - args = [ "-e" vmRunCommand ]; - origArgs = attrs.args; - origBuilder = attrs.builder; - }); - - - runInMachineWithX = { require ? [ ], ... } @ args: - let - client = - { ... }: - { - inherit require; - imports = [ - ../tests/common/auto.nix - ]; - virtualisation.memorySize = 1024; - services.xserver.enable = true; - test-support.displayManager.auto.enable = true; - services.xserver.displayManager.defaultSession = "none+icewm"; - services.xserver.windowManager.icewm.enable = true; - }; - in - runInMachine ({ - machine = client; - preBuild = - '' - client.wait_for_x() - ''; - } // args); + runInMachine = abortForFunction "runInMachine"; + runInMachineWithX = abortForFunction "runInMachineWithX"; simpleTest = as: (makeTest as).test; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 6baa986b2bda..48d98ee8b6fe 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -385,7 +385,6 @@ in rspamd = handleTest ./rspamd.nix {}; rss2email = handleTest ./rss2email.nix {}; rsyslogd = handleTest ./rsyslogd.nix {}; - runInMachine = handleTest ./run-in-machine.nix {}; rxe = handleTest ./rxe.nix {}; samba = handleTest ./samba.nix {}; samba-wsdd = handleTest ./samba-wsdd.nix {}; diff --git a/nixos/tests/run-in-machine.nix b/nixos/tests/run-in-machine.nix deleted file mode 100644 index 67840f3e9fe7..000000000000 --- a/nixos/tests/run-in-machine.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ system ? builtins.currentSystem, - config ? {}, - pkgs ? import ../.. { inherit system config; } -}: - -with import ../lib/testing-python.nix { inherit system pkgs; }; - -let - output = runInMachine { - drv = pkgs.hello; - machine = { ... }: { /* services.sshd.enable = true; */ }; - }; - - test = pkgs.runCommand "verify-output" { inherit output; } '' - if [ ! -e "$output/bin/hello" ]; then - echo "Derivation built using runInMachine produced incorrect output:" >&2 - ls -laR "$output" >&2 - exit 1 - fi - "$output/bin/hello" > "$out" - ''; - -in test // { inherit test; } # To emulate behaviour of makeTest From 00727874f77a2ef2baad4179cd66de5ae64a72e0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Sep 2021 23:14:55 +0000 Subject: [PATCH 07/54] pipenv: 2020.11.15 -> 2021.5.29 --- pkgs/development/tools/pipenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 2eff05b04ea7..a3b41aa03e26 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -18,11 +18,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2020.11.15"; + version = "2021.5.29"; src = fetchPypi { inherit pname version; - sha256 = "8253fe6f9cfb3791a54da8a0571f73c918cb3457dd908684c1800a13a06ec4c1"; + sha256 = "05958fadcd70b2de6a27542fcd2bd72dd5c59c6d35307fdac3e06361fb06e30e"; }; LC_ALL = "en_US.UTF-8"; From 16bbc6a7586a7c2319fac0ff02b7573c12a9b992 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 10:36:38 +0000 Subject: [PATCH 08/54] helmsman: 3.7.2 -> 3.7.3 --- pkgs/applications/networking/cluster/helmsman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index 933f1bfe71b4..2ea7ea8d2455 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmsman"; - version = "3.7.2"; + version = "3.7.3"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-wzmn06nUycNaQ4tUEBd4q17M1CVC0+5X13rqF7zaHqU="; + sha256 = "sha256-7WN4YjhPbsFZfoFuZzsN85a+kdEVlEzQ9CfWh4nxxTs="; }; vendorSha256 = "sha256-XHgdVFGIzbPPYgv/T4TtvDDbKAe3niev4S5tu/nwSqg="; From 2a0486ed8b5af9b5941dd5ba59f9251955a28c64 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 11:09:15 +0000 Subject: [PATCH 09/54] qmidinet: 0.9.1 -> 0.9.4 --- pkgs/applications/audio/qmidinet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index 51772cc135b5..556787ca9ea5 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/applications/audio/qmidinet/default.nix @@ -1,12 +1,12 @@ { mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, alsa-lib, libjack2 }: mkDerivation rec { - version = "0.9.1"; + version = "0.9.4"; pname = "qmidinet"; src = fetchurl { url = "mirror://sourceforge/qmidinet/${pname}-${version}.tar.gz"; - sha256 = "sha256-cDgF5hbjy5DzGn4Rlmb76XzRa2wURVwPu2rQRKENxQU="; + sha256 = "sha256-7Ui4kUgYgpPVAaaINrd6WGZoYon5UuHszGVaHafb/p0="; }; hardeningDisable = [ "format" ]; From 6140bfd79cd55bb446fa5bbdf29a20db8dc73358 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 12:49:42 +0000 Subject: [PATCH 10/54] qdirstat: 1.7.1 -> 1.8 --- pkgs/applications/misc/qdirstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix index d5450f0e5c4e..60db29b83ba5 100644 --- a/pkgs/applications/misc/qdirstat/default.nix +++ b/pkgs/applications/misc/qdirstat/default.nix @@ -4,13 +4,13 @@ let pname = "qdirstat"; - version = "1.7.1"; + version = "1.8"; src = fetchFromGitHub { owner = "shundhammer"; repo = pname; rev = version; - sha256 = "sha256-i1xHMwSnBULJbOA/ykQK9WBd+6TBNBRI9hnU1FDGQlY="; + sha256 = "sha256-R/eUqv5AxO5TcLkqOvlAXEkjAzeKGihf8YIQIIevOR0="; }; in From 7f0832382c1d342f406d45a65b18a83012fe23a6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 15:35:47 +0000 Subject: [PATCH 11/54] libreddit: 0.14.14 -> 0.15.1 --- pkgs/servers/libreddit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/libreddit/default.nix b/pkgs/servers/libreddit/default.nix index 744b5efe2100..6963f508c855 100644 --- a/pkgs/servers/libreddit/default.nix +++ b/pkgs/servers/libreddit/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "libreddit"; - version = "0.14.14"; + version = "0.15.1"; src = fetchFromGitHub { owner = "spikecodes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-duirX+X8moByV1urdgXjzTQ2zOfCfz7etzjDxkSKvhk="; + sha256 = "sha256-Df2WedLOz4wpot0Isy3JCF5p1sV9Hx3bkTNp1KkSfHQ="; }; - cargoSha256 = "sha256-pFCERBnN386rW8ajpLWUHteCTWRmEiR19Sp5d8HXc5Y="; + cargoSha256 = "sha256-eR/0gpuEBQ7gHrSmJqGaM4vqKwg9WZdVVnBU4DgJcVQ="; buildInputs = lib.optional stdenv.isDarwin Security; From b47f3bd50c1a95fe4da2ceb106b14731af0d657f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 14 Sep 2021 08:34:23 +0200 Subject: [PATCH 12/54] linux_zen: 5.14.1-zen1 -> 5.14.3-zen1 --- pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index b19b52132352..1c064059047e 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -2,7 +2,7 @@ let # having the full version string here makes it easier to update - modDirVersion = "5.14.1-zen1"; + modDirVersion = "5.14.3-zen1"; parts = lib.splitString "-" modDirVersion; version = lib.elemAt parts 0; suffix = lib.elemAt parts 1; @@ -19,7 +19,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${modDirVersion}"; - sha256 = "sha256-InfDIs+eELLJE5aw7mD8Jo7SlrpeI/ZuD3z4TyFf7/k="; + sha256 = "sha256-ByewBT+1z83jCuEMmNvtmhHaEk4qjHa2Kgue8wVfPIY="; }; structuredExtraConfig = with lib.kernel; { From 3baa393ae34b0073e90be1ad825f4ff86440c68b Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Wed, 15 Sep 2021 18:18:49 +1000 Subject: [PATCH 13/54] vscode-extensions.faustinoaq.lex-flex-yacc-bison: init at 0.0.3 --- pkgs/misc/vscode-extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index c65307e50644..f2c2b9e29f53 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -564,6 +564,23 @@ let }; }; + faustinoaq.lex-flex-yacc-bison = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "lex-flex-yacc-bison"; + publisher = "faustinoaq"; + version = "0.0.3"; + sha256 = "6254f52157dc796eae7bf135ac88c1c9cc19d884625331a1e634f9768722cc3d"; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/faustinoaq.lex-flex-yacc-bison/changelog"; + description = "Language support for Lex, Flex, Yacc and Bison."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=faustinoaq.lex-flex-yacc-bison"; + homepage = "https://github.com/faustinoaq/vscode-lex-flex-yacc-bison"; + license = licenses.mit; + maintainers = with maintainers; [ angustrau ]; + }; + }; + file-icons.file-icons = buildVscodeMarketplaceExtension { meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/file-icons.file-icons/changelog"; From a3205773b02dda37000b78d3a0df3e1d350d2190 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Sep 2021 11:58:02 +0000 Subject: [PATCH 14/54] fluxctl: 1.24.0 -> 1.24.1 --- 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 003c527a176f..fd6a314ecacc 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.24.0"; + version = "1.24.1"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "sha256-YjZ73Qc1lXosHopW+ZsrIyv16YupgB6ZpdcSGaZuafQ="; + sha256 = "sha256-lgcEkOu4iaLg+tP826Qpgmn0ogOpr62o1iWlv1yLbBQ="; }; - vendorSha256 = "sha256-OlM0HXFLTLYOZuVCud3k8K5X89zdZVlNkhXZzh0eKXc="; + vendorSha256 = "sha256-NQonBTHToGPo7QsChvuVM/jbV5FK71HMJfe5fe1gZYw="; nativeBuildInputs = [ installShellFiles ]; From cb7056c9009712c8f8211ebe9f2f3c4c4f26ee5c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Sep 2021 15:53:47 +0000 Subject: [PATCH 15/54] livepeer: 0.5.15 -> 0.5.20 --- pkgs/servers/livepeer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix index c84dc85ef93e..b8a4f3c5569d 100644 --- a/pkgs/servers/livepeer/default.nix +++ b/pkgs/servers/livepeer/default.nix @@ -4,16 +4,16 @@ buildGoModule rec { pname = "livepeer"; - version = "0.5.15"; + version = "0.5.20"; runVend = true; - vendorSha256 = "sha256-PhkdbixJDA9Ym4cK5ALIYJgDQnO5GTbZ0XGsVHcvYYQ="; + vendorSha256 = "sha256-iFVScV3arPkBjMi8sCHIja4G2QeQDb2sgBrbTFyxKyw="; src = fetchFromGitHub { owner = "livepeer"; repo = "go-livepeer"; rev = "v${version}"; - sha256 = "sha256-ZB80QssqN9SBpmYk/QgPRVF88qedmNeUG+EkjxWz4rQ="; + sha256 = "sha256-cOxIL093Mi+g9Al/SQJ6vdaeBAXUN6ZGsSaVvEIiJpU="; }; # livepeer_cli has a vendoring problem From 8583e77ad1c973ec934d57219226e9869dbf2c0c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Sep 2021 18:18:26 +0200 Subject: [PATCH 16/54] python-packages.nix: fix some style issues --- pkgs/top-level/python-packages.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ae27d628e26c..cad2a4df28d2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -56,7 +56,7 @@ let # See build-setupcfg/default.nix for documentation. buildSetupcfg = import ../build-support/build-setupcfg self; - fetchPypi = callPackage ../development/interpreters/python/fetchpypi.nix {}; + fetchPypi = callPackage ../development/interpreters/python/fetchpypi.nix { }; # Check whether a derivation provides a Python module. hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python; @@ -1475,7 +1475,7 @@ in { class-registry = callPackage ../development/python-modules/class-registry { }; - claripy = callPackage ../development/python-modules/claripy { }; + claripy = callPackage ../development/python-modules/claripy { }; cld2-cffi = callPackage ../development/python-modules/cld2-cffi { }; @@ -1517,11 +1517,11 @@ in { click-threading = callPackage ../development/python-modules/click-threading { }; - clickhouse-cityhash = callPackage ../development/python-modules/clickhouse-cityhash {}; + clickhouse-cityhash = callPackage ../development/python-modules/clickhouse-cityhash { }; clickhouse-cli = callPackage ../development/python-modules/clickhouse-cli { }; - clickhouse-driver = callPackage ../development/python-modules/clickhouse-driver {}; + clickhouse-driver = callPackage ../development/python-modules/clickhouse-driver { }; cliff = callPackage ../development/python-modules/cliff { }; @@ -2368,7 +2368,7 @@ in { env-canada = callPackage ../development/python-modules/env-canada { }; - environmental-override = callPackage ../development/python-modules/environmental-override {}; + environmental-override = callPackage ../development/python-modules/environmental-override { }; envisage = callPackage ../development/python-modules/envisage { }; @@ -3257,9 +3257,9 @@ in { guzzle_sphinx_theme = callPackage ../development/python-modules/guzzle_sphinx_theme { }; - gvm-tools = callPackage ../development/python-modules/gvm-tools {}; + gvm-tools = callPackage ../development/python-modules/gvm-tools { }; - gviz-api = callPackage ../development/python-modules/gviz-api {}; + gviz-api = callPackage ../development/python-modules/gviz-api { }; gym = callPackage ../development/python-modules/gym { }; @@ -7633,7 +7633,7 @@ in { queuelib = callPackage ../development/python-modules/queuelib { }; - qmk-dotty-dict = callPackage ../development/python-modules/qmk-dotty-dict {}; + qmk-dotty-dict = callPackage ../development/python-modules/qmk-dotty-dict { }; r2pipe = callPackage ../development/python-modules/r2pipe { }; @@ -8745,7 +8745,7 @@ in { tensorboard-plugin-profile = callPackage ../development/python-modules/tensorboard-plugin-profile { }; - tensorboard-plugin-wit = callPackage ../development/python-modules/tensorboard-plugin-wit {}; + tensorboard-plugin-wit = callPackage ../development/python-modules/tensorboard-plugin-wit { }; tensorboardx = callPackage ../development/python-modules/tensorboardx { }; From 63138e8ecf1d496dd814ae5414d79b8250e99da7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Sep 2021 21:13:58 +0200 Subject: [PATCH 17/54] python3Packages.archinfo: 9.0.9792 -> 9.0.9947 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 18f6b9859af5..52efb5483b1c 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.9792"; + version = "9.0.9947"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-st4h/ck7hxIx2cZ241C4hEFJvFsTqHmawAB4zsfQ/oU="; + sha256 = "sha256-DffiOMJUxreoWyPxelEL7mzaekwInYLquTS7HBIUJiM="; }; checkInputs = [ From 0b3b87dddaf3756e87cb076e697d68b6571e07df Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Sep 2021 21:14:01 +0200 Subject: [PATCH 18/54] python3Packages.ailment: 9.0.9792 -> 9.0.9947 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 551e26e71add..09ab7d8fff15 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.9792"; + version = "9.0.9947"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c+E3ypmN69IyE0HagefrYN8bdCY7amRxa/PGoIX4/cQ="; + sha256 = "sha256-4QwpIZbS+ZPjKp2oKSOzpjCK3Bi5AdntKTO8Ujx2TPE="; }; propagatedBuildInputs = [ pyvex ]; From 2ceddbd892197747897d15cb7c311f00ecbb2781 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Sep 2021 21:14:07 +0200 Subject: [PATCH 19/54] python3Packages.pyvex: 9.0.9792 -> 9.0.9947 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 4e3200c3fe70..731e462c47dd 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.9792"; + version = "9.0.9947"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8AF7dCvQvBDjITRwi40KqMXcgiJpmKcK16ys1ybFIyk="; + sha256 = "sha256-52yI8V2rQTDbo/giHqhTKJ5Pz0PAMEz6ErZuo7RlbbM="; }; postPatch = lib.optionalString stdenv.isDarwin '' From 4d5f14d5f3123cb4346ee70ebd06c2068f5c16d8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Sep 2021 21:14:10 +0200 Subject: [PATCH 20/54] python3Packages.claripy: 9.0.9792 -> 9.0.9947 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 5a80bb1dc360..a8e1ab9f43d4 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.9792"; + version = "9.0.9947"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9jwD75leV02N5B7RaLF2DbC6GjhoDQMmkfFIO9MJ4Es="; + sha256 = "sha256-3nG173x0N4enGTN52wd0HbHbJJrAI7IKSp7FHQ/v/5U="; }; # Use upstream z3 implementation From eaa123db26032e580f343c5052e1685716820d2b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Sep 2021 21:14:13 +0200 Subject: [PATCH 21/54] python3Packages.cle: 9.0.9792 -> 9.0.9947 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 0b4b0fc94d00..ade7fe633f48 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.9792"; + version = "9.0.9947"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lCRZj0/L/XNcnJNiLxPY2mCFZowV6hLEpHOEiCsyQ/0="; + sha256 = "sha256-xlzc5Bde/OFlGJe9e4qb7QSszWyINJkQfEzY0wTaKD0="; }; propagatedBuildInputs = [ From f062738da25bc570660302e6e71244b2f9d00a9d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Sep 2021 21:14:17 +0200 Subject: [PATCH 22/54] python3Packages.angr: 9.0.9792 -> 9.0.9947 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 7ff5e8bb35c9..e2f6c8051a8a 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -43,14 +43,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.9792"; + version = "9.0.9947"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-zDy3dwhCNBtCAwflF/grdNsRllNUHJHMx1PQThHjcnw="; + sha256 = "sha256-qE2LIfcKwMAbmEXycPYo4T1WU9A6tr6mDYcxDs21ySI="; }; propagatedBuildInputs = [ From 8a5693dd7e8d80824bcdf2a3ecca4bb596f94942 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Sep 2021 21:14:20 +0200 Subject: [PATCH 23/54] python3Packages.angrop: 9.0.9792 -> 9.0.9947 --- pkgs/development/python-modules/angrop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 3bee7edbf520..7884e03a2aa2 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.9792"; + version = "9.0.9947"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rXhXzqjefsKvfsFky4XJd+RaF5z/TRWDg6+IYFIfP2w="; + sha256 = "sha256-f9T2M2ilT8v6G87sbJ1r192zEpBeuWUpgQP9sYsUoeU="; }; propagatedBuildInputs = [ From 0721aa49a3488241499aee805e4bb66b0589e42f Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 15 Sep 2021 18:35:12 +0200 Subject: [PATCH 24/54] nixos/tox-bootstrapd: use DynamicUser --- nixos/modules/misc/ids.nix | 2 +- .../services/networking/tox-bootstrapd.nix | 21 +++++++------------ 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 77575f322746..d2e73193453f 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -201,7 +201,7 @@ in peerflix = 163; #chronos = 164; # removed 2020-08-15 gitlab = 165; - tox-bootstrapd = 166; + # tox-bootstrapd = 166; removed 2021-09-15 cadvisor = 167; nylon = 168; #apache-kafka = 169;# dynamically allocated as of 2021-09-03 diff --git a/nixos/modules/services/networking/tox-bootstrapd.nix b/nixos/modules/services/networking/tox-bootstrapd.nix index f88e34827d00..7c13724e084a 100644 --- a/nixos/modules/services/networking/tox-bootstrapd.nix +++ b/nixos/modules/services/networking/tox-bootstrapd.nix @@ -3,15 +3,15 @@ with lib; let - home = "/var/lib/tox-bootstrapd"; - PIDFile = "${home}/pid"; + WorkingDirectory = "/var/lib/tox-bootstrapd"; + PIDFile = "${WorkingDirectory}/pid"; pkg = pkgs.libtoxcore; cfg = config.services.toxBootstrapd; cfgFile = builtins.toFile "tox-bootstrapd.conf" '' port = ${toString cfg.port} - keys_file_path = "${home}/keys" + keys_file_path = "${WorkingDirectory}/keys" pid_file_path = "${PIDFile}" ${cfg.extraConfig} ''; @@ -36,7 +36,7 @@ in keysFile = mkOption { type = types.str; - default = "${home}/keys"; + default = "${WorkingDirectory}/keys"; description = "Node key file."; }; @@ -56,13 +56,6 @@ in config = mkIf config.services.toxBootstrapd.enable { - users.users.tox-bootstrapd = - { uid = config.ids.uids.tox-bootstrapd; - description = "Tox bootstrap daemon user"; - inherit home; - createHome = true; - }; - systemd.services.tox-bootstrapd = { description = "Tox DHT bootstrap daemon"; after = [ "network.target" ]; @@ -70,8 +63,10 @@ in serviceConfig = { ExecStart = "${pkg}/bin/tox-bootstrapd --config=${cfgFile}"; Type = "forking"; - inherit PIDFile; - User = "tox-bootstrapd"; + inherit PIDFile WorkingDirectory; + AmbientCapabilities = ["CAP_NET_BIND_SERVICE"]; + DynamicUser = true; + StateDirectory = "tox-bootstrapd"; }; }; From bb47ec4d4cd9eab6f01a4dd2dc104e85bcf81f76 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Sep 2021 20:18:44 +0000 Subject: [PATCH 25/54] profetch: 0.1.6 -> 0.1.7 --- pkgs/tools/misc/profetch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/profetch/default.nix b/pkgs/tools/misc/profetch/default.nix index d5118b346a6b..c113f48fd13d 100644 --- a/pkgs/tools/misc/profetch/default.nix +++ b/pkgs/tools/misc/profetch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "profetch"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "RustemB"; repo = pname; rev = "v${version}"; - sha256 = "1clh3l50wz6mlrw9kx0wh2bbhnz6bsksyh4ngz7givv4y3g9m702"; + sha256 = "sha256-JsjpPUXMN0jytRS4yzSjrseqHiEQ+YinklG+tIIy+Zo="; }; nativeBuildInputs = [ gprolog ]; From 0f2a56b89a56f28fe7db3a75be2232d1b3c3dcda Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Sep 2021 22:38:05 +0200 Subject: [PATCH 26/54] python3Packages.censys: 2.0.6 -> 2.0.7 --- pkgs/development/python-modules/censys/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index 06e619676a67..09dc32c6b698 100644 --- a/pkgs/development/python-modules/censys/default.nix +++ b/pkgs/development/python-modules/censys/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.0.6"; + version = "2.0.7"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "v${version}"; - sha256 = "sha256-Lbd2Pm79n0cFoGHC2rucxgZijzcVYVJJsq1yzqB9QLk="; + sha256 = "0s9y9956awl26rnrp5l78rbrjcwliqdijnmm7k6xm4hh7iak4q6z"; }; nativeBuildInputs = [ From 64bac8e8740de4cb1cba2edd8db86459a7960cd2 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 15 Sep 2021 23:13:57 +0200 Subject: [PATCH 27/54] quantum-espresso: switch to fetchFromGitLab --- .../chemistry/quantum-espresso/default.nix | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix index a348c51c2815..6889aec53577 100644 --- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -1,5 +1,10 @@ -{ lib, stdenv, fetchurl -, gfortran, fftw, blas, lapack +{ lib +, stdenv +, fetchFromGitLab +, gfortran +, fftw +, blas +, lapack , useMpi ? false , mpi }: @@ -8,9 +13,11 @@ stdenv.mkDerivation rec { version = "6.6"; pname = "quantum-espresso"; - src = fetchurl { - url = "https://gitlab.com/QEF/q-e/-/archive/qe-${version}/q-e-qe-${version}.tar.gz"; - sha256 = "0b3718bwdqfyssyz25jknijar79qh5cf1bbizv9faliz135mcilj"; + src = fetchFromGitLab { + owner = "QEF"; + repo = "q-e"; + rev = "qe-${version}"; + sha256 = "1mkfmw0fq1dabplzdn6v1abhw0ds55gzlvbx3a9brv493whk21yp"; }; passthru = { @@ -24,18 +31,18 @@ stdenv.mkDerivation rec { buildInputs = [ fftw blas lapack gfortran ] ++ (lib.optionals useMpi [ mpi ]); -configureFlags = if useMpi then [ "LD=${mpi}/bin/mpif90" ] else [ "LD=${gfortran}/bin/gfortran" ]; + configureFlags = if useMpi then [ "LD=${mpi}/bin/mpif90" ] else [ "LD=${gfortran}/bin/gfortran" ]; makeFlags = [ "all" ]; meta = with lib; { description = "Electronic-structure calculations and materials modeling at the nanoscale"; longDescription = '' - Quantum ESPRESSO is an integrated suite of Open-Source computer codes for - electronic-structure calculations and materials modeling at the - nanoscale. It is based on density-functional theory, plane waves, and - pseudopotentials. - ''; + Quantum ESPRESSO is an integrated suite of Open-Source computer codes for + electronic-structure calculations and materials modeling at the + nanoscale. It is based on density-functional theory, plane waves, and + pseudopotentials. + ''; homepage = "https://www.quantum-espresso.org/"; license = licenses.gpl2; platforms = [ "x86_64-linux" "x86_64-darwin" ]; From af8ebcb7766820e94619df34b0f143b685d68bb9 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 15 Sep 2021 23:14:26 +0200 Subject: [PATCH 28/54] postgresql11Packages.pg_ed25519: switch to fetchFromGitLab --- pkgs/servers/sql/postgresql/ext/pg_ed25519.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix index d3ff2a56e3a8..010f8f819da9 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix @@ -1,12 +1,13 @@ -{ lib, stdenv, fetchurl, postgresql }: +{ lib, stdenv, fetchFromGitLab, postgresql }: stdenv.mkDerivation rec { pname = "pg_ed25519"; version = "0.2"; - - src = fetchurl { - url = "https://gitlab.com/dwagin/${pname}/-/archive/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0q46pvk1vq5w3al6i3inzlw6w7za3n7p1gd4wfbbxzvzh7qnynda"; + src = fetchFromGitLab { + owner = "dwagin"; + repo = "pg_ed25519"; + rev = version; + sha256 = "16w3qx3wj81bzfhydl2pjhn8b1jak6h7ja9wq1kc626g0siggqi0"; }; buildInputs = [ postgresql ]; From d56ea21008ed2f047b00104b7399485bfe449346 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Sep 2021 00:22:03 +0000 Subject: [PATCH 29/54] ticker: 4.2.1 -> 4.3.0 --- pkgs/applications/misc/ticker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ticker/default.nix b/pkgs/applications/misc/ticker/default.nix index 4de28e6a861a..f268a9f4ecec 100644 --- a/pkgs/applications/misc/ticker/default.nix +++ b/pkgs/applications/misc/ticker/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ticker"; - version = "4.2.1"; + version = "4.3.0"; src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-T9pApuzATohiOUmWa+GBlLrlTNgKNMwtW6fSPO/NS6Y="; + sha256 = "sha256-DdUXT8xrKd114U+CSwIgl7XczxQZGWVZA3tMU7461xY="; }; vendorSha256 = "sha256-vTB1RPg1LN44bkWrdGEXR6WRlM/Q2EITUO0yt5ar/zg="; From eac9faf01be06ce4fdea37a4d1f21909a4d57649 Mon Sep 17 00:00:00 2001 From: Mike Purvis Date: Tue, 14 Sep 2021 19:10:54 +0000 Subject: [PATCH 30/54] opencv3: 3.4.8 -> 3.4.15 --- pkgs/development/libraries/opencv/3.x.nix | 13 +++++++++---- pkgs/development/libraries/opencv/4.x.nix | 6 ++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 33b1cd187571..fcc6238500f1 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,5 +1,5 @@ { lib, stdenv -, fetchFromGitHub, fetchpatch +, fetchFromGitHub , cmake, pkg-config, unzip, zlib, pcre, hdf5 , glog, boost, gflags, protobuf , config @@ -39,20 +39,20 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; assert enablePython -> pythonPackages != null; let - version = "3.4.8"; + version = "3.4.15"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "1dnz3gfj70lm1gbrk8pz28apinlqi2x6nvd6xcy5hs08505nqnjp"; + hash = "sha256-dLwQM2VhVlBV4xazS2rItTscKYeeNlNT0G8G1A1mOmc="; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "0psaa1yx36n34l09zd1y8jxgf8q4jzxd3vn06fqmzwzy85hcqn8i"; + hash = "sha256-FJDRMmSOT5jA+n2Ke0gEH7n5rgGvB1UzYpYZ1vmucjg="; }; # Contrib must be built in order to enable Tesseract support: @@ -151,6 +151,11 @@ stdenv.mkDerivation { cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib" ''; + # Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV. + patches = [ + ./cmake-don-t-use-OpenCVFindOpenEXR.patch + ]; + # This prevents cmake from using libraries in impure paths (which # causes build failure on non NixOS) # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index a33eff4faa53..16ada2609323 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -214,11 +214,13 @@ stdenv.mkDerivation { cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib" ''; - # This prevents cmake from using libraries in impure paths (which - # causes build failure on non NixOS) + # Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV. patches = [ ./cmake-don-t-use-OpenCVFindOpenEXR.patch ] ++ lib.optional enableCuda ./cuda_opt_flow.patch; + + # This prevents cmake from using libraries in impure paths (which + # causes build failure on non NixOS) postPatch = '' sed -i '/Add these standard paths to the search paths for FIND_LIBRARY/,/^\s*$/{d}' CMakeLists.txt ''; From 58fc4b4a7526c130d5cc3142f614b2c55d7a5854 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 16 Sep 2021 09:16:16 +0000 Subject: [PATCH 31/54] =?UTF-8?q?oh-my-zsh:=202021-09-10=20=E2=86=92=20202?= =?UTF-8?q?1-09-15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 0681fe08f578..4cdad61a8abf 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-09-10"; + version = "2021-09-15"; pname = "oh-my-zsh"; - rev = "735808f48d54aabce540f6c90294e21118104cf4"; + rev = "93b557e291ba60286bcd49f5d3e4ac61730b3f7c"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "fd/Y6kBqO/RO+LMUdCgGGHdHXWghj1YU+Pch5RLNAP0="; + sha256 = "71vJHlr+g8a+mTGBn4Bupog1lsmukJhl+qT8aVnd8pk="; }; installPhase = '' From b5cdae3f9b05bb3b0ef3935b2d7d618ac1ecabe4 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 16 Sep 2021 09:18:25 +0000 Subject: [PATCH 32/54] =?UTF-8?q?sbt-extras:=202021-08-04=20=E2=86=92=2020?= =?UTF-8?q?21-09-15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../development/tools/build-managers/sbt-extras/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index b79e9ff1b7f3..53cb289cb30e 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "d77c348e3f2fdfbd90b51ce0e5894405bb08687c"; - version = "2021-08-04"; + rev = "bd4c3e80a0a07c78407422de13039ce5889fb4b0"; + version = "2021-09-15"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "u0stt4w0iK4h+5PMkqjp9m8kqvrKvM3m7lBcV2yXPKU="; + sha256 = "NBERpDSY1FoGzD0AXJx1yTG37fjzw+VsTAgkIBfJdhs="; }; dontBuild = true; From 5c4df1a06b40d0c11cf87d0994df3afca745f7c4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Sep 2021 10:18:09 +0000 Subject: [PATCH 33/54] grype: 0.17.0 -> 0.19.0 --- pkgs/tools/security/grype/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index 4dc119980a5d..dde9da346efc 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "grype"; - version = "0.17.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-410mCfYzbqgj3hb3dgVOGPWPCIYrB41soLA8dXK23NE="; + sha256 = "sha256-xSjmwD0V4+LKfLwknQU8PAFOG3zpJ87ghHdA2c+nYQM="; }; - vendorSha256 = "sha256-KkS/1VSObniAykAwv7uW+RCrdvb5BM6DbHzDWZ6kPoQ="; + vendorSha256 = "sha256-mlsKB/WOiQ2Ud9C19rsQhVtJfblh0CGd8tDs+3SSfcg="; propagatedBuildInputs = [ docker ]; From 9bd8dc43f5fffca3d83153ed21ae5230415b6cfe Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 13 Sep 2021 18:10:46 -0400 Subject: [PATCH 34/54] lunatic: init at 0.6.2 --- .../interpreters/lunatic/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/interpreters/lunatic/default.nix diff --git a/pkgs/development/interpreters/lunatic/default.nix b/pkgs/development/interpreters/lunatic/default.nix new file mode 100644 index 000000000000..39e8323e194c --- /dev/null +++ b/pkgs/development/interpreters/lunatic/default.nix @@ -0,0 +1,24 @@ +{ cmake, fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "lunatic"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "lunatic-solutions"; + repo = pname; + rev = "v${version}"; + sha256 = "1dz8v19jw9v55p3mz4932v6z24ihp6wk238n4d4lx9xj91mf3g6r"; + }; + + cargoSha256 = "1rkxl27l6ydmcq3flc6qbnd7zmpkfmyc86b8q4pi7dwhqnd5g70g"; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "An Erlang inspired runtime for WebAssembly"; + homepage = "https://lunatic.solutions"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b32996992937..73c0d572d75d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7049,6 +7049,8 @@ with pkgs; ltris = callPackage ../games/ltris { }; + lunatic = callPackage ../development/interpreters/lunatic { }; + lv = callPackage ../tools/text/lv { }; lxc = callPackage ../os-specific/linux/lxc { From ceb9e86e806ec933eec81e41274878846ee8b554 Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Thu, 16 Sep 2021 12:13:02 +0000 Subject: [PATCH 35/54] spotify-unwrapped: 1.1.67.586.gbb5ef64e -> 1.1.68.628.geb44bd66 --- pkgs/applications/audio/spotify/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index fa8174e3a95b..48e6a85f5d25 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -10,14 +10,14 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.1.67.586.gbb5ef64e"; + version = "1.1.68.628.geb44bd66"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "50"; + rev = "52"; deps = [ alsa-lib @@ -80,7 +80,7 @@ stdenv.mkDerivation { # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - sha512 = "f29aa4a3f3d6a72f108f350905789f12ab3ae50cf4f4828f021d3be7759b192506c9a397e45309a5ee659578b6e85de80d7d78f994af9ab631c9fb2dc527c242"; + sha512 = "be6f1cb650924eb9e244497374d1dfe6136d28056dbecc7000a03341a4bb4c6ab2c83ec6c707bd6f57afde95262230eafbde08e9c7a7dfcacdf660eb10499f3a"; }; nativeBuildInputs = [ makeWrapper wrapGAppsHook squashfsTools ]; From 05f43a9321f4c948426f2bd74623720ad31e6062 Mon Sep 17 00:00:00 2001 From: Philipp Herzog Date: Thu, 16 Sep 2021 14:13:18 +0200 Subject: [PATCH 36/54] python3.pkgs.pysdl2: fix build Update patches after version bump. --- .../python-modules/pysdl2/PySDL2-dll.patch | 227 ++++++++++-------- 1 file changed, 127 insertions(+), 100 deletions(-) diff --git a/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch b/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch index db6895edfbf8..37b318ebb7c7 100644 --- a/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch +++ b/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch @@ -1,100 +1,127 @@ -diff -ru PySDL2-0.9.7-old/sdl2/dll.py PySDL2-0.9.7/sdl2/dll.py ---- PySDL2-0.9.7-old/sdl2/dll.py 2020-02-15 09:36:29.000000000 +0100 -+++ PySDL2-0.9.7/sdl2/dll.py 2020-09-23 20:24:09.365497270 +0200 -@@ -94,15 +94,16 @@ - """Function wrapper around the different DLL functions. Do not use or - instantiate this one directly from your user code. - """ -- def __init__(self, libinfo, libnames, path=None): -+ def __init__(self, libinfo, libfile): - self._dll = None - self._libname = libinfo - self._version = None -- foundlibs = _findlib(libnames, path) -- dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset") -- if len(foundlibs) == 0: -- raise RuntimeError("could not find any library for %s (%s)" % -- (libinfo, dllmsg)) -+ #foundlibs = _findlib(libnames, path) -+ #dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset") -+ #if len(foundlibs) == 0: -+ # raise RuntimeError("could not find any library for %s (%s)" % -+ # (libinfo, dllmsg)) -+ foundlibs = [ libfile ] - for libfile in foundlibs: - try: - self._dll = CDLL(libfile) -@@ -117,9 +118,9 @@ - if self._dll is None: - raise RuntimeError("found %s, but it's not usable for the library %s" % - (foundlibs, libinfo)) -- if path is not None and sys.platform in ("win32",) and \ -- path in self._libfile: -- os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"]) -+ #if path is not None and sys.platform in ("win32",) and \ -+ # path in self._libfile: -+ # os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"]) - - def bind_function(self, funcname, args=None, returns=None, added=None): - """Binds the passed argument and return value types to the specified -@@ -220,7 +221,7 @@ - return - - try: -- dll = DLL("SDL2", ["SDL2", "SDL2-2.0"], os.getenv("PYSDL2_DLL_PATH")) -+ dll = DLL("SDL2", "@sdl2@") - except RuntimeError as exc: - raise ImportError(exc) - -diff -ru PySDL2-0.9.7-old/sdl2/sdlgfx.py PySDL2-0.9.7/sdl2/sdlgfx.py ---- PySDL2-0.9.7-old/sdl2/sdlgfx.py 2020-02-02 11:07:00.000000000 +0100 -+++ PySDL2-0.9.7/sdl2/sdlgfx.py 2020-09-23 20:23:56.997419129 +0200 -@@ -39,8 +39,7 @@ - ] - - try: -- dll = DLL("SDL2_gfx", ["SDL2_gfx", "SDL2_gfx-1.0"], -- os.getenv("PYSDL2_DLL_PATH")) -+ dll = DLL("SDL2_gfx", "@sdl2_gfx@") - except RuntimeError as exc: - raise ImportError(exc) - -diff -ru PySDL2-0.9.7-old/sdl2/sdlimage.py PySDL2-0.9.7/sdl2/sdlimage.py ---- PySDL2-0.9.7-old/sdl2/sdlimage.py 2020-02-02 11:07:00.000000000 +0100 -+++ PySDL2-0.9.7/sdl2/sdlimage.py 2020-09-23 20:23:50.085375658 +0200 -@@ -27,8 +27,7 @@ - ] - - try: -- dll = DLL("SDL2_image", ["SDL2_image", "SDL2_image-2.0"], -- os.getenv("PYSDL2_DLL_PATH")) -+ dll = DLL("SDL2_image", "@sdl2_image@") - except RuntimeError as exc: - raise ImportError(exc) - -diff -ru PySDL2-0.9.7-old/sdl2/sdlmixer.py PySDL2-0.9.7/sdl2/sdlmixer.py ---- PySDL2-0.9.7-old/sdl2/sdlmixer.py 2020-02-02 11:07:00.000000000 +0100 -+++ PySDL2-0.9.7/sdl2/sdlmixer.py 2020-09-23 20:23:46.117350771 +0200 -@@ -53,8 +53,7 @@ - ] - - try: -- dll = DLL("SDL2_mixer", ["SDL2_mixer", "SDL2_mixer-2.0"], -- os.getenv("PYSDL2_DLL_PATH")) -+ dll = DLL("SDL2_mixer", "@sdl2_mixer@") - except RuntimeError as exc: - raise ImportError(exc) - -diff -ru PySDL2-0.9.7-old/sdl2/sdlttf.py PySDL2-0.9.7/sdl2/sdlttf.py ---- PySDL2-0.9.7-old/sdl2/sdlttf.py 2020-02-02 11:07:00.000000000 +0100 -+++ PySDL2-0.9.7/sdl2/sdlttf.py 2020-09-23 20:23:40.069312931 +0200 -@@ -39,8 +39,7 @@ - ] - - try: -- dll = DLL("SDL2_ttf", ["SDL2_ttf", "SDL2_ttf-2.0"], -- os.getenv("PYSDL2_DLL_PATH")) -+ dll = DLL("SDL2_ttf", "@sdl2_ttf@") - except RuntimeError as exc: - raise ImportError(exc) - +diff --git a/sdl2/dll.py b/sdl2/dll.py +index 6e30259..12e1f7d 100644 +--- a/sdl2/dll.py ++++ b/sdl2/dll.py +@@ -145,7 +145,7 @@ class DLL(object): + """Function wrapper around the different DLL functions. Do not use or + instantiate this one directly from your user code. + """ +- def __init__(self, libinfo, libnames, path=None): ++ def __init__(self, libinfo, libfile): + self._dll = None + self._deps = None + self._libname = libinfo +@@ -157,11 +157,12 @@ class DLL(object): + "SDL2_image": 2001, + "SDL2_gfx": 1003 + } +- foundlibs = _findlib(libnames, path) +- dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset") +- if len(foundlibs) == 0: +- raise RuntimeError("could not find any library for %s (%s)" % +- (libinfo, dllmsg)) ++ #foundlibs = _findlib(libnames, path) ++ #dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset") ++ #if len(foundlibs) == 0: ++ # raise RuntimeError("could not find any library for %s (%s)" % ++ # (libinfo, dllmsg)) ++ foundlibs = [ libfile ] + for libfile in foundlibs: + try: + self._dll = CDLL(libfile) +@@ -185,19 +186,19 @@ class DLL(object): + (foundlibs, libinfo)) + if _using_ms_store_python(): + self._deps = _preload_deps(libinfo, self._libfile) +- if path is not None and sys.platform in ("win32",) and \ +- path in self._libfile: +- os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"]) ++ #if path is not None and sys.platform in ("win32",) and \ ++ # path in self._libfile: ++ # os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"]) + + def bind_function(self, funcname, args=None, returns=None, added=None): + """Binds the passed argument and return value types to the specified + function. If the version of the loaded library is older than the + version where the function was added, an informative exception will + be raised if the bound function is called. + + Args: + funcname (str): The name of the function to bind. + args (List or None, optional): The data types of the C function's + arguments. Should be 'None' if function takes no arguments. + returns (optional): The return type of the bound C function. Should + be 'None' if function returns 'void'. +@@ -288,7 +289,7 @@ def nullfunc(*args): + return + + try: +- dll = DLL("SDL2", ["SDL2", "SDL2-2.0", "SDL2-2.0.0"], os.getenv("PYSDL2_DLL_PATH")) ++ dll = DLL("SDL2", "@sdl2@") + except RuntimeError as exc: + raise ImportError(exc) + +diff --git a/sdl2/sdlgfx.py b/sdl2/sdlgfx.py +index 090752e..a8a7488 100644 +--- a/sdl2/sdlgfx.py ++++ b/sdl2/sdlgfx.py +@@ -50,8 +50,7 @@ __all__ = [ + + + try: +- dll = DLL("SDL2_gfx", ["SDL2_gfx", "SDL2_gfx-1.0"], +- os.getenv("PYSDL2_DLL_PATH")) ++ dll = DLL("SDL2_gfx", "@sdl2_gfx@") + except RuntimeError as exc: + raise ImportError(exc) + +diff --git a/sdl2/sdlimage.py b/sdl2/sdlimage.py +index a6884e8..95d96df 100644 +--- a/sdl2/sdlimage.py ++++ b/sdl2/sdlimage.py +@@ -32,15 +32,14 @@ __all__ = [ + "IMG_LoadXCF_RW", "IMG_LoadWEBP_RW", "IMG_LoadXPM_RW", + "IMG_LoadXV_RW", "IMG_ReadXPMFromArray", + "IMG_GetError", "IMG_SetError", "IMG_SaveJPG", "IMG_SaveJPG_RW", +- ++ + # Python Functions + "get_dll_file" + ] + + + try: +- dll = DLL("SDL2_image", ["SDL2_image", "SDL2_image-2.0"], +- os.getenv("PYSDL2_DLL_PATH")) ++ dll = DLL("SDL2_image", "@sdl2_image@") + except RuntimeError as exc: + raise ImportError(exc) + +diff --git a/sdl2/sdlmixer.py b/sdl2/sdlmixer.py +index 9ad9b85..1c36289 100644 +--- a/sdl2/sdlmixer.py ++++ b/sdl2/sdlmixer.py +@@ -76,8 +76,7 @@ __all__ = [ + ] + + try: +- dll = DLL("SDL2_mixer", ["SDL2_mixer", "SDL2_mixer-2.0"], +- os.getenv("PYSDL2_DLL_PATH")) ++ dll = DLL("SDL2_mixer", "@sdl2_mixer@") + except RuntimeError as exc: + raise ImportError(exc) + +diff --git a/sdl2/sdlttf.py b/sdl2/sdlttf.py +index 9c2d951..bd5a16a 100644 +--- a/sdl2/sdlttf.py ++++ b/sdl2/sdlttf.py +@@ -54,8 +54,7 @@ __all__ = [ + + + try: +- dll = DLL("SDL2_ttf", ["SDL2_ttf", "SDL2_ttf-2.0"], +- os.getenv("PYSDL2_DLL_PATH")) ++ dll = DLL("SDL2_ttf", "@sdl2_ttf@") + except RuntimeError as exc: + raise ImportError(exc) + From a4178b25dd417ba2078d5afae4649c3efe97f9af Mon Sep 17 00:00:00 2001 From: Yevhen Shymotiuk Date: Thu, 16 Sep 2021 15:46:22 +0300 Subject: [PATCH 37/54] python3Packages.userpath: 1.6.0 -> 1.7.0 --- pkgs/development/python-modules/userpath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/userpath/default.nix b/pkgs/development/python-modules/userpath/default.nix index d619cba0649d..6ce92e9f3b47 100644 --- a/pkgs/development/python-modules/userpath/default.nix +++ b/pkgs/development/python-modules/userpath/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "userpath"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256="1xpgdmdvhmmmdlivsqlzx1xvyj0gcnfp0j2ba5izmv3q2k5abfdj"; + sha256="sha256-3NZsX6mxo8EjYvMJu7W8eZK6yK+G0XtOaxpLFmoRxD8="; }; propagatedBuildInputs = [ click ]; From 0518560cf13e1a08a93de6b562d6326c19a3294f Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 16 Sep 2021 09:12:44 -0400 Subject: [PATCH 38/54] apacheHttpd: 2.4.48 -> 2.4.49 --- pkgs/servers/http/apache-httpd/2.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index a8caf1da17ba..2ec30cbf0a75 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -17,12 +17,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.48"; + version = "2.4.49"; pname = "apache-httpd"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "0v4npxnvih5mlxx6dywwhhfs8xvgcckc0hxzwk3hi0g8nbkjdj0v"; + sha256 = "0fqkfjcpdd40ji2279wfxh5hddb5jdxlnpjr0sbhva8fi7b6bfb5"; }; # FIXME: -dev depends on -doc From 1ddc9bd87b32ca9522c5d678583853bb71b1cae4 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 16 Sep 2021 09:17:53 -0400 Subject: [PATCH 39/54] tomcat-native: 1.2.30 -> 1.2.31 --- pkgs/servers/http/tomcat/tomcat-native.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/tomcat-native.nix b/pkgs/servers/http/tomcat/tomcat-native.nix index dfcbe5d0f18b..cf912d87a1d6 100644 --- a/pkgs/servers/http/tomcat/tomcat-native.nix +++ b/pkgs/servers/http/tomcat/tomcat-native.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tomcat-native"; - version = "1.2.30"; + version = "1.2.31"; src = fetchurl { url = "mirror://apache/tomcat/tomcat-connectors/native/${version}/source/${pname}-${version}-src.tar.gz"; - sha512 = "51a8c55214de166cace193c3330abe77cabea56c2d05efc8c3408bc06369c328899376c94c572725ebe2887f2faf99fea05d1819fa84c712d57fd309d0476953"; + sha512 = "2aaa93f0acf3eb780d39faeda3ece3cf053d3b6e2918462f7183070e8ab32232e035e9062f7c07ceb621006d727d3596d9b4b948f4432b4f625327b72fdb0e49"; }; sourceRoot = "${pname}-${version}-src/native"; From dfa5b4643bcb017d0d25d155204517a86bcd2b92 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 16 Sep 2021 09:21:50 -0400 Subject: [PATCH 40/54] tomcat9: 9.0.46 -> 9.0.53 --- pkgs/servers/http/tomcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 506b692e68af..080657a2ef4b 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -32,8 +32,8 @@ let in { tomcat9 = common { versionMajor = "9"; - versionMinor = "0.46"; - sha256 = "02p1d7xkmfna5brwi5imjz83g5va1g6fxkiaj4q22l8jpkr6xf6h"; + versionMinor = "0.53"; + sha256 = "1zdnbb0bfbi7762lz69li0wf48jbfz1mv637jzcl42vbsxp4agkv"; }; tomcat10 = common { From 2b6f96fc1a86f55e63db50e78cf66448f853163b Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 16 Sep 2021 09:22:55 -0400 Subject: [PATCH 41/54] tomcat10: 10.0.6 -> 10.0.11 --- pkgs/servers/http/tomcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 080657a2ef4b..8b0f814177aa 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -38,7 +38,7 @@ in { tomcat10 = common { versionMajor = "10"; - versionMinor = "0.6"; - sha256 = "1bpcxpsfws3b8ykq53vrcx3f04mvs5if80p329jm3x2dvdvj3d9n"; + versionMinor = "0.11"; + sha256 = "1hjvsxxxavni7bis1hm56281ffmf4x0zdh65zqkrnhqa1rbs0lg2"; }; } From 68e2c5e22d12b0c4cd14bb7bd788fd83333b8980 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 16 Sep 2021 09:26:24 -0400 Subject: [PATCH 42/54] zabbix40: 4.0.31 -> 4.0.33 --- pkgs/servers/monitoring/zabbix/versions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 154bc235406e..3cde16bdea5e 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -5,7 +5,7 @@ generic: { }; v40 = generic { - version = "4.0.31"; - sha256 = "1jfawwwqzd9bsywsn4qc7d1j2a4i8d92xg16k0f3y34pbmfm4603"; + version = "4.0.33"; + sha256 = "05pdqiql6xv1l7cn2piydsfjiaw6np0rbl1n5wg7bc7r4ikiyp4v"; }; } From 94683a072a6f7fc488e76f5cbf835bf80af1f117 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 16 Sep 2021 09:35:38 -0400 Subject: [PATCH 43/54] zabbix50: 5.0.12 -> 5.0.15 --- pkgs/servers/monitoring/zabbix/agent2.nix | 2 +- pkgs/servers/monitoring/zabbix/versions.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/agent2.nix b/pkgs/servers/monitoring/zabbix/agent2.nix index 98fafa4265d6..97179fa26680 100644 --- a/pkgs/servers/monitoring/zabbix/agent2.nix +++ b/pkgs/servers/monitoring/zabbix/agent2.nix @@ -12,7 +12,7 @@ import ./versions.nix ({ version, sha256 }: modRoot = "src/go"; - vendorSha256 = "07caz0jfy0r1vb1h9mhb169wyn949z9xj0pmvyamr2d8y3k3hbyd"; + vendorSha256 = "1iyi7lnknr42gbv25illqnnjc7mshv73ih9anc6rxbf87n9s46ac"; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libiconv openssl pcre zlib ]; diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 3cde16bdea5e..749b68bdcc80 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,7 +1,7 @@ generic: { v50 = generic { - version = "5.0.12"; - sha256 = "1gxlsmvz3m3dm4qqgx5qg5zjs680salah17mdzm3m27w8srg13i5"; + version = "5.0.15"; + sha256 = "1q9xwixzdj3w9qmarpp8xbkjphsz4m185br8g6i9f96676hrw5ww"; }; v40 = generic { From 72a064fb9844df2b94b38e85252f20ccad6a917d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 16 Sep 2021 17:01:51 +0200 Subject: [PATCH 44/54] grafana: 8.1.3 -> 8.1.4 ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.1.4 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index a297dd0eea95..f1e96dca2b9d 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "8.1.3"; + version = "8.1.4"; excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; @@ -10,12 +10,12 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-gJO21qTTiP6/8Oln0w89UYEYWb6pIlXvKfiALAUAjnM="; + sha256 = "sha256-fBeiJL40TXY5UHdNUYQhy4wzuaoCidHAidN7aWJ2GnQ="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-1ZZMZEErt/OD55mEu/mF2XrsZcDVk700jRkTcYK14rE="; + sha256 = "sha256-a1fY4W8ZfA9wSb1DiNixTnwKhfoJ+salaRXcy1Y2t9Y="; }; vendorSha256 = "sha256-DFD6orsM5oDOLgHbCbrD+zNKVGbQT3Izm1VtNCZO40I="; From 996b51ee8569d7042ba1d92d87a51e9bf90e73b5 Mon Sep 17 00:00:00 2001 From: Jan Solanti Date: Thu, 16 Sep 2021 18:52:08 +0300 Subject: [PATCH 45/54] pipewire: 0.3.35 -> 0.3.36 --- .../desktops/pipewire/bluez-hardware.conf.json | 12 ++++++++++++ pkgs/development/libraries/pipewire/default.nix | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json b/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json index a02cf13aa654..e5e7517e38d4 100644 --- a/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json +++ b/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json @@ -51,6 +51,18 @@ { "name": "JBL LIVE650BTNC" }, + { + "name": "Motorola DC800", + "no-features": [ + "sbc-xq" + ] + }, + { + "name": "Motorola S305", + "no-features": [ + "sbc-xq" + ] + }, { "name": "Soundcore Life P2-L", "no-features": [ diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 3fd15f7b36cc..0ada18539984 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -58,7 +58,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.35"; + version = "0.3.36"; outputs = [ "out" @@ -77,7 +77,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-cGH0Hd4c4KLyynMb3LIwElwHD99apNiI40SwZC3KG/s="; + sha256 = "sha256-kwoffB0Hi84T4Q0NaxLxsCyPV4R0LayX9kHmXU/vRPA="; }; patches = [ From 65a010bcead26c971fe5b01bb02c4a9f02d02271 Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 17 Sep 2021 01:06:27 +0900 Subject: [PATCH 46/54] vscodium: fix sha256 on linux --- pkgs/applications/editors/vscode/vscodium.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 818a0b12ae8e..fb2417389652 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,7 +13,7 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1lzw3svnaf11g8g50w3plymy16rbb71lcag46y1q3xdh62jbq8nc"; + x86_64-linux = "03z6wpzbvf046sl1mjvvcshy5czvr4bq2f3ajlr8bj39y9df93h9"; x86_64-darwin = "0cs5ikf5dxkg9qkyaq75h0rypil80sk6zmbb0s63191gj6l569yl"; aarch64-linux = "05ivgn72v05yy3a9qly4qx0qpyjd2r3ygdw978zc8z09694g5x3i"; armv7l-linux = "044izh9ap5s50k796zjcfk0p997b7sfryshp4gaxh3yf5qs0w7l9"; From 0e23ab20660758703ebd2f29a9d783bae986e838 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Thu, 16 Sep 2021 13:32:50 -0400 Subject: [PATCH 47/54] anytype: 0.18.68 -> 0.19.0 --- pkgs/applications/misc/anytype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index 403973c46e7c..dcd0aa498c5b 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.18.68"; + version = "0.19.0"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-VZYFMUgflc3LEk/nN7eoQbinGQS1AnPHmb8WgKzhGRM="; + sha256 = "sha256-sqCq9/QFygFcOUNCCBReD+eEk/8gvhMsuVD3g/ZPAFg="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in From 2182da1de8081da92f3c5c04e3fa5e5452266afc Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 16 Sep 2021 13:35:43 -0400 Subject: [PATCH 48/54] bloop: 1.4.8 -> 1.4.9 --- pkgs/development/tools/build-managers/bloop/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 1b4f74f91d43..d940e6ca54d1 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "1.4.8"; + version = "1.4.9"; bloop-coursier-channel = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json"; - sha256 = "1hfd5gc98bp4p4m85jva2mlkh10q10n9s5136z8620mmjq93rx70"; + sha256 = "0yh9k98c0cq9ksi3g6rb1q1qblnhcznrc5z1y9ps8cvwv2lx8ly4"; }; bloop-bash = fetchurl { @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = if stdenv.isLinux && stdenv.isx86_64 then "1cs3ng6bj9s7xf6c4xaiqgg5qr34abnipfgc44sy2ljklr7x0jwa" - else if stdenv.isDarwin && stdenv.isx86_64 then "0l9vqvzcmxya1s04cps96skw4dslh3i3ks73dl53ing50zb0ga9r" + outputHash = if stdenv.isLinux && stdenv.isx86_64 then "1hxyzf430g95l6qz1qlq8wvizvy6j3a7a9crb3lcxd67cpbg3x7i" + else if stdenv.isDarwin && stdenv.isx86_64 then "0x5yqf3i8y6s5h27yr0jkpvj6ch25ckx2802dmaxlgq6gz0fx6w2" else throw "unsupported platform"; }; From af69a713958cac3956123844906dae2f0d3af6be Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 16 Sep 2021 11:06:10 -0700 Subject: [PATCH 49/54] linuxPackages.zfs: 2.1.0 -> 2.1.1 --- pkgs/os-specific/linux/zfs/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index ceaa6535c6cf..4d3716ef528b 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -207,23 +207,23 @@ in { # to be adapted zfsStable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.14"; - latestCompatibleLinuxPackages = linuxPackages_5_13; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15"; + latestCompatibleLinuxPackages = linuxPackages_5_14; # this package should point to the latest release. - version = "2.1.0"; + version = "2.1.1"; - sha256 = "sha256-YdY4SStXZGBBdAHdM3R/unco7ztxI3s0/buPSNSeh5o="; + sha256 = "sha256-UUuJa5w/GsEvsgH/BnXFsP/dsOt9wwmPqKzDxLPrhiY="; }; zfsUnstable = common { # check the release notes for compatible kernels kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15"; - latestCompatibleLinuxPackages = linuxPackages_5_13; + latestCompatibleLinuxPackages = linuxPackages_5_14; # this package should point to a version / git revision compatible with the latest kernel release - version = "unstable-2021-08-30"; - rev = "3b89d9518df2c7fd747e349873a3d4d498beb20e"; + version = "2.1.1"; + # rev = "0000000000000000000000000000000000000000"; sha256 = "sha256-wVbjpVrPQmhJmMqdGUf0IwlCIoOsT7Zfj5lxSKcOsgg="; From ff6fb898ac11223e281cffac992246e3b6c31a97 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Sep 2021 19:29:14 +0000 Subject: [PATCH 50/54] symfony-cli: 4.26.0 -> 4.26.3 --- pkgs/development/tools/symfony-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index 6eb4efda62bd..07d7c0ded366 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "symfony-cli"; - version = "4.26.0"; + version = "4.26.3"; src = fetchurl { url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_amd64.gz"; - sha256 = "sha256-fQZKRDLc6T+YEX443k6DnarSNV3Rbc2Y34ingJik+sc="; + sha256 = "sha256-les12GheTKr4XvZpE4YIyNMaXWizeB0COhDiMcYYC7o="; }; dontBuild = true; From bb46e4f6fb5fb8ff80753a27585daa6f1c50b797 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 16 Sep 2021 00:03:56 +0200 Subject: [PATCH 51/54] bash-preexec: init at 0.4.1 --- maintainers/maintainer-list.nix | 6 +++ .../libraries/bash/bash-preexec/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 51 insertions(+) create mode 100644 pkgs/development/libraries/bash/bash-preexec/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3d31fb1120d8..cf968044f203 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4287,6 +4287,12 @@ githubId = 731722; name = "Ryan Scheel"; }; + hawkw = { + email = "eliza@elizas.website"; + github = "hawkw"; + githubId = 2796466; + name = "Eliza Weisman"; + }; hax404 = { email = "hax404foogit@hax404.de"; github = "hax404"; diff --git a/pkgs/development/libraries/bash/bash-preexec/default.nix b/pkgs/development/libraries/bash/bash-preexec/default.nix new file mode 100644 index 000000000000..db928729bd9a --- /dev/null +++ b/pkgs/development/libraries/bash/bash-preexec/default.nix @@ -0,0 +1,41 @@ +{ stdenvNoCC, lib, fetchFromGitHub, bats }: + +let version = "0.4.1"; +in stdenvNoCC.mkDerivation { + pname = "bash-preexec"; + inherit version; + + src = fetchFromGitHub { + owner = "rcaloras"; + repo = "bash-preexec"; + rev = version; + sha256 = "062iigps285628p710i7vh7kmgra5gahq9qiwj7rxir167lg0ggw"; + }; + + checkInputs = [ bats ]; + + dontConfigure = true; + doCheck = true; + dontBuild = true; + + patchPhase = '' + # Needed since the tests expect that HISTCONTROL is set. + sed -i '/setup()/a HISTCONTROL=""' test/bash-preexec.bats + ''; + + checkPhase = '' + bats test + ''; + + installPhase = '' + install -Dm755 $src/bash-preexec.sh $out/share/bash/bash-preexec.sh + ''; + + meta = with lib; { + description = "preexec and precmd functions for Bash just like Zsh"; + license = licenses.mit; + homepage = "https://github.com/rcaloras/bash-preexec"; + maintainers = [ maintainers.hawkw maintainers.rycee ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ec8e17f93c4..cb0bde14fece 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19581,6 +19581,10 @@ with pkgs; }; agda = agdaPackages.agda; + ### DEVELOPMENT / LIBRARIES / BASH + + bash-preexec = callPackage ../development/libraries/bash/bash-preexec { }; + ### DEVELOPMENT / LIBRARIES / JAVA commonsBcel = callPackage ../development/libraries/java/commons/bcel { }; From b1aecac8a1fc3d54e92cacc67dad4a459c9b86bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 16 Sep 2021 14:55:59 -0700 Subject: [PATCH 52/54] python3Packages.mat2: remove unused fetchpatch --- pkgs/development/python-modules/mat2/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index 7515cb76a256..0d54656c1586 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -3,7 +3,6 @@ , python , pythonOlder , fetchFromGitLab -, fetchpatch , substituteAll , bubblewrap , exiftool From 2a79244302be9f4ad93ac51fe8aeff6df036c139 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 16 Sep 2021 17:45:24 -0500 Subject: [PATCH 53/54] emacs.pkgs.agda-input: Fix syntax error --- .../editors/emacs/elisp-packages/agda-input/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/agda-input/default.nix b/pkgs/applications/editors/emacs/elisp-packages/agda-input/default.nix index e2a9944e83bf..a96f7393dfaf 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/agda-input/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/agda-input/default.nix @@ -1,6 +1,6 @@ { trivialBuild , haskellPackages -} +}: trivialBuild { pname = "agda-input"; From d6c2bb73fb47ea502caac8be9ed061a8ec4e7234 Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Fri, 17 Sep 2021 00:47:45 +0200 Subject: [PATCH 54/54] doc/python: fix typo in example --- doc/languages-frameworks/python.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 987ea1af9daa..cc1a7083dc25 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1513,7 +1513,7 @@ If you need to change a package's attribute(s) from `configuration.nix` you coul python = super.python.override { packageOverrides = python-self: python-super: { twisted = python-super.twisted.overrideAttrs (oldAttrs: { - src = super.fetchPipy { + src = super.fetchPypi { pname = "twisted"; version = "19.10.0"; sha256 = "7394ba7f272ae722a74f3d969dcf599bc4ef093bc392038748a490f1724a515d";