From 72d6d73e3750b6ec4dfffeb05eb0688d6358aeab Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 30 Mar 2022 01:42:00 +0200 Subject: [PATCH 01/26] nixos/ipfs: Only set ReadWritePaths when hardened Co-authored-by: Luflosi --- nixos/modules/services/network-filesystems/ipfs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 7e96179b3cab..f63debe13acd 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -280,7 +280,7 @@ in User = cfg.user; Group = cfg.group; StateDirectory = ""; - ReadWritePaths = [ "" cfg.dataDir ]; + ReadWritePaths = optionals (!cfg.autoMount) [ "" cfg.dataDir ]; } // optionalAttrs (cfg.serviceFdlimit != null) { LimitNOFILE = cfg.serviceFdlimit; }; } // optionalAttrs (!cfg.startWhenNeeded) { wantedBy = [ "default.target" ]; From 699e389f8343fb14f7ca3bda09e8871c705c9dde Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 16 Apr 2022 21:14:26 +0200 Subject: [PATCH 02/26] nixos/ipfs: test FUSE mount --- nixos/tests/ipfs.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/nixos/tests/ipfs.nix b/nixos/tests/ipfs.nix index 5e7c967028e4..1fd0ef9d8bda 100644 --- a/nixos/tests/ipfs.nix +++ b/nixos/tests/ipfs.nix @@ -14,6 +14,14 @@ import ./make-test-python.nix ({ pkgs, ...} : { }; }; + nodes.fuse = { ... }: { + services.ipfs = { + enable = true; + apiAddress = "/ip4/127.0.0.1/tcp/2324"; + autoMount = true; + }; + }; + testScript = '' start_all() @@ -40,5 +48,12 @@ import ./make-test-python.nix ({ pkgs, ...} : { # Test if setting dataDir works properly with the hardened systemd unit machine.succeed("test -e /mnt/ipfs/config") machine.succeed("test ! -e /var/lib/ipfs/") + + # Test FUSE mountpoint + ipfs_hash = fuse.succeed( + "echo fnord3 | ipfs --api /ip4/127.0.0.1/tcp/2324 add | awk '{ print $2 }'" + ) + + fuse.succeed(f"cat /ipfs/{ipfs_hash.strip()} | grep fnord3") ''; }) From 664dab95743b9e11402d41dbedb1c8da6af163f6 Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 13 Jun 2022 21:01:32 +0200 Subject: [PATCH 03/26] nixos/tests/ipfs: Simplify FUSE test Co-authored-by: Luflosi --- nixos/tests/ipfs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/ipfs.nix b/nixos/tests/ipfs.nix index 1fd0ef9d8bda..295a7b9c7273 100644 --- a/nixos/tests/ipfs.nix +++ b/nixos/tests/ipfs.nix @@ -51,7 +51,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { # Test FUSE mountpoint ipfs_hash = fuse.succeed( - "echo fnord3 | ipfs --api /ip4/127.0.0.1/tcp/2324 add | awk '{ print $2 }'" + "echo fnord3 | ipfs --api /ip4/127.0.0.1/tcp/2324 add --quieter" ) fuse.succeed(f"cat /ipfs/{ipfs_hash.strip()} | grep fnord3") From 1dfaad73ed98254c1c0522156fe45b115e0a8eb4 Mon Sep 17 00:00:00 2001 From: Sebastian Jordan Date: Tue, 14 Jun 2022 00:14:29 +0200 Subject: [PATCH 04/26] nix-prefetch-git: Fix inconsistency with fetchgit regarding deepClone The fetchgit function in nixpkgs sets the leaveDotGit argument to true if deepClone is set to true. nix-prefetch-git did behave differently. It would not assume --leave-dotGit if --deepClone is specified. With this change the inconsistency is addressed by assuming --leave-dotGit if --deepClone is specified. --- pkgs/build-support/fetchgit/nix-prefetch-git | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 4e6f25b8dd7d..f6a317a888a5 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -105,6 +105,10 @@ for arg; do fi done +if test -n $deepClone; then + leaveDotGit=true +fi + if test -z "$url"; then usage fi From 13ba5dda40aa9ef0852e82ff5525e19f7a20dc5c Mon Sep 17 00:00:00 2001 From: Dominic Delabruere Date: Sun, 19 Jun 2022 22:49:58 -0400 Subject: [PATCH 05/26] deadbeefPlugins.musical-spectrum: init at unstable-2020-07-01 --- .../deadbeef/plugins/musical-spectrum.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/audio/deadbeef/plugins/musical-spectrum.nix diff --git a/pkgs/applications/audio/deadbeef/plugins/musical-spectrum.nix b/pkgs/applications/audio/deadbeef/plugins/musical-spectrum.nix new file mode 100644 index 000000000000..de371bfb552d --- /dev/null +++ b/pkgs/applications/audio/deadbeef/plugins/musical-spectrum.nix @@ -0,0 +1,42 @@ +{ deadbeef +, fetchFromGitHub +, fftw +, glib +, gtk3 +, lib +, pkg-config +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "deadbeef-musical-spectrum-plugin"; + version = "unstable-2020-07-01"; + + src = fetchFromGitHub { + owner = "cboxdoerfer"; + repo = "ddb_musical_spectrum"; + rev = "a97fd4e1168509911ab43ba32d815b5489000a06"; + sha256 = "0p33wyqi27y0q1mvjv5nn6l3vvqlg6b8yd6k2l07bax670bl0q3g"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ deadbeef fftw glib gtk3 ]; + makeFlags = [ "gtk3" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/deadbeef + install -v -c -m 644 gtk3/ddb_vis_musical_spectrum_GTK3.so $out/lib/deadbeef/ + + runHook postInstall + ''; + + meta = with lib; { + description = "Musical spectrum plugin for the DeaDBeeF music player"; + homepage = "https://github.com/cboxdoerfer/ddb_musical_spectrum"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.ddelabru ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f32d5264aebb..198a6e90c461 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25921,6 +25921,7 @@ with pkgs; headerbar-gtk3 = callPackage ../applications/audio/deadbeef/plugins/headerbar-gtk3.nix { }; lyricbar = callPackage ../applications/audio/deadbeef/plugins/lyricbar.nix { }; mpris2 = callPackage ../applications/audio/deadbeef/plugins/mpris2.nix { }; + musical-spectrum = callPackage ../applications/audio/deadbeef/plugins/musical-spectrum.nix { }; statusnotifier = callPackage ../applications/audio/deadbeef/plugins/statusnotifier.nix { }; }; From 588f97f9dd394d45baca8a626600f656b9324d31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 05:58:15 +0000 Subject: [PATCH 06/26] apk-tools: 2.12.9 -> 2.12.10 --- pkgs/tools/package-management/apk-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/apk-tools/default.nix b/pkgs/tools/package-management/apk-tools/default.nix index 252036a9e9d7..cdfef032a3b2 100644 --- a/pkgs/tools/package-management/apk-tools/default.nix +++ b/pkgs/tools/package-management/apk-tools/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "apk-tools"; - version = "2.12.9"; + version = "2.12.10"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = "apk-tools"; rev = "v${version}"; - sha256 = "sha256-WmL2sjBUwk9qw8+vHgaufaElQnbDAtOCZHoBXLcvJ18="; + sha256 = "sha256-VKgnnrEG1cx4cx6StWh+XaCe5meSU9LqZRH1ElMQkfk="; }; nativeBuildInputs = [ pkg-config scdoc ] From c3725e42b280deca55dd480d4f681bc4b6aecee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 25 Jun 2022 22:56:54 +0200 Subject: [PATCH 07/26] matterbridge: 1.25.1 -> 1.25.2 --- pkgs/servers/matterbridge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index 1f8ab972b05f..b4e4e87fb7dc 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "matterbridge"; - version = "1.25.1"; + version = "1.25.2"; src = fetchFromGitHub { owner = "42wim"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mJEOYtQe+CHh73ev7+cdghxZHPTEGxvKgJbVoefK4Q0="; + sha256 = "sha256-VqVrAmbKTfDhcvgayEE1wUeFBSTGczBrntIJQ5/uWzM="; }; vendorSha256 = null; From 923e3c59045cdd432748bd174dc228546956e41a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jun 2022 15:41:34 +0000 Subject: [PATCH 08/26] python310Packages.sphinxcontrib-spelling: 7.5.1 -> 7.6.0 --- .../python-modules/sphinxcontrib-spelling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index 629e4a3262f8..a8a55ff8780b 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "sphinxcontrib-spelling"; - version = "7.5.1"; + version = "7.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-D8TCSGOezvPUigR1T+uhdEaOaza1bJAwJcUNYNbPtO8="; + hash = "sha256-KSzX4fc6djRRaTtNSMm97RUQhPapHlM3cz6fqHFdIOw="; }; nativeBuildInputs = [ From d7326b6372eaf596a6823d53e0a853c4d781cfb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 26 Jun 2022 19:49:00 +0200 Subject: [PATCH 09/26] actionlint: 1.6.13 -> 1.6.14 --- pkgs/development/tools/analysis/actionlint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/actionlint/default.nix b/pkgs/development/tools/analysis/actionlint/default.nix index 9e94fe79d358..b4d9dd9698df 100644 --- a/pkgs/development/tools/analysis/actionlint/default.nix +++ b/pkgs/development/tools/analysis/actionlint/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "actionlint"; - version = "1.6.13"; + version = "1.6.14"; subPackages = [ "cmd/actionlint" ]; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "rhysd"; repo = "actionlint"; rev = "v${version}"; - sha256 = "sha256-EZqWamNfv4+f1Ajm6StEdDLOwwWdJr1mrzd3+ba3YHI="; + sha256 = "sha256-eBIAm+mgjOLePxJ6b9d3cr3k0vqaDqLzorZg/ZplpcM="; }; - vendorSha256 = "sha256-fADaYrGtg4B7XqD2MUMw30xfGT70Hx+iue79AIDsSRc="; + vendorSha256 = "sha256-wKK597mk51jT6s1eKA4AjiCvI4IkZ9WjMXxaY8AWwkU="; nativeBuildInputs = [ makeWrapper ronn installShellFiles ]; From 7514467d42f5e872adb552590b92b50c72383094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 26 Jun 2022 22:36:27 +0200 Subject: [PATCH 10/26] libbaseencode: 1.0.12 -> 1.0.14 --- pkgs/development/libraries/libbaseencode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libbaseencode/default.nix b/pkgs/development/libraries/libbaseencode/default.nix index b72f5ca1dbfb..fdd5dbd1cb33 100644 --- a/pkgs/development/libraries/libbaseencode/default.nix +++ b/pkgs/development/libraries/libbaseencode/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libbaseencode"; - version = "1.0.12"; + version = "1.0.14"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TKmM2BPzas9qbWI8n63lfR8OvsSj+BKC12NXpfe9aow="; + sha256 = "sha256-cSiinuIc/qONuy9ZVsmsF4DiN1VUL43ZAXffCiIGgkY="; }; nativeBuildInputs = [ cmake ]; From e4749a8bd249bc8a86e39ec26beebe467f1363bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 27 Jun 2022 01:06:01 +0200 Subject: [PATCH 11/26] libcotp: 1.2.4 -> 1.2.6 --- pkgs/development/libraries/libcotp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcotp/default.nix b/pkgs/development/libraries/libcotp/default.nix index bd555bdbc364..6fb7b3879c20 100644 --- a/pkgs/development/libraries/libcotp/default.nix +++ b/pkgs/development/libraries/libcotp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcotp"; - version = "1.2.4"; + version = "1.2.6"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PN0kd0CP2zrkuPTdaS3TdsdEl+Gy6CecrDSh0Bd7mRk="; + sha256 = "sha256-AMLnUFLDL592zcbVN8yaQeOJQWDLUUG+6aKh4paPGlE="; }; buildInputs = [ libbaseencode libgcrypt ]; From 6e4140dac9c56094325a22324c390801672215cb Mon Sep 17 00:00:00 2001 From: Jeremy Kolb Date: Fri, 24 Jun 2022 15:22:33 -0400 Subject: [PATCH 12/26] lcm: init at 1.4.0 --- pkgs/development/libraries/lcm/default.nix | 32 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/libraries/lcm/default.nix diff --git a/pkgs/development/libraries/lcm/default.nix b/pkgs/development/libraries/lcm/default.nix new file mode 100644 index 000000000000..64d22f4c7dcd --- /dev/null +++ b/pkgs/development/libraries/lcm/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, cmake, glib, pkg-config }: + +stdenv.mkDerivation rec { + pname = "lcm"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "lcm-proj"; + repo = "lcm"; + rev = "v${version}"; + hash = "sha256-ujz52m7JuE5DYGM9QHLwVWVVBcny4w05J6Eu6DI2HBI="; + }; + + outputs = [ "out" "dev" "man" ]; + + nativeBuildInputs = [ + pkg-config + cmake + ]; + + buildInputs = [ + glib + ]; + + meta = with lib; { + description = "Lightweight Communications and Marshalling (LCM)"; + homepage = "https://github.com/lcm-proj/lcm"; + license = licenses.lgpl21; + maintainers = with maintainers; [ kjeremy ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcf088595606..cb2ab89d56f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18257,6 +18257,8 @@ with pkgs; LASzip = callPackage ../development/libraries/LASzip { }; LASzip2 = callPackage ../development/libraries/LASzip/LASzip2.nix { }; + lcm = callPackage ../development/libraries/lcm {}; + lcms = lcms1; lcms1 = callPackage ../development/libraries/lcms { }; From db615de4de2ff5327ffa7cf129e7ff9909e2ce65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Jun 2022 22:23:37 +0200 Subject: [PATCH 13/26] python3.pkgs.coqui-trainer: build on python3.10 --- pkgs/development/python-modules/coqui-trainer/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/coqui-trainer/default.nix b/pkgs/development/python-modules/coqui-trainer/default.nix index 62d49d2aba0a..a653370ad838 100644 --- a/pkgs/development/python-modules/coqui-trainer/default.nix +++ b/pkgs/development/python-modules/coqui-trainer/default.nix @@ -21,8 +21,6 @@ buildPythonPackage { inherit pname version; format = "pyproject"; - disabled = pythonAtLeast "3.10"; # https://github.com/coqui-ai/Trainer/issues/22 - src = fetchFromGitHub { owner = "coqui-ai"; repo = "Trainer"; From bbdee55013a38b1a135f0675f7816ebe1b74a5db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Jun 2022 04:22:37 +0000 Subject: [PATCH 14/26] python310Packages.dremel3dpy: 1.1.1 -> 2.0.1 --- pkgs/development/python-modules/dremel3dpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dremel3dpy/default.nix b/pkgs/development/python-modules/dremel3dpy/default.nix index 8d28ac60dccb..e7a777021b18 100644 --- a/pkgs/development/python-modules/dremel3dpy/default.nix +++ b/pkgs/development/python-modules/dremel3dpy/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "dremel3dpy"; - version = "1.1.1"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mf0YjK0nnuNnWgP20yqSgwc0SJfbqnvZqW0MKEXFTg8="; + hash = "sha256-+gw7JBr4/u7iaxo6DTiCQGq58eBkp6SYX6Z/Lyv+T90="; }; propagatedBuildInputs = [ From 31c7cd728f7a2f601d490a0140e094f6afb909d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Jun 2022 23:20:50 +0200 Subject: [PATCH 15/26] python3.pkgs.coqui-trainer: 0.0.11 -> 0.0.12 --- .../python-modules/coqui-trainer/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/coqui-trainer/default.nix b/pkgs/development/python-modules/coqui-trainer/default.nix index a653370ad838..b7b08325e0b4 100644 --- a/pkgs/development/python-modules/coqui-trainer/default.nix +++ b/pkgs/development/python-modules/coqui-trainer/default.nix @@ -7,6 +7,8 @@ , coqpit , fsspec , pytorch-bin +, tensorboardx +, protobuf , pytestCheckHook , soundfile @@ -15,7 +17,7 @@ let pname = "coqui-trainer"; - version = "0.0.11"; + version = "0.0.12"; in buildPythonPackage { inherit pname version; @@ -25,21 +27,16 @@ buildPythonPackage { owner = "coqui-ai"; repo = "Trainer"; rev = "v${version}"; - hash = "sha256-ujuQ9l6NOpDb2TdQbRcOM+j91RfbE8wCL9C0PID8g8Q="; + hash = "sha256-MSB3XbQALEKQi6Jtr/d2K8cIqyZryebYEcewGG48HV0="; }; - patches = [ - (fetchpatch { - url = "https://github.com/coqui-ai/Trainer/commit/07b447abf3290c8f2e5e723687b8a480b7382265.patch"; - sha256 = "0v1hl784d9rghkblcfwgzp0gg9d6r5r0yv2kapzdz2qymiajy7y2"; - }) - ]; - propagatedBuildInputs = [ coqpit fsspec pytorch-bin soundfile + tensorboardx + protobuf ]; # only one test and that requires training data from the internet From 679707115e8596857fda6686cee795872b6b8868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Jun 2022 23:18:01 +0200 Subject: [PATCH 16/26] python3.pkgs.python-crfsuite: enable for python 3.10 --- pkgs/development/python-modules/python-crfsuite/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/python-crfsuite/default.nix b/pkgs/development/python-modules/python-crfsuite/default.nix index 7cb9281a7ba1..f4f0f107f539 100644 --- a/pkgs/development/python-modules/python-crfsuite/default.nix +++ b/pkgs/development/python-modules/python-crfsuite/default.nix @@ -33,6 +33,5 @@ buildPythonPackage rec { homepage = "https://github.com/scrapinghub/python-crfsuite"; license = licenses.mit; maintainers = teams.tts.members; - broken = pythonAtLeast "3.10"; # https://github.com/scrapinghub/python-crfsuite/issues/130 }; } From 6e819e825158ba6206cd4438dd5e373046adf5ca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Jun 2022 09:03:33 +0200 Subject: [PATCH 17/26] python310Packages.dremel3dpy: removal of pinning is no longer needed --- pkgs/development/python-modules/dremel3dpy/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/python-modules/dremel3dpy/default.nix b/pkgs/development/python-modules/dremel3dpy/default.nix index e7a777021b18..b734311b1591 100644 --- a/pkgs/development/python-modules/dremel3dpy/default.nix +++ b/pkgs/development/python-modules/dremel3dpy/default.nix @@ -35,11 +35,6 @@ buildPythonPackage rec { yarl ]; - postPatch = '' - # Ignore the pinning - sed -i -e "s/==[0-9.]*//" setup.py - ''; - # Module has no tests doCheck = false; From a4b4d2d2fd37502e556023a68e6d4d369e24d3f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 28 Jun 2022 06:02:52 +0000 Subject: [PATCH 18/26] tensorflow-bin: 2.9.0 -> 2.9.1 --- .../tensorflow/binary-hashes.nix | 50 +++++++++---------- .../python-modules/tensorflow/prefetcher.sh | 2 +- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow/binary-hashes.nix b/pkgs/development/python-modules/tensorflow/binary-hashes.nix index 69f72867cd87..b2ce20d93486 100644 --- a/pkgs/development/python-modules/tensorflow/binary-hashes.nix +++ b/pkgs/development/python-modules/tensorflow/binary-hashes.nix @@ -1,51 +1,51 @@ { -version = "2.9.0"; +version = "2.9.1"; linux_py_37_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "1gs10w8hm47lmp4hln8qw02x7c018lxmcxs4i8dj3z5h2k64nx75"; + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1wpqjqx3zfyrclhs6kkqhq76kmb45h2jv2jdi89jrk8pfk3mcf2k"; }; linux_py_38_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "01jz7vsinbzznzh6dv5bcz0yf8v050wd0axpn9z2jakkh5bwskhp"; + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1np06xy18z8k29q8vg5a8kmvxpbcz0grjjww3hcpb4kvy9rx01sw"; }; linux_py_39_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "0458w6p567pm9xs1n5x4z5qygmlwy752d8livvn98p3j0lzccnhy"; + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1gy258wfgjf2f1lcpayvgx5cnncnqjcp2mj70mz50bm9mhmzl4kd"; }; linux_py_310_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "136d7hjdsks7gvgz54vl9riq1xdqpiamjp449myy9a768vz2xghp"; + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.9.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "0bh5xg4wfc86q1x7ph8bvdpa3arm6kmbvd4cg3d427sywkmdsrk6"; }; linux_py_37_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "11w1jrz9x6c8kzqfv14snp9djrwy17qc74h5kdiphhprm9ikkikz"; + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1qsq7la0fpmk2hych7sy9k8mza1q7w05c4nmgq92cxgkmpa7d17x"; }; linux_py_38_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "0vszrrnm706cqqv7b0726dd9ql3pcd08almqk8w0bcfk3fz05d3w"; + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "0913znz5mg6mkryi24xhz4s7rwhxbx172fsk26lxl6w6qx219pfd"; }; linux_py_39_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "18mgv36kdpx4q39qm708abfcjxy4gppv9ray0f418q0jlmfy2fi0"; + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "01srcvpcwpgpvb9inlc2mwsmf5sj13rqb695rvm50ybkjrrac7l4"; }; linux_py_310_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "17wnvfgj9vynq1ibylfqw2cngnjawsxw1mvphdl3g57i92mqsn2x"; + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.9.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "19g93jig1x389ybc25ifsh1grrsghn3w2xgk029289432bnlpzp4"; }; mac_py_37_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.0-cp37-cp37m-macosx_10_14_x86_64.whl"; - sha256 = "1lvc8rp0a0snjz5cgw6m5nk9qdnl6h7v2cc2pmxssp5c0flqzx4j"; + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.1-cp37-cp37m-macosx_10_14_x86_64.whl"; + sha256 = "0b2hirjhqw4jl75h0ik1a9hgbkkq0b3gj4wkkp9vb6mi4116gxxi"; }; mac_py_38_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.0-cp38-cp38-macosx_10_14_x86_64.whl"; - sha256 = "1lgpgbasmc1av9njz3i1654qkbw2c99x8c7vb2yslnw63s79j774"; + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.1-cp38-cp38-macosx_10_14_x86_64.whl"; + sha256 = "0da6csvldvxg47r932wbx5z6w3hf1d107p9blayzrjchdwhqs16z"; }; mac_py_39_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.0-cp39-cp39-macosx_10_14_x86_64.whl"; - sha256 = "07dd3srqx78aq7w0g6k1x6l7zphwhm29lv9ai3gyqszi99cpn5pr"; + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.1-cp39-cp39-macosx_10_14_x86_64.whl"; + sha256 = "1fa0nf4pj5sl5shifaahr8n30q86k6hdsg0qwvan0hyg75fh9bc1"; }; mac_py_310_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.0-cp310-cp310-macosx_10_14_x86_64.whl"; - sha256 = "14fz1id9clcbcrq4y8i1ij1nrk6dz36cqxb88ilip0jj36vfy991"; + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.1-cp310-cp310-macosx_10_14_x86_64.whl"; + sha256 = "0baq0djx8vhn8d75wyf82m6iqgfxwcrgg4xcvlr20m4x9bmysxrc"; }; } diff --git a/pkgs/development/python-modules/tensorflow/prefetcher.sh b/pkgs/development/python-modules/tensorflow/prefetcher.sh index e4904b46d4f3..2e24cde079da 100755 --- a/pkgs/development/python-modules/tensorflow/prefetcher.sh +++ b/pkgs/development/python-modules/tensorflow/prefetcher.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -version="2.9.0" +version="2.9.1" bucket="https://storage.googleapis.com/tensorflow" From b3e7e9a732a7ff98b5e8833305886c600f5abb52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 28 Jun 2022 06:27:25 +0000 Subject: [PATCH 19/26] tensorflow: 2.9.0 -> 2.9.1 --- pkgs/development/python-modules/tensorflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 92b78b02e063..1b402732f81f 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -76,7 +76,7 @@ let tfFeature = x: if x then "1" else "0"; - version = "2.9.0"; + version = "2.9.1"; variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; @@ -190,7 +190,7 @@ let owner = "tensorflow"; repo = "tensorflow"; rev = "v${version}"; - hash = "sha256-9VsgNvl+2gxxkC4F+pq4ABuOONpcf96Qbk46shDRpVY="; + hash = "sha256-kILNvwHi29F8BClYsZw+7RT2t6x57AsAHURVTfs5uOE="; }; # On update, it can be useful to steal the changes from gentoo From 280920d0c04c18c22038064c01b8462a001198f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 28 Jun 2022 07:41:19 +0200 Subject: [PATCH 20/26] tts: 0.6.2 -> 0.7.1 --- pkgs/tools/audio/tts/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index c9116b22ba0e..0072c8c26028 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -31,14 +31,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.6.2"; + version = "0.7.1"; format = "setuptools"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "v${version}"; - sha256 = "sha256-n27a1s3Dpe5Hd3JryD4fPAjRcNc0YR1fpop+uhYA6sQ="; + sha256 = "sha256-ch+711soRfZj1egyaF0+6NrUJtf7JqfZuxQ4eDf1zas="; }; postPatch = let @@ -50,6 +50,7 @@ python.pkgs.buildPythonApplication rec { "numpy" "umap-learn" "unidic-lite" + "pyworld" ]; in '' sed -r -i \ @@ -129,6 +130,9 @@ python.pkgs.buildPythonApplication rec { "test_text_to_ids_phonemes_with_eos_bos_and_blank" # Takes too long "test_parametrized_wavernn_dataset" + + # requires network + "test_voice_conversion" ]; disabledTestPaths = [ From 6f4fa5cb4800f37d85c8fe9ea380f7b3977679ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Jun 2022 10:20:07 +0000 Subject: [PATCH 21/26] python310Packages.plaid-python: 9.6.0 -> 9.7.0 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index c67c50afd84f..44247bfdcc67 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "9.6.0"; + version = "9.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-LijBSAnRwXoeddWwolamM3QYSTwFvgodmaIbayco8fY="; + hash = "sha256-yNjrWjlTF7cfEpFbPP6b/L6foNuhNa6JFNv6ImbAZ5k="; }; propagatedBuildInputs = [ From 0a2337c4da1464b8601b8d997fa1c2ac48613b49 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 28 Jun 2022 11:58:47 +0000 Subject: [PATCH 22/26] nixos/ids: fix typo in comment --- nixos/modules/misc/ids.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 05d483af3c2e..60794cef3627 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -3,7 +3,7 @@ # IMPORTANT! # We only add static uids and gids for services where it is not feasible -# to change uids/gids on service start, in example a service with a lot of +# to change uids/gids on service start, for example a service with a lot of # files. Please also check if the service is applicable for systemd's # DynamicUser option and does not need a uid/gid allocation at all. # Systemd can also change ownership of service directories using the From afff3ab34cf5e68f2bfa6a5825451e2c32b77ccf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Jun 2022 13:25:10 +0000 Subject: [PATCH 23/26] python310Packages.python-gitlab: 3.5.0 -> 3.6.0 --- pkgs/development/python-modules/python-gitlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index c9b7194a4a16..4b3ff1b977bc 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "3.5.0"; + version = "3.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Ka5/ubjJrrLm4ZvS/QSGfpPs169xmXjOaPrAzxFqsw0="; + sha256 = "sha256-kBxU/5JvEEectZGjTWXwowIvK8xBB0+aGSx/p+TFcGE="; }; propagatedBuildInputs = [ From 89d1b48eb5821c05b81f94ba6768001424fe9788 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Jun 2022 16:26:35 +0200 Subject: [PATCH 24/26] matrix-synapse: 1.61.0 -> 1.61.1 ChangeLog: https://github.com/matrix-org/synapse/releases/tag/v1.61.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 0cc0a570118a..438b370475c6 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.61.0"; + version = "1.61.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-tEYvbR7uQe7WLtkYt0xXFGLu8w4q8bhf9HqDbGXF+T8="; + sha256 = "sha256-IB7YIqmWIJMxZVFWIF6HggVgjkCSok3YYMykV72p4us="; }; buildInputs = [ openssl ]; From 387c727f8d78dca84f7c550452bc4678e8bf2cf2 Mon Sep 17 00:00:00 2001 From: cab Date: Mon, 27 Jun 2022 15:54:03 +0400 Subject: [PATCH 25/26] klippy: 2022-03-14 -> 2022-06-18; drop python2 --- pkgs/servers/klipper/default.nix | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index b882bc589c61..c3f97ce779f9 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -1,32 +1,38 @@ { stdenv , lib , fetchFromGitHub -, python2 +, python3 , unstableGitUpdater }: stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2022-03-14"; + version = "unstable-2022-06-18"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "30098db22a43274ceb87e078e603889f403a35c4"; - sha256 = "sha256-ORpXBFGPY6A/HEYX9Hhwb3wP2KcAE+z3pTxf6j7CwGg="; + rev = "d3c4ba4839dd7a4339ae024752e6c6424884c185"; + sha256 = "sha256-2Fq56JIk5qcKpWffz1k/EJ+xYAnUpuxvCryq88l//8E="; }; sourceRoot = "source/klippy"; - # there is currently an attempt at moving it to Python 3, but it will remain - # Python 2 for the foreseeable future. - # c.f. https://github.com/KevinOConnor/klipper/pull/3278 # NB: This is needed for the postBuild step - nativeBuildInputs = [ (python2.withPackages ( p: with p; [ cffi ] )) ]; + nativeBuildInputs = [ (python3.withPackages ( p: with p; [ cffi ] )) ]; - buildInputs = [ (python2.withPackages (p: with p; [ cffi pyserial greenlet jinja2 numpy ])) ]; + buildInputs = [ (python3.withPackages (p: with p; [ cffi pyserial greenlet jinja2 markupsafe ])) ]; # we need to run this to prebuild the chelper. - postBuild = "python2 ./chelper/__init__.py"; + postBuild = "python ./chelper/__init__.py"; + + # 2022-06-28: Python 3 is already supported in klipper, alas shebangs remained + # the same - we replace them in patchPhase. + patchPhase = '' + for F in klippy.py console.py parsedump.py; do + substituteInPlace $F \ + --replace '/usr/bin/env python2' '/usr/bin/env python' + done + ''; # NB: We don't move the main entry point into `/bin`, or even symlink it, # because it uses relative paths to find necessary modules. We could wrap but @@ -50,7 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The Klipper 3D printer firmware"; homepage = "https://github.com/KevinOConnor/klipper"; - maintainers = with maintainers; [ lovesegfault zhaofengli ]; + maintainers = with maintainers; [ lovesegfault zhaofengli cab404 ]; platforms = platforms.linux; license = licenses.gpl3Only; }; From 51aeb96449599234ffca5314a3ab2eecc19c4d38 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 28 Jun 2022 15:54:15 +0000 Subject: [PATCH 26/26] roon-server: 1.8-943 -> 1.8-970 --- pkgs/servers/roon-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index 358e55291ac5..dab3b1a03b85 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -16,7 +16,7 @@ }: stdenv.mkDerivation rec { pname = "roon-server"; - version = "1.8-943"; + version = "1.8-970"; src = let @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { in fetchurl { url = "http://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-osQ0/HhcSO6pirUDjOnw0yUsGUsxZI62ViHc6Lb/rT4="; + hash = "sha256-A1DT3cVdUksszp+25D5JYHrxIGFPXJ/J14oQOfShbak="; }; dontConfigure = true;