From cd67516dcf747871b5bd384f15c7074289a6c8a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Jul 2022 22:13:10 +0000 Subject: [PATCH 01/45] dhewm3: 1.5.1 -> 1.5.2 --- pkgs/games/dhewm3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix index da75f3fd5d1b..20e9f986f0c9 100644 --- a/pkgs/games/dhewm3/default.nix +++ b/pkgs/games/dhewm3/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dhewm3"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "dhewm"; repo = "dhewm3"; rev = version; - sha256 = "sha256-QI2INtNP+TSXdGSNxBcJ+lQK9dvDStrir20z3kCY8v4="; + sha256 = "sha256-3ONOP/pRp04rxehXxgCCan1fPCqAs2bVDU/R4HPN1xQ="; }; # Add libGLU libGL linking From 328448a15306ef65319af532364d33cbe7bdf8cb Mon Sep 17 00:00:00 2001 From: Mihai-Drosi Caju Date: Thu, 11 Aug 2022 01:04:10 +0300 Subject: [PATCH 02/45] waydroid: 1.2.1 -> 1.3.0 --- pkgs/os-specific/linux/waydroid/default.nix | 25 +++++---------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/pkgs/os-specific/linux/waydroid/default.nix b/pkgs/os-specific/linux/waydroid/default.nix index 0a0a4019e983..c9298ecec4e2 100644 --- a/pkgs/os-specific/linux/waydroid/default.nix +++ b/pkgs/os-specific/linux/waydroid/default.nix @@ -16,13 +16,13 @@ python3Packages.buildPythonApplication rec { pname = "waydroid"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Sf1rl8GCSTuneuYroGqsm9Aq2rBurpyswOrfCq2mWOs="; + sha256 = "sha256-6osDGYyFuyPDeK1QFowh414j3laD8i4bqPgCeJmsszE="; }; propagatedBuildInputs = with python3Packages; [ @@ -37,25 +37,12 @@ python3Packages.buildPythonApplication rec { dontWrapPythonPrograms = true; installPhase = '' - mkdir -p $out/${python3Packages.python.sitePackages} + make install DESTDIR=$out PREFIX= USE_SYSTEMD=0 USE_NFTABLES=1 - cp -ra tools $out/${python3Packages.python.sitePackages}/tools + wrapProgram $out/lib/waydroid/data/scripts/waydroid-net.sh \ + --prefix PATH ":" ${lib.makeBinPath [ dnsmasq getent iproute2 nftables ]} - cp -ra data $out/${python3Packages.python.sitePackages}/data - wrapProgram $out/${python3Packages.python.sitePackages}/data/scripts/waydroid-net.sh \ - --prefix PATH ":" ${lib.makeBinPath [ dnsmasq getent iproute2 iptables nftables ]} - - mkdir -p $out/share/waydroid/gbinder.d - cp gbinder/anbox.conf $out/share/waydroid/gbinder.d/anbox.conf - - mkdir -p $out/share/applications - ln -s $out/${python3Packages.python.sitePackages}/data/Waydroid.desktop $out/share/applications/Waydroid.desktop - - mkdir $out/bin - cp -a waydroid.py $out/${python3Packages.python.sitePackages}/waydroid.py - ln -s $out/${python3Packages.python.sitePackages}/waydroid.py $out/bin/waydroid - - wrapPythonProgramsIn $out/${python3Packages.python.sitePackages} "${lib.concatStringsSep " " [ + wrapPythonProgramsIn $out/lib/waydroid/ "${lib.concatStringsSep " " [ "$out" python3Packages.gbinder-python python3Packages.pygobject3 From f72c072710f53d79db5281dc1667b4b279360296 Mon Sep 17 00:00:00 2001 From: Nikita Uvarov Date: Mon, 15 Aug 2022 14:01:10 +0000 Subject: [PATCH 03/45] =?UTF-8?q?webex:=2042.8.0.22907=20=E2=86=92=2042.10?= =?UTF-8?q?.0.23251?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/instant-messengers/webex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/webex/default.nix b/pkgs/applications/networking/instant-messengers/webex/default.nix index f324dd0db083..253c16b12e5d 100644 --- a/pkgs/applications/networking/instant-messengers/webex/default.nix +++ b/pkgs/applications/networking/instant-messengers/webex/default.nix @@ -54,11 +54,11 @@ stdenv.mkDerivation rec { pname = "webex"; - version = "42.8.0.22907"; + version = "42.10.0.23251"; src = fetchurl { - url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Blue/20220712081040/Webex_ubuntu.7z"; - sha256 = "b83950cdcf978a3beda93de27b25b70554fc82fcf072a5a7ea858d2ce0d176ac"; + url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Blue/20220815132636/Webex_ubuntu.7z"; + sha256 = "a30002585194a7cb01985184031ca6250f4f648590715376aa6f164bce8ed898"; }; buildInputs = [ From 03317d0edb637b3106327f2ac2343dbdd7b9bdda Mon Sep 17 00:00:00 2001 From: Alexander Nortung Date: Thu, 18 Aug 2022 21:47:53 +0200 Subject: [PATCH 04/45] session-desktop-appimage: 1.8.6 -> 1.9.1 --- .../instant-messengers/session-desktop-appimage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix index 61166a82f38e..3ce0054c3025 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix @@ -8,12 +8,12 @@ }: let - version = "1.8.6"; + version = "1.9.1"; pname = "session-desktop-appimage"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; - sha256 = "h7uEdxBuqPNWGFp5wWWRI9VsK3HYOtLVgj7rIbeO9kY="; + sha256 = "sha256-Zc3btkvN4ic47IGigeFJGx4dwbM+b7iuIOxpmcWmrRQ="; }; appimage = appimageTools.wrapType2 { inherit version pname src; From 44cc09c2b492585986eaba093f4ac9b450a5c111 Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Sat, 20 Aug 2022 21:40:42 +0200 Subject: [PATCH 05/45] utsushi: Fix scanning This commit fixes the problem reported in issue #177572. Turns out that re-adding this line, which was removed in commit 526238b288baafd99bb4fb6a69ead3f9db0c7f0a, fixes the problem. --- pkgs/misc/drivers/utsushi/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix index b802431d4e0e..464bc12f491a 100644 --- a/pkgs/misc/drivers/utsushi/default.nix +++ b/pkgs/misc/drivers/utsushi/default.nix @@ -69,6 +69,7 @@ in stdenv.mkDerivation rec { touch $out/etc/sane.d/dll.conf # absolute paths to convert & tesseract + sed -i '/\[AC_DEFINE(\[HAVE_IMAGE_MAGICK\], \[1\])/a \ MAGICK_CONVERT="${imagemagick}/bin/convert"' configure.ac substituteInPlace filters/magick.cpp \ --replace 'convert ' '${imagemagick}/bin/convert ' substituteInPlace filters/reorient.cpp \ From bc3d4bb2956eadef8452b06542b2d3b9ecdf5a40 Mon Sep 17 00:00:00 2001 From: Alexander Nortung Date: Sun, 21 Aug 2022 19:45:25 +0200 Subject: [PATCH 06/45] session-desktop: refactor Renamed session-desktop-appimage to session-desktop --- .../default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) rename pkgs/applications/networking/instant-messengers/{session-desktop-appimage => session-desktop}/default.nix (88%) diff --git a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix similarity index 88% rename from pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix rename to pkgs/applications/networking/instant-messengers/session-desktop/default.nix index 3ce0054c3025..0f1e9f9e8ad9 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix @@ -9,7 +9,7 @@ let version = "1.9.1"; - pname = "session-desktop-appimage"; + pname = "session-desktop"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; @@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation { name = "Session"; desktopName = "Session"; comment = "Onion routing based messenger"; - exec = "${appimage}/bin/session-desktop-appimage-${version}"; + exec = "${appimage}/bin/session-desktop-${version}"; icon = "${appimage-contents}/session-desktop.png"; terminal = false; type = "Application"; @@ -44,10 +44,12 @@ stdenvNoCC.mkDerivation { installPhase = '' runHook preInstall + mv bin/session-desktop-${version} bin/session-desktop + mkdir -p $out/ cp -r bin $out/bin - wrapProgram $out/bin/session-desktop-appimage-${version} \ + wrapProgram $out/bin/session-desktop \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" runHook postInstall diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54a73b520bcc..a9f71a341ec1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25602,7 +25602,7 @@ with pkgs; seshat = callPackage ../data/fonts/seshat { }; - session-desktop-appimage = callPackage ../applications/networking/instant-messengers/session-desktop-appimage { }; + session-desktop = callPackage ../applications/networking/instant-messengers/session-desktop { }; shaderc = callPackage ../development/compilers/shaderc { }; From 1e6931dac85fc1cc8d668bdd9160cbfab247a7cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 21 Aug 2022 17:44:17 -0300 Subject: [PATCH 07/45] vopono: 0.10.1 -> 0.10.3 --- pkgs/tools/networking/vopono/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/vopono/default.nix b/pkgs/tools/networking/vopono/default.nix index f14d61a94ed9..aa981ab7331e 100644 --- a/pkgs/tools/networking/vopono/default.nix +++ b/pkgs/tools/networking/vopono/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "vopono"; - version = "0.10.1"; + version = "0.10.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-JwtiqY56Cn2oY5lRz/oxmQe2rw4spFvCOp1zKKuVsys="; + sha256 = "sha256-hbijcLX4CwnQVyM7XZneZH1pFEmZceN0ougltldyWnc="; }; - cargoHash = "sha256-NvdgyFlZ2udoWikJI7kzY14rfQi0KxpI2/P0+O5dqVA="; + cargoHash = "sha256-FSgI6ZFRxl9uE1yA4LkdHcI2fymvMqkibxgTNTlJq5g="; meta = with lib; { description = "Run applications through VPN connections in network namespaces"; From b1f1945e3e0dedd6033bf4ae2c5c01319a59be9d Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 22 Aug 2022 11:17:14 +0300 Subject: [PATCH 08/45] ngtcp2: 0.7.0 -> 0.8.0 --- pkgs/development/libraries/ngtcp2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index 90372cc97a26..0726356ae118 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-REAN5TW0miWXI3HFxtW3znTKTrhsBbNqu1VfjC2w0no="; + sha256 = "sha256-ehOIWUGSPyHhNitkkA8voVciuEsCoRWv1s3MVMmOT0c="; }; outputs = [ "out" "dev" "doc" ]; From 838d46c003fd8f60e987cf0444748e5786fc3d34 Mon Sep 17 00:00:00 2001 From: Alexander Nortung Date: Mon, 22 Aug 2022 21:26:50 +0200 Subject: [PATCH 09/45] session-desktop: etc Added alias for session-desktop-appimage --- pkgs/top-level/aliases.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3d1eb0c2035a..f15ca582e458 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1284,6 +1284,7 @@ mapAliases ({ sdlmame = mame; # Added 2019-10-30 seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21 sepolgen = throw "sepolgen was merged into selinux-python"; # Added 2021-11-11 + session-desktop-appimage = session-desktop; shared_mime_info = throw "'shared_mime_info' has been renamed to/replaced by 'shared-mime-info'"; # Converted to throw 2022-02-22 inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17 shellinabox = throw "shellinabox has been removed from nixpkgs, as it was unmaintained upstream"; # Added 2021-12-15 From 189c57aaa6814e33355122bc6e3d14094071297a Mon Sep 17 00:00:00 2001 From: Ken Micklas Date: Wed, 24 Aug 2022 13:21:54 +0100 Subject: [PATCH 10/45] mpvacious: 0.15 -> 0.18 --- .../video/mpv/scripts/mpvacious.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix index 071f762ff4a7..4052c968d2ba 100644 --- a/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -8,28 +8,31 @@ stdenvNoCC.mkDerivation rec { pname = "mpvacious"; - version = "0.15"; + version = "0.18"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "mpvacious"; rev = "v${version}"; - sha256 = "1lxlgbjk4x3skg5s7kkr9llcdlmpmabfrcslwhhz5f4j3bq7498w"; + sha256 = "sha256-FiYEpZVaeJQVSXa9obFYSKNVASJolOBm5D3faOlCzNY="; }; postPatch = '' - substituteInPlace subs2srs.lua \ - --replace "'curl'" "'${curl}/bin/curl'" \ - --replace "'wl-copy'" "'${wl-clipboard}/bin/wl-copy'" \ - --replace "xclip" "${xclip}/bin/xclip" + substituteInPlace utils/forvo.lua \ + --replace "'curl" "'${curl}/bin/curl" + substituteInPlace platform/nix.lua \ + --replace "'curl" "'${curl}/bin/curl" \ + --replace "'wl-copy" "'${wl-clipboard}/bin/wl-copy" \ + --replace "'xclip" "'${xclip}/bin/xclip" ''; dontBuild = true; installPhase = '' runHook preInstall - mkdir -p $out/share/mpv/scripts/mpvacious - cp *.lua $out/share/mpv/scripts/mpvacious + rm -r .github + mkdir -p $out/share/mpv/scripts + cp -r . $out/share/mpv/scripts/mpvacious runHook postInstall ''; From 6c2479f6e999a2168dafe1e6ada2dbec4ca4d80a Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Fri, 26 Aug 2022 22:30:34 +0200 Subject: [PATCH 11/45] trilium-{desktop,server}: 0.54.2 -> 0.54.3 --- pkgs/applications/office/trilium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 46bd79eab822..3aff212ae49e 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -10,13 +10,13 @@ let maintainers = with maintainers; [ fliegendewurst ]; }; - version = "0.54.2"; + version = "0.54.3"; desktopSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - desktopSource.sha256 = "15wbag2hk5pa6ds56ikxn9rj405jgbg6w1y896vl60sa02lm20df"; + desktopSource.sha256 = "1r7gzvcgdy8i5z5l8z4xw6s44mplr6h1pnpp19di953zmywbdi0f"; serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - serverSource.sha256 = "03z7z0jr1s132f10lagj786fr198l2xvpr72x2325brqlny5fzng"; + serverSource.sha256 = "1c3mcga87ifdlgxdhsgxndmqqkjl2glxilyf702wf1bpscsirc4z"; in { From 7f227409836dcdd49024dc76417544b407f99e7c Mon Sep 17 00:00:00 2001 From: KFears Date: Sun, 28 Aug 2022 15:56:46 +0400 Subject: [PATCH 12/45] nixos/syncthing: fix path setting for versioning Syncthing config XML uses `fsPath` setting for specifying the path to the versioning folder. This commit adds `services.syncthing.folders..versioning.fsPath` option to enable this functionality declaratively. Previously, `versioning.params.versionsPath` was used, which doesn't work. --- nixos/modules/services/networking/syncthing.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 373fd03223d6..2b029be19cf0 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -268,10 +268,10 @@ in { { versioning = { type = "staggered"; + fsPath = "/syncthing/backup"; params = { cleanInterval = "3600"; maxAge = "31536000"; - versionsPath = "/syncthing/backup"; }; }; } @@ -296,6 +296,14 @@ in { See . ''; }; + fsPath = mkOption { + default = ""; + type = either str path; + description = mdDoc '' + Path to the versioning folder. + See . + ''; + }; params = mkOption { type = attrsOf (either str path); description = mdDoc '' From 01f70337fd58ea9afd1776f1b17154598c6cd108 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 29 Aug 2022 13:36:07 -0400 Subject: [PATCH 13/45] epick: 0.7.0 -> 0.8.0 --- pkgs/applications/graphics/epick/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix index 668999f68dfa..8144a901a40f 100644 --- a/pkgs/applications/graphics/epick/default.nix +++ b/pkgs/applications/graphics/epick/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "epick"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "vv9k"; repo = pname; rev = version; - sha256 = "sha256-BrJkG1OYpkAfBYUfLn/CNDBc0n1tW5OLnpobkPABQow="; + sha256 = "sha256-LJg68YY8PqKF7Thn181XRFsCNJA0DkYKVFbIR1UkxGU="; }; - cargoSha256 = "sha256-hFay+XL2oqA7SC+I3wlrzhUmUitO2vbeqfoArU9Jsp4="; + cargoSha256 = "sha256-j6tim6dS++ECfBMdyQlS3CqN+Tr5ozHqyZ1bPKhDKV0="; nativeBuildInputs = lib.optional stdenv.isLinux python3; From ef49a84500e0bdcb31668c24fa906008ebe9c821 Mon Sep 17 00:00:00 2001 From: Alex Wied Date: Fri, 19 Aug 2022 13:22:50 -0400 Subject: [PATCH 14/45] python3Packages.coinmetrics-api-client: init at 2022.8.29.6 This package provides a Python interface to the Coin Metrics API. --- .../coinmetrics-api-client/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/coinmetrics-api-client/default.nix diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix new file mode 100644 index 000000000000..5192ef131f5a --- /dev/null +++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -0,0 +1,42 @@ +{ buildPythonPackage, fetchPypi, lib, orjson, pandas, poetry-core +, pytestCheckHook, pytest-mock, pythonOlder, python-dateutil, requests, typer +, websocket-client }: + +buildPythonPackage rec { + pname = "coinmetrics-api-client"; + version = "2022.8.29.6"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-EPPRKOdFbLLYw0K5C4nojR8GueekoFW7xIlwKeSV1EY="; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ + orjson python-dateutil requests typer websocket-client + ]; + + checkInputs = [ + pandas + pytestCheckHook + pytest-mock + ]; + + pythonImportsCheck = [ "coinmetrics.api_client" ]; + + passthru = { + optional-dependencies = { + pandas = [ pandas ]; + }; + }; + + meta = with lib; { + homepage = "https://coinmetrics.github.io/api-client-python/site/index.html"; + description = "Coin Metrics API v4 client library (Python)"; + license = licenses.mit; + maintainers = with maintainers; [ centromere ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 86489f4738d5..b36ba24aef3d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1947,6 +1947,8 @@ in { cogapp = callPackage ../development/python-modules/cogapp { }; + coinmetrics-api-client = callPackage ../development/python-modules/coinmetrics-api-client { }; + ColanderAlchemy = callPackage ../development/python-modules/colanderalchemy { }; colander = callPackage ../development/python-modules/colander { }; From 3bfe6bfca2fbe5f7f6c9d640172d482bfdcec815 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 30 Aug 2022 19:57:55 +0100 Subject: [PATCH 15/45] openscad: add patches for CVE-2022-0496 & CVE-2022-0497 --- pkgs/applications/graphics/openscad/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 98afab94f3d1..646594d4afba 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , qtbase , qtmultimedia , qscintilla @@ -42,6 +43,19 @@ mkDerivation rec { sha256 = "sha256-2tOLqpFt5klFPxHNONnHVzBKEFWn4+ufx/MU+eYbliA="; }; + patches = [ + (fetchpatch { + name = "CVE-2022-0496.patch"; + url = "https://github.com/openscad/openscad/commit/00a4692989c4e2f191525f73f24ad8727bacdf41.patch"; + sha256 = "sha256-q3SLj2b5aM/IQ8vIDj4iVcwCajgyJ5juNV/KN35uxfI="; + }) + (fetchpatch { + name = "CVE-2022-0497.patch"; + url = "https://github.com/openscad/openscad/commit/84addf3c1efbd51d8ff424b7da276400bbfa1a4b.patch"; + sha256 = "sha256-KNEVu10E2d4G2x+FJcuHo2tjD8ygMRuhUcW9NbN98bM="; + }) + ]; + nativeBuildInputs = [ bison flex pkg-config gettext qmake ]; buildInputs = [ From 6d09a0268c8082923cbee097ef40af07f6340b13 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 30 Aug 2022 21:38:07 +0000 Subject: [PATCH 16/45] python310Packages.oslo-db: 12.0.0 -> 12.1.0 --- pkgs/development/python-modules/oslo-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-db/default.nix b/pkgs/development/python-modules/oslo-db/default.nix index 7a393e69e741..6f50c4cbffb3 100644 --- a/pkgs/development/python-modules/oslo-db/default.nix +++ b/pkgs/development/python-modules/oslo-db/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "oslo-db"; - version = "12.0.0"; + version = "12.1.0"; src = fetchPypi { pname = "oslo.db"; inherit version; - sha256 = "sha256-EFuxQWOk7GG85z+N8ZADLIdZiJuA8B1ZrsdwR+cN24c="; + sha256 = "sha256-NekFa19t537lMlld8CX6iG4qstxIN4v11vTobdN8v3Y="; }; nativeBuildInputs = [ pbr ]; From 2e4e7dd7eb842d04b85bfa81c48a820220acb5d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 30 Aug 2022 23:31:33 +0000 Subject: [PATCH 17/45] python310Packages.python-ironicclient: 5.0.0 -> 5.0.1 --- .../python-modules/python-ironicclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix index 44c258675a7c..5f0f1d8dea53 100644 --- a/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/pkgs/development/python-modules/python-ironicclient/default.nix @@ -20,11 +20,11 @@ buildPythonApplication rec { pname = "python-ironicclient"; - version = "5.0.0"; + version = "5.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mA8+4cvWhxPn7LGVcWvwxGRBnlM671YgFfE10zhVPtQ="; + sha256 = "sha256-7RawbJ5O5KCruD499fOkuFcouBzp3f7aEUnE37wJqmM="; }; propagatedBuildInputs = [ From 69ccd66a735d408d991530566c0f558b41ea3e00 Mon Sep 17 00:00:00 2001 From: mingchuan Date: Thu, 18 Aug 2022 20:25:13 -0700 Subject: [PATCH 18/45] krita: 5.0.8 -> 5.1.0 --- pkgs/applications/graphics/krita/default.nix | 4 ++-- pkgs/applications/graphics/krita/generic.nix | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 603c1a44f4f2..6a7edb460ecc 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "5.0.8"; + version = "5.1.0"; kde-channel = "stable"; - sha256 = "sha256:7R0fpQc+4MQVDh/enhCTgpgOqU0y5YRShrv/ILa/XkU="; + sha256 = "sha256-mjs/WFhIC3CRvUhEmSbmE1OOqKTcBiSchg/+PaWs2II="; }) diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index d5f778b592ac..21ba5d513751 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -3,7 +3,7 @@ , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash, breeze-icons , boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib -, openjpeg, opencolorio_1, vc, poppler, curl, ilmbase, libmypaint, libwebp +, openjpeg, opencolorio_1, xsimd, poppler, curl, ilmbase, libmypaint, libwebp , qtmultimedia, qtx11extras, quazip , python3Packages @@ -32,7 +32,8 @@ mkDerivation rec { openjpeg opencolorio_1 poppler curl ilmbase libmypaint libwebp qtmultimedia qtx11extras quazip python3Packages.pyqt5 - ] ++ lib.optional stdenv.hostPlatform.isx86 vc; + xsimd + ]; NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ] ++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy"; From 54fd3e5b7f3eeea588ecd2d1c4a4c7bc14fab6a9 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 18 Aug 2022 13:23:07 +0200 Subject: [PATCH 19/45] python310Packages.flax: 0.5.2 -> 0.6.0 --- .../python-modules/flax/default.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index 5eda127fb1c0..ebdb3ac898ad 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -1,6 +1,7 @@ { buildPythonPackage , fetchFromGitHub , jaxlib +, jax , keras , lib , matplotlib @@ -10,26 +11,40 @@ , pytest-xdist , pytestCheckHook , tensorflow +, fetchpatch +, rich }: buildPythonPackage rec { pname = "flax"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-t24JZ08EmvuAINZC26OQI1icklUhUkfz6ZRKPr2COAw="; + sha256 = "sha256-egTYYFZxhE/Kk7jXRi1HmjCjyFia2LoRigH042isDu0="; }; + patches = [ + # Bump rich dependency, should be fixed in releases after 0.6.0 + # https://github.com/google/flax/pull/2407 + (fetchpatch { + url = "https://github.com/google/flax/commit/72189153f9779022b97858ae747c23fbaf571e3d.patch"; + sha256 = "sha256-hKOn/M7qpBM6R1RIJpnXpRoZgIHqkwQZApN4L0fBzIE="; + name = "bump_rich_dependency.patch"; + }) + ]; + buildInputs = [ jaxlib ]; propagatedBuildInputs = [ + jax matplotlib msgpack numpy optax + rich ]; pythonImportsCheck = [ From 9a7bd01e5273ccfff96df172e0df5bb29e34bd1a Mon Sep 17 00:00:00 2001 From: kilianar Date: Wed, 31 Aug 2022 18:04:55 +0200 Subject: [PATCH 20/45] tailscale: 1.28.0 -> 1.30.0 https://github.com/tailscale/tailscale/releases/tag/v1.30.0 --- pkgs/servers/tailscale/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index ee17c110e1a3..de4d7e7fdf99 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "tailscale"; - version = "1.28.0"; + version = "1.30.0"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-6h9LAtaDIwQb+oU4zNABJeBOMaiKqWvhxsFbwEQNC4o="; + sha256 = "sha256-KruBCpJe6RhQYxNopj7ZZlZZy/UYtO1vQMvHxUgw0P8="; }; - vendorSha256 = "sha256-W5QiHhdSP5xPIJWs8LMl+EGu/AE9/aFD2sOZOnDL0yo="; + vendorSha256 = "sha256-+7Cr7wmt4PheHJRAlyKhRd6QRIZBqrbVtn5I94h8lLo="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a077ad5cced..fe08d3875a6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23535,7 +23535,9 @@ with pkgs; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; - tailscale = callPackage ../servers/tailscale { }; + tailscale = callPackage ../servers/tailscale { + buildGoModule = buildGo119Module; + }; thanos = callPackage ../servers/monitoring/thanos { }; From 28912692e18584aae54d2fc7a55cd020301c40f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 Aug 2022 16:24:55 +0000 Subject: [PATCH 21/45] ginkgo: 2.1.5 -> 2.1.6 --- pkgs/development/tools/ginkgo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index c703ff1b2216..0c5073ff6e70 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-y/GLX6dHQfuH8QVC+A8biGiEhy2XZqzFz7J14zVX/zU="; + sha256 = "sha256-Tgf91nbW1eYcInX+HccAW5ajzOY/BI9fVb5JC0kbI84="; }; vendorSha256 = "sha256-QXrRsDaWoPp4mbgS7nV/5c5Z5Ca6PyoDpfrjvtoHK4Q="; From 9f3436d2fb5c88be4a90749316c9927826abb4e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 Aug 2022 16:55:18 +0000 Subject: [PATCH 22/45] hugo: 0.102.1 -> 0.102.2 --- pkgs/applications/misc/hugo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index b2c177fda2d6..70602b7b7cde 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.102.1"; + version = "0.102.2"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lCdFxUlqGRQ5IMlhPhcJ5Ma35q75LnlcBNW1XUSWb1I="; + sha256 = "sha256-mAkdx42JaYSSpNLssBNkX45V3VniVKVbPt2SQ/QaXmY="; }; - vendorSha256 = "sha256-y9bZ9EoB/n300oXO+PT4d8vSVMJC3HYyMRNf6eNhVik="; + vendorSha256 = "sha256-oWOu8vmxe0a/nIgkjpx7XrB49rjcuqnnpuOMtI9bLfY="; doCheck = false; From 5f3beb0cee74798a056cf2a7dfb91405e149e6fb Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Wed, 31 Aug 2022 19:06:57 +0200 Subject: [PATCH 23/45] dbeaver: 22.1.4 -> 22.1.5 --- pkgs/applications/misc/dbeaver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 8bf473d2cfc8..2257589f950b 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -23,16 +23,16 @@ inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix) }) rec { pname = "dbeaver"; - version = "22.1.4"; # When updating also update mvnSha256 + version = "22.1.5"; # When updating also update mvnSha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-5s2SFquB0i5X2deBO0FStudReB4wGhQkhR39PHPBEAM="; + sha256 = "sha256-KMrevQ37c84UD46XygKa0Q06qacJianoYqfe4j4MfEI="; }; - mvnSha256 = "YIeKSL5scU8NxEIf+jK1g9cdFDOBVh14ruKMqUuz1Ts="; + mvnSha256 = "KVE+AYYEWN9bjAWop4mpiPq8yU3GdSGqOTmLG4pdflQ="; mvnParameters = "-P desktop,all-platforms"; nativeBuildInputs = [ From 17d6094ac706ec748ba86bf1680cc74b75492751 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 Aug 2022 17:32:39 +0000 Subject: [PATCH 24/45] jsonnet-language-server: 0.7.2 -> 0.8.0 --- pkgs/development/tools/jsonnet-language-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/jsonnet-language-server/default.nix b/pkgs/development/tools/jsonnet-language-server/default.nix index 1bd82f850199..393970cea717 100644 --- a/pkgs/development/tools/jsonnet-language-server/default.nix +++ b/pkgs/development/tools/jsonnet-language-server/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "jsonnet-language-server"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "grafana"; repo = "jsonnet-language-server"; rev = "v${version}"; - sha256 = "sha256-hI8eGfHC7la52nImg6BaBxdl9oD/J9q3F3+xbsHrn30="; + sha256 = "sha256-lcaC6sOZyfQFKopCKOt855nib1BzK8eitY8pvmX3PQ4="; }; - vendorSha256 = "sha256-UEQogVVlTVnSRSHH2koyYaR9l50Rn3075opieK5Fu7I="; + vendorSha256 = "sha256-tsVevkMHuCv70A9Ohg9L+ghH5+v52X4sToI4bMlDzzo="; ldflags = [ "-s -w -X 'main.version=${version}'" From 0374eda4da18bc5c20f2040e86513b5313b7ae22 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 Aug 2022 17:37:20 +0000 Subject: [PATCH 25/45] kics: 1.5.14 -> 1.5.15 --- pkgs/tools/admin/kics/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/tools/admin/kics/default.nix index 3296beb4ca23..9447060dc559 100644 --- a/pkgs/tools/admin/kics/default.nix +++ b/pkgs/tools/admin/kics/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kics"; - version = "1.5.14"; + version = "1.5.15"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; rev = "v${version}"; - sha256 = "sha256-6ZxkKtzav9mq6MTTuf83l3F8aH1EYyX4cV/xKqyv+2Q="; + sha256 = "sha256-e6esrGb1p96yV9Ce7z0UCapXqOpRPjFb4EdStolAiMk="; }; - vendorSha256 = "sha256-G19VVoba15pCJld5hSIWZGr5bYDUcdC82GYWXdx0OMc="; + vendorSha256 = "sha256-eieulT+Vt6p2+gmQ/Ic8kgd3Cg6uHX0LSUSr/QrK/yw="; subPackages = [ "cmd/console" ]; From 3305fd81772270a25d5b5706690c21f845470886 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 Aug 2022 17:38:28 +0000 Subject: [PATCH 26/45] koreader: 2022.07 -> 2022.08 --- pkgs/applications/misc/koreader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index b424ad4cb72b..e1785065b0a8 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -13,12 +13,12 @@ let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; }; in stdenv.mkDerivation rec { pname = "koreader"; - version = "2022.07"; + version = "2022.08"; src = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - sha256 = "sha256-8WQFfmKgu6XPqWQsma656RWpNwNkSXmHOHs2cyVVqJU="; + sha256 = "sha256-+JBJNJTAnC5gpuo8cehfe/3YwGIW5iFA8bZ8nfz9qsk="; }; sourceRoot = "."; From 5e3c9e7bb8d9220ab75ec7f0b4057fe2179452d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 Aug 2022 17:40:58 +0000 Subject: [PATCH 27/45] kubeone: 1.4.7 -> 1.5.0 --- pkgs/applications/networking/cluster/kubeone/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/applications/networking/cluster/kubeone/default.nix index 7851496558f6..60fc4847aa56 100644 --- a/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/pkgs/applications/networking/cluster/kubeone/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubeone"; - version = "1.4.7"; + version = "1.5.0"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - sha256 = "sha256-SgberbjqIf+5bfE+gM7+lxl25aQVs2tJBNrPgkzowJ4="; + sha256 = "sha256-GC51gKAwurrsm8/zkYpSs7bnT55kpctsTpN6ZtlYxHk="; }; - vendorSha256 = "sha256-kI5i1us3Ooh603HOz9Y+HlfPUy/1J8z89/jvKEenpLw="; + vendorSha256 = "sha256-w/uLR7wi28Ub7Nouxxg39NlD1OzyIE2oEP4D88Xbwu0="; nativeBuildInputs = [ installShellFiles From 8c68069328de82e719f3c8f94e7745570664e3e1 Mon Sep 17 00:00:00 2001 From: Alain Zscheile Date: Wed, 31 Aug 2022 20:00:25 +0200 Subject: [PATCH 28/45] element-{web,desktop}: 1.11.3 -> 1.11.4 See also: https://matrix.org/blog/2022/08/31/security-releases-matrix-js-sdk-19-4-0-and-matrix-react-sdk-3-53-0 Fixes #189143 --- .../networking/instant-messengers/element/pin.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index c8ea1feda6ef..e204b13b90b3 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,7 +1,7 @@ { - "version": "1.11.3", - "desktopSrcHash": "DJqnMEN7KlRIGefMcZCp27xLnPEoSR8Ml5sN5JfqNSM=", - "desktopYarnHash": "15wa3ggw1zcc17lfhzig5qw1bpiph7qd6h53qc5nahmfan4jv06a", - "webSrcHash": "D95eVWTAvpStOZK0cjP2V8k1ZTnkGLsA0/woVGqDKEI=", - "webYarnHash": "1i0djpnn545n83nmm0hm752b66ai1kh3irkfpvw98300c6q1m7fx" + "version": "1.11.4", + "desktopSrcHash": "lIyx1gpPkuOGzHTbkHKNiGsVKEkKUIz/8sj/KZ9XK9o=", + "desktopYarnHash": "0m0zzq2wbk7h7anjmj586089j2qgsd5cj99rmi2hmsmssq63fmwk", + "webSrcHash": "bZ5SKydrQE+qLQEZ5qS7F1RC33nHZneUd8OwrV1H2T4=", + "webYarnHash": "1yji94xcigz54bbhvssj2pgncw9fgal7mzw9h9bfwmny0pjh8c4p" } From 8ea56dfc8f678100dbdc8cd35fcb4b6dae77dc3f Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 23 Jul 2022 05:27:01 +0300 Subject: [PATCH 29/45] samba: don't depend on build python3 add disallowedReferences to prevent future regressions buildPackages.python3Packages.python.intepreter will be python3.10 while the one in shebang is python3 had to move the substituting to after wrapPythonPrograms because the wrapper contained build python so something weird is going on --- pkgs/servers/samba/4.x.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index d32a545069de..c85764596565 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -26,6 +26,7 @@ , tdb , cmocka , rpcsvc-proto +, bash , python3Packages , nixosTests @@ -82,8 +83,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - python3Packages.python + bash python3Packages.wrapPython + python3Packages.python readline popt dbus @@ -170,14 +172,20 @@ stdenv.mkDerivation rec { EOF find $out -type f -regex '.*\.so\(\..*\)?' -exec $SHELL -c "$SCRIPT" \; - # Samba does its own shebang patching, but uses build Python - find "$out/bin" -type f -executable -exec \ - sed -i '1 s^#!${python3Packages.python.pythonForBuild}/bin/python.*^#!${python3Packages.python.interpreter}^' {} \; - # Fix PYTHONPATH for some tools wrapPythonPrograms + + # Samba does its own shebang patching, but uses build Python + find $out/bin -type f -executable | while read file; do + isScript "$file" || continue + sed -i 's^${lib.getBin buildPackages.python3Packages.python}/bin^${lib.getBin python3Packages.python}/bin^' "$file" + done ''; + disallowedReferences = + lib.optionals (buildPackages.python3Packages.python != python3Packages.python) + [ buildPackages.python3Packages.python ]; + passthru = { tests.samba = nixosTests.samba; }; From 252244a9fd7b5094ad7806dfb5dc081e1016483a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 31 Aug 2022 11:55:31 -0700 Subject: [PATCH 30/45] doppler: 3.41.0 -> 3.42.0 * doppler: 3.41.0 -> 3.42.0 * doppler: fix typo in description Co-authored-by: superherointj <5861043+superherointj@users.noreply.github.com> --- pkgs/tools/security/doppler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index 135aa15ad1c9..904af7e5660a 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.41.0"; + version = "3.42.0"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-nYw3ZEGrqmuo6UKtlE+xS/mX1P5VXZ0zn8s/3K3k0jk="; + sha256 = "sha256-bIcBn6BjRerbIb+2/own51avbp6rUr4kClrY3iyTKso="; }; vendorSha256 = "sha256-evG1M0ZHfn9hsMsSncwxF5Hr/VJ7y6Ir0D2gHJaunBo="; @@ -21,7 +21,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://doppler.com"; - description = "The official CLI for interacting with your Doppler Enclave secrets and configuation"; + description = "The official CLI for interacting with your Doppler Enclave secrets and configuration"; license = licenses.asl20; maintainers = with maintainers; [ lucperkins ]; }; From 55d613752a5bd73bb318f7714fde3db8eb9d54e8 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 31 Aug 2022 15:55:56 -0400 Subject: [PATCH 31/45] nomad_1_2: 1.2.11 -> 1.2.12 --- pkgs/applications/networking/cluster/nomad/1.2.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/1.2.nix b/pkgs/applications/networking/cluster/nomad/1.2.nix index a478dc3b4fee..901f464c38f4 100644 --- a/pkgs/applications/networking/cluster/nomad/1.2.nix +++ b/pkgs/applications/networking/cluster/nomad/1.2.nix @@ -4,7 +4,7 @@ callPackage ./generic.nix { inherit buildGoModule; - version = "1.2.11"; - sha256 = "sha256-mBaqTiPCPNjhdBKv4ydlNuJxGwFCcJTj4khaOJs9LQM="; - vendorSha256 = "sha256-2Draoydjsu15GK1QMHiZCB9ldTrAb0FwhO7MUH3s1Q8="; + version = "1.2.12"; + sha256 = "sha256-PdMo96/foN7rSNvMOQ16N3advy+h0GX7LYtfl23xRfs="; + vendorSha256 = "sha256-fmqhaM3yK2ThiD+qwQTr+d5FqhZWzkwcGTSPdXNNFTU="; } From f10333f64bd91e31a92cb8eb5a5e39114f7a7299 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 31 Aug 2022 15:58:50 -0400 Subject: [PATCH 32/45] nomad_1_3: 1.3.4 -> 1.3.5 --- pkgs/applications/networking/cluster/nomad/1.3.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/1.3.nix b/pkgs/applications/networking/cluster/nomad/1.3.nix index 511b3d34decf..0d33c5efd087 100644 --- a/pkgs/applications/networking/cluster/nomad/1.3.nix +++ b/pkgs/applications/networking/cluster/nomad/1.3.nix @@ -4,7 +4,7 @@ callPackage ./generic.nix { inherit buildGoModule; - version = "1.3.4"; - sha256 = "sha256-NeBZVCpylP16dPi68unk3H3/V6gWO/SvJRmjgwwwVts="; - vendorSha256 = "sha256-XIHtAB0js55mbVuTTWdLW5BMhQjd6/GUbcBk8DEYZg8="; + version = "1.3.5"; + sha256 = "sha256-WKS7EfZxysy/oyq1fa8rKvmfgHRiB7adSVhALZNFYgo="; + vendorSha256 = "sha256-byc6wAxpqhxlN3kyHyFQeBS9/oIjHeoz6ldYskizgaI="; } From a60e0aefe66fb70dfcf2f0a69efcc9aa895d951c Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 31 Aug 2022 15:47:32 -0400 Subject: [PATCH 33/45] vault: 1.11.2 -> 1.11.3 --- pkgs/tools/security/vault/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 0d16ee9a995d..2ed493cb6566 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-dEIrTz24zBN6axl8bPdc4N9iebE7YBF0mGUSAbHx9Ug="; + sha256 = "sha256-L86wV47xGf3W6LEhFuH6cP30dtvETRbEGsmQNCHviCI="; }; - vendorSha256 = "sha256-/EXrOS7kBxu6LtwTMipVJfjrJH7RuIwqD5LHH3yDADQ="; + vendorSha256 = "sha256-fKHo/m2QKEclNMeDxlM8kmOxAWbKu1lsXC4cKDaImdg="; subPackages = [ "." ]; From 74ca03fa3a13003fcc15dc65e9915e2e67c3f959 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 31 Aug 2022 15:48:02 -0400 Subject: [PATCH 34/45] vault-bin: 1.11.1 -> 1.11.3 --- pkgs/tools/security/vault/vault-bin.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index b253898c02b8..3e8dc21111fd 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "vault-bin"; - version = "1.11.1"; + version = "1.11.3"; src = let @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-mh/O9X4yOEspZ3Z+N22Wt8PeNee9U7U4R8laS7PCrhI="; - aarch64-linux = "sha256-9LybdftRdc9NYxYzPwojYdYxu1DbtVjG0nlT88oxX9E="; - i686-linux = "sha256-nPnWzxv5AVfOrGJxnFImZacUeKRZ0+Gyesf5TiRvz/0="; - x86_64-darwin = "sha256-kOT1Vs2LxCih/GewL66tVI5t50eKU/ejT9ccSjp7ar8="; - aarch64-darwin = "sha256-UkuZAFzT3pjg7q7NJ4+DaAk0syAVf6N512bxwLuQHHE="; + x86_64-linux = "sha256-k4477q9gE5CwOZkguzfAXSzZvBL/ZiAY4GWIXwKMSPM="; + aarch64-linux = "sha256-TIQm3pxV3ix6c7IUXMFnsAvJb9wATByNQ+i0aPYHypI="; + i686-linux = "sha256-Ms7LycRSRamb3myJ97Gm/9h/kQwIJrf9r99qMvIw8Dc="; + x86_64-darwin = "sha256-eOpXf0w2Ok89rVYqM2GJEpPpx8jIKnlThgL9esSheB8="; + aarch64-darwin = "sha256-JRacHUcwM2lKt2tTC6D4LUOb312F0MgQsmFqlk626fg="; }; in fetchzip { From 23028550cf3064f519bb302361c9500ebc837f92 Mon Sep 17 00:00:00 2001 From: Michael Davis Date: Wed, 31 Aug 2022 13:06:21 -0500 Subject: [PATCH 35/45] helix: 22.05 -> 22.08 --- pkgs/applications/editors/helix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix index e33eaa787a2c..349ef8f7ba00 100644 --- a/pkgs/applications/editors/helix/default.nix +++ b/pkgs/applications/editors/helix/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "helix"; - version = "22.05"; + version = "22.08"; # This release tarball includes source code for the tree-sitter grammars, # which is not ordinarily part of the repository. src = fetchzip { url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz"; - sha256 = "sha256-MVHfj9iVC8rFGFU+kpRcH0qX9kQ+scFsRgSw7suC5RU="; + sha256 = "sha256-PSTsPt+OQhYQ/m/hm5PgHWrQXtbooT+tG0767KyiJJw="; stripRoot = false; }; - cargoSha256 = "sha256-9jkSZ2yW0Pca1ats7Mgv7HprpjoZWLpsbuwMjYOKlmk="; + cargoSha256 = "sha256-5Ap/PU8IjAPKKiFxzHqWQMspWkbTYIwTNiSMWIceUPc="; nativeBuildInputs = [ makeWrapper ]; From 12756f54134a2c6652499152112889466dcbc2c8 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sun, 28 Aug 2022 23:07:38 -0700 Subject: [PATCH 36/45] ocamlPackages.kicadsch: init at 0.9 --- .../ocaml-modules/kicadsch/default.nix | 23 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/ocaml-modules/kicadsch/default.nix diff --git a/pkgs/development/ocaml-modules/kicadsch/default.nix b/pkgs/development/ocaml-modules/kicadsch/default.nix new file mode 100644 index 000000000000..69b4aae3eafb --- /dev/null +++ b/pkgs/development/ocaml-modules/kicadsch/default.nix @@ -0,0 +1,23 @@ +{ lib +, buildDunePackage +, fetchurl +}: + +buildDunePackage rec { + pname = "kicadsch"; + version = "0.9.0"; + + minimalOCamlVersion = "4.07"; + + src = fetchurl { + url = "https://github.com/jnavila/plotkicadsch/releases/download/v${version}/plotkicadsch-${version}.tbz"; + sha256 = "sha256-B+vnEPyd3SUzviTdNoyvYk0p7Hrg/XTJm8KxsY8A4jQ="; + }; + + meta = with lib; { + description = "OCaml library for exporting Kicad Sch files to SVG pictures"; + homepage = "https://github.com/jnavila/plotkicadsch"; + license = licenses.isc; + maintainers = with maintainers; [ leungbk ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 9f69a906b967..dd307efdecb6 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -664,6 +664,8 @@ let ke = callPackage ../development/ocaml-modules/ke { }; + kicadsch = callPackage ../development/ocaml-modules/kicadsch { }; + lablgl = callPackage ../development/ocaml-modules/lablgl { }; lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 { }; From 2b2e5df47812fe5d2fc59b260bf422a07c3bf62a Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Mon, 29 Aug 2022 11:57:56 -0700 Subject: [PATCH 37/45] ocamlPackages.git-unix: Add git to propagatedBuildInputs This is necessary to make ocamlPackages.plotkicadsch build. --- pkgs/development/ocaml-modules/git/unix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/git/unix.nix b/pkgs/development/ocaml-modules/git/unix.nix index 3e5f464cea06..319613a73335 100644 --- a/pkgs/development/ocaml-modules/git/unix.nix +++ b/pkgs/development/ocaml-modules/git/unix.nix @@ -26,7 +26,7 @@ buildDunePackage { astring cohttp-lwt-unix decompress domain-name ipaddr mtime mirage-flow cstruct ptime mimic ca-certs-nss - tls tls-mirage + tls tls-mirage git ]; checkInputs = [ alcotest alcotest-lwt base64 ke From 9a64a6d1ef03e0339e82702856b241d450f6630e Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sun, 28 Aug 2022 22:48:44 -0700 Subject: [PATCH 38/45] ocamlPackages.plotkicadsch: init at 0.9 --- .../ocaml-modules/plotkicadsch/default.nix | 50 +++++++++++++++++++ .../plotkicadsch/fix-paths.patch | 26 ++++++++++ pkgs/top-level/ocaml-packages.nix | 4 ++ 3 files changed, 80 insertions(+) create mode 100644 pkgs/development/ocaml-modules/plotkicadsch/default.nix create mode 100644 pkgs/development/ocaml-modules/plotkicadsch/fix-paths.patch diff --git a/pkgs/development/ocaml-modules/plotkicadsch/default.nix b/pkgs/development/ocaml-modules/plotkicadsch/default.nix new file mode 100644 index 000000000000..e08fcdfeb2f3 --- /dev/null +++ b/pkgs/development/ocaml-modules/plotkicadsch/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildDunePackage +, fetchFromGitHub +, substituteAll +, base64 +, cmdliner +, digestif +, git-unix +, kicadsch +, lwt +, lwt_ppx +, sha +, tyxml +, coreutils +, imagemagick +}: + +buildDunePackage rec { + pname = "plotkicadsch"; + + inherit (kicadsch) src version; + + minimalOCamlVersion = "4.09"; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit coreutils imagemagick; + }) + ]; + + buildInputs = [ + base64 + cmdliner + digestif + git-unix + kicadsch + lwt + lwt_ppx + sha + tyxml + ]; + + meta = with lib; { + description = "A tool to export Kicad Sch files to SVG pictures"; + homepage = "https://github.com/jnavila/plotkicadsch"; + license = licenses.isc; + maintainers = with maintainers; [ leungbk ]; + }; +} diff --git a/pkgs/development/ocaml-modules/plotkicadsch/fix-paths.patch b/pkgs/development/ocaml-modules/plotkicadsch/fix-paths.patch new file mode 100644 index 000000000000..d9e8d5109f53 --- /dev/null +++ b/pkgs/development/ocaml-modules/plotkicadsch/fix-paths.patch @@ -0,0 +1,26 @@ +diff --git a/plotkicadsch/src/git-imgdiff b/plotkicadsch/src/git-imgdiff +index cbddecb..8d21a8a 100755 +--- a/plotkicadsch/src/git-imgdiff ++++ b/plotkicadsch/src/git-imgdiff +@@ -1,4 +1,4 @@ + #!/bin/bash + PIPE=$(mktemp -u) +-(! compare -metric RMSE $2 $1 png:${PIPE} 2> /dev/null) && (montage -geometry +4+4 $2 $PIPE $1 png:- | display -title "$1" -) ++(! @imagemagick@/bin/compare -metric RMSE $2 $1 png:${PIPE} 2> /dev/null) && (@imagemagick@/bin/montage -geometry +4+4 $2 $PIPE $1 png:- | @imagemagick@/bin/display -title "$1" -) + rm $PIPE +diff --git a/plotkicadsch/src/sysAbst.ml b/plotkicadsch/src/sysAbst.ml +index c3c7b52..15db6d4 100644 +--- a/plotkicadsch/src/sysAbst.ml ++++ b/plotkicadsch/src/sysAbst.ml +@@ -30,7 +30,7 @@ let detect_os () : os = + if Sys.win32 then Windows + else if Sys.cygwin then Cygwin + else +- let ((in_ch, _, _) as uname) = UnixLabels.open_process_full "uname" ~env:[| |] in ++ let ((in_ch, _, _) as uname) = UnixLabels.open_process_full "@coreutils@/bin/uname" ~env:[| |] in + let os = input_line in_ch in + ignore (UnixLabels.close_process_full uname) ; + match os with +-- +2.37.1 + diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index dd307efdecb6..04dfa7365dc8 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1147,6 +1147,10 @@ let piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { }; + plotkicadsch = callPackage ../development/ocaml-modules/plotkicadsch { + inherit (pkgs) coreutils imagemagick; + }; + posix-base = callPackage ../development/ocaml-modules/posix/base.nix { }; posix-socket = callPackage ../development/ocaml-modules/posix/socket.nix { }; From ac455609648554cf2fb40d9d1ce030202b0921b7 Mon Sep 17 00:00:00 2001 From: kilianar Date: Wed, 31 Aug 2022 23:11:49 +0200 Subject: [PATCH 39/45] delta: 0.13.0 -> 0.14.0 https://github.com/dandavison/delta/releases/tag/0.14.0 - add shell completions for fish --- .../version-management/git-and-tools/delta/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index 92914f454968..0bd1e2a51217 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "sha256-5h4epV3RORZiynW1fkFLImqPunC3PZ/YzLiSrzescww="; + sha256 = "sha256-hB8qpVXsAVJvtrdTnbPYcL9K4gL2nkZLo6vunjOP/7o="; }; - cargoSha256 = "sha256-4dPTcrT8Gx3WfT0sauqnCSmcGE9LrgIqgHrY5l503ZA="; + cargoSha256 = "sha256-19ZGWM8vPbIEYaCxrAZ2HWgSqbeLu3hEb8eLL4a7fAI="; nativeBuildInputs = [ installShellFiles ]; @@ -29,6 +29,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' installShellCompletion --bash --name delta.bash etc/completion/completion.bash installShellCompletion --zsh --name _delta etc/completion/completion.zsh + installShellCompletion --fish --name delta.fish etc/completion/completion.fish ''; meta = with lib; { From 9b183572a7789cd3b271af38ca1ca7245801e9af Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 30 Aug 2022 20:42:49 +0200 Subject: [PATCH 40/45] python3Packages.torch: 1.11.0 -> 1.12.1 https://github.com/pytorch/pytorch/releases/tag/v1.12.0 https://github.com/pytorch/pytorch/releases/tag/v1.12.1 --- .../torch/breakpad-sigstksz.patch | 13 ----- .../python-modules/torch/default.nix | 48 +++++++++---------- pkgs/top-level/python-packages.nix | 1 - 3 files changed, 24 insertions(+), 38 deletions(-) delete mode 100644 pkgs/development/python-modules/torch/breakpad-sigstksz.patch diff --git a/pkgs/development/python-modules/torch/breakpad-sigstksz.patch b/pkgs/development/python-modules/torch/breakpad-sigstksz.patch deleted file mode 100644 index 33a2304cb9b1..000000000000 --- a/pkgs/development/python-modules/torch/breakpad-sigstksz.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/third_party/breakpad/src/client/linux/handler/exception_handler.cc b/third_party/breakpad/src/client/linux/handler/exception_handler.cc -index ca353c4099..499be0a986 100644 ---- a/third_party/breakpad/src/client/linux/handler/exception_handler.cc -+++ b/third_party/breakpad/src/client/linux/handler/exception_handler.cc -@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { - // SIGSTKSZ may be too small to prevent the signal handlers from overrunning - // the alternative stack. Ensure that the size of the alternative stack is - // large enough. -- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); -+ const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); - - // Only set an alternative stack if there isn't already one, or if the current - // one is too small. diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 9d4c64861a3f..672fcf75d331 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -122,31 +122,26 @@ let in buildPythonPackage rec { pname = "torch"; # Don't forget to update torch-bin to the same version. - version = "1.11.0"; + version = "1.12.1"; format = "setuptools"; disabled = pythonOlder "3.7.0"; outputs = [ - "out" # output standard python package - "dev" # output libtorch headers - "lib" # output libtorch libraries + "out" # output standard python package + "dev" # output libtorch headers + "lib" # output libtorch libraries ]; src = fetchFromGitHub { - owner = "pytorch"; - repo = "pytorch"; - rev = "v${version}"; + owner = "pytorch"; + repo = "pytorch"; + rev = "refs/tags/v${version}"; fetchSubmodules = true; - sha256 = "sha256-CEu63tdRBAF8CTchO3Qu8gUNObQylX6U08yDTI4/c/0="; + hash = "sha256-8378BVOBFCRYRG1+yIYFSPKmb1rFOLgR+8pNZKt9NfI="; }; - patches = [ - # Fix for a breakpad incompatibility with glibc>2.33 - # https://github.com/pytorch/pytorch/issues/70297 - # https://github.com/google/breakpad/commit/605c51ed96ad44b34c457bbca320e74e194c317e - ./breakpad-sigstksz.patch - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ # pthreadpool added support for Grand Central Dispatch in April # 2020. However, this relies on functionality (DISPATCH_APPLY_AUTO) # that is available starting with macOS 10.13. However, our current @@ -208,7 +203,7 @@ in buildPythonPackage rec { PYTORCH_BUILD_VERSION = version; PYTORCH_BUILD_NUMBER = 0; - USE_SYSTEM_NCCL=setBool useSystemNccl; # don't build pytorch's third_party NCCL + USE_SYSTEM_NCCL = setBool useSystemNccl; # don't build pytorch's third_party NCCL # Suppress a weird warning in mkl-dnn, part of ideep in pytorch # (upstream seems to have fixed this in the wrong place?) @@ -243,15 +238,17 @@ in buildPythonPackage rec { pillow six future tensorboard protobuf ] ++ lib.optionals MPISupport [ mpi ]; - checkInputs = [ hypothesis ninja psutil ]; - # Tests take a long time and may be flaky, so just sanity-check imports doCheck = false; + pythonImportsCheck = [ "torch" ]; + checkInputs = [ hypothesis ninja psutil ]; + checkPhase = with lib.versions; with lib.strings; concatStringsSep " " [ + "runHook preCheck" cudaStubEnv "${python.interpreter} test/run_test.py" "--exclude" @@ -264,13 +261,15 @@ in buildPythonPackage rec { # tensorboard has acceptable failures for pytorch 1.3.x due to dependencies on tensorboard-plugins (optionalString (majorMinor version == "1.3" ) "tensorboard") ]) + "runHook postCheck" ]; + postInstall = '' find "$out/${python.sitePackages}/torch/include" "$out/${python.sitePackages}/torch/lib" -type f -exec remove-references-to -t ${stdenv.cc} '{}' + mkdir $dev cp -r $out/${python.sitePackages}/torch/include $dev/include - cp -r $out/${python.sitePackages}/torch/share $dev/share + cp -r $out/${python.sitePackages}/torch/share $dev/share # Fix up library paths for split outputs substituteInPlace \ @@ -282,7 +281,7 @@ in buildPythonPackage rec { --replace \''${_IMPORT_PREFIX}/lib "$lib/lib" mkdir $lib - mv $out/${python.sitePackages}/torch/lib $lib/lib + mv $out/${python.sitePackages}/torch/lib $lib/lib ln -s $lib/lib $out/${python.sitePackages}/torch/lib ''; @@ -312,11 +311,12 @@ in buildPythonPackage rec { }; meta = with lib; { - description = "Open source, prototype-to-production deep learning platform"; - homepage = "https://pytorch.org/"; - license = licenses.bsd3; + changelog = "https://github.com/pytorch/pytorch/releases/tag/v${version}"; + # keep PyTorch in the description so the package can be found under that name on search.nixos.org + description = "PyTorch: Tensors and Dynamic neural networks in Python with strong GPU acceleration"; + homepage = "https://pytorch.org/"; + license = licenses.bsd3; maintainers = with maintainers; [ teh thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds - platforms = with platforms; linux ++ lib.optionals (!cudaSupport) darwin; - broken = stdenv.isLinux && stdenv.isAarch64; + platforms = with platforms; linux ++ lib.optionals (!cudaSupport) darwin; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5cedebec3232..8e01b0f15281 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10929,7 +10929,6 @@ in { torch-bin = callPackage ../development/python-modules/torch/bin.nix { }; - torchWithCuda = self.torch.override { cudaSupport = true; }; From 4b37958011a18e69ba3987cfdca8815258a52172 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 30 Aug 2022 22:19:28 +0200 Subject: [PATCH 41/45] python3Packages.torch-bin: 1.11.0 -> 1.12.1 https://github.com/pytorch/pytorch/releases/tag/v1.12.0 https://github.com/pytorch/pytorch/releases/tag/v1.12.1 --- pkgs/development/python-modules/torch/bin.nix | 4 +- .../python-modules/torch/binary-hashes.nix | 68 +++++++++---------- .../python-modules/torch/prefetch.sh | 11 +-- 3 files changed, 42 insertions(+), 41 deletions(-) diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix index 5badb88d3750..ac83f1015726 100644 --- a/pkgs/development/python-modules/torch/bin.nix +++ b/pkgs/development/python-modules/torch/bin.nix @@ -20,7 +20,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "1.11.0"; + version = "1.12.1"; in buildPythonPackage { inherit version; @@ -68,7 +68,7 @@ in buildPythonPackage { pythonImportsCheck = [ "torch" ]; meta = with lib; { - description = "Open source, prototype-to-production deep learning platform"; + description = "PyTorch: Tensors and Dynamic neural networks in Python with strong GPU acceleration"; homepage = "https://pytorch.org/"; changelog = "https://github.com/pytorch/pytorch/releases/tag/v${version}"; # Includes CUDA and Intel MKL, but redistributions of the binary are not limited. diff --git a/pkgs/development/python-modules/torch/binary-hashes.nix b/pkgs/development/python-modules/torch/binary-hashes.nix index fccc7ce642e7..2169e1873b0b 100644 --- a/pkgs/development/python-modules/torch/binary-hashes.nix +++ b/pkgs/development/python-modules/torch/binary-hashes.nix @@ -6,61 +6,61 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "1.11.0" = { + "1.12.1" = { x86_64-linux-37 = { - name = "torch-1.11.0-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torch-1.11.0%2Bcu113-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-9WMzRw2uo8lweLN2B+ADXMz3L8XDb9hFRuGkuNmUTys="; + name = "torch-1.12.1-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torch-1.12.1%2Bcu116-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-/JtHhuxUvmfqqLDHyZmeL0riuJocGOQd4VFaGQRAxpE="; }; x86_64-linux-38 = { - name = "torch-1.11.0-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torch-1.11.0%2Bcu113-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-tqeZvbbuPZFOXmK920J21KECSMGvTy0hdzjl+e4nSFs="; + name = "torch-1.12.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torch-1.12.1%2Bcu116-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-3aMSkBIgiVCHzIPTZlRko9wXHQRGDGHDGvRj77+1SJY="; }; x86_64-linux-39 = { - name = "torch-1.11.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torch-1.11.0%2Bcu113-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-6RJrCl2VcEvuQKnQ7xy9gtjceGPkY4o3a+9wLf1lk3A="; + name = "torch-1.12.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torch-1.12.1%2Bcu116-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-dyVCDavr/K9EmE7c4yg+6pH5jw99WHS8aMehZL2BJuM="; }; x86_64-linux-310 = { - name = "torch-1.11.0-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torch-1.11.0%2Bcu113-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-powzZXpUYTHrm8ROKpjS+nBKr66GFGCwUbgoE4Usy0Q="; + name = "torch-1.12.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torch-1.12.1%2Bcu116-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-trwxJEqigYkp+7MMSDwiHfRx6dhW6AXFof9ysTGunns="; }; x86_64-darwin-37 = { - name = "torch-1.11.0-cp37-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp37-none-macosx_10_9_x86_64.whl"; - hash = "sha256-aGCx0b8LsLZ6a9R/haDkyCW1GO6hO11hAZmdu8vVvAw="; + name = "torch-1.12.1-cp37-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp37-none-macosx_10_9_x86_64.whl"; + hash = "sha256-ijSi+7qgfJIeGyA/WdPW4A7TefKzhERXc70U4yiltsg="; }; x86_64-darwin-38 = { - name = "torch-1.11.0-cp38-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp38-none-macosx_10_9_x86_64.whl"; - hash = "sha256-DMyFzQYiej7fgJ4seV/Vdiw9Too4tcn3RMbnz4QTYbs="; + name = "torch-1.12.1-cp38-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp38-none-macosx_10_9_x86_64.whl"; + hash = "sha256-qDILqa2H6AylpqAW5GraTRugxUYm4TXZmyEppFQcUJ0="; }; x86_64-darwin-39 = { - name = "torch-1.11.0-cp39-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp39-none-macosx_10_9_x86_64.whl"; - hash = "sha256-UP2b+FxXjIccKPHLCs6d/GAkQBx/OZsXT7DzcImfRFQ="; + name = "torch-1.12.1-cp39-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp39-none-macosx_10_9_x86_64.whl"; + hash = "sha256-v+woQ9qmVPBP2iO6gjrwPntvdlCoc823JnUtDjcY2to="; }; x86_64-darwin-310 = { - name = "torch-1.11.0-cp310-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp39-none-macosx_10_9_x86_64.whl"; - hash = "sha256-UP2b+FxXjIccKPHLCs6d/GAkQBx/OZsXT7DzcImfRFQ="; + name = "torch-1.12.1-cp310-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp310-none-macosx_10_9_x86_64.whl"; + hash = "sha256-l2w/mXzqOO6RoN08OkIyJ4VBR0jRdh75JreJ36l8YTQ="; }; aarch64-darwin-38 = { - name = "torch-1.11.0-cp38-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp38-none-macosx_11_0_arm64.whl"; - hash = "sha256-wVVOSddPGyw+cgLXcFa6LddGVDdYW6xkBitYD3FKROk="; + name = "torch-1.12.1-cp38-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp38-none-macosx_11_0_arm64.whl"; + hash = "sha256-A+McN3Edss0gHgLeWCbeh1Up5FpVYx0xeq3OLx7UWqg="; }; aarch64-darwin-39 = { - name = "torch-1.11.0-cp39-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp39-none-macosx_11_0_arm64.whl"; - hash = "sha256-DkivZq11Xw+cXyZkAopBT1fEnWrcN+d+Bv4ABNpO22E="; + name = "torch-1.12.1-cp39-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp39-none-macosx_11_0_arm64.whl"; + hash = "sha256-af4srnw5zK3WWhI3k9MODbiB8cGSeUVRnFwXMjExQ34="; }; aarch64-darwin-310 = { - name = "torch-1.11.0-cp310-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp39-none-macosx_11_0_arm64.whl"; - hash = "sha256-DkivZq11Xw+cXyZkAopBT1fEnWrcN+d+Bv4ABNpO22E="; + name = "torch-1.12.1-cp310-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp310-none-macosx_11_0_arm64.whl"; + hash = "sha256-aBBORxWlXEuymoXGqNV9gg4HV9o2O+G6aA+ozFvhe1I="; }; }; } diff --git a/pkgs/development/python-modules/torch/prefetch.sh b/pkgs/development/python-modules/torch/prefetch.sh index 31aae438dc56..78151ae787a5 100755 --- a/pkgs/development/python-modules/torch/prefetch.sh +++ b/pkgs/development/python-modules/torch/prefetch.sh @@ -5,14 +5,15 @@ set -eou pipefail version=$1 -linux_bucket="https://download.pytorch.org/whl/cu113" +linux_cuda_version="cu116" +linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" darwin_bucket="https://download.pytorch.org/whl/cpu" url_and_key_list=( - "x86_64-linux-37 $linux_bucket/torch-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torch-${version}-cp37-cp37m-linux_x86_64.whl" - "x86_64-linux-38 $linux_bucket/torch-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl" - "x86_64-linux-39 $linux_bucket/torch-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl" - "x86_64-linux-310 $linux_bucket/torch-${version}%2Bcu113-cp310-cp310-linux_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl" + "x86_64-linux-37 $linux_bucket/torch-${version}%2B${linux_cuda_version}-cp37-cp37m-linux_x86_64.whl torch-${version}-cp37-cp37m-linux_x86_64.whl" + "x86_64-linux-38 $linux_bucket/torch-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl" + "x86_64-linux-39 $linux_bucket/torch-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-310 $linux_bucket/torch-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl" "x86_64-darwin-37 $darwin_bucket/torch-${version}-cp37-none-macosx_10_9_x86_64.whl torch-${version}-cp37-none-macosx_10_9_x86_64.whl" "x86_64-darwin-38 $darwin_bucket/torch-${version}-cp38-none-macosx_10_9_x86_64.whl torch-${version}-cp38-none-macosx_10_9_x86_64.whl" "x86_64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_10_9_x86_64.whl torch-${version}-cp39-none-macosx_10_9_x86_64.whl" From 8d3b89d030e6a3d5df80c8f61a8f72f1ba26caa1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 30 Aug 2022 22:35:44 +0200 Subject: [PATCH 42/45] python3Packages.torchaudio: 0.11.0 -> 0.12.1 https://github.com/pytorch/audio/releases/tag/v0.12.0 https://github.com/pytorch/audio/releases/tag/v0.12.1 --- .../python-modules/torchaudio/bin.nix | 2 +- .../torchaudio/binary-hashes.nix | 68 +++++++++---------- .../python-modules/torchaudio/prefetch.sh | 25 +++---- 3 files changed, 48 insertions(+), 47 deletions(-) diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index aabec0a8d497..7388bbc7d26f 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "torchaudio"; - version = "0.11.0"; + version = "0.12.1"; format = "wheel"; src = diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix index 2cd39f3a9142..8731c63787cf 100644 --- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -6,61 +6,61 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "0.11.0" = { + "0.12.1" = { x86_64-linux-37 = { - name = "torchaudio-0.11.0-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torchaudio-0.11.0%2Bcu113-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-AdqgntXh2rTD7rBePshFAQ2tVl7b+734wG4r471/Y2U="; + name = "torchaudio-0.12.1-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torchaudio-0.12.1%2Bcu116-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-8Z72lazhnV2ZBtnvpdm5ZHhiyE/wHwEpQ9UzZoi//mw="; }; x86_64-linux-38 = { - name = "torchaudio-0.11.0-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torchaudio-0.11.0%2Bcu113-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-zuCHDpz3bkOUjYWprqX9VXoUbXfR8Vhdf1VFfOUg8z4="; + name = "torchaudio-0.12.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torchaudio-0.12.1%2Bcu116-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-CCtZ6eUhs/6kaoU0HwDDaK4JTSFKkVJF+OMAu368Zno="; }; x86_64-linux-39 = { - name = "torchaudio-0.11.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torchaudio-0.11.0%2Bcu113-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-btI9TpsOjeLnIz6J56avNv4poJTpXjjhDbMy6+ZFQvI="; + name = "torchaudio-0.12.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torchaudio-0.12.1%2Bcu116-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-pNa5fV9vC1cXeDLhHTCscO7RO2lst2Vmm0K7NzINqgw="; }; x86_64-linux-310 = { - name = "torchaudio-0.11.0-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torchaudio-0.11.0%2Bcu113-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-Zk+AWytEXfJ+HM69BAPhVsvN6pgQwC6uaW7Xux2row4="; + name = "torchaudio-0.12.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torchaudio-0.12.1%2Bcu116-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-KdeBVGBQ1lQxXxCQGwX17E1iptMis0Rfex++o4JmVog="; }; x86_64-darwin-37 = { - name = "torchaudio-0.11.0-cp37-cp37m-macosx_10_15_x86_64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp37-cp37m-macosx_10_15_x86_64.whl"; - hash = "sha256-uaTT4athEWHAZe0hBoBIM/9LhfZNhAIexZBGg2MWn50="; + name = "torchaudio-0.12.1-cp37-cp37m-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.12.1-cp37-cp37m-macosx_10_9_x86_64.whl"; + hash = "sha256-I9vPN68vQdSRwDN8qUUB7H71iK2xdm4esoAz+sVJu9k="; }; x86_64-darwin-38 = { - name = "torchaudio-0.11.0-cp38-cp38-macosx_10_15_x86_64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp38-cp38-macosx_10_15_x86_64.whl"; - hash = "sha256-9OndqejTzgu9XnkZJiGfUFS4uFNlx5vi7pAzOs+a2/w="; + name = "torchaudio-0.12.1-cp38-cp38-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.12.1-cp38-cp38-macosx_10_9_x86_64.whl"; + hash = "sha256-pMjBWx6BCpO7d7J/pJFZvqIlO1k++UA5lG7Emu9Rdk8="; }; x86_64-darwin-39 = { - name = "torchaudio-0.11.0-cp39-cp39-macosx_10_15_x86_64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp39-cp39-macosx_10_15_x86_64.whl"; - hash = "sha256-cNi8B/J3YI0jqaoI2z+68DVmAlS8EtmzYWQMRVZ3dVk="; + name = "torchaudio-0.12.1-cp39-cp39-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.12.1-cp39-cp39-macosx_10_9_x86_64.whl"; + hash = "sha256-CPkrxTaC07rYYG3ttwpJ5aD3z5MGyRc/B027qXeFRC4="; }; x86_64-darwin-310 = { - name = "torchaudio-0.11.0-cp310-cp310-macosx_10_15_x86_64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp310-cp310-macosx_10_15_x86_64.whl"; - hash = "sha256-g2Pj2wqK9YIP19O/g5agryPcgiHJqdS2Di44mAVJKUQ="; + name = "torchaudio-0.12.1-cp310-cp310-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.12.1-cp310-cp310-macosx_10_9_x86_64.whl"; + hash = "sha256-3BOL7gayMFRC/BMhcfKgHV9CUJ6qIb34fD0mpvSgn90="; }; aarch64-darwin-38 = { - name = "torchaudio-0.11.0-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-MX/Y7Dn92zrx2tkGWTuezcPt9o5/V4DEL43pVlha5IA="; + name = "torchaudio-0.12.1-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-0.12.1-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-g8CLcabcjiPB17AHgKu55MKVKOR6bmRP497nrCJjgh4="; }; aarch64-darwin-39 = { - name = "torchaudio-0.11.0-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-5eVRP83VeHAGGWW++/B2V4eyX0mcPgC1j02ETkQYMXc="; + name = "torchaudio-0.12.1-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-0.12.1-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-L8WivI6KrUdbxRnzyCuWSeFLXGV0h/+nEs98UUFD6dc="; }; aarch64-darwin-310 = { - name = "torchaudio-0.11.0-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-06OyzOuV8E7ZNtozvFO9Zm2rBxWnnbM65HGYUiQdwtI="; + name = "torchaudio-0.12.1-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-0.12.1-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-HYH3GDfV1b5lHoXKn6k3fstFE7ASnd+wJVQOHCQG0+Y="; }; }; } diff --git a/pkgs/development/python-modules/torchaudio/prefetch.sh b/pkgs/development/python-modules/torchaudio/prefetch.sh index 294c917e0d17..72b919c479dd 100755 --- a/pkgs/development/python-modules/torchaudio/prefetch.sh +++ b/pkgs/development/python-modules/torchaudio/prefetch.sh @@ -5,21 +5,22 @@ set -eou pipefail version=$1 -linux_bucket="https://download.pytorch.org/whl/cu113" +linux_cuda_version="cu116" +linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" darwin_bucket="https://download.pytorch.org/whl" url_and_key_list=( - "x86_64-linux-37 $linux_bucket/torchaudio-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torchaudio-${version}-cp37-cp37m-linux_x86_64.whl" - "x86_64-linux-38 $linux_bucket/torchaudio-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl" - "x86_64-linux-39 $linux_bucket/torchaudio-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl" - "x86_64-linux-310 $linux_bucket/torchaudio-${version}%2Bcu113-cp310-cp310-linux_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl" - "x86_64-darwin-37 $darwin_bucket/torchaudio-${version}-cp37-cp37m-macosx_10_15_x86_64.whl torchaudio-${version}-cp37-cp37m-macosx_10_15_x86_64.whl" - "x86_64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_10_15_x86_64.whl torchaudio-${version}-cp38-cp38-macosx_10_15_x86_64.whl" - "x86_64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_10_15_x86_64.whl torchaudio-${version}-cp39-cp39-macosx_10_15_x86_64.whl" - "x86_64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_10_15_x86_64.whl torchaudio-${version}-cp310-cp310-macosx_10_15_x86_64.whl" - "aarch64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl" - "aarch64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl" - "aarch64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl" + "x86_64-linux-37 $linux_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp37-cp37m-linux_x86_64.whl torchaudio-${version}-cp37-cp37m-linux_x86_64.whl" + "x86_64-linux-38 $linux_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl" + "x86_64-linux-39 $linux_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-310 $linux_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl" + "x86_64-darwin-37 $darwin_bucket/torchaudio-${version}-cp37-cp37m-macosx_10_9_x86_64.whl torchaudio-${version}-cp37-cp37m-macosx_10_9_x86_64.whl" + "x86_64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_10_9_x86_64.whl torchaudio-${version}-cp38-cp38-macosx_10_9_x86_64.whl" + "x86_64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_10_9_x86_64.whl torchaudio-${version}-cp39-cp39-macosx_10_9_x86_64.whl" + "x86_64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_10_9_x86_64.whl torchaudio-${version}-cp310-cp310-macosx_10_9_x86_64.whl" + "aarch64-darwin-38 $darwin_bucket/cpu/torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl" + "aarch64-darwin-39 $darwin_bucket/cpu/torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl" + "aarch64-darwin-310 $darwin_bucket/cpu/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl" ) hashfile=binary-hashes-"$version".nix From 5863492c519eeea7f4caabddcefc2617a873a931 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 30 Aug 2022 22:42:19 +0200 Subject: [PATCH 43/45] python3Packages.torchvision-bin: 1.12.0 -> 1.13.1 https://github.com/pytorch/vision/releases/tag/v0.13.0 https://github.com/pytorch/vision/releases/tag/v0.13.1 --- .../python-modules/torchvision/bin.nix | 2 +- .../torchvision/binary-hashes.nix | 68 +++++++++---------- .../python-modules/torchvision/prefetch.sh | 17 ++--- 3 files changed, 44 insertions(+), 43 deletions(-) diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index 2abf60009f9e..e1a0055af260 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -16,7 +16,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.12.0"; + version = "0.13.1"; in buildPythonPackage { inherit version; diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index 4dbeb8d18150..9b6301bab2c3 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -6,61 +6,61 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "0.12.0" = { + "0.13.1" = { x86_64-linux-37 = { - name = "torchvision-0.12.0-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torchvision-0.12.0%2Bcu113-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-i/qktZT+5HQYQjtTHtxOV751DcsP9AHMsSV9/svsGzA="; + name = "torchvision-0.13.1-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torchvision-0.13.1%2Bcu116-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-3PMvbZmEk+duwho4u7hWt0Ailc96Z/sJzlvefn5yV1Y="; }; x86_64-linux-38 = { - name = "torchvision-0.12.0-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torchvision-0.12.0%2Bcu113-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-NxM+jFsOwvAZmeWRFvbQ422a+xx/j1i9DD3ImW+DVBk="; + name = "torchvision-0.13.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torchvision-0.13.1%2Bcu116-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-w86ys/RW8MmEr3HvVfhjfxeKKdw+E6ZvuwEM7q0okeE="; }; x86_64-linux-39 = { - name = "torchvision-0.12.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torchvision-0.12.0%2Bcu113-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-bGO5q+KEnv7SexmbbUWaIbsBcIxyDbL8pevZQbLwDbg="; + name = "torchvision-0.13.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torchvision-0.13.1%2Bcu116-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-dZhqvlchOCWOuXlctM1z9Asr34N0/voa9v9rsNvJcsY="; }; x86_64-linux-310 = { - name = "torchvision-0.12.0-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torchvision-0.12.0%2Bcu113-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-ocsGOHa967HcZGV+1omD/xMHufmoi166Yg2Hr+SEhfE="; + name = "torchvision-0.13.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torchvision-0.13.1%2Bcu116-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-DJorYFrDD89HXWD3m6N4rwBzoi3lhUU/jD3WwUUqubw="; }; x86_64-darwin-37 = { - name = "torchvision-0.12.0-cp37-cp37m-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp37-cp37m-macosx_10_9_x86_64.whl"; - hash = "sha256-GJM7xZf0VjmTJJcZqWqV28fTN0yQ+7MNPafVGPOv60I="; + name = "torchvision-0.13.1-cp37-cp37m-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchvision-0.13.1-cp37-cp37m-macosx_10_9_x86_64.whl"; + hash = "sha256-XmMSQb7jZh3mT4NhZlYiSvLjUS6yWA2nwI4IuMllqKw="; }; x86_64-darwin-38 = { - name = "torchvision-0.12.0-cp38-cp38-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp38-cp38-macosx_10_9_x86_64.whl"; - hash = "sha256-DWAuCb1Fc2/y55aOjduw7s6Vb/ltcVSLGxtIeP33S9g="; + name = "torchvision-0.13.1-cp38-cp38-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchvision-0.13.1-cp38-cp38-macosx_10_9_x86_64.whl"; + hash = "sha256-8jChpA7XDVHkY85D3yQ+xSCQL4cl3iUC5IXvxe6p2GQ="; }; x86_64-darwin-39 = { - name = "torchvision-0.12.0-cp39-cp39-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp39-cp39-macosx_10_9_x86_64.whl"; - hash = "sha256-RMye+ZLS4qtjsIg/fezrwiRNupO3JUe6EfV6yEUvbq0="; + name = "torchvision-0.13.1-cp39-cp39-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchvision-0.13.1-cp39-cp39-macosx_10_9_x86_64.whl"; + hash = "sha256-Api647Caw2GGYIhDQAjYK5nWRY/oiIyN+Qcg70s0fUQ="; }; x86_64-darwin-310 = { - name = "torchvision-0.12.0-cp310-cp310-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp310-cp310-macosx_10_9_x86_64.whl"; - hash = "sha256-aTZW5nkLarIeSm6H6BwpgrrZ5FW16yThS7ZyOC7GEw8="; + name = "torchvision-0.13.1-cp310-cp310-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchvision-0.13.1-cp310-cp310-macosx_10_9_x86_64.whl"; + hash = "sha256-GShqczxp3L1Be4Z5PfgHvSJ9tXhu14fBcpd0GpsND8c="; }; aarch64-darwin-38 = { - name = "torchvision-0.12.0-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-n0JCD38LKc09YXdt8xV4JyV6DPFrLAJ3bcFslquxJW0="; + name = "torchvision-0.13.1-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.13.1-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-6aVjiU+fpAaS4k0apYw+8EBFABfP7TWY/5Y39ATz/js="; }; aarch64-darwin-39 = { - name = "torchvision-0.12.0-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-adgvR7Z7rW3cu4eDO6WVCmwnG6l7quTAlVYQBxvwNPU="; + name = "torchvision-0.13.1-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.13.1-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-xe1gnIvIjFdSJkALIjLgMJCUR3yCrziVLgNz7e8AA/0="; }; aarch64-darwin-310 = { - name = "torchvision-0.12.0-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-oL5FAcoLobGVZEySQ/SaHEmiblKn83kkxCOdC/XsvY0="; + name = "torchvision-0.13.1-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.13.1-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-CPWS6mGDbr7Otcl/TXqBO519xlG7985EAVY8z65qIfw="; }; }; } diff --git a/pkgs/development/python-modules/torchvision/prefetch.sh b/pkgs/development/python-modules/torchvision/prefetch.sh index 5f38bce8d8b3..44a9ba8ece5a 100755 --- a/pkgs/development/python-modules/torchvision/prefetch.sh +++ b/pkgs/development/python-modules/torchvision/prefetch.sh @@ -5,21 +5,22 @@ set -eou pipefail version=$1 -linux_bucket="https://download.pytorch.org/whl/cu113" +linux_cuda_version="cu116" +linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" darwin_bucket="https://download.pytorch.org/whl" url_and_key_list=( - "x86_64-linux-37 $linux_bucket/torchvision-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torchvision-${version}-cp37-cp37m-linux_x86_64.whl" - "x86_64-linux-38 $linux_bucket/torchvision-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torchvision-${version}-cp38-cp38-linux_x86_64.whl" - "x86_64-linux-39 $linux_bucket/torchvision-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl" - "x86_64-linux-310 $linux_bucket/torchvision-${version}%2Bcu113-cp310-cp310-linux_x86_64.whl torchvision-${version}-cp310-cp310-linux_x86_64.whl" + "x86_64-linux-37 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp37-cp37m-linux_x86_64.whl torchvision-${version}-cp37-cp37m-linux_x86_64.whl" + "x86_64-linux-38 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torchvision-${version}-cp38-cp38-linux_x86_64.whl" + "x86_64-linux-39 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-310 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchvision-${version}-cp310-cp310-linux_x86_64.whl" "x86_64-darwin-37 $darwin_bucket/torchvision-${version}-cp37-cp37m-macosx_10_9_x86_64.whl torchvision-${version}-cp37-cp37m-macosx_10_9_x86_64.whl" "x86_64-darwin-38 $darwin_bucket/torchvision-${version}-cp38-cp38-macosx_10_9_x86_64.whl torchvision-${version}-cp38-cp38-macosx_10_9_x86_64.whl" "x86_64-darwin-39 $darwin_bucket/torchvision-${version}-cp39-cp39-macosx_10_9_x86_64.whl torchvision-${version}-cp39-cp39-macosx_10_9_x86_64.whl" "x86_64-darwin-310 $darwin_bucket/torchvision-${version}-cp310-cp310-macosx_10_9_x86_64.whl torchvision-${version}-cp310-cp310-macosx_10_9_x86_64.whl" - "aarch64-darwin-38 $darwin_bucket/torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl" - "aarch64-darwin-39 $darwin_bucket/torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl" - "aarch64-darwin-310 $darwin_bucket/torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl" + "aarch64-darwin-38 $darwin_bucket/cpu/torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl" + "aarch64-darwin-39 $darwin_bucket/cpu/torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl" + "aarch64-darwin-310 $darwin_bucket/cpu/torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl" ) hashfile="binary-hashes-$version.nix" From aba6cd17c4785a82e6261cc00316cf97862a1ed2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 30 Aug 2022 23:22:16 +0200 Subject: [PATCH 44/45] python3Packages.torchvision: 1.13.0 -> 1.13.1 https://github.com/pytorch/vision/releases/tag/v0.13.1 --- pkgs/development/python-modules/torchvision/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 594aee03431e..c44413ba4948 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -24,13 +24,13 @@ let cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" torch.cudaArchList; in buildPythonPackage rec { pname = "torchvision"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "pytorch"; repo = "vision"; rev = "refs/tags/v${version}"; - sha256 = "sha256-nIE1HvmAhRh3Hvj3qlF52sN9LGIorLiXlLtN7tzQxqU="; + hash = "sha256-QlUAFAG6zEDCDSXR5n2CznspU3fT0kbqySzofGLPgK4="; }; nativeBuildInputs = [ libpng ninja which ] From 9c48988907a45f28f6e042e30cac4a79ef8be117 Mon Sep 17 00:00:00 2001 From: maralorn Date: Thu, 1 Sep 2022 01:17:27 +0200 Subject: [PATCH 45/45] maintainers: Update maralorn --- maintainers/maintainer-list.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e3a9f6cb1506..b6192f78a8bf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8068,11 +8068,11 @@ name = "Michael Fellinger"; }; maralorn = { - email = "malte.brandy@maralorn.de"; + email = "mail@maralorn.de"; matrix = "@maralorn:maralorn.de"; github = "maralorn"; githubId = 1651325; - name = "Malte Brandy"; + name = "maralorn"; }; marcweber = { email = "marco-oweber@gmx.de";