From e368c70817cee56bd87a1d8dcc7fd44454e499aa Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 23 Jan 2023 00:18:41 +0100 Subject: [PATCH 01/39] openvpn_24: remove EOL in March (https://community.openvpn.net/openvpn/wiki/SupportedVersions) --- pkgs/tools/networking/openvpn/default.nix | 7 ------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 65e20ca67774..0ef5076eaf99 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -5,7 +5,6 @@ , iproute2 , lzo , openssl -, openssl_1_1 , pam , useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd @@ -74,12 +73,6 @@ let in { - openvpn_24 = generic { - version = "2.4.12"; - sha256 = "1vjx82nlkxrgzfiwvmmlnz8ids5m2fiqz7scy1smh3j9jnf2v5b6"; - extraBuildInputs = [ openssl_1_1 ]; - }; - openvpn = generic { version = "2.5.8"; sha256 = "1cixqm4gn2d1v8qkbww75j30fzvxz13gc7whcmz54i0x4fvibwx6"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 39f375fa9947..82b2ea4409ad 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1087,6 +1087,7 @@ mapAliases ({ opensans-ttf = throw "'opensans-ttf' has been renamed to/replaced by 'open-sans'"; # Converted to throw 2022-02-22 openssh_with_kerberos = throw "'openssh_with_kerberos' has been renamed to/replaced by 'openssh'"; # Converted to throw 2022-02-22 openssl_3_0 = openssl_3; # Added 2022-06-27 + openvpn_24 = throw "openvpn_24 has been removed, because it went EOL. 2.5.x or newer is still available"; # Added 2023-01-23 orchis = orchis-theme; # Added 2021-06-09 osxfuse = macfuse-stubs; # Added 2021-03-20 otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # Added 2020-02-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1fc6d073d097..4381d8de0b98 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10358,7 +10358,6 @@ with pkgs; opentsdb = callPackage ../tools/misc/opentsdb {}; inherit (callPackages ../tools/networking/openvpn {}) - openvpn_24 openvpn; openvpn3 = callPackage ../tools/networking/openvpn3 { }; From 0289bacdfd818182f465c0176b9ce01b5e876a28 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 2 Jan 2023 22:54:46 +0100 Subject: [PATCH 02/39] teeworlds: add Luflosi as maintainer --- pkgs/games/teeworlds/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index b0a49cc77d1f..5a7966c441d8 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { homepage = "https://teeworlds.com/"; license = "BSD-style, see `license.txt'"; - maintainers = with lib.maintainers; [ astsmtl ]; + maintainers = with lib.maintainers; [ astsmtl Luflosi ]; platforms = lib.platforms.linux; }; } From 38cb19ace8a96996956034fcd9c66d74fb8842d2 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Thu, 29 Dec 2022 21:47:32 +0100 Subject: [PATCH 03/39] teeworlds: build on macOS --- pkgs/games/teeworlds/default.nix | 45 ++++++++++++++++--- .../rename-VERSION-to-VERSION.txt.patch | 33 ++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 75 insertions(+), 7 deletions(-) create mode 100644 pkgs/games/teeworlds/rename-VERSION-to-VERSION.txt.patch diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 5a7966c441d8..e12c19f6cb6a 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -1,6 +1,8 @@ { fetchFromGitHub, lib, stdenv, cmake, pkg-config, python3, alsa-lib , libX11, libGLU, SDL2, lua5_3, zlib, freetype, wavpack, icoutils , nixosTests +, Carbon +, Cocoa }: stdenv.mkDerivation rec { @@ -15,26 +17,57 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # Can't use fetchpatch or fetchpatch2 because of https://github.com/NixOS/nixpkgs/issues/32084 + # Using fetchurl instead is also not a good idea, see https://github.com/NixOS/nixpkgs/issues/32084#issuecomment-727223713 + ./rename-VERSION-to-VERSION.txt.patch + ]; + postPatch = '' # set compiled-in DATA_DIR so resources can be found substituteInPlace src/engine/shared/storage.cpp \ --replace '#define DATA_DIR "data"' \ '#define DATA_DIR "${placeholder "out"}/share/teeworlds/data"' + + # Quote nonsense is a workaround for https://github.com/NixOS/nix/issues/661 + substituteInPlace 'other/bundle/client/Info.plist.in' \ + --replace ${"'"}''${TARGET_CLIENT}' 'teeworlds' \ + --replace ${"'"}''${PROJECT_VERSION}' '${version}' ''; - nativeBuildInputs = [ cmake pkg-config icoutils ]; - - buildInputs = [ - python3 alsa-lib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack + nativeBuildInputs = [ + cmake + pkg-config + ] ++ lib.optionals stdenv.isLinux [ + icoutils ]; - postInstall = '' + buildInputs = [ + python3 libGLU SDL2 lua5_3 zlib freetype wavpack + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + libX11 + ] ++ lib.optionals stdenv.isDarwin [ + Carbon + Cocoa + ]; + + postInstall = lib.optionalString stdenv.isLinux '' # Convert and install desktop icon mkdir -p $out/share/pixmaps icotool --extract --index 1 --output $out/share/pixmaps/teeworlds.png $src/other/icons/teeworlds.ico # Install menu item install -D $src/other/teeworlds.desktop $out/share/applications/teeworlds.desktop + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p "$out/Applications/teeworlds.app/Contents/MacOS" + mkdir -p "$out/Applications/teeworlds.app/Contents/Resources" + + cp '../other/icons/teeworlds.icns' "$out/Applications/teeworlds.app/Contents/Resources/" + cp '../other/bundle/client/Info.plist.in' "$out/Applications/teeworlds.app/Contents/Info.plist" + cp '../other/bundle/client/PkgInfo' "$out/Applications/teeworlds.app/Contents/" + ln -s "$out/bin/teeworlds" "$out/Applications/teeworlds.app/Contents/MacOS/" + ln -s "$out/share/teeworlds/data" "$out/Applications/teeworlds.app/Contents/Resources/data" ''; passthru.tests.teeworlds = nixosTests.teeworlds; @@ -52,6 +85,6 @@ stdenv.mkDerivation rec { homepage = "https://teeworlds.com/"; license = "BSD-style, see `license.txt'"; maintainers = with lib.maintainers; [ astsmtl Luflosi ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/games/teeworlds/rename-VERSION-to-VERSION.txt.patch b/pkgs/games/teeworlds/rename-VERSION-to-VERSION.txt.patch new file mode 100644 index 000000000000..4d56286cb40a --- /dev/null +++ b/pkgs/games/teeworlds/rename-VERSION-to-VERSION.txt.patch @@ -0,0 +1,33 @@ +From 86d6687ef07f7f05457a7f67537b650656b13820 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert=20M=C3=BCller?= +Date: Fri, 15 Oct 2021 23:45:50 +0200 +Subject: [PATCH] rename VERSION to VERSION.txt: + +Fixes compilation on systems with case insensitive file names where the standard library includes the version file source code. +--- + src/engine/external/json-parser/{VERSION => VERSION.txt} | 0 + src/engine/external/pnglite/{VERSION => VERSION.txt} | 0 + src/engine/external/wavpack/{VERSION => VERSION.txt} | 0 + src/engine/external/zlib/{VERSION => VERSION.txt} | 0 + 4 files changed, 0 insertions(+), 0 deletions(-) + rename src/engine/external/json-parser/{VERSION => VERSION.txt} (100%) + rename src/engine/external/pnglite/{VERSION => VERSION.txt} (100%) + rename src/engine/external/wavpack/{VERSION => VERSION.txt} (100%) + rename src/engine/external/zlib/{VERSION => VERSION.txt} (100%) + +diff --git a/src/engine/external/json-parser/VERSION b/src/engine/external/json-parser/VERSION.txt +similarity index 100% +rename from src/engine/external/json-parser/VERSION +rename to src/engine/external/json-parser/VERSION.txt +diff --git a/src/engine/external/pnglite/VERSION b/src/engine/external/pnglite/VERSION.txt +similarity index 100% +rename from src/engine/external/pnglite/VERSION +rename to src/engine/external/pnglite/VERSION.txt +diff --git a/src/engine/external/wavpack/VERSION b/src/engine/external/wavpack/VERSION.txt +similarity index 100% +rename from src/engine/external/wavpack/VERSION +rename to src/engine/external/wavpack/VERSION.txt +diff --git a/src/engine/external/zlib/VERSION b/src/engine/external/zlib/VERSION.txt +similarity index 100% +rename from src/engine/external/zlib/VERSION +rename to src/engine/external/zlib/VERSION.txt diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6178f6beed0..14785884bf2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35402,7 +35402,9 @@ with pkgs; teetertorture = callPackage ../games/teetertorture { }; - teeworlds = callPackage ../games/teeworlds { }; + teeworlds = callPackage ../games/teeworlds { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + }; tengine = callPackage ../servers/http/tengine { openssl = openssl_1_1; From 599f669e996799990b5ce409f70e0d3e8646235a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Jan 2023 10:49:42 +0100 Subject: [PATCH 04/39] python310Packages.types-docutils: 0.19.1.1 -> 0.19.1.2 --- pkgs/development/python-modules/types-docutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-docutils/default.nix b/pkgs/development/python-modules/types-docutils/default.nix index af33403ee7fc..31906b220af2 100644 --- a/pkgs/development/python-modules/types-docutils/default.nix +++ b/pkgs/development/python-modules/types-docutils/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-docutils"; - version = "0.19.1.1"; + version = "0.19.1.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-vgpRuhx90hXZ0t9m1oReY8EAm0u/TFvrh6DZdFzbqWI="; + hash = "sha256-yj0hNUhK21LdBCu929bt3LvajGCLo/Xl+Qi9VI/8s5k="; }; # Module doesn't have tests From 48846b36296de81dd8db5d17c03757bafaffbef2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Jan 2023 10:50:56 +0100 Subject: [PATCH 05/39] python310Packages.types-python-dateutil: 2.8.19.5 -> 2.8.19.6 --- .../python-modules/types-python-dateutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-python-dateutil/default.nix b/pkgs/development/python-modules/types-python-dateutil/default.nix index 39430b92140d..e671b91bb979 100644 --- a/pkgs/development/python-modules/types-python-dateutil/default.nix +++ b/pkgs/development/python-modules/types-python-dateutil/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-python-dateutil"; - version = "2.8.19.5"; + version = "2.8.19.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-q5H8X3FffXbZpQ09100MaN/jilTwI5z6BQZXWuTYep0="; + hash = "sha256-Sm9MwZzkuhoIZwhx4pe/OAL1XU8SnmqiRD9UC2z4A9I="; }; # Modules doesn't have tests From dca5821f54e2e5378b1934f0fd9de7500861937c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 26 Jan 2023 11:18:26 -0800 Subject: [PATCH 06/39] igraph: 0.10.3 -> 0.10.4 Diff: https://github.com/igraph/igraph/compare/0.10.3...0.10.4 Changelog: https://github.com/igraph/igraph/blob/0.10.4/CHANGELOG.md --- pkgs/development/libraries/igraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 9aea9e545395..3ebba3c50d0f 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -26,13 +26,13 @@ assert (blas.isILP64 == lapack.isILP64 && stdenv.mkDerivation rec { pname = "igraph"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - hash = "sha256-+U8bo68Q6XX3p2sZiIChjidcRwA10gv9eWccRt4MoYM="; + hash = "sha256-LsTOxUktGZcp46Ec9QH3+9C+VADMYTZZCjKF1gp36xk="; }; postPatch = '' From b0ccd1d737d29e2afbc455124b694e9815a03ddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 27 Jan 2023 21:10:36 +0100 Subject: [PATCH 07/39] treewide: use more secure and proxy friendly https protocol to fetch from git.kernel.org --- pkgs/development/tools/ofono-phonesim/default.nix | 2 +- pkgs/os-specific/linux/blktrace/default.nix | 2 +- pkgs/os-specific/linux/error-inject/default.nix | 4 ++-- pkgs/os-specific/linux/libtraceevent/default.nix | 2 +- pkgs/os-specific/linux/libtracefs/default.nix | 2 +- pkgs/os-specific/linux/trace-cmd/default.nix | 2 +- pkgs/tools/misc/xfstests/default.nix | 2 +- pkgs/tools/networking/mmsd/default.nix | 2 +- pkgs/tools/networking/ofono/default.nix | 2 +- pkgs/tools/security/efitools/default.nix | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/pkgs/development/tools/ofono-phonesim/default.nix index c9728f9cbbf6..faa7b3eae900 100644 --- a/pkgs/development/tools/ofono-phonesim/default.nix +++ b/pkgs/development/tools/ofono-phonesim/default.nix @@ -11,7 +11,7 @@ mkDerivation { version = "unstable-2019-11-18"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/network/ofono/phonesim.git"; + url = "https://git.kernel.org/pub/scm/network/ofono/phonesim.git"; rev = "adf231a84cd3708b825dc82c56e841dd7e3b4541"; sha256 = "1840914sz46l8h2jwa0lymw6dvgj72wq9bhp3k4v4rk6masbf6hp"; }; diff --git a/pkgs/os-specific/linux/blktrace/default.nix b/pkgs/os-specific/linux/blktrace/default.nix index e44f90a36367..8ff4b16a1a53 100644 --- a/pkgs/os-specific/linux/blktrace/default.nix +++ b/pkgs/os-specific/linux/blktrace/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.3.0"; # Official source - # "git://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git" + # "https://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git" src = fetchurl { url = "https://brick.kernel.dk/snaps/blktrace-${version}.tar.bz2"; sha256 = "sha256-1t7aA4Yt4r0bG5+6cpu7hi2bynleaqf3yoa2VoEacNY="; diff --git a/pkgs/os-specific/linux/error-inject/default.nix b/pkgs/os-specific/linux/error-inject/default.nix index 87a40580deb7..f4a544172176 100644 --- a/pkgs/os-specific/linux/error-inject/default.nix +++ b/pkgs/os-specific/linux/error-inject/default.nix @@ -10,7 +10,7 @@ version = "4cbe46321b4a81365ff3aafafe63967264dbfec5"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git"; + url = "https://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git"; rev = version; sha256 = "0gjapg2hrlxp8ssrnhvc19i3r1xpcnql7xv0zjgbv09zyha08g6z"; }; @@ -40,7 +40,7 @@ version = "9bd5e2c7886fca72f139cd8402488a2235957d41"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/linux/kernel/git/gong.chen/aer-inject.git"; + url = "https://git.kernel.org/pub/scm/linux/kernel/git/gong.chen/aer-inject.git"; rev = version; sha256 = "0bh6mzpk2mr4xidkammmkfk21b4dbq793qjg25ryyxd1qv0c6cg4"; }; diff --git a/pkgs/os-specific/linux/libtraceevent/default.nix b/pkgs/os-specific/linux/libtraceevent/default.nix index c81949bf39a6..427f2eb69c49 100644 --- a/pkgs/os-specific/linux/libtraceevent/default.nix +++ b/pkgs/os-specific/linux/libtraceevent/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.6.2"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git"; + url = "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git"; rev = "libtraceevent-${version}"; sha256 = "sha256-iLy2rEKn0UJguRcY/W8RvUq7uX+snQojb/cXOmMsjwc="; }; diff --git a/pkgs/os-specific/linux/libtracefs/default.nix b/pkgs/os-specific/linux/libtracefs/default.nix index 588c99b5a339..3cb79ae07780 100644 --- a/pkgs/os-specific/linux/libtracefs/default.nix +++ b/pkgs/os-specific/linux/libtracefs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { version = "1.6.4"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git"; + url = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git"; rev = "libtracefs-${version}"; sha256 = "sha256-fWop0EMkoVulLBzU7q8x1IhMtdnEJ89wMz0cz964F6s="; }; diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index f408e6a95056..6b349e70656f 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "3.1.6"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/"; + url = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/"; rev = "trace-cmd-v${version}"; sha256 = "sha256-qjfeomeExjsx/6XrUaGm5szbL7XVlekGd4Hsuncv8NY="; }; diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index aec0bd62addd..11fb3f5b7045 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "2022.09.04"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git"; + url = "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git"; rev = "v${version}"; sha256 = "sha256-hPFoqNmB8pewvBN1nzVMkTrMHCo0xc8tmmIODaiDeRw="; }; diff --git a/pkgs/tools/networking/mmsd/default.nix b/pkgs/tools/networking/mmsd/default.nix index 120d1f19be2a..43891d612bb1 100644 --- a/pkgs/tools/networking/mmsd/default.nix +++ b/pkgs/tools/networking/mmsd/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "unstable-2019-07-15"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/network/ofono/mmsd.git"; + url = "https://git.kernel.org/pub/scm/network/ofono/mmsd.git"; rev = "f4b8b32477a411180be1823fdc460b4f7e1e3c9c"; sha256 = "0hcnpyhsi7b5m825dhnwbp65yi0961wi8mipzdvaw5nc693xv15b"; }; diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix index 3733998c10b1..2b8b09d174c6 100644 --- a/pkgs/tools/networking/ofono/default.nix +++ b/pkgs/tools/networking/ofono/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchgit { - url = "git://git.kernel.org/pub/scm/network/ofono/ofono.git"; + url = "https://git.kernel.org/pub/scm/network/ofono/ofono.git"; rev = version; sha256 = "sha256-T8rfReruvHGQCN9IDGIrFCoNjFKKMnUGPKzxo2HTZFQ="; }; diff --git a/pkgs/tools/security/efitools/default.nix b/pkgs/tools/security/efitools/default.nix index c9deb16ff441..59cb794d718e 100644 --- a/pkgs/tools/security/efitools/default.nix +++ b/pkgs/tools/security/efitools/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; src = fetchgit { - url = "git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git"; + url = "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git"; rev = "v${version}"; sha256 = "0jabgl2pxvfl780yvghq131ylpf82k7banjz0ksjhlm66ik8gb1i"; }; From 826442cc476fbac19e594902c8b09f8165041d0b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Jan 2023 21:47:51 +0000 Subject: [PATCH 08/39] talosctl: 1.3.2 -> 1.3.3 --- pkgs/applications/networking/cluster/talosctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 255ec944c8da..0d0d0ab08498 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - hash = "sha256-o037LemAZhsHVIfAU0yVoNNbJ6g8ehlA4lFLN78Q8dY="; + hash = "sha256-tkgWrNew0dLBPQ2G96RdFoFDyPm4nOwgkkH/3DpBnRg="; }; - vendorHash = "sha256-HPuVDfVxbHbNaCRg/D4VeW0finbFB4eageiAzoax1wk="; + vendorHash = "sha256-mFuXRMIzEf4bx9jnQlFwFBpBDVXQ99jz2OGojp1EEh0="; ldflags = [ "-s" "-w" ]; From 09550ba1aae16ce07f5a25b923de2aba1af8a835 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Jan 2023 03:01:26 +0000 Subject: [PATCH 09/39] kapowbang: 0.7.0 -> 0.7.1 --- pkgs/servers/kapowbang/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/kapowbang/default.nix b/pkgs/servers/kapowbang/default.nix index 81536ab143ad..7027d8a50c12 100644 --- a/pkgs/servers/kapowbang/default.nix +++ b/pkgs/servers/kapowbang/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kapowbang"; - version = "0.7.0"; + version = "0.7.1"; subPackages = [ "." ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "BBVA"; repo = "kapow"; rev = "v${version}"; - sha256 = "sha256-0ftdc3ol1g0WnZgicXl46Xpph4cUYk/G/eeu+9JnPyA="; + sha256 = "sha256-HUZ1Uf8Z2YbYvqKEUHckKAZ5q+C83zafi3UjemqHFM4="; }; - vendorSha256 = "sha256-41Jk3aTe4EA5dwkriEo48QNJg2k3T/R/8i8XWcURcG8="; + vendorHash = "sha256-vvC9l/6b7AIEmCMVdeKMyi9ThIcAzjtV+uaQ4oSJZuU="; doCheck = false; From 2b9695bc790d44cdeebef2a5e36d09ff4f2f55ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Jan 2023 03:43:35 +0000 Subject: [PATCH 10/39] belle-sip: 5.1.55 -> 5.2.16 --- pkgs/development/libraries/belle-sip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 8a5ed8f91f30..152572c6b16a 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "belle-sip"; - version = "5.1.55"; + version = "5.2.16"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-wMf570/RP2Q4yluedECs+AKoH92PQQ8yVY+eBGGSAP4="; + sha256 = "sha256-LMbQz22ENTT27jr9tGakzNjidC5nfCuLDMZ6sFwtRKI="; }; nativeBuildInputs = [ cmake ]; From 0b5c2008dedfebe30abf6cceb8c02132f073cc4c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 28 Jan 2023 13:42:33 +0800 Subject: [PATCH 11/39] python3Packages.python-rapidjson: disable check of overridden rapidjson --- pkgs/development/python-modules/python-rapidjson/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index 337abedc5f56..f2cd6d285b75 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -25,6 +25,8 @@ let hash = "sha256-BjSZEwfCXA/9V+kxQ/2JPWbc26jQn35CfN8+8NW24s4="; }) ]; + # valgrind_unittest failed + cmakeFlags = old.cmakeFlags ++ [ "-DCMAKE_CTEST_ARGUMENTS=-E;valgrind_unittest" ]; }); in buildPythonPackage rec { version = "1.9"; From 7876328375128861d54b2c0ab12991e1427c0ef9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Jan 2023 09:45:51 +0000 Subject: [PATCH 12/39] python310Packages.google-cloud-resource-manager: 1.8.0 -> 1.8.1 --- .../python-modules/google-cloud-resource-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index a4709e4db26e..b2aa7804b601 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.8.0"; + version = "1.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-O1g8NcpvQn+3eyD1yqZ43aM6+eubVQGzLAt9DuI2Aqc="; + hash = "sha256-npTv+f533JK/J2ceJ6Na7mS90HfKaHORmGnFz1LBzLQ="; }; propagatedBuildInputs = [ From e2abe48d457f58e7080fab58af3b222c9cae0f47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Jan 2023 15:57:42 +0000 Subject: [PATCH 13/39] python310Packages.pytest-subprocess: 1.4.2 -> 1.5.0 --- pkgs/development/python-modules/pytest-subprocess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-subprocess/default.nix b/pkgs/development/python-modules/pytest-subprocess/default.nix index 13621e68e21c..d3ea76b8a1bb 100644 --- a/pkgs/development/python-modules/pytest-subprocess/default.nix +++ b/pkgs/development/python-modules/pytest-subprocess/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytest-subprocess"; - version = "1.4.2"; + version = "1.5.0"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "aklajnert"; repo = "pytest-subprocess"; rev = "refs/tags/${version}"; - hash = "sha256-8Of3/RltijfF5MXtVazGzIqpmRIhreT26kLNjzXLF1k="; + hash = "sha256-u9d9RhbikOyknMWs18j2efYJb9YdHsQrp31LfcbudoA="; }; buildInputs = [ From 2be40c5713bc11f163ca49593bbd07ec9bb93416 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 28 Jan 2023 13:51:56 -0500 Subject: [PATCH 14/39] nix-update: 0.14.0 -> 0.15.0 Diff: https://github.com/Mic92/nix-update/compare/0.14.0...0.15.0 Changelog: https://github.com/Mic92/nix-update/releases/tag/0.15.0 --- pkgs/tools/package-management/nix-update/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index 2e20f1ad3dc2..a24fd43bc6fa 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -8,14 +8,14 @@ buildPythonApplication rec { pname = "nix-update"; - version = "0.14.0"; + version = "0.15.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - sha256 = "sha256-7HZ5LEQAhA1TXQZVfeUGOruwgqJBkSFtmDLR8PLSiOw="; + sha256 = "sha256-Q3yExefODBrrziRnCYETrJgSn42BOR7ZsL8pu3q5D/w="; }; makeWrapperArgs = [ From 44187e2a044a9458b13f44162a1981376737caa9 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 28 Jan 2023 15:19:25 -0500 Subject: [PATCH 15/39] nix-init: init at 0.1.0 --- pkgs/tools/nix/nix-init/default.nix | 60 +++++++++++++++++++++++++++++ pkgs/tools/nix/nix-init/license.nix | 23 +++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 85 insertions(+) create mode 100644 pkgs/tools/nix/nix-init/default.nix create mode 100644 pkgs/tools/nix/nix-init/license.nix diff --git a/pkgs/tools/nix/nix-init/default.nix b/pkgs/tools/nix/nix-init/default.nix new file mode 100644 index 000000000000..473830097a46 --- /dev/null +++ b/pkgs/tools/nix/nix-init/default.nix @@ -0,0 +1,60 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, installShellFiles +, makeWrapper +, pkg-config +, zstd +, stdenv +, darwin +, nix +, nurl +, callPackage +, spdx-license-list-data +}: + +rustPlatform.buildRustPackage rec { + pname = "nix-init"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = "nix-init"; + rev = "v${version}"; + hash = "sha256-97aAlH03H8xTVhp45FwecNb7i/ZUtJG9OOYBx8Sf+YI="; + }; + + cargoHash = "sha256-uvn1cP6aIxfPKG/QLtHBd6fHjl7JNRtkZ4gIG2tpHVg="; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + pkg-config + ]; + + buildInputs = [ + zstd + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + postInstall = '' + wrapProgram $out/bin/nix-init \ + --prefix PATH : ${lib.makeBinPath [ nix nurl ]} + installManPage artifacts/nix-init.1 + installShellCompletion artifacts/nix-init.{bash,fish} --zsh artifacts/_nix-init + ''; + + GEN_ARTIFACTS = "artifacts"; + NIX_LICENSES = callPackage ./license.nix { }; + SPDX_LICENSE_LIST_DATA = "${spdx-license-list-data.json}/json/details"; + ZSTD_SYS_USE_PKG_CONFIG = true; + + meta = with lib; { + description = "Command line tool to generate Nix packages from URLs"; + homepage = "https://github.com/nix-community/nix-init"; + changelog = "https://github.com/nix-community/nix-init/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mpl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/nix/nix-init/license.nix b/pkgs/tools/nix/nix-init/license.nix new file mode 100644 index 000000000000..28e798645dad --- /dev/null +++ b/pkgs/tools/nix/nix-init/license.nix @@ -0,0 +1,23 @@ +# vendored from src/licenses.nix + +{ lib, writeText }: + +let + inherit (builtins) concatLists concatStringsSep length; + inherit (lib) flip licenses mapAttrsToList optional; + + inserts = concatLists + (flip mapAttrsToList licenses + (k: v: optional (v ? spdxId) '' xs.insert("${v.spdxId}", "${k}");'')); +in + +writeText "license.rs" '' + fn get_nix_licenses() -> rustc_hash::FxHashMap<&'static str, &'static str> { + let mut xs = std::collections::HashMap::with_capacity_and_hasher( + ${toString (length inserts)}, + Default::default(), + ); + ${concatStringsSep "\n " inserts} + xs + } +'' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c9a3a7787df..b3b6dfc20144 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37644,6 +37644,8 @@ with pkgs; nix-info = callPackage ../tools/nix/info { }; nix-info-tested = nix-info.override { doCheck = true; }; + nix-init = callPackage ../tools/nix/nix-init { }; + nix-index-unwrapped = callPackage ../tools/package-management/nix-index { inherit (darwin.apple_sdk.frameworks) Security; }; From 5f18993ca10e2606b8e21038117a5ef46091a9e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Jan 2023 21:19:21 +0000 Subject: [PATCH 16/39] python310Packages.servefile: 0.5.3 -> 0.5.4 --- pkgs/development/python-modules/servefile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/servefile/default.nix b/pkgs/development/python-modules/servefile/default.nix index 986cd3397592..a4a62a5145af 100644 --- a/pkgs/development/python-modules/servefile/default.nix +++ b/pkgs/development/python-modules/servefile/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "servefile"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "sebageek"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-/ZEMZIH/ImuZ2gh5bwB0FlaWnG/ELxfBGEJ2SuNSEb8="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-hIqXwhmvstCslsCO973oK5FF2c8gZJ0wNUI/z8W+OjU="; }; propagatedBuildInputs = [ pyopenssl ]; From 0b9018f9b66cc00efb3180bf26879b5b9b6b14de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Jan 2023 22:11:47 +0000 Subject: [PATCH 17/39] crow-translate: 2.10.1 -> 2.10.3 --- pkgs/applications/misc/crow-translate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix index 4da0af251d5a..7ec45226785f 100644 --- a/pkgs/applications/misc/crow-translate/default.nix +++ b/pkgs/applications/misc/crow-translate/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "crow-translate"; - version = "2.10.1"; + version = "2.10.3"; src = fetchzip { url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz"; - hash = "sha256-xRXNT/IybcynS5S71XFFsx3PoLXDBcKuz81ybxoVtV4="; + hash = "sha256-K6mYzR4EIBHd0w/6Dpx4ldX4iDFszmfSLT6jNTfJlDQ="; }; patches = [ From 3d33b5532963d37adae3b0a2c60e76446918274e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Jan 2023 22:22:52 +0000 Subject: [PATCH 18/39] devbox: 0.2.2 -> 0.2.3 --- pkgs/development/tools/devbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index 8817a5726cb2..5b1d9bfb73f1 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/pkgs/development/tools/devbox/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "jetpack-io"; repo = pname; rev = version; - hash = "sha256-n2zFfa+UlrAOvBtqF+FkF+oSF1t/7Hg79um7Rl8yTCc="; + hash = "sha256-AvLTDuODn0tcG13lJ9MiN8DgnKzdIzZL1eLnFuEleRw="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { # integration tests want file system access doCheck = false; - vendorHash = "sha256-pZ9s2i62uMebGLpWerOkSJLxShD06vY4MybqM9ZcdGc="; + vendorHash = "sha256-IJay/CDWq9/6P4+qbNleUp4rzTas0LW9zbsV9QN+ufI="; nativeBuildInputs = [ installShellFiles ]; From 0e7c4288f53763b5993c94590c255d1014cb96ca Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 28 Jan 2023 23:35:10 +0100 Subject: [PATCH 19/39] colemak-dh: deprecate phases --- pkgs/data/misc/colemak-dh/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/colemak-dh/default.nix b/pkgs/data/misc/colemak-dh/default.nix index 261a7741f16f..0ce188bdc906 100644 --- a/pkgs/data/misc/colemak-dh/default.nix +++ b/pkgs/data/misc/colemak-dh/default.nix @@ -9,14 +9,12 @@ stdenvNoCC.mkDerivation rec { src = fetchFromGitHub { owner = "ColemakMods"; - repo = "mod-dh"; + repo = "mod-dh"; rev = "e846a5bd24d59ed15ba70b3a9d5363a38ca51d09"; - sha256 = "sha256-RFOpN+tIMfakb7AZN0ock9eq2mytvL0DWedvQV67+ks="; + sha256 = "sha256-RFOpN+tIMfakb7AZN0ock9eq2mytvL0DWedvQV67+ks="; sparseCheckout = [ "console" ]; }; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' runHook preInstall From cd7476bac9412582c16d6d45e992844e755c94bb Mon Sep 17 00:00:00 2001 From: Stephen Checkoway Date: Sat, 28 Jan 2023 17:38:32 -0500 Subject: [PATCH 20/39] psych: add libyaml as build input Starting with version 5, psych no longer bundles libyaml (https://github.com/ruby/psych/releases/tag/v5.0.0) and the psych gem cannot be built. This adds libyaml as a build input. --- pkgs/development/ruby-modules/gem-config/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 1a95520b9273..9f2e8dbfcd11 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -26,7 +26,7 @@ , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk , bundler, libsass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie -, CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libmaxminddb +, CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libmaxminddb, libyaml }@args: let @@ -544,6 +544,10 @@ in ]; }; + psych = attrs: { + buildInputs = [ libyaml ]; + }; + puma = attrs: { buildInputs = [ openssl ]; }; From 99067bac2b06889d6c0e87ae20e4f996880b3357 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Jan 2023 23:33:01 +0000 Subject: [PATCH 21/39] snappymail: 2.24.6 -> 2.25.0 --- pkgs/servers/snappymail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index 3a5c3b47e6b0..eb8310397637 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.24.6"; + version = "2.25.0"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-CGpPmarY990084/Whkk3YjzupPqU4FqAfpTXNFXIAH4="; + sha256 = "sha256-obPWI6tvZx8HEWvNUw9euJav1ncbBYtXwY7SgEurkdQ="; }; sourceRoot = "snappymail"; From 6607132a7e3a19967c4c5636cf4a916d33360261 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 28 Jan 2023 20:34:06 -0300 Subject: [PATCH 22/39] mpv: add meta.changelog --- pkgs/applications/video/mpv/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 7f6fd0b286f4..701654d81f5b 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -216,6 +216,7 @@ in stdenv.mkDerivation rec { mpv is a free and open-source general-purpose video player, based on the MPlayer and mplayer2 projects, with great improvements above both. ''; + changelog = "https://github.com/mpv-player/mpv/releases/tag/v${version}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres fpletz globin ma27 tadeokondrak ]; platforms = platforms.unix; From d6cb3d2b8ab808556e87d1a80a60bcf8640c325e Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 28 Jan 2023 20:35:42 -0300 Subject: [PATCH 23/39] mpv: use rec-less overlay-style attributes --- pkgs/applications/video/mpv/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 701654d81f5b..8bd6713d9ccb 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -80,7 +80,7 @@ let inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer; luaEnv = lua.withPackages (ps: with ps; [ luasocket ]); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (self: { pname = "mpv"; version = "0.35.0"; @@ -89,7 +89,7 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "mpv-player"; repo = "mpv"; - rev = "v${version}"; + rev = "v${self.version}"; sha256 = "sha256-U3NDSxlX4/WkoHFkOvpcwPMwfwTnSpCw0QI5yLMK08o="; }; @@ -216,9 +216,9 @@ in stdenv.mkDerivation rec { mpv is a free and open-source general-purpose video player, based on the MPlayer and mplayer2 projects, with great improvements above both. ''; - changelog = "https://github.com/mpv-player/mpv/releases/tag/v${version}"; + changelog = "https://github.com/mpv-player/mpv/releases/tag/v${self.version}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres fpletz globin ma27 tadeokondrak ]; platforms = platforms.unix; }; -} +}) From 79d0f368bf7251106c9c77248eef05103816908a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jan 2023 00:34:40 +0000 Subject: [PATCH 24/39] circleci-cli: 0.1.23117 -> 0.1.23241 --- pkgs/development/tools/misc/circleci-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index a6ba7777bf13..2a435ea4ac0b 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.23117"; + version = "0.1.23241"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-w7vBDJnkfpdOaNJWlo0fCRvdqEzImCn9y22Xflg/aH0="; + sha256 = "sha256-GpW7mSmUSp1lLgPJmSGmAzYTn2vPsJKorTNQVAHKwU0="; }; vendorHash = "sha256-qnn55C9ZK80gd/ZOtPvAGNJs0d96KqwruU4bZD6TQzY="; From 2de710db47d40f5c6ffb7b447a4f3a72b5e312f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jan 2023 00:36:07 +0000 Subject: [PATCH 25/39] go-swag: 1.8.9 -> 1.8.10 --- pkgs/development/tools/go-swag/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-swag/default.nix b/pkgs/development/tools/go-swag/default.nix index 0417f8d567de..026433cabcb2 100644 --- a/pkgs/development/tools/go-swag/default.nix +++ b/pkgs/development/tools/go-swag/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-swag"; - version = "1.8.9"; + version = "1.8.10"; src = fetchFromGitHub { owner = "swaggo"; repo = "swag"; rev = "v${version}"; - sha256 = "sha256-8UnDrWZ0gQlhPQLDqA5DLBBeHqQFlNxK7+y4qlUk/fI="; + sha256 = "sha256-PDK1TI99/8hAuyK4NOb357WZG0JBno8er8HMfus5V7Q="; }; - vendorSha256 = "sha256-iu4rSgB7Gu5n1Sgu0jU9QwdwvuZ5rAqysvKuBnJd2jQ="; + vendorHash = "sha256-iu4rSgB7Gu5n1Sgu0jU9QwdwvuZ5rAqysvKuBnJd2jQ="; subPackages = [ "cmd/swag" ]; From 0578fc09f9ce0987c44edd46e420524929bede7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 28 Jan 2023 10:42:17 -0800 Subject: [PATCH 26/39] python310Packages.igraph: 0.10.3 -> 0.10.4 Diff: https://github.com/igraph/python-igraph/compare/0.10.3...0.10.4 Changelog: https://github.com/igraph/python-igraph/blob/0.10.4/CHANGELOG.md --- pkgs/development/python-modules/igraph/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix index 3cbdd97e719b..b8f02166f330 100644 --- a/pkgs/development/python-modules/igraph/default.nix +++ b/pkgs/development/python-modules/igraph/default.nix @@ -10,15 +10,17 @@ buildPythonPackage rec { pname = "igraph"; - version = "0.10.3"; + version = "0.10.4"; disabled = pythonOlder "3.7"; + format = "setuptools"; + src = fetchFromGitHub { owner = "igraph"; repo = "python-igraph"; - rev = version; - hash = "sha256-j7c1CtZ796EYMsS11kd8YED7pPolskgT+611uvePTsA="; + rev = "refs/tags/${version}"; + hash = "sha256-DR4D12J/BKFpF4hMHfitNmwDZ7UEo+pI0tvEa1T5GTY="; }; postPatch = '' From 0bdee1f3e04043406cbdd5bf9d944f574a1f2a3e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jan 2023 01:34:26 +0000 Subject: [PATCH 27/39] ddosify: 0.12.0 -> 0.13.0 --- pkgs/development/tools/ddosify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/development/tools/ddosify/default.nix index 43207e5a9c9d..e0d03e7f890b 100644 --- a/pkgs/development/tools/ddosify/default.nix +++ b/pkgs/development/tools/ddosify/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddosify"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-peqLeZ8RxkvaqUER2FBQeTdy1AQ/+Bcz9gGOGz1CACc="; + sha256 = "sha256-tw6rrhFhuIsVAj5IqSHGHSYheDqGENLDxiJr+PQno1U="; }; vendorHash = "sha256-3y5ppTtvGqwWhgnVBpP4gf26DHKPnSNYK4jfhBiYDwY="; From 32a2093a65dfe705b229a39707421e830acd8667 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jan 2023 01:46:41 +0000 Subject: [PATCH 28/39] lefthook: 1.2.7 -> 1.2.8 --- pkgs/applications/version-management/lefthook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/lefthook/default.nix b/pkgs/applications/version-management/lefthook/default.nix index 3e1f002f9776..7973b8ff1c04 100644 --- a/pkgs/applications/version-management/lefthook/default.nix +++ b/pkgs/applications/version-management/lefthook/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lefthook"; - version = "1.2.7"; + version = "1.2.8"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-bsPTOv1s/kU6UUxmmPpYC5Y9/YeR6LnuL09j1x5e3Es="; + sha256 = "sha256-hW3zKco0c90eIwWefHLABAZGUc2fGHsGnyPaSa/zGuQ="; }; vendorHash = "sha256-Dx9OL1D4VNfVQ0NUJr9aq54PXHecgMMtLg7GMFnQFCI="; From f45f44bb0f472f79ac56636e79da5302dec3c653 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 29 Jan 2023 02:54:27 +0100 Subject: [PATCH 29/39] python3Packages.tensorflow: Replace tensorflow-estimator alias --- pkgs/development/python-modules/tensorflow/bin.nix | 4 ++-- pkgs/development/python-modules/tensorflow/default.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 7a2d29b75c7c..dcfa8e0e964c 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -18,7 +18,7 @@ , wheel , opt-einsum , backports_weakref -, tensorflow-estimator +, tensorflow-estimator-bin , tensorboard , cudaSupport ? false , cudaPackages ? {} @@ -76,7 +76,7 @@ in buildPythonPackage { opt-einsum google-pasta wrapt - tensorflow-estimator + tensorflow-estimator-bin tensorboard keras-applications keras-preprocessing diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index fef979b70d18..8082fd9267bc 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -6,7 +6,7 @@ , numpy, tensorboard, absl-py , packaging, setuptools, wheel, keras, keras-preprocessing, google-pasta , opt-einsum, astunparse, h5py -, termcolor, grpcio, six, wrapt, protobuf-python, tensorflow-estimator +, termcolor, grpcio, six, wrapt, protobuf-python, tensorflow-estimator-bin , dill, flatbuffers-python, portpicker, tblib, typing-extensions # Common deps , git, pybind11, which, binutils, glibcLocales, cython, perl, coreutils @@ -98,7 +98,7 @@ let six tblib tensorboard - tensorflow-estimator + tensorflow-estimator-bin termcolor typing-extensions wheel @@ -479,7 +479,7 @@ in buildPythonPackage { packaging protobuf-python six - tensorflow-estimator + tensorflow-estimator-bin termcolor typing-extensions wrapt From a882214fc1e51214b334c11ea32f128d11815f39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jan 2023 02:14:21 +0000 Subject: [PATCH 30/39] opentelemetry-collector: 0.69.1 -> 0.70.0 --- pkgs/tools/misc/opentelemetry-collector/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 647b6aa0c198..67ac3c0f40a2 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -12,17 +12,17 @@ let in buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.69.1"; + version = "0.70.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - sha256 = "sha256-p/epsqaDQNPS2gd3fN/Ny0XtGIeoKI7hdZVI1bqvg4s="; + sha256 = "sha256-r7Pw2zBRwaDMXZ7j8hNT1+a9sSWZpl0+8Y4rtIveoPY="; }; # there is a nested go.mod sourceRoot = "source/cmd/otelcorecol"; - vendorHash = "sha256-AIn38bjnYX9gAaKXTyIA7Lv5/oRzy3BMK5Q+9JvapFI="; + vendorHash = "sha256-HyI3ETQQJE6bAhC2W7UfO9yqfoxu8aITcmIJmrOZpbM="; preBuild = '' # set the build version, can't be done via ldflags From 2d260cac490051a3aa73da24bd0a5c707f7248be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jan 2023 02:15:38 +0000 Subject: [PATCH 31/39] gifski: 1.9.0 -> 1.10.0 --- pkgs/tools/graphics/gifski/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index 532201c4818a..5723d40141de 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - sha256 = "sha256-iG7XaPBNTmt/yNMeSY8UKwesFJFUECAsOYQ0idegk1w="; + sha256 = "sha256-JJSAU9z3JOlvfW6AW/P/KrjhOcD0ax8TmqgqM48rlAo="; }; - cargoHash = "sha256-7bjsxbUsHjsVER0HaQ+x0dkaAI2sb7if8mS6JwQIbzc="; + cargoHash = "sha256-UV2iQFbeGvJs8kEowYRNv8DxEGwaIWL1/3A2oUCcauw="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; From b6d523f112a6ae610b704ced37b6a6d06ec08290 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jan 2023 02:25:38 +0000 Subject: [PATCH 32/39] mdbook-katex: 0.3.3 -> 0.3.4 --- pkgs/tools/text/mdbook-katex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index 1f28ca3ff4aa..c4fc19ef1a7f 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.3.3"; + version = "0.3.4"; src = fetchCrate { inherit pname version; - hash = "sha256-PmNoux12A6MBlviyCy9kjGUHigBDxCiiqXlwf6Sc76I="; + hash = "sha256-Bc9nUY2XyNlgOI436omg885Qm0BtqcrFsJz6qr2Zhys="; }; - cargoHash = "sha256-YSLJsiIkoeSAh3oUMkbk5jSW0NMdJLB6YsOt1YlGyfs="; + cargoHash = "sha256-pH5ZN6bTjstrSTv0hdOoyWAdRLRjALarML3ZVoYvGRI="; OPENSSL_DIR = "${lib.getDev openssl}"; OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; From 0a9a0fefc285361d3147a2dab74b8412d9518c82 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 29 Jan 2023 02:44:08 +0000 Subject: [PATCH 33/39] mpv: 0.35.0 -> 0.35.1 (#213229) --- pkgs/applications/video/mpv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 8bd6713d9ccb..28e0d1d469a0 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -82,7 +82,7 @@ let luaEnv = lua.withPackages (ps: with ps; [ luasocket ]); in stdenv.mkDerivation (self: { pname = "mpv"; - version = "0.35.0"; + version = "0.35.1"; outputs = [ "out" "dev" "man" ]; @@ -90,7 +90,7 @@ in stdenv.mkDerivation (self: { owner = "mpv-player"; repo = "mpv"; rev = "v${self.version}"; - sha256 = "sha256-U3NDSxlX4/WkoHFkOvpcwPMwfwTnSpCw0QI5yLMK08o="; + sha256 = "sha256-CoYTX9hgxLo72YdMoa0sEywg4kybHbFsypHk1rCM6tM="; }; postPatch = '' From 304ba96eaef02415be2cb3f80fe48393e49ac36e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jan 2023 02:44:26 +0000 Subject: [PATCH 34/39] cargo-tauri: 1.2.3 -> 1.2.4 --- pkgs/development/tools/rust/cargo-tauri/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-tauri/default.nix b/pkgs/development/tools/rust/cargo-tauri/default.nix index 3f9549401441..64bf3fccbc4f 100644 --- a/pkgs/development/tools/rust/cargo-tauri/default.nix +++ b/pkgs/development/tools/rust/cargo-tauri/default.nix @@ -16,20 +16,20 @@ let in rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "tauri-apps"; repo = pname; rev = "tauri-v${version}"; - sha256 = "sha256-4v0ZlFBVBB+0xWbTRncVwELaZWLKyCmIceTfseXvS8s="; + sha256 = "sha256-BzstYoRZuZTNAkVGqPGYrd/AiWEhoH6t/XezDaFdmVo="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 sourceRoot = "source/tooling/cli"; - cargoSha256 = "sha256-Hp6+T2CN0CsXaGnCVqAYaOjZNDkmI+MXDfHIgbU1S0g="; + cargoHash = "sha256-t5MlJpQOA5T/EwbPoSD95kATGReiZTmq+JkbDVbRj+0="; buildInputs = lib.optionals stdenv.isLinux [ glibc libsoup cairo gtk3 webkitgtk ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; From 445a62dc6c0e77e8bfb42809640ddf9787b59c58 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 29 Jan 2023 05:10:06 +0100 Subject: [PATCH 35/39] fira-code: fix font --- pkgs/data/fonts/fira-code/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index 1ba15dadb112..b0e63835156a 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -14,8 +14,7 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/share/fonts - cp variable_ttf/*-VF.ttf $out/share/fonts/truetype + install -Dm644 variable_ttf/*-VF.ttf -t $out/share/fonts/truetype runHook postInstall ''; From 63f5159ec3e199e36729313668a12dae89ac7c0a Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sat, 28 Jan 2023 12:47:49 +0100 Subject: [PATCH 36/39] octoprint: pin flask-limiter to 2.6.2 fixes startup error with: `TypeError: Limiter.__init__() got multiple values for argument 'key_func'` Signed-off-by: Florian Brandes --- pkgs/applications/misc/octoprint/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 89260c09f789..b6dcf9056841 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -14,6 +14,21 @@ let self = py; packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ( [ + ( + # with version 3 of flask-limiter octoprint 1.8.6 fails to start with + # TypeError: Limiter.__init__() got multiple values for argument 'key_func' + self: super: { + flask-limiter = super.flask-limiter.overridePythonAttrs (oldAttrs: rec { + version = "2.6.2"; + src = fetchFromGitHub { + owner = "alisaifee"; + repo = "flask-limiter"; + rev = version; + sha256 = "sha256-eWOdJ7m3cY08ASN/X+7ILJK99iLJJwCY8294fwJiDew="; + }; + }); + } + ) # Built-in dependency ( self: super: { From 5aa6589c3415b72904482802efed24b8dc7bf03f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 29 Jan 2023 05:30:28 +0100 Subject: [PATCH 37/39] treewide: fonts: remove unused mkdir --- pkgs/data/fonts/cozette/default.nix | 1 - pkgs/data/fonts/d2coding/default.nix | 1 - pkgs/data/fonts/eb-garamond/default.nix | 1 - pkgs/data/fonts/gentium-book-basic/default.nix | 1 - pkgs/data/fonts/hanazono/default.nix | 1 - pkgs/data/fonts/wqy-zenhei/default.nix | 3 +-- 6 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/data/fonts/cozette/default.nix index 03670a1c917d..29ecabe9de2c 100644 --- a/pkgs/data/fonts/cozette/default.nix +++ b/pkgs/data/fonts/cozette/default.nix @@ -12,7 +12,6 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/share/fonts install -Dm644 *.ttf -t $out/share/fonts/truetype install -Dm644 *.otf -t $out/share/fonts/opentype install -Dm644 *.bdf -t $out/share/fonts/misc diff --git a/pkgs/data/fonts/d2coding/default.nix b/pkgs/data/fonts/d2coding/default.nix index 9742e5c241fa..84af3d18bfe4 100644 --- a/pkgs/data/fonts/d2coding/default.nix +++ b/pkgs/data/fonts/d2coding/default.nix @@ -13,7 +13,6 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/share/fonts install -Dm644 */*-all.ttc -t $out/share/fonts/truetype/ runHook postInstall diff --git a/pkgs/data/fonts/eb-garamond/default.nix b/pkgs/data/fonts/eb-garamond/default.nix index 6e5d09c9bcc8..7a57d9308cf9 100644 --- a/pkgs/data/fonts/eb-garamond/default.nix +++ b/pkgs/data/fonts/eb-garamond/default.nix @@ -12,7 +12,6 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/share/{doc,fonts} install -Dm644 otf/*.otf -t $out/share/fonts/opentype install -Dm644 Changes README.markdown README.xelualatex -t $out/share/doc/${pname}-${version} diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/pkgs/data/fonts/gentium-book-basic/default.nix index 96e9789cd115..5cbc31accf07 100644 --- a/pkgs/data/fonts/gentium-book-basic/default.nix +++ b/pkgs/data/fonts/gentium-book-basic/default.nix @@ -12,7 +12,6 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/share/{doc,fonts} install -Dm644 *.ttf -t $out/share/fonts/truetype install -Dm644 FONTLOG.txt GENTIUM-FAQ.txt -t $out/share/doc/${pname}-${version} diff --git a/pkgs/data/fonts/hanazono/default.nix b/pkgs/data/fonts/hanazono/default.nix index fc499534d1e3..f6dd5baa60c2 100644 --- a/pkgs/data/fonts/hanazono/default.nix +++ b/pkgs/data/fonts/hanazono/default.nix @@ -13,7 +13,6 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/share/{doc,fonts} install -Dm644 *.ttf -t $out/share/fonts/truetype install -Dm644 *.txt -t $out/share/doc/hanazono diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix index a5106b5e6b18..c59f74d45474 100644 --- a/pkgs/data/fonts/wqy-zenhei/default.nix +++ b/pkgs/data/fonts/wqy-zenhei/default.nix @@ -12,8 +12,7 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/share/fonts - install -m644 *.ttc $out/share/fonts/ + install -Dm644 *.ttc -t $out/share/fonts/ runHook postInstall ''; From 5b3ce4f78fe3eef68179a177928b4ee9d63ecb85 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sat, 28 Jan 2023 20:02:15 +0100 Subject: [PATCH 38/39] octoprint: add nixosTests Signed-off-by: Florian Brandes Co-authored-by: Nick Cao --- nixos/tests/all-tests.nix | 1 + nixos/tests/octoprint.nix | 61 ++++++++++++++++++++ pkgs/applications/misc/octoprint/default.nix | 4 ++ 3 files changed, 66 insertions(+) create mode 100644 nixos/tests/octoprint.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b839d539c9f5..12e386f1c2d5 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -485,6 +485,7 @@ in { opensmtpd = handleTest ./opensmtpd.nix {}; opensmtpd-rspamd = handleTest ./opensmtpd-rspamd.nix {}; openssh = handleTest ./openssh.nix {}; + octoprint = handleTest ./octoprint.nix {}; openstack-image-metadata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).metadata or {}; openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {}; opentabletdriver = handleTest ./opentabletdriver.nix {}; diff --git a/nixos/tests/octoprint.nix b/nixos/tests/octoprint.nix new file mode 100644 index 000000000000..15a2d677d4cf --- /dev/null +++ b/nixos/tests/octoprint.nix @@ -0,0 +1,61 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: + +let + apikey = "testapikey"; +in +{ + name = "octoprint"; + meta.maintainers = with lib.maintainers; [ gador ]; + + nodes.machine = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ jq ]; + services.octoprint = { + enable = true; + extraConfig = { + server = { + firstRun = false; + }; + api = { + enabled = true; + key = apikey; + }; + plugins = { + # these need internet access and pollute the output with connection failed errors + _disabled = [ "softwareupdate" "announcements" "pluginmanager" ]; + }; + }; + }; + }; + + testScript = '' + import json + + @polling_condition + def octoprint_running(): + machine.succeed("pgrep octoprint") + + with subtest("Wait for octoprint service to start"): + machine.wait_for_unit("octoprint.service") + machine.wait_until_succeeds("pgrep octoprint") + + with subtest("Wait for final boot"): + # this appears whe octoprint is almost finished starting + machine.wait_for_file("/var/lib/octoprint/uploads") + + # octoprint takes some time to start. This makes sure we'll retry just in case it takes longer + # retry-all-errors in necessary, since octoprint will report a 404 error when not yet ready + curl_cmd = "curl --retry-all-errors --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 0 \ + --retry-max-time 40 -X GET --header 'X-API-Key: ${apikey}' " + + # used to fail early, in case octoprint first starts and then crashes + with octoprint_running: # type: ignore[union-attr] + with subtest("Check for web interface"): + machine.wait_until_succeeds("curl -s localhost:5000") + + with subtest("Check API"): + version = json.loads(machine.succeed(curl_cmd + "localhost:5000/api/version")) + server = json.loads(machine.succeed(curl_cmd + "localhost:5000/api/server")) + assert version["server"] == str("${pkgs.octoprint.version}") + assert server["safemode"] == None + ''; +}) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index b6dcf9056841..4b445c6b3083 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -5,6 +5,7 @@ , python3 , substituteAll , nix-update-script +, nixosTests # To include additional plugins, pass them here as an overlay. , packageOverrides ? self: super: { } }: @@ -217,6 +218,9 @@ let passthru = { python = self.python; updateScript = nix-update-script { }; + tests = { + inherit (nixosTests) octoprint; + }; }; meta = with lib; { From 206eb29ca194d10eba55487a3d94e927677f07b2 Mon Sep 17 00:00:00 2001 From: Mateusz Wykurz Date: Sat, 28 Jan 2023 20:38:42 -0700 Subject: [PATCH 39/39] rustfilt: init at 0.2.1 --- .../tools/rust/rustfilt/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/rust/rustfilt/default.nix diff --git a/pkgs/development/tools/rust/rustfilt/default.nix b/pkgs/development/tools/rust/rustfilt/default.nix new file mode 100644 index 000000000000..353cdcdbfdc6 --- /dev/null +++ b/pkgs/development/tools/rust/rustfilt/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "rustfilt"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "luser"; + repo = pname; + rev = version; + hash = "sha256-zb1tkeWmeMq7aM8hWssS/UpvGzGbfsaVYCOKBnAKwiQ="; + }; + + cargoSha256 = "sha256-rs2EWcvTxLVeJ0t+jLM75s+K72t+hqKzwy3oAdCZ8BE="; + + meta = with lib; { + description = "Demangle Rust symbol names using rustc-demangle"; + homepage = "https://github.com/luser/rustfilt"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ wykurz ]; + mainProgram = "rustfilt"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25c8ed9dd9cb..6c1486ebeca2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11513,6 +11513,8 @@ with pkgs; rustdesk = callPackage ../applications/networking/remote/rustdesk { }; + rustfilt = callPackage ../development/tools/rust/rustfilt { }; + rustscan = callPackage ../tools/security/rustscan { inherit (darwin.apple_sdk.frameworks) Security; };