From 30081adcd56e046701a7209fd58f1695a442d660 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Mon, 30 Jan 2023 18:04:18 +0200 Subject: [PATCH 01/54] nixos/docker: add "local" as valid logDriver option --- nixos/modules/virtualisation/docker.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index d9bd10ba1fc8..84fd6405e46d 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -100,7 +100,7 @@ in logDriver = mkOption { - type = types.enum ["none" "json-file" "syslog" "journald" "gelf" "fluentd" "awslogs" "splunk" "etwlogs" "gcplogs"]; + type = types.enum ["none" "json-file" "syslog" "journald" "gelf" "fluentd" "awslogs" "splunk" "etwlogs" "gcplogs" "local"]; default = "journald"; description = lib.mdDoc '' From d9f8b18044c63c0649491486db1c1dce0153f3f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Tue, 14 Feb 2023 09:28:42 +0100 Subject: [PATCH 02/54] vscode: Explicitly disable integration tests --- pkgs/applications/editors/vscode/vscode.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 65675dd92488..9fde08c747aa 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -42,6 +42,9 @@ in inherit sha256; }; + # We don't test vscode on CI, instead we test vscodium + tests = {}; + sourceRoot = ""; updateScript = ./update-vscode.sh; From a65374c436140880a6cd457138f33473a849e65d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 15 Feb 2023 15:15:18 +0100 Subject: [PATCH 03/54] scilab-bin: refactor --- .../science/math/scilab-bin/default.nix | 112 ++++++++---------- 1 file changed, 51 insertions(+), 61 deletions(-) diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix index 59e64bd0b8ef..f6da20531385 100644 --- a/pkgs/applications/science/math/scilab-bin/default.nix +++ b/pkgs/applications/science/math/scilab-bin/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, undmg, makeWrapper, xorg }: +{ lib +, stdenv +, fetchurl +, makeWrapper +, undmg +, autoPatchelfHook +, alsa-lib +, ncurses5 +, xorg +}: let pname = "scilab-bin"; @@ -26,88 +35,69 @@ let platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.gpl2Only; + mainProgram = "scilab"; }; darwin = stdenv.mkDerivation rec { inherit pname version src meta; - nativeBuildInputs = [ undmg makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + undmg + ]; sourceRoot = "scilab-${version}.app"; installPhase = '' + runHook preInstall + mkdir -p $out/{Applications/scilab.app,bin} cp -R . $out/Applications/scilab.app makeWrapper $out/{Applications/scilab.app/Contents/MacOS,bin}/scilab + + runHook postInstall ''; }; linux = stdenv.mkDerivation rec { inherit pname version src meta; - libPath = lib.makeLibraryPath [ - stdenv.cc.cc - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXrender - xorg.libXtst - xorg.libXxf86vm - ]; + nativeBuildInputs = [ + autoPatchelfHook + ]; - fixupPhase = '' - sed -i 's|\$(/bin/|$(|g' bin/scilab - sed -i 's|/usr/bin/||g' bin/scilab + buildInputs = [ + alsa-lib + ncurses5 + stdenv.cc.cc + ] ++ (with xorg; [ + libX11 + libXcursor + libXext + libXft + libXi + libXrandr + libXrender + libXtst + libXxf86vm + ]); - sci="$out/opt/scilab-${version}" - fullLibPath="$sci/lib/scilab:$sci/lib/thirdparty:$libPath" - fullLibPath="$fullLibPath:$sci/lib/thirdparty/redist" + installPhase = '' + runHook preInstall - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$fullLibPath" bin/scilab-bin - find . -name '*.so' -type f | while read file; do - patchelf --set-rpath "$fullLibPath" "$file" 2>/dev/null - done - ''; + mkdir -p $out + mv -t $out bin include lib share thirdparty + sed -i \ + -e 's|\$(/bin/|$(|g' \ + -e 's|/usr/bin/||g' \ + $out/bin/{scilab,xcos} + sed -i \ + -e "s|Exec=|Exec=$out/bin/|g" \ + -e "s|Terminal=.*$|Terminal=true|g" \ + $out/share/applications/*.desktop - installPhase = '' - mkdir -p "$out/opt/scilab-${version}" - cp -r . "$out/opt/scilab-${version}/" - - # Create bin/ dir - mkdir "$out/bin" - - # Creating executable symlinks - ln -s "$out/opt/scilab-${version}/bin/scilab" "$out/bin/scilab" - ln -s "$out/opt/scilab-${version}/bin/scilab-cli" "$out/bin/scilab-cli" - ln -s "$out/opt/scilab-${version}/bin/scilab-adv-cli" "$out/bin/scilab-adv-cli" - - # Creating desktop config dir - mkdir -p "$out/share/applications" - - # Moving desktop config files - mv $out/opt/scilab-${version}/share/applications/*.desktop $out/share/applications - - # Fixing Exec paths and launching each app with a terminal - sed -i -e "s|Exec=|Exec=$out/opt/scilab-${version}/bin/|g" \ - -e "s|Terminal=.*$|Terminal=true|g" $out/share/applications/*.desktop - - # Moving icons to the appropriate locations - for path in $out/opt/scilab-${version}/share/icons/hicolor/*/*/* - do - newpath=$(echo $path | sed 's|/opt/scilab-${version}||g') - filename=$(echo $path | sed 's|.*/||g') - dir=$(echo $newpath | sed "s|$filename||g") - mkdir -p $dir - mv $path $newpath - done - - # Removing emptied folders - rm -rf $out/opt/scilab-${version}/share/{applications,icons} - - # Moving other share/ folders - mv $out/opt/scilab-${version}/share/{appdata,locale,mime} $out/share - ''; + runHook postInstall + ''; }; in if stdenv.isDarwin then darwin else linux From da79c1937d8687f9b870bf3ff413ee90fc71be17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Feb 2023 21:12:32 +0000 Subject: [PATCH 04/54] python310Packages.zigpy: 0.53.1 -> 0.53.2 --- pkgs/development/python-modules/zigpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index e8949b496e4b..040a181e4a67 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.53.1"; + version = "0.53.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-1ey1JDxRF9zYSTn1EKWz1gcCw5WrCCH1eNyp6KOO8eI="; + hash = "sha256-/IUJzMzbNKXQZkhwmoKoafMVw+6rD3Sw/coBLOi4FIk="; }; propagatedBuildInputs = [ From 266609b0e275a24699df5def4d42f739cb2db01c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Feb 2023 03:01:34 +0000 Subject: [PATCH 05/54] arkade: 0.8.62 -> 0.9.0 --- pkgs/applications/networking/cluster/arkade/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 5b0c5c57cdea..11ee9a8b3568 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,20 +7,20 @@ buildGoModule rec { pname = "arkade"; - version = "0.8.62"; + version = "0.9.0"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-lnMinIZ1n94ks7H5tlYmgaDDHyGi5YxTM9dTrckQ9y0="; + sha256 = "sha256-0o6keMr+bAAZ3gmaDhsU2r3T8hRxpkbqCnNVLqWvK+k="; }; CGO_ENABLED = 0; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-WQsnBBx05wXKDS7h3bhipTqZTQLxRjVLObuMNUfAiTk="; + vendorHash = "sha256-WuBZj6W3/E9HbvWTBegmJdY+aw43CYyuw1hXF7RXd3A="; # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true subPackages = [ From eb30f33d0a89739e8739f0c4f13cd9a7e5f1e748 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Feb 2023 03:44:06 +0000 Subject: [PATCH 06/54] wtfis: 0.5.1 -> 0.6.1 --- pkgs/tools/networking/wtfis/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/wtfis/default.nix b/pkgs/tools/networking/wtfis/default.nix index 30c2eda8eda0..06c321d99d6e 100644 --- a/pkgs/tools/networking/wtfis/default.nix +++ b/pkgs/tools/networking/wtfis/default.nix @@ -6,15 +6,15 @@ let pname = "wtfis"; - version = "0.5.1"; + version = "0.6.1"; in python3.pkgs.buildPythonApplication { inherit pname version; src = fetchFromGitHub { owner = "pirxthepilot"; repo = "wtfis"; - rev = "v${version}"; - hash = "sha256-XoQ/iJTdZoekA5guxI8POG4NEhN8Up3OuIz344G75ao="; + rev = "refs/tags/v${version}"; + hash = "sha256-bHgv5+HoM1hFhpkqml+HxqiMDvKbMqsTH+zYtDrV7Ko="; }; patches = [ From 59a2869c5ef9c947e0faf24162a55e6ba0b2717f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Feb 2023 05:08:59 +0000 Subject: [PATCH 07/54] python310Packages.dkimpy: 1.0.5 -> 1.1.0 --- pkgs/development/python-modules/dkimpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index dbe8912153fe..9d294977ca70 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dkimpy"; - version = "1.0.5"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "9a2420bf09af686736773153fca32a02ae11ecbe24b540c26104628959f91121"; + sha256 = "sha256-NQDukEVLfCz3ElgeA5jrRwONJ+aRSDKd9jTs2Y3YYhw="; }; nativeCheckInputs = [ pytest ]; From d63e95274a156b1cfabd220b9f1557f72e213628 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Feb 2023 14:20:05 +0100 Subject: [PATCH 08/54] python310Packages.suds-jurko: remove - still uses use_2to3 - unmaintained for a while --- .../python-modules/suds-jurko/default.nix | 33 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 pkgs/development/python-modules/suds-jurko/default.nix diff --git a/pkgs/development/python-modules/suds-jurko/default.nix b/pkgs/development/python-modules/suds-jurko/default.nix deleted file mode 100644 index f2776265b067..000000000000 --- a/pkgs/development/python-modules/suds-jurko/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, isPyPy -}: - -buildPythonPackage rec { - pname = "suds-jurko"; - version = "0.6"; - disabled = isPyPy; # lots of failures - - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "1s4radwf38kdh3jrn5acbidqlr66sx786fkwi0rgq61hn4n2bdqw"; - }; - - doCheck = false; - - postPatch = '' - # fails - substituteInPlace tests/test_transport_http.py \ - --replace "test_sending_unicode_data" "noop" - ''; - - meta = with lib; { - description = "Lightweight SOAP client (Jurko's fork)"; - homepage = "https://bitbucket.org/jurko/suds"; - license = licenses.lgpl3; - broken = true; # Uses use2to3, which has been removed in setuptools>=58 - }; - -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index ce9c2b3916ed..619861bc96ed 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -233,6 +233,7 @@ mapAliases ({ sphinxcontrib_plantuml = sphinxcontrib-plantuml; # added 2021-08-02 sqlalchemy_migrate = sqlalchemy-migrate; # added 2021-10-28 SQLAlchemy-ImageAttach = throw "sqlalchemy-imageattach has been removed as it is incompatible with sqlalchemy 1.4 and unmaintained"; # added 2022-04-23 + suds-jurko = throw "suds-jurko has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-02-27 tensorflow-bin_2 = tensorflow-bin; # added 2021-11-25 tensorflow-build_2 = tensorflow-build; # added 2021-11-25 tensorflow-estimator = tensorflow-estimator-bin; # added 2023-01-17 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 08f7417ac863..28ef3f5ffdcb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11194,8 +11194,6 @@ self: super: with self; { subzerod = callPackage ../development/python-modules/subzerod { }; - suds-jurko = callPackage ../development/python-modules/suds-jurko { }; - sumo = callPackage ../development/python-modules/sumo { }; sumtypes = callPackage ../development/python-modules/sumtypes { }; From 28a70c103bfb9543d572f16aba86a7e48f557d32 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Feb 2023 14:35:05 +0100 Subject: [PATCH 09/54] python310Packages.transip: remove - TransIP SOAP V5 API was marked as deprecated - no longer maintained https://github.com/benkonrath/transip-api/issues/65#issuecomment-1158884743 --- .../python-modules/transip/default.nix | 51 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 pkgs/development/python-modules/transip/default.nix diff --git a/pkgs/development/python-modules/transip/default.nix b/pkgs/development/python-modules/transip/default.nix deleted file mode 100644 index 1179f9240200..000000000000 --- a/pkgs/development/python-modules/transip/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, requests -, cryptography -, suds-jurko -, pytestCheckHook -, pythonOlder -}: - -buildPythonPackage rec { - pname = "transip"; - version = "2.0.0"; - format = "setuptools"; - - disabled = pythonOlder "3.5"; - - src = fetchFromGitHub { - owner = "benkonrath"; - repo = "transip-api"; - rev = "v${version}"; - hash = "sha256-J/zcDapry8pm1zozzCDzrQED7vvCR6yoE4NcduBFfZQ="; - }; - - propagatedBuildInputs = [ - requests - cryptography - suds-jurko - ]; - - nativeCheckInputs = [ - pytestCheckHook - ]; - - disabledTests = [ - # Constructor tests require network access - "test_constructor" - "testConstructor" - ]; - - pythonImportsCheck = [ - "transip" - ]; - - meta = with lib; { - description = "TransIP API Connector"; - homepage = "https://github.com/benkonrath/transip-api"; - license = licenses.mit; - maintainers = with maintainers; [ flyfloh ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index ce9c2b3916ed..59975440f714 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -239,6 +239,7 @@ mapAliases ({ tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25 tensorflow-tensorboard = tensorboard; # added 2022-03-06 tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25 + transip = throw "transip has been removed because it is no longer maintained. TransIP SOAP V5 API was marked as deprecated"; # added 2023-02-27 tumpa = throw "tumpa was promoted to a top-level attribute"; # added 2022-11-19 tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 08f7417ac863..4ff8223b168a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11702,8 +11702,6 @@ self: super: with self; { transforms3d = callPackage ../development/python-modules/transforms3d { }; - transip = callPackage ../development/python-modules/transip { }; - transitions = callPackage ../development/python-modules/transitions { }; translatepy = callPackage ../development/python-modules/translatepy { }; From f4849d6b5fef32658542360c4a9ad15964dcc6d6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Feb 2023 17:29:00 +0100 Subject: [PATCH 10/54] python310Packages.rich-argparse-plus: init at 0.3.1.4 --- .../rich-argparse-plus/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/rich-argparse-plus/default.nix diff --git a/pkgs/development/python-modules/rich-argparse-plus/default.nix b/pkgs/development/python-modules/rich-argparse-plus/default.nix new file mode 100644 index 000000000000..e152ce267f4c --- /dev/null +++ b/pkgs/development/python-modules/rich-argparse-plus/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, rich +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "rich-argparse-plus"; + version = "0.3.1.4"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "michelcrypt4d4mus"; + repo = "rich-argparse-plus"; + rev = "v${version}"; + hash = "sha256-oF2wuvyLYwObVJ4fhJl9b/sdfmQ2ahgKkfd9ZwObfPw="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + rich + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "rich_argparse_plus" + ]; + + disabledTests = [ + # Tests are comparing CLI output + "test_spans" + "test_actions_spans_in_usage" + "test_boolean_optional_action_spans" + "test_usage_spans_errors" + "test_text_highlighter" + "test_default_highlights" + ]; + + meta = with lib; { + description = "Library to help formatting argparse"; + homepage = "https://github.com/michelcrypt4d4mus/rich-argparse-plus"; + changelog = "https://github.com/michelcrypt4d4mus/rich-argparse-plus/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 08f7417ac863..3fcddb27fff7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10093,6 +10093,8 @@ self: super: with self; { rich = callPackage ../development/python-modules/rich { }; + rich-argparse-plus = callPackage ../development/python-modules/rich-argparse-plus { }; + rich-click = callPackage ../development/python-modules/rich-click { }; rich-rst = callPackage ../development/python-modules/rich-rst { }; From c973f19acde96069266c31b251d4ef799030b3c4 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 8 Feb 2023 19:50:04 -0300 Subject: [PATCH 11/54] SDL2_mixer: 2.0.4 -> 2.6.3 Release: https://github.com/libsdl-org/SDL_mixer/releases/tag/release-2.6.3 --- .../libraries/SDL2_mixer/default.nix | 36 ++++++++----------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index 7e562dddf0fd..dab76bdab70b 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -18,13 +18,25 @@ stdenv.mkDerivation rec { pname = "SDL2_mixer"; - version = "2.0.4"; + version = "2.6.3"; src = fetchurl { url = "https://www.libsdl.org/projects/SDL_mixer/release/${pname}-${version}.tar.gz"; - sha256 = "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl"; + sha256 = "sha256-emuoakeGSM5hfjpekncYG8Z/fOmHZgXupq/9Sg1u6o8="; }; + configureFlags = [ + "--disable-music-ogg-shared" + "--disable-music-flac-shared" + "--disable-music-mod-modplug-shared" + "--disable-music-mp3-mpg123-shared" + "--disable-music-opus-shared" + "--disable-music-midi-fluidsynth-shared" + ] ++ lib.optionals stdenv.isDarwin [ + "--disable-sdltest" + "--disable-smpegtest" + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isDarwin [ @@ -49,28 +61,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - # fix default path to timidity.cfg so MIDI files could be played - postPatch = '' - substituteInPlace timidity/options.h \ - --replace "/usr/share/timidity" "${timidity}/share/timidity" - ''; - - configureFlags = [ - "--disable-music-ogg-shared" - "--disable-music-flac-shared" - "--disable-music-mod-modplug-shared" - "--disable-music-mp3-mpg123-shared" - "--disable-music-opus-shared" - "--disable-music-midi-fluidsynth-shared" - ] ++ lib.optionals stdenv.isDarwin [ - "--disable-sdltest" - "--disable-smpegtest" - ]; - meta = with lib; { description = "SDL multi-channel audio mixer library"; platforms = platforms.unix; - homepage = "https://www.libsdl.org/projects/SDL_mixer/"; + homepage = "https://github.com/libsdl-org/SDL_mixer"; maintainers = with maintainers; [ MP2E ]; license = licenses.zlib; }; From bac11af0da17f85d3cec38cc1f9584542fe28913 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Feb 2023 18:50:50 +0100 Subject: [PATCH 12/54] yaralyzer: init at 0.9.0 --- pkgs/tools/security/yaralyzer/default.nix | 46 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/tools/security/yaralyzer/default.nix diff --git a/pkgs/tools/security/yaralyzer/default.nix b/pkgs/tools/security/yaralyzer/default.nix new file mode 100644 index 000000000000..a384280c2f40 --- /dev/null +++ b/pkgs/tools/security/yaralyzer/default.nix @@ -0,0 +1,46 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "yaralyzer"; + version = "0.9.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "michelcrypt4d4mus"; + repo = "yaralyzer"; + rev = "refs/tags/v${version}"; + hash = "sha256-QsMO/fnHy4puuToUHSS05fWnXHdAVnWFFBVq3cb0Zj4="; + }; + + pythonRelaxDeps = [ + "rich" + ]; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = with python3.pkgs; [ + chardet + python-dotenv + rich + rich-argparse-plus + yara-python + ]; + + pythonImportsCheck = [ + "yaralyzer" + ]; + + meta = with lib; { + description = "Tool to visually inspect and force decode YARA and regex matches"; + homepage = "https://github.com/michelcrypt4d4mus/yaralyzer"; + changelog = "https://github.com/michelcrypt4d4mus/yaralyzer/blob/${version}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a59307ce294..0c3c20840e5c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38836,6 +38836,8 @@ with pkgs; yara = callPackage ../tools/security/yara { }; + yaralyzer = callPackage ../tools/security/yaralyzer { }; + yarGen = callPackage ../tools/security/yarGen { }; yersinia = callPackage ../tools/security/yersinia { }; From d928451e6d9d5ff6dd0d117e3fadc620d4609b3a Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Mon, 27 Feb 2023 18:49:44 +0100 Subject: [PATCH 13/54] python3Packages.django-compression-middleware: init at 0.4.2 --- .../django-compression-middleware/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/django-compression-middleware/default.nix diff --git a/pkgs/development/python-modules/django-compression-middleware/default.nix b/pkgs/development/python-modules/django-compression-middleware/default.nix new file mode 100644 index 000000000000..7857ae74834b --- /dev/null +++ b/pkgs/development/python-modules/django-compression-middleware/default.nix @@ -0,0 +1,32 @@ +{ lib +, fetchPypi +, buildPythonPackage +, django +, zstandard +, brotli +}: + +buildPythonPackage rec { + pname = "django-compression-middleware"; + version = "0.4.2"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-cdS80JVGz4h4MVCsZGfrQWhZlTR3Swm4Br4wFxOcKVs="; + }; + + propagatedBuildInputs = [ + django + zstandard + brotli + ]; + + meta = with lib; { + description = "Django middleware to compress responses using several algorithms"; + homepage = "https://github.com/friedelwolff/django-compression-middleware"; + changelog = "https://github.com/friedelwolff/django-compression-middleware/releases/tag/v${version}"; + license = licenses.mpl20; + maintainers = with maintainers; [ e1mo ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 08f7417ac863..b4773c063d2f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2563,6 +2563,8 @@ self: super: with self; { django-compressor = callPackage ../development/python-modules/django-compressor { }; + django-compression-middleware = callPackage ../development/python-modules/django-compression-middleware { }; + django-configurations = callPackage ../development/python-modules/django-configurations { }; django_contrib_comments = callPackage ../development/python-modules/django_contrib_comments { }; From 3ee30ec4027738cf0ed5e0921657651f18702197 Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Mon, 27 Feb 2023 19:28:45 +0100 Subject: [PATCH 14/54] paperless-ngx: 1.12.2 -> 1.13.0 --- pkgs/applications/office/paperless-ngx/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index b27c41581563..f4535b59cf89 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -17,13 +17,13 @@ }: let - version = "1.12.2"; + version = "1.13.0"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-1QufnRD2Nbc4twRZ4Yrf3ae1BRGves8tJ/M7coWnRPI="; + hash = "sha256-aIJWEZD98tjfNDQjQfxRR1kOJ4P/fxZP8sw1dKy7apw="; }; # Use specific package versions required by paperless-ngx @@ -93,7 +93,7 @@ let pname = "paperless-ngx-frontend"; inherit version src; - npmDepsHash = "sha256-fp0Gy3018u2y6jaUM9bmXU0SVjyEJdsvkBqbmb8S10Y="; + npmDepsHash = "sha256-es9x7KR5S7E8KjYWq8ie/EwlAy6zrDvySYQi1vy08Wc="; nativeBuildInputs = [ python3 @@ -157,6 +157,7 @@ python.pkgs.buildPythonApplication rec { dateparser django-celery-results django-cors-headers + django-compression-middleware django-extensions django-filter django @@ -295,7 +296,7 @@ python.pkgs.buildPythonApplication rec { # Disable unneeded code coverage test substituteInPlace src/setup.cfg \ - --replace "--cov --cov-report=html" "" + --replace "--cov --cov-report=html --cov-report=xml" "" # OCR on NixOS recognizes the space in the picture, upstream CI doesn't. # See https://github.com/paperless-ngx/paperless-ngx/pull/2216 substituteInPlace src/paperless_tesseract/tests/test_parser.py \ From 645253e62fdcabe9247f38d8033bf086f86b0715 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 27 Feb 2023 11:54:16 -0800 Subject: [PATCH 15/54] firefox: fix desktop file and icon for variants --- .../networking/browsers/firefox/wrapper.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index de68807d8f25..6b89e4cd7000 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -31,7 +31,7 @@ let (lib.toUpper (lib.substring 0 1 applicationName) + lib.substring 1 (-1) applicationName) , nameSuffix ? "" , icon ? applicationName - , wmClass ? null + , wmClass ? applicationName , extraNativeMessagingHosts ? [] , pkcs11Modules ? [] , useGlvnd ? true @@ -61,7 +61,7 @@ let smartcardSupport = cfg.smartcardSupport or false; nativeMessagingHosts = - ([ ] + [ ] ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass) ++ lib.optional (cfg.enableBukubrow or false) bukubrow ++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native @@ -70,7 +70,7 @@ let ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5Packages.plasma-browser-integration ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge ++ extraNativeMessagingHosts - ); + ; libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils ] ++ lib.optional pipewireSupport pipewire ++ lib.optional ffmpegSupport ffmpeg_5 @@ -168,10 +168,10 @@ let inherit pname version; desktopItem = makeDesktopItem ({ - name = applicationName; - exec = "${launcherName} %U"; + name = launcherName; + exec = "${launcherName} --name ${wmClass} %U"; inherit icon; - desktopName = "${desktopName}${nameSuffix}"; + inherit desktopName; startupNotify = true; startupWMClass = wmClass; terminal = false; @@ -403,7 +403,7 @@ let disallowedRequisites = [ stdenv.cc ]; meta = browser.meta // { - description = browser.meta.description; + inherit (browser.meta) description; hydraPlatforms = []; priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c858df96053..d05d0286d109 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29788,6 +29788,7 @@ with pkgs; firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { pname = "firefox-beta-bin"; desktopName = "Firefox Beta"; + wmClass = "firefox-beta"; }; firefox-devedition-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { @@ -29800,6 +29801,7 @@ with pkgs; nameSuffix = "-devedition"; pname = "firefox-devedition-bin"; desktopName = "Firefox DevEdition"; + wmClass = "firefox-devedition"; }; librewolf-unwrapped = callPackage ../applications/networking/browsers/librewolf {}; From 8e149942c7740a146e0fb4e361f245f574b01d36 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Feb 2023 22:52:53 +0100 Subject: [PATCH 16/54] octosuite: init at 3.1.0 --- pkgs/tools/security/octosuite/default.nix | 44 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/tools/security/octosuite/default.nix diff --git a/pkgs/tools/security/octosuite/default.nix b/pkgs/tools/security/octosuite/default.nix new file mode 100644 index 000000000000..88b29dce721c --- /dev/null +++ b/pkgs/tools/security/octosuite/default.nix @@ -0,0 +1,44 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "octosuite"; + version = "3.1.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "bellingcat"; + repo = "octosuite"; + rev = "refs/tags/${version}"; + hash = "sha256-C73txVtyWTcIrJSApBy4uIKDcuUq0HZrGM6dqDVLkKY="; + }; + + postPatch = '' + # pyreadline3 is Windows-only + substituteInPlace setup.py \ + --replace ', "pyreadline3"' "" + ''; + + propagatedBuildInputs = with python3.pkgs; [ + psutil + requests + rich + ]; + + pythonImportsCheck = [ + "octosuite" + ]; + + # Project has no tests + doCheck = false; + + meta = with lib; { + description = "Advanced Github OSINT framework"; + homepage = "https://github.com/bellingcat/octosuite"; + changelog = "https://github.com/bellingcat/octosuite/releases/tag/${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a59307ce294..d40cc94ae66a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -622,6 +622,8 @@ with pkgs; erosmb = callPackage ../tools/security/erosmb { }; + octosuite = callPackage ../tools/security/octosuite { }; + octosql = callPackage ../tools/misc/octosql { }; onesixtyone = callPackage ../tools/security/onesixtyone {}; From 59cb90605d1ee9ed0f5207d3ef0dec810c5eaf2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Feb 2023 05:45:08 +0000 Subject: [PATCH 17/54] python310Packages.udatetime: 0.0.16 -> 0.0.17 --- pkgs/development/python-modules/udatetime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/udatetime/default.nix b/pkgs/development/python-modules/udatetime/default.nix index 457020af6457..2188cf25a5e7 100644 --- a/pkgs/development/python-modules/udatetime/default.nix +++ b/pkgs/development/python-modules/udatetime/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "udatetime"; - version = "0.0.16"; + version = "0.0.17"; src = fetchPypi { inherit pname version; - sha256 = "09vlcskvaxnfk73l9w5xgl2ks9l62g1b24yrm0xxb7gn93qxglw2"; + sha256 = "sha256-sQvFVwaZpDinLitaZOdr2MKO4779FvIJOHpVB/oLgwE="; }; patches = [ From 0c960d8de4c94bc2577294b9fdff0a3341c8099e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Feb 2023 06:11:48 +0000 Subject: [PATCH 18/54] ctlptl: 0.8.16 -> 0.8.17 --- pkgs/development/tools/ctlptl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ctlptl/default.nix b/pkgs/development/tools/ctlptl/default.nix index 1759596e8f71..182ad8e484f7 100644 --- a/pkgs/development/tools/ctlptl/default.nix +++ b/pkgs/development/tools/ctlptl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ctlptl"; - version = "0.8.16"; + version = "0.8.17"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-JCBlP8ESCiqr4pk8QyG5CVs+3qSlnvw0jYS5R0Civk0="; + hash = "sha256-vX2U6bkl8ms31zIjXOy/3vw/q9ul74x9TEpsLu5o6XI="; }; - vendorHash = "sha256-M9B/rfMBjYJb9szmYPVZqURlcv62qHOLJ3ka0v++z0s="; + vendorHash = "sha256-zlMCfa94gYLWDYC9YOzhLYs5khzmDk8a/2MljpSoFng="; nativeBuildInputs = [ installShellFiles ]; From 8041ca7884a6ba3c6265b96eeb02974ca491765e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Feb 2023 06:57:14 +0000 Subject: [PATCH 19/54] your-editor: 1503 -> 1504 --- pkgs/applications/editors/your-editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix index 09bc1793818a..b5e524ea529e 100644 --- a/pkgs/applications/editors/your-editor/default.nix +++ b/pkgs/applications/editors/your-editor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "your-editor"; - version = "1503"; + version = "1504"; src = fetchFromGitHub { owner = "your-editor"; repo = "yed"; rev = version; - sha256 = "sha256-tRS01z2SnWTDDUfQxZTWiagQuIULDA4aQ8390ZFBqn0="; + sha256 = "sha256-EUDkuCMhBz/Gs4DW3V6fqU583MzqXy1r08WDnUN76cw="; }; installPhase = '' From 6f82f79acd671832fe70416687b6bb908074a4c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Feb 2023 07:19:48 +0000 Subject: [PATCH 20/54] dua: 2.19.1 -> 2.19.2 --- pkgs/tools/misc/dua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 0a4577b9f9c9..40370f33ab7e 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.19.1"; + version = "2.19.2"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-GNVmrFY/qWInP0qT9Y+UurIyK3rBhj2OyAcH+Sw3smo="; + sha256 = "sha256-A39lYXkHinvppZVm2V9HXmtcbR4jOiHRtABQeryqLG8="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-xhNHvTVOBwAkMn/lLUShhZkBih1zX5b/udeJaEcZGgs="; + cargoHash = "sha256-7SrNPf1inu8zaIMErJ6zADDFkLMPvR6zCg44Vv1DarM="; doCheck = false; From 14533fe0ae2c95751711a568fb6f7c840c6ae950 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Feb 2023 09:00:30 +0100 Subject: [PATCH 21/54] python310Packages.cart: add changelog to meta --- pkgs/development/python-modules/cart/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cart/default.nix b/pkgs/development/python-modules/cart/default.nix index c4ef21648773..2671b2d4a2f8 100644 --- a/pkgs/development/python-modules/cart/default.nix +++ b/pkgs/development/python-modules/cart/default.nix @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CybercentreCanada"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-PsdDlNhX0FbuwS5ZXk9P98DjnzDGdigfnRwrdwYa4qY="; + rev = "refs/tags/v${version}"; + hash = "sha256-PsdDlNhX0FbuwS5ZXk9P98DjnzDGdigfnRwrdwYa4qY="; }; propagatedBuildInputs = [ @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for the CaRT Neutering format"; homepage = "https://github.com/CybercentreCanada/cart"; + changelog = "https://github.com/CybercentreCanada/cart/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 31b4cd4bcad55c702f47a28019d4f5032e3200d2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Feb 2023 09:01:29 +0100 Subject: [PATCH 22/54] python310Packages.cart: 1.2.1 -> 1.2.2 Changelog: https://github.com/CybercentreCanada/cart/releases/tag/v1.2.2 --- pkgs/development/python-modules/cart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cart/default.nix b/pkgs/development/python-modules/cart/default.nix index 2671b2d4a2f8..a0541fc1467f 100644 --- a/pkgs/development/python-modules/cart/default.nix +++ b/pkgs/development/python-modules/cart/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "cart"; - version = "1.2.1"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "CybercentreCanada"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-PsdDlNhX0FbuwS5ZXk9P98DjnzDGdigfnRwrdwYa4qY="; + hash = "sha256-0dHdXb4v92681xL21FsrIkNgNQ9R5ULV1lnSCITZzP8="; }; propagatedBuildInputs = [ From 2d42003f5ff81da8a496a72363067e465d33411e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Feb 2023 09:05:53 +0100 Subject: [PATCH 23/54] python310Packages.neo4j: 5.5.0 -> 5.6.0 Changelog: https://github.com/neo4j/neo4j-python-driver/releases/tag/5.6.0 --- pkgs/development/python-modules/neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 5f7e3430cb09..67e0947b5c14 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.5.0"; + version = "5.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-K3ggXXDDdyPIcWL4eLo1HrpZB05tA9oYWpbOohcCF/w="; + hash = "sha256-OjGLV7xHyF8kB++juXTM40aUl4OK+xwhnFaLSyxHMo4="; }; propagatedBuildInputs = [ From b17c7d1ba4ec14a690ce8b6a0177beb3181e11bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Feb 2023 08:42:41 +0000 Subject: [PATCH 24/54] gitleaks: 8.15.4 -> 8.16.0 --- pkgs/tools/security/gitleaks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index 83f819a8974e..3e245e02feb4 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.15.4"; + version = "8.16.0"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - hash = "sha256-VhOepelAX4Pa/SoL0kH7vPGG1nI5oA5JrhI5T09hKCw="; + hash = "sha256-EazTDPJMMUGmGSfQ5d7J1opv/KlapQLZZYxjbzBRaUY="; }; vendorHash = "sha256-Ev0/CSpwJDmc+Dvu/bFDzsgsq80rWImJWXNAUqYHgoE="; From d0c6fa6d4e09fa8a946ef81a836635ded8abded3 Mon Sep 17 00:00:00 2001 From: Indexyz Date: Tue, 28 Feb 2023 17:17:58 +0800 Subject: [PATCH 25/54] qbittorrent: 4.5.1 -> 4.5.2 --- pkgs/applications/networking/p2p/qbittorrent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 1ddc8a14f5f5..999d2fa5dd65 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -11,13 +11,13 @@ assert trackerSearch -> (python3 != null); mkDerivation rec { pname = "qbittorrent" + lib.optionalString (!guiSupport) "-nox"; - version = "4.5.1"; + version = "4.5.2"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - hash = "sha256-FpnWN++tgARETeUQhY9yXUPPz5FpOimqCUvBCfy0sAY="; + hash = "sha256-U0JDLLyIrMBqP4EqRAj48sdv9Om9cwdx4vP/0Ob1QB8="; }; enableParallelBuilding = true; From b6b62949e7365c606a7a1577b642de0ffea956e3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Feb 2023 10:34:14 +0100 Subject: [PATCH 26/54] python310Packages.pypsrp: add changelog to meta --- pkgs/development/python-modules/pypsrp/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pypsrp/default.nix b/pkgs/development/python-modules/pypsrp/default.nix index e474a8456738..53fc9af70034 100644 --- a/pkgs/development/python-modules/pypsrp/default.nix +++ b/pkgs/development/python-modules/pypsrp/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jborean93"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-Pwfc9e39sYPdcHN1cZtxxGEglEYzPp4yOYLD5/4SSiU="; }; @@ -73,6 +73,7 @@ buildPythonPackage rec { meta = with lib; { description = "PowerShell Remoting Protocol Client library"; homepage = "https://github.com/jborean93/pypsrp"; + changelog = "https://github.com/jborean93/pypsrp/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 95df4033fc9febdcb57b5d6706c6db7cdb5bba71 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Feb 2023 10:50:05 +0100 Subject: [PATCH 27/54] python310Packages.pypsrp: disable failing tests --- pkgs/development/python-modules/pypsrp/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/pypsrp/default.nix b/pkgs/development/python-modules/pypsrp/default.nix index 53fc9af70034..1dd8c57a260d 100644 --- a/pkgs/development/python-modules/pypsrp/default.nix +++ b/pkgs/development/python-modules/pypsrp/default.nix @@ -70,6 +70,13 @@ buildPythonPackage rec { "pypsrp" ]; + disabledTests = [ + # TypeError: Backend.load_rsa_private_numbers() missing 1 required... + "test_psrp_pshost_ui_mocked_methods" + "test_psrp_key_exchange_timeout" + "test_psrp_multiple_commands" + ]; + meta = with lib; { description = "PowerShell Remoting Protocol Client library"; homepage = "https://github.com/jborean93/pypsrp"; From cad648850915c9a5f8219e5635766c69d858c146 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 28 Feb 2023 10:45:38 +0000 Subject: [PATCH 28/54] nixos/multipass: typo s/SyslogIdentifer/SyslogIdentifier/ --- nixos/modules/virtualisation/multipass.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/multipass.nix b/nixos/modules/virtualisation/multipass.nix index d066932b6120..6ef7de4b2bf5 100644 --- a/nixos/modules/virtualisation/multipass.nix +++ b/nixos/modules/virtualisation/multipass.nix @@ -44,7 +44,7 @@ in serviceConfig = { ExecStart = "${cfg.package}/bin/multipassd --logger platform --verbosity ${cfg.logLevel}"; - SyslogIdentifer = "multipassd"; + SyslogIdentifier = "multipassd"; Restart = "on-failure"; TimeoutStopSec = 300; Type = "simple"; From 74422033aa269c101b3c4d2f27acd335ffe97c32 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 28 Feb 2023 12:52:35 +0200 Subject: [PATCH 29/54] mmex: 1.6.1 -> 1.6.3 --- pkgs/applications/office/mmex/default.nix | 17 +++++++++++------ pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index 4846279569f4..e1f39e8964c5 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -10,26 +10,29 @@ , wrapGAppsHook , curl , sqlite -, wxGTK +, wxGTK32 , gtk3 -, libobjc +, darwin }: stdenv.mkDerivation rec { pname = "money-manager-ex"; - version = "1.6.1"; + version = "1.6.3"; src = fetchFromGitHub { owner = "moneymanagerex"; repo = "moneymanagerex"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-0zUZBkdFLvc32gkGqu0pYlVsHuwjhaVZzu9acSmNfu8="; + hash = "sha256-TQgJ2Q4Z7+OtwuwkfPBgm2BmMKML9nmyFLSkmKJ1RE4="; }; postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' substituteInPlace src/platfdep_mac.mm \ --replace "appearance.name == NSAppearanceNameDarkAqua" "NO" + '' + lib.optionalString (stdenv.isLinux && !stdenv.isx86_64) '' + substituteInPlace 3rd/CMakeLists.txt \ + --replace "-msse4.2 -maes" "" ''; nativeBuildInputs = [ @@ -46,14 +49,16 @@ stdenv.mkDerivation rec { buildInputs = [ curl sqlite - wxGTK + wxGTK32 gtk3 ] ++ lib.optionals stdenv.isDarwin [ - libobjc + darwin.libobjc ]; env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ + "-Wno-deprecated-copy" "-Wno-old-style-cast" + "-Wno-unused-parameter" ]); postInstall = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3cf138d13488..6c5548efeff5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31450,8 +31450,7 @@ with pkgs; MMA = callPackage ../applications/audio/MMA { }; mmex = callPackage ../applications/office/mmex { - inherit (darwin) libobjc; - wxGTK = wxGTK32.override { + wxGTK32 = wxGTK32.override { withWebKit = true; }; }; From 2caa0a8188e8181b2943df624b5ea4bd2870b816 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 27 Feb 2023 18:24:30 -0300 Subject: [PATCH 30/54] manaplus: fix build manaplus: mark broken for Darwin --- pkgs/games/manaplus/default.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/manaplus/default.nix b/pkgs/games/manaplus/default.nix index 09edb32ad140..1ea5231a65ea 100644 --- a/pkgs/games/manaplus/default.nix +++ b/pkgs/games/manaplus/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { description = "A free OpenSource 2D MMORPG client"; homepage = "https://manaplus.org/"; license = lib.licenses.gpl2; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c858df96053..9cb377e2c468 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35503,7 +35503,7 @@ with pkgs; mari0 = callPackage ../games/mari0 { }; - manaplus = callPackage ../games/manaplus { }; + manaplus = callPackage ../games/manaplus { stdenv = gcc11Stdenv; }; mars = callPackage ../games/mars { }; From f3a39f218ae33cbebb6f26601bc083f8e1e22ee4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Feb 2023 11:12:47 +0100 Subject: [PATCH 31/54] python311Packages.psrpcore: disable failing tests on Python 3.11 --- pkgs/development/python-modules/psrpcore/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/psrpcore/default.nix b/pkgs/development/python-modules/psrpcore/default.nix index 131d49f4ac93..fc0517f0df84 100644 --- a/pkgs/development/python-modules/psrpcore/default.nix +++ b/pkgs/development/python-modules/psrpcore/default.nix @@ -3,6 +3,7 @@ , cryptography , fetchFromGitHub , pytestCheckHook +, pythonAtLeast , pythonOlder , xmldiff }: @@ -30,11 +31,17 @@ buildPythonPackage rec { xmldiff ]; - pythonImportsCheck = [ "psrpcore" ]; + disabledTests = lib.optionals (pythonAtLeast "3.11") [ + # https://github.com/jborean93/psrpcore/issues/22 + "test_remote_stream_options" + "test_ps_flags" + ]; + + meta = with lib; { description = "Library for the PowerShell Remoting Protocol (PSRP)"; homepage = "https://github.com/jborean93/psrpcore"; From 008a86b223df66253c5d7c22edbc42a64ab1a14e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Feb 2023 13:10:47 +0100 Subject: [PATCH 32/54] strace: 6.1 -> 6.2 ChangeLog: https://github.com/strace/strace/releases/tag/v6.2 --- pkgs/development/tools/misc/strace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 538437b2a6cf..100014a139b1 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "6.1"; + version = "6.2"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-JXnpzsN9u3hvbqC+vRX0DdVh7yveKiouzc5ZY7AYWf0="; + sha256 = "sha256-DH04pElBYmjTAEApoiChWnfCIGoDzIgSDzf0bpSRd+g="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From 71aac402cce3f2e895875624871e98c35d408fa2 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 28 Feb 2023 09:19:27 -0300 Subject: [PATCH 33/54] SDL2_mixer_2_0: init at 2.0.4 * As required by `lzwolf`. --- pkgs/development/libraries/SDL2_mixer/2_0.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/SDL2_mixer/2_0.nix diff --git a/pkgs/development/libraries/SDL2_mixer/2_0.nix b/pkgs/development/libraries/SDL2_mixer/2_0.nix new file mode 100644 index 000000000000..764a39219980 --- /dev/null +++ b/pkgs/development/libraries/SDL2_mixer/2_0.nix @@ -0,0 +1,22 @@ +{ fetchurl +, lzwolf +, SDL2_mixer +, timidity +}: + +SDL2_mixer.overrideAttrs(oa: rec { + version = "2.0.4"; + + src = fetchurl { + url = "https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${version}.tar.gz"; + sha256 = "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl"; + }; + + # fix default path to timidity.cfg so MIDI files could be played + postPatch = '' + substituteInPlace timidity/options.h \ + --replace "/usr/share/timidity" "${timidity}/share/timidity" + ''; + + passthru.tests.lzwolf = lzwolf; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 698edfa6b86e..adca185b1c88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23186,6 +23186,8 @@ with pkgs; SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; }; + # SDL2_mixer_2_0 pinned for lzwolf + SDL2_mixer_2_0 = callPackage ../development/libraries/SDL2_mixer/2_0.nix { }; SDL2_net = callPackage ../development/libraries/SDL2_net { }; From e07edafb95211338ebeba5282f07639702582857 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 27 Feb 2023 16:34:46 -0300 Subject: [PATCH 34/54] python311Packages.pygame: marked broken for python >3.11 --- pkgs/development/python-modules/pygame/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index d89ca3dde700..7155ec3778e3 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, substituteAll, fetchFromGitHub, buildPythonPackage, python, pkg-config, libX11 , SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, libpng, libjpeg, portmidi, freetype, fontconfig , AppKit +, pythonAtLeast }: buildPythonPackage rec { @@ -75,5 +76,7 @@ buildPythonPackage rec { license = licenses.lgpl21Plus; maintainers = with maintainers; [ emilytrau ]; platforms = platforms.unix; + # fatal error: longintrepr.h: No such file or directory. + broken = pythonAtLeast "3.11"; # At 2022-02-27 }; } From 0536b97fb49f7c42ef84621ef87f6bb0ff64d66a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Feb 2023 13:50:51 +0100 Subject: [PATCH 35/54] vt-cli: add changelog to meta --- pkgs/tools/security/vt-cli/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vt-cli/default.nix b/pkgs/tools/security/vt-cli/default.nix index eccafd7b0edd..26338528758a 100644 --- a/pkgs/tools/security/vt-cli/default.nix +++ b/pkgs/tools/security/vt-cli/default.nix @@ -10,11 +10,11 @@ buildGoModule rec { src = fetchFromGitHub { owner = "VirusTotal"; repo = pname; - rev = version; - sha256 = "0jqr2xf6f9ywavkx5hzcfnky8ax23ahdj24hjsnq6zlpdqvfn1xb"; + rev = "refs/tags/${version}"; + hash = "sha256-qwfrNm6XfoOtlpAI2aAaoivkp3Xsw9LnVtwnZ1wXGUs="; }; - vendorSha256 = "sha256-XN6dJpoJe9nJn+Tr9SYD64LE0XFiO2vlpdyI9SrZZjQ="; + vendorHash = "sha256-XN6dJpoJe9nJn+Tr9SYD64LE0XFiO2vlpdyI9SrZZjQ="; ldflags = [ "-X github.com/VirusTotal/vt-cli/cmd.Version=${version}" @@ -25,6 +25,7 @@ buildGoModule rec { meta = with lib; { description = "VirusTotal Command Line Interface"; homepage = "https://github.com/VirusTotal/vt-cli"; + changelog = "https://github.com/VirusTotal/vt-cli/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ dit7ya ]; }; From 6ef8111cc762e85ccc2a5fb57529fab1837f88bf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Feb 2023 13:53:54 +0100 Subject: [PATCH 36/54] vt-cli: add mainProgram --- pkgs/tools/security/vt-cli/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/vt-cli/default.nix b/pkgs/tools/security/vt-cli/default.nix index 26338528758a..3a549d7e6f1a 100644 --- a/pkgs/tools/security/vt-cli/default.nix +++ b/pkgs/tools/security/vt-cli/default.nix @@ -27,6 +27,7 @@ buildGoModule rec { homepage = "https://github.com/VirusTotal/vt-cli"; changelog = "https://github.com/VirusTotal/vt-cli/releases/tag/${version}"; license = licenses.asl20; + mainProgram = "vt"; maintainers = with maintainers; [ dit7ya ]; }; } From 87cb67b8c6ef4c708667909d7c65c04e09403f16 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 27 Feb 2023 16:41:58 -0300 Subject: [PATCH 37/54] lzwolf: pin SDL2_mixer to 2.0.x --- pkgs/games/lzwolf/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/games/lzwolf/default.nix b/pkgs/games/lzwolf/default.nix index 4faa7419b7ab..30d34ffa2ce1 100644 --- a/pkgs/games/lzwolf/default.nix +++ b/pkgs/games/lzwolf/default.nix @@ -5,6 +5,7 @@ stdenv.mkDerivation rec { pname = "lzwolf"; + # Fix-Me: Remember to remove SDL2_mixer pin (at top-level) on next lzwolf upgrade. version = "unstable-2022-01-04"; src = fetchFromBitbucket { @@ -13,6 +14,7 @@ stdenv.mkDerivation rec { rev = "6e470316382b87378966f441e233760ce0ff478c"; sha256 = "sha256-IbZleY2FPyW3ORIGO2YFXQyAf1l9nDthpJjEKTTsilM="; }; + nativeBuildInputs = [ p7zip cmake ]; buildInputs = [ SDL2 bzip2 zlib libjpeg SDL2_mixer SDL2_net libsndfile mpg123 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index adca185b1c88..fb12c22a4cf2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9663,7 +9663,7 @@ with pkgs; lzop = callPackage ../tools/compression/lzop { }; - lzwolf = callPackage ../games/lzwolf { }; + lzwolf = callPackage ../games/lzwolf { SDL2_mixer = SDL2_mixer_2_0; }; macchanger = callPackage ../os-specific/linux/macchanger { }; From 7fcb2ae4b53b8402ff30fa808e6e5aeb8666fbca Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Tue, 21 Feb 2023 21:11:56 -0800 Subject: [PATCH 38/54] dotnet-sdk_8: init at 8.0.100-preview.1.23115.2 --- pkgs/development/compilers/dotnet/default.nix | 3 +- .../compilers/dotnet/versions/8.0.nix | 181 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 + 3 files changed, 186 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/dotnet/versions/8.0.nix diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index fddcbcea466b..c0764ed95113 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -30,6 +30,7 @@ let dotnet_3_1 = import ./versions/3.1.nix (buildAttrs // { icu = icu70; }); dotnet_6_0 = import ./versions/6.0.nix (buildAttrs // { inherit icu; }); dotnet_7_0 = import ./versions/7.0.nix (buildAttrs // { inherit icu; }); + dotnet_8_0 = import ./versions/8.0.nix (buildAttrs // { inherit icu; }); in rec { inherit systemToDotnetRid; @@ -41,4 +42,4 @@ rec { sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; sdk_5_0 = throw "Dotnet SDK 5.0 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; -} // dotnet_3_1 // dotnet_6_0 // dotnet_7_0 +} // dotnet_3_1 // dotnet_6_0 // dotnet_7_0 // dotnet_8_0 diff --git a/pkgs/development/compilers/dotnet/versions/8.0.nix b/pkgs/development/compilers/dotnet/versions/8.0.nix new file mode 100644 index 000000000000..be943300c70c --- /dev/null +++ b/pkgs/development/compilers/dotnet/versions/8.0.nix @@ -0,0 +1,181 @@ +{ buildAspNetCore, buildNetRuntime, buildNetSdk, icu }: + +# v8.0 (preview) +{ + aspnetcore_8_0 = buildAspNetCore { + inherit icu; + version = "8.0.0-preview.1.23112.2"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/bcd36740-4478-4104-aad3-97de2eda3c63/4278c479d008a08a82e6ed799ea4cab6/aspnetcore-runtime-8.0.0-preview.1.23112.2-linux-x64.tar.gz"; + sha512 = "8d7a5fbbd62078d55cd93dadb346e8889b5cf4a7337f864839d2ca32283d592d037b89cb0c9940df4cdd956b527fcd3ce5fe608ef7b77dc9ab6d04390e053495"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/63cbd12f-0328-4828-878c-4970ebe2561d/3b0e89d0e68beb6d09ad2323d64d039c/aspnetcore-runtime-8.0.0-preview.1.23112.2-linux-arm64.tar.gz"; + sha512 = "b8f5eb4087267f84bbea48f7c98f53d09cffdf269792c713c9d02b892ebc1eea075a39af7fc3cc63348ee6adc54179a5145b884fdf5d8853b7018c800073a10e"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/60354a8c-773b-4999-af88-f6232bf5b644/19f1f472670e5625ee6a75d09b95653b/aspnetcore-runtime-8.0.0-preview.1.23112.2-osx-x64.tar.gz"; + sha512 = "8fa6786adfcab090872ade64b742af43d75d973d6800ed5be171ba16324dcff7957e52582136116c1e2708e64c08141d4e095088841146d8e651f1f496757d19"; + }; + aarch64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/00e1ec5d-62c0-4084-bf5d-f5667a77afe5/f4d1ceeb2d51a60323084ef43317b1f2/aspnetcore-runtime-8.0.0-preview.1.23112.2-osx-arm64.tar.gz"; + sha512 = "f816c7a078a6d121e74108a9199dfa235ec27e47222e2d25573f8d417560526d9c1e7792a0efe21e0a65e7db07bdbda942b33e38b656d32e9d00d250d7013092"; + }; + }; + }; + + runtime_8_0 = buildNetRuntime { + inherit icu; + version = "8.0.0-preview.1.23110.8"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/6c535b62-2132-4f07-90d0-2b172d18e436/b4b8aa2b558e1472c650a40707f25241/dotnet-runtime-8.0.0-preview.1.23110.8-linux-x64.tar.gz"; + sha512 = "76436051d57d602e7d45055c64f5ef4db9a3af3358f880115442b3d7bdcd2a4eaad36c59d51d8508049418d9f62a3f7c0747d989d7d758bd84244806a6f83b02"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/29109381-5068-4e80-a3f8-d0c825202bbc/b4205a8a483c639c0cfdf54bb1fb5ec6/dotnet-runtime-8.0.0-preview.1.23110.8-linux-arm64.tar.gz"; + sha512 = "2a15a8affb01c905e9ab4989f58a36bf9fec4e7395e3c44f143657e7d2e3903d7469ddc06c3fd57d3fcf48db4713d2ecd2c8ad2b3e361e8138e1890ba81adf73"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/02916946-04e0-45d1-b36d-07ebc9bab6c2/c160d7f42df423bd40d7251ee015b440/dotnet-runtime-8.0.0-preview.1.23110.8-osx-x64.tar.gz"; + sha512 = "c07754ca2067f38a37b2e4f35eea1dd8a82757906ae21964a21d2c2eabddfb80cb309a2267e619b6bb2447b917d8b47948c7835063200efded1fa35f89edb4d9"; + }; + aarch64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/13005a07-288f-4c55-b874-71a336d4c687/ba476df7f39fd64214b1911ac4791c97/dotnet-runtime-8.0.0-preview.1.23110.8-osx-arm64.tar.gz"; + sha512 = "415ff6cc4cffc0cb25b92a88cd12f4653d087247b6e81b2e3d2f49b25363301ab239ef82d0d174f7dd7b31989ecfa8b6ed4dbf5e37d659fee864bcc22df0a908"; + }; + }; + }; + + sdk_8_0 = buildNetSdk { + inherit icu; + version = "8.0.100-preview.1.23115.2"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/e2578737-231b-493c-a6ee-f181496fe679/18038808d2621094ebe172ca011a7c22/dotnet-sdk-8.0.100-preview.1.23115.2-linux-x64.tar.gz"; + sha512 = "23a14c92e402161ed8d42ec9cb25a97868a1b72348195d28cffa00a12815f019308b56485e4375c0d0a33d9a683d83cc1e1a2a517eea44af8fb353171b6c3f64"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/57c316ef-4b1d-4b1e-b180-f38302132d3d/b938e1b373897fadfb25ff4b55ca32e6/dotnet-sdk-8.0.100-preview.1.23115.2-linux-arm64.tar.gz"; + sha512 = "98518887927605051312554499e197c14b32e8100fe8d8015a4556fdca3a347a3d2215d14069d33b27d978489f3e958c11baf18ba33e1b98580d2eb64cc1097b"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/0b01073d-3861-4fe0-abba-41e271c79725/12150bdbeeeb50e157b91f2adab90c80/dotnet-sdk-8.0.100-preview.1.23115.2-osx-x64.tar.gz"; + sha512 = "fb67f43a8a4e56d6121fadb2e2a8a24157d9cee3ba1b0e0bbeb2997f0574f97a525d22bd40ceee026ae782512d9ef88ced892d94af852681399e7e320c1d642b"; + }; + aarch64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/00476255-fac3-4e26-98a4-c487aa89945c/76550e8fb59f35fcb6b789d570b9ace5/dotnet-sdk-8.0.100-preview.1.23115.2-osx-arm64.tar.gz"; + sha512 = "51164fa4a7353d36bf83126e8a2875152ef55b3d0641d61d143a3572c0e169e9e6026e924209d7b9cca93475b8b9fd6e476f733b1d21944e942f67a43f319aea"; + }; + }; + packages = { fetchNuGet }: [ + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.0-preview.1.23112.2"; sha256 = "1lbzvxjm9mhbwygvn6rfbih2gsaapb33c9bkr48812jz0n1nj4kk"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.0-preview.1.23112.2"; sha256 = "0p99wvlr0mpg5600ajcmsxhqcazk1m95vivjrw691a7sqbqibrq6"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.0-preview.1.23112.2"; sha256 = "07j3asxynyby94qi3ky1yqcmakjd06fyq9354r6mkckn30i4ncs5"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.0-preview.1.23112.2"; sha256 = "0d3qxg43wz7g5kas3c2mr9hcxzm5bw8cm0q4jv17wzwzwkk4jnfy"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.0-preview.1.23112.2"; sha256 = "0il697pzhd5ikfc76695i3621bhl469cg0hz50j061bsb06q4dqi"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.0-preview.1.23112.2"; sha256 = "195qsdbrzv3llb5yq0dfwx3iqiyw7v6f8idwibj43347j4pdi6w9"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "8.0.0-preview.1.23112.2"; sha256 = "1jrc4fjydzqj4ksa0hr51ic4xp1ifrsq2liy1sjzsvvkyifbz9f8"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.0-preview.1.23112.2"; sha256 = "1b0f760q94x33x4masnz9v643adrdqc5xf8cliphd4g3awspkszf"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.0-preview.1.23112.2"; sha256 = "0vxndnbgyvjminvssx0qlwiqyapsy7fsjyh8ndkf3g5brvr4id2n"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.0-preview.1.23112.2"; sha256 = "0li0x59gdzgip7fwkbvcfr4vw9h8hkfh96jpj8wnk66jbmyk6phk"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.0-preview.1.23112.2"; sha256 = "1r5z6h6c9w1xw4d5fvqplsr2j6k1bkw8kp2a7zkxya0f185g1abl"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.0-preview.1.23112.2"; sha256 = "1317rfzgc1znrzqjk31ykrnzcpw8835y7vsrxi19fk6m6a2ylx4s"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.0-preview.1.23112.2"; sha256 = "1l5vh6qz4y31l3mxa7isv6pbhaqfd9j23493c8wci1adqg2lhgfv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.0-preview.1.23110.8"; sha256 = "09f8ckxyw8mpvypzifk3rmcays4jzypbz61gznvhkk1mxfh47hia"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "1d433w5750sf540w2nf4m926yw3mciml4z5w1wiyw4fgq3z329d5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "17dla35fn05rn2svkap5j2j6579i3sgarama3ma2s0zsd3qbppbw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "1qc8h53yyyryfx9c9wj5zzjm47g4xc57wjrcq4ddr6dbw9spyq7i"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "0adzrwsccm8wl666haxybrs2x3qm86mjl0ql18sz67gxpdx1lbf2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "13m9gzs0dy8nr7k8ha82h04491c932z45lf02xpdw7f30p8wd111"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "8.0.0-preview.1.23110.8"; sha256 = "13wnc79f0kjhq6g5024v2vjn3cc0618117vz9bwbkfpy6bnsz1ny"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "1p5jws2bdj5swy7r8z32swzn9c0h2mrwalhd3q9f7n8mgqqr9g5n"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "08w4mkak0kabbaqv9vw2hy65qmz5967z73cmd901l9sr5gr8k9i0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.0-preview.1.23110.8"; sha256 = "1vshh5crb100kqpis3qxjffp09mkcha20yps4czl0aqy6rv7nacf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.0-preview.1.23110.8"; sha256 = "0vwx782gmcgmzid0pync6xwyg4ribcq4yawpssd0jldmy7kr8zvg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "1r5f67l3jhiw7hyfawm680aag3wlhqx79rarlbgqmh1gs4z3z2ds"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "04y6rks7j3mizg1y5ykdgl8kczl31zr99kn15z1z7ymajldxga4a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "1f7hklh9vkzxnr81k1i5rhjwn5q9bi4a7gf5lz6lrjg8w97fh1fy"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "009l5ykx91zy9inrr0xmqqgjgxj9gr20350j1gzv8n0hwd73n3s1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "0jllhxnmpmbspk6p9mwnlac1f0pw42vxy4vgc4dm8y4d8mqpbp9p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "8.0.0-preview.1.23110.8"; sha256 = "0vnwx5607gwnjnzs89c48202jiysb92kby0s7jfv5lvb0r1naacb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "08mxpbzdpdj99w3a0mbvb2873kd7gf36w76d6qrix1zcpf4chfih"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "0kx86mr5jss54a51iyky4x1j7jy6zmac50yr9hdmzkgg4ilqz82w"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.0-preview.1.23110.8"; sha256 = "12ll7kdgc2v1270lww2ylcrlapzrwr2nbd2jx2wjgsb1q13asas0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "1s5z4p505z9ymf41s247w2f3xy3p433sf8g6a01anmkhyrja0shy"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0x0z37702vw2wwhypjvdfxxrdxyhykv30npm3q9w68d00w7kdaj3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "1lwdndszklk7m2pmj9b9s1k2h9cp3a8hsas0nq6kypmpwh473asj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "0zmxs0v0r92g3f3680fp4mryi74mza85yknzcg2ygvasw1zq57db"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "1d2xvd54lgfsipv5gpakv8r5qvqhxg47k89qbr62f11clqjp1pbl"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0bc702a48wpbfya6ffaz3jnzl1b01q915v9aqd07h2km57mimyc8"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "1i6l87iqkg4695cbsfchzv74smag9wi5xfz6854k7pqhfx0bmmnn"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "1ysiwq6z3xz9b0n8prvgd5a5bwdyl86fcan6fy7h2zj3crbc5hnh"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "14xnzkimq1pf7qcm8dlcwszcx00yy39im064yxj46bak9md0ppfz"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "006f41nqrbq2wh6qfik71pf2zqknmckk8g6pf4hbnckp95jlb9zj"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "0kd96jcwmpjb0cvpdaj88rnv99vdb4p0fmy05khq0jk1qyxm4h9i"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "0qlm6p4s49w7v911pia35h6dh3ljl0yk8gavb0ij9xmy8zkrjxsk"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "10vrhk52f87q98ixmy642avj5b47dhgnhgd9z0mv063xx31f7z4h"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0hid6jpg4q1xl5lf0a65pj1x4dn4zvim4j4pyhgsshb0pqj9kzhy"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "19rylmrajxcmjpfijgmn64z2v935d4rmq9vnm0187a1h9kyvqz9l"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "1a3ckzz5l92hr6rhdv942w16654dldcv8s4g3hiv2snd3ra1qdal"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "06ykyfmj6q65fn5xx6hgr8g83k4pwv118rs02wi5sl2xgl37w60s"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "00ikv949xhyd50ndv58inblggjdzphcky8w9nf84pyiw9vpfgaxr"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "1h7qkd30q588lmkr7yw68xmm9cipiwbi7lyardcc7kkqr7v3m2r0"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "14kclfm2cg55j94nynrqdy3nby98051lvh5jl0r6aw06380g6z3h"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "1p9p8anr605fmrqzll2qlrryb060lkijnsw6w7rarh724jcx6van"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "1gl523fpl5446h8hds2w38lr05x41fnggkb26d92wrl4av3ymmhm"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "0y8gsgzx44zyw5ixacm5sisqmclgvf7qi1dgflfd33mpylzskway"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "0534xd1n557s09n1bf88ninp7r6cdj4d27dk1ls6bwq9a1f7wz11"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "1mlcgfxpl7n8p968qxs92mis7yvwcf8zv6ypgj7h3gpzxk7mpyb9"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0hkxz60p0byc10qi3kmhzfgwr5a94y64z5ijagas0s829y3xg15w"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "1blcg6isbcbb0vv1misnhgp8005d4kjs1rpjmssv5r7abvz077wq"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "1afsc9a1drr7i1blqcgaphggjpkyfj6amc5wrw8r7q3sx6ix3m9l"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0mpr88cfi1cqlw0asf43jrh4g5j8brz7bmv5ggzjjskq5s4ijyrz"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "07d3mxprv0szcvj2s0fynzbzhx67iamjdil69cavkwx5lkry07s5"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "00iz16i9kdmjg8wax6w6ybm810xi6593rkixawpszjqhiifwd4vh"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "0gxpywgcda1z82r8xzcw4xsynlc330r4ms9bnfdm5iq8xbdafkbh"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0aklxhf1kfn6rk9ifapkrrviamrdr2nvsjniwgz02ihms7d38maz"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "12k9flpf571xz14jg47mra12ssv6s4nscafb3zivlhw949bpz4sd"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "0p67vwnhczfz6p8vx1llybwkp9wvvk5piiw9pzwy2qi71913l2nz"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "1szg1rgyyj0c1fsnyf0xv5m7c2dp9qs13pdaa0r8l0g2nc79wd59"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "03jwqgr2x9lliz4f96bdbc6h1z02dgq037qhjn48s7a9khp3ky77"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "144sxccrc0m5wwp192csa3byyhbn0s40d6gysh9z1da680m6rmvq"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "01i9lifhxsali51j4p7ip9jnpdl30cgx8j0w6ib7l4bq0719s5pm"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "1rwn1c22a14fkb5wlap81p0amaa2s19z9xb44zwk844vyfyia9iv"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0gnhcx2avlr4cvxfnz0rwbdbg7sxpvkn1rq7ff6a8gp9wf9xngp5"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0b0wc36adbfc31wc2lcwbzlb056pj8x9zcp8h1iikpc1fpxn0dyh"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "0ahn58gm3031yy9glhdph0chpixxpjykbgjzk2nxi65b6knvn9lv"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "063rf8bc5200vzcdig2pm1qb5y9ihnn35dyv2ws2k487v54mchh5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "8.0.0-preview.1.23110.8"; sha256 = "176gkl0hwgiw6dj5j10gaqi7sra2qshhfsrksh2zrr2askrynkyj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.0-preview.1.23110.8"; sha256 = "1jrmf89v3596gfv2ihfaahx144yaxy31zy4h6mz7g1d3si18i5d1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "0j01372ydb1w1jqydyds175cgcj4gnhwv1swzcbxl6ljp8zpjw0l"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.0-preview.1.23110.8"; sha256 = "1vwfp4xwgbffzihx2sxqwq2ywrd5xrnj9djgchmcscssgix8p6k1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "094q704n6np5hiqc75p24frqrzw155194128bhs1frhq4qbyfwxh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.0-preview.1.23110.8"; sha256 = "1zzjs4wi9i06kfv301ib5pgi631w0ssv1sw5vawk6j20aks098mr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.0-preview.1.23110.8"; sha256 = "1jdbr2425mvyqcycd257hr75r9b5jfm8g2n8ycdily7viagk37wm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "03yzv12bxlix9dag8ik3smxbk9fxyw9agnwdqa68dlacqi515w4r"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "1dqzg08wililm03qx760cjq56d2q340vsrqk5r5i8y3dvzzbmpb9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "18pi9ih1jx2fwkvx6smw1vlcyky2cj981v1fnav983ywz5cm1l5y"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "0msgs5dvjqcaz59dx4l0fxdfs48vab6nypimq4q8q4az52r6pikl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "1inn16z3ms723lanc323b0zbvn0kygh67hyi6y9afvn5l6wjb29j"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "1h8ijydxk6qby92vcbj7im1vwsyi7xwcmck7p6iqxmfph06kl02p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.0-preview.1.23110.8"; sha256 = "11lr9a44m9mxrwr5d8yrhv6pjp11lycd1z8jarx553vjnilqaryr"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "00nki84qrr7nmgvm93ivclj5jmxbnp3i0461s03yi7hcc459qhmz"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "00k4g5nah2dc7iwcd422i793mrkg02fz09yig3kqy1z8q3b5m2ln"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "0lgkamn3x004wkq0ijqsw0rdfrkwb68kg6wf8lg9fssikp6r75c2"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "05c7cxrg2191v8lnbsg0ygj5qc4mj5x9x6088v9m039wbswc4ggc"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0p2aqc921666d35hgwc45kn6qxh1qn28jq7ca0pql4v8778pxkln"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "1wcw6rzqcdvc14p87d5ip4l9hlnf5cm52sqklakgnv15k9a00i7i"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "1qddlbadxfk3jmbm41gry0d4nl8rm6rgb58cya3qvwrp4rizxi5s"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "1ryndj04m867fdfn8jvkahkm5mq3bp3z4b4skpf6skq9w994fksk"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.1.23110.8"; sha256 = "1p798z08kyw2mnpps9z8f1q7mj76p1phqrikhxh99l12cdcv69z9"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.1.23110.8"; sha256 = "0bfw4wmwjijm7aimf1zf51ghhxabp4ag27x1sgjx9vbysi0g9fjd"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.1.23110.8"; sha256 = "055snp02x9v4s8kqhyrcmasz0dsjw2mp2wsfyfnyjvyj1nrr47ii"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.1.23110.8"; sha256 = "0w2wciixif3j8l210jvdlk92hxmhzydwy7si8g9509a848s3rppc"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.1.23110.8"; sha256 = "162gb1a7g3y7prcp6k40bj0z7jvs6hhsx063i1m1w8a07ng65mpy"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.1.23110.8"; sha256 = "107sh6dmzpv2jign21r50pg68qq7n8iyrd2ia159p3rlchc6w3qv"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.1.23110.8"; sha256 = "1vgahyzblbvgjfl3dcxhd1d2f1jz7bk9vc7k8bi28sh4hm9xq1av"; }) + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2e7c0066fa2..16b897fe141d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -685,14 +685,17 @@ with pkgs; dotnet-sdk_5 = dotnetCorePackages.sdk_5_0; dotnet-sdk_6 = dotnetCorePackages.sdk_6_0; dotnet-sdk_7 = dotnetCorePackages.sdk_7_0; + dotnet-sdk_8 = dotnetCorePackages.sdk_8_0; dotnet-runtime_3 = dotnetCorePackages.runtime_3_1; dotnet-runtime_6 = dotnetCorePackages.runtime_6_0; dotnet-runtime_7 = dotnetCorePackages.runtime_7_0; + dotnet-runtime_8 = dotnetCorePackages.runtime_8_0; dotnet-aspnetcore_3 = dotnetCorePackages.aspnetcore_3_1; dotnet-aspnetcore_6 = dotnetCorePackages.aspnetcore_6_0; dotnet-aspnetcore_7 = dotnetCorePackages.aspnetcore_7_0; + dotnet-aspnetcore_8 = dotnetCorePackages.aspnetcore_8_0; dotnet-sdk = dotnetCorePackages.sdk_6_0; dotnet-runtime = dotnetCorePackages.runtime_6_0; From 93a524dba0299e2096643635bcf87dc5c23a97aa Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 28 Feb 2023 15:07:27 +0000 Subject: [PATCH 39/54] git-cola: update dependencies and make it work in darwin - `pyinotify` was removed a long time ago: https://github.com/git-cola/git-cola/pull/510 - `sip_4` does not seem to be needed, at least there is no mention at docs and the program seems to works fine without it - `send2trash` added since it is an optional feature: https://github.com/git-cola/git-cola#optional-features The removal of `pyinotify` also makes this build and works in darwin, so removing the `meta.platforms` (will inherit from `buildPythonApplication` instead). --- pkgs/applications/version-management/git-cola/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/git-cola/default.nix b/pkgs/applications/version-management/git-cola/default.nix index fb4ebea2480f..08a3989b5bbc 100644 --- a/pkgs/applications/version-management/git-cola/default.nix +++ b/pkgs/applications/version-management/git-cola/default.nix @@ -1,9 +1,6 @@ { lib, fetchFromGitHub, python3Packages, gettext, git, qt5 }: -let - inherit (python3Packages) buildPythonApplication pyqt5 sip_4 pyinotify qtpy; - -in buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "git-cola"; version = "4.1.0"; @@ -15,7 +12,7 @@ in buildPythonApplication rec { }; buildInputs = [ git gettext ]; - propagatedBuildInputs = [ pyqt5 sip_4 pyinotify qtpy ]; + propagatedBuildInputs = with python3Packages; [ pyqt5 qtpy send2trash ]; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; doCheck = false; @@ -28,7 +25,6 @@ in buildPythonApplication rec { homepage = "https://github.com/git-cola/git-cola"; description = "A sleek and powerful Git GUI"; license = licenses.gpl2; - platforms = platforms.linux; maintainers = [ maintainers.bobvanderlinden ]; }; } From 2e07ef872d5efc15cda8e0f5d9679903c855e65f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Feb 2023 15:20:20 +0000 Subject: [PATCH 40/54] checkstyle: 10.7.0 -> 10.8.0 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index cd2843b48cb4..fb6372e491b4 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "10.7.0"; + version = "10.8.0"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-JJGAnja/ONuUUTbLlmk/BrGa0NwJH+EfFn1yL5SvrEw="; + sha256 = "sha256-gWcenFKcqTDg1Ld3D40+dbw+cD4QO2JG/3Bcol2Aj6c="; }; nativeBuildInputs = [ makeWrapper ]; From b850f713c41552e8c3e9bb96ab27f3b9bde13c8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Feb 2023 15:26:47 +0000 Subject: [PATCH 41/54] oh-my-posh: 14.2.7 -> 14.9.1 --- pkgs/development/tools/oh-my-posh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index 10d99906b40c..d83d5ef6f11e 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "14.2.7"; + version = "14.9.1"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-x+hSsN/STJYbyGRCQJ70T3FMKfe1aJaqiK+KT0eNpwE="; + hash = "sha256-oWif17MawHKiFRts9wfLA7XcSLMuogaPLziYzgKihas="; }; - vendorHash = "sha256-rLPL2kGIPR/paY3mLXsqMgvTe7EgQPmg3EqXrLjlFPk="; + vendorHash = "sha256-JZ5UiL2vGsXy/xmz+NcAKYDmp5hq7bx54/OdUyQHUp0="; sourceRoot = "source/src"; From 95e89adfb7769ca0129576477795711d6863e711 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Feb 2023 15:43:08 +0000 Subject: [PATCH 42/54] regctl: 0.4.5 -> 0.4.7 --- pkgs/development/tools/regclient/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/regclient/default.nix b/pkgs/development/tools/regclient/default.nix index f03b522e70a2..4ede9ef7deee 100644 --- a/pkgs/development/tools/regclient/default.nix +++ b/pkgs/development/tools/regclient/default.nix @@ -4,16 +4,16 @@ let bins = [ "regbot" "regctl" "regsync" ]; in buildGoModule rec { pname = "regclient"; - version = "0.4.5"; + version = "0.4.7"; tag = "v${version}"; src = fetchFromGitHub { owner = "regclient"; repo = "regclient"; rev = tag; - sha256 = "sha256-WyjVJp0JVwLitz46YjPGpR/+AjLhjgqTRqabCB9VhHw="; + sha256 = "sha256-BPMdBTtH2uZ6x6sQe7SDe+WcLQrr8gqOka2OnLSA1kU="; }; - vendorSha256 = "sha256-QTeVgvjRw2wBd8QGoVpRVTTh+Wwu2NEZYR1Z9R52/p0="; + vendorHash = "sha256-lDazAGhNzguDzMLHYz2dbk8Jp7VKhV2ULqdXMa+WFPg="; outputs = [ "out" ] ++ bins; From 78e3d43ba45e0fd1681ac06d81fb66b26d259dd9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Feb 2023 15:55:15 +0000 Subject: [PATCH 43/54] unciv: 4.4.19 -> 4.5.1 --- pkgs/games/unciv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index 244f317065cd..96a1ebf3f648 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.4.19"; + version = "4.5.1"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-+f/cl+a8AQ4VUui8ds8PhY9G9Xkag+qv7FuansXRd34="; + hash = "sha256-bghFcLwfEonsBjB9Erhib45soR2UIOr4cYz5ROUOTFo="; }; dontUnpack = true; From 6f1d2013c0f6df93cd0164b3cdcc24eaed5d46f8 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 28 Feb 2023 16:02:06 +0000 Subject: [PATCH 44/54] git-cola: run tests --- .../version-management/git-cola/default.nix | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/git-cola/default.nix b/pkgs/applications/version-management/git-cola/default.nix index 08a3989b5bbc..e9959cd42dee 100644 --- a/pkgs/applications/version-management/git-cola/default.nix +++ b/pkgs/applications/version-management/git-cola/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages, gettext, git, qt5 }: +{ stdenv, lib, fetchFromGitHub, python3Packages, gettext, git, qt5 }: python3Packages.buildPythonApplication rec { pname = "git-cola"; @@ -11,11 +11,23 @@ python3Packages.buildPythonApplication rec { hash = "sha256-s+acQo9b+ZQ31qXBf0m8ajXYuYEQzNybmX9nw+c0DQY="; }; - buildInputs = [ git gettext ]; - propagatedBuildInputs = with python3Packages; [ pyqt5 qtpy send2trash ]; - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + # TODO: remove in the next release since upstream removed pytest-flake8 + # https://github.com/git-cola/git-cola/commit/6c5c5c6c888ee1a095fc1ca5521af9a03b833205 + postPatch = '' + substituteInPlace pytest.ini \ + --replace "--flake8" "" + ''; - doCheck = false; + propagatedBuildInputs = with python3Packages; [ git pyqt5 qtpy send2trash ]; + nativeBuildInputs = [ gettext qt5.wrapQtAppsHook ]; + nativeCheckInputs = with python3Packages; [ git pytestCheckHook ]; + + disabledTestPaths = [ + "qtpy/" + "contrib/win32" + ] ++ lib.optionals stdenv.isDarwin [ + "cola/inotify.py" + ]; preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") From c3bc7b1bcb7a6da680507c01d058a6d506bed69f Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 28 Feb 2023 13:08:55 -0300 Subject: [PATCH 45/54] fluxcd: 0.40.1 -> 0.40.2 Release: https://github.com/fluxcd/flux2/releases/tag/v0.40.2 --- pkgs/applications/networking/cluster/fluxcd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 8b02c25c32b2..a10761578c48 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }: let - version = "0.40.1"; - sha256 = "074iiskgmvk6ys4arxs7kvgkklfvcnrarqw3f6hbida6qnrv5b61"; - manifestsSha256 = "02rvy55q77n1ikw8i0xx6c8r6sxqj6vhp4rks9zy9z84k82mqsj7"; + version = "0.40.2"; + sha256 = "00rzd9i9dd13wsr2f8y6b7q5zphrfx3bgigfinmzcfdinydv3bm4"; + manifestsSha256 = "05bkqkhyb3mgd68w2zr9bav6dfibfzfw65anzkz269wqrkf0d86k"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-/TsCtiZTbWzyAo3IzUkM58Oj97Lo1ztDe9M/CDMF0ao="; + vendorSha256 = "sha256-crFBOWRjgFIm4mrX3Sf9ovodG5t8hhJUbMr2qpIt7LQ="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests From cfc46fb39a33e59942b62f7538298cc937d4215f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Feb 2023 16:24:51 +0000 Subject: [PATCH 46/54] python310Packages.types-dateutil: 2.8.19.8 -> 2.8.19.9 --- pkgs/development/python-modules/types-dateutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-dateutil/default.nix b/pkgs/development/python-modules/types-dateutil/default.nix index ae2d30d9722f..92dfde3b5e6f 100644 --- a/pkgs/development/python-modules/types-dateutil/default.nix +++ b/pkgs/development/python-modules/types-dateutil/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-dateutil"; - version = "2.8.19.8"; + version = "2.8.19.9"; format = "setuptools"; src = fetchPypi { pname = "types-python-dateutil"; inherit version; - hash = "sha256-MWxrEH0FW70GMktxNi5hBBAiIOaYiqSjiFUKo6itXQY="; + hash = "sha256-Y3cW+zr73H62g/ZBFx+HSTevExSc1Faoxj6PgRJ6Oe0="; }; pythonImportsCheck = [ From 31f780bf67407348c2362219997305a50a9402b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Feb 2023 16:41:06 +0000 Subject: [PATCH 47/54] python310Packages.weconnect: 0.54.0 -> 0.54.1 --- pkgs/development/python-modules/weconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index 998ae3cf0d6b..0cbd788f637d 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.54.0"; + version = "0.54.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-mCUaaWR8jRqm8V8ZQBMgycExkN2zjoJxWIEohVH2K/o="; + hash = "sha256-WNvEcx+Ut4CtL2L81u5fCfmZoi+5hi/CbB9mfrG8Hm4="; }; propagatedBuildInputs = [ From 36e654185065cc26117ffac4ec3031a43c7533c7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Feb 2023 14:54:57 +0100 Subject: [PATCH 48/54] python310Packages.suseapi: remove - is no longer maintained - requires suds-jurko which is also no longer maintained --- .../python-modules/suseapi/default.nix | 39 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 pkgs/development/python-modules/suseapi/default.nix diff --git a/pkgs/development/python-modules/suseapi/default.nix b/pkgs/development/python-modules/suseapi/default.nix deleted file mode 100644 index 83925dd64d93..000000000000 --- a/pkgs/development/python-modules/suseapi/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, django -, suds-jurko -, python-ldap -, mechanize -, beautifulsoup4 -, pyxdg -, python-dateutil -, requests -, httpretty -}: - -buildPythonPackage rec { - pname = "suseapi"; - version = "0.24-31-g0fcbe96"; - - src = fetchFromGitHub { - owner = "openSUSE"; - repo = "python-${pname}"; - rev = version; - sha256 = "0hyzq0h1w8gp0zfvhqh7qsgcg1wp05a14371m6bn5a7gss93rbv4"; - }; - - propagatedBuildInputs = [ - django suds-jurko python-ldap mechanize beautifulsoup4 pyxdg python-dateutil requests - ]; - - buildInputs = [ httpretty ]; - - doCheck = false; - - meta = { - homepage = "https://github.com/openSUSE/python-suseapi/"; - description = "Python module to work with various SUSE services"; - license = lib.licenses.gpl3Plus; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f78390ce9a52..045ca9b02f73 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -234,6 +234,7 @@ mapAliases ({ sqlalchemy_migrate = sqlalchemy-migrate; # added 2021-10-28 SQLAlchemy-ImageAttach = throw "sqlalchemy-imageattach has been removed as it is incompatible with sqlalchemy 1.4 and unmaintained"; # added 2022-04-23 suds-jurko = throw "suds-jurko has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-02-27 + suseapi = throw "suseapi has been removed because it is no longer maintained"; # added 2023-02-27 tensorflow-bin_2 = tensorflow-bin; # added 2021-11-25 tensorflow-build_2 = tensorflow-build; # added 2021-11-25 tensorflow-estimator = tensorflow-estimator-bin; # added 2023-01-17 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b975adf84dc1..63c7fc310b25 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11226,8 +11226,6 @@ self: super: with self; { survey = callPackage ../development/python-modules/survey { }; - suseapi = callPackage ../development/python-modules/suseapi { }; - svg2tikz = callPackage ../development/python-modules/svg2tikz { }; svglib = callPackage ../development/python-modules/svglib { }; From 45ee5cbf63b01a7edd3f742e09c7b84b1bdeb045 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 28 Feb 2023 11:56:26 -0500 Subject: [PATCH 49/54] cargo-hack: 0.5.27 -> 0.5.28 Changelog: https://github.com/taiki-e/cargo-hack/blob/v0.5.28/CHANGELOG.md --- pkgs/development/tools/rust/cargo-hack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/development/tools/rust/cargo-hack/default.nix index 61bc71374870..43dc8e2d361b 100644 --- a/pkgs/development/tools/rust/cargo-hack/default.nix +++ b/pkgs/development/tools/rust/cargo-hack/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.5.27"; + version = "0.5.28"; src = fetchCrate { inherit pname version; - sha256 = "sha256-oiCZiwJr1BqMCWCNUOTQT3XPX0QZRr0wLewf8OU6lHA="; + sha256 = "sha256-434imb66AINKeW50ITc4RRYO9v7sH3fs1DEwSBc3mys="; }; - cargoSha256 = "sha256-g5O51V4BPNqzsQo1prLIpamqwcOy+SJat2Rb5UDHRLc="; + cargoSha256 = "sha256-oDrpQskQV5hG9Ksp0TJcXjm/J9q/K831mOzxH+CXjfg="; # some necessary files are absent in the crate version doCheck = false; From c72a30954f1aaa1d82406283e92413f71e0b90b1 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 28 Feb 2023 20:13:24 +0300 Subject: [PATCH 50/54] plasma: 5.27.1 -> 5.27.2 --- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/srcs.nix | 480 ++++++++++++++++---------------- 2 files changed, 241 insertions(+), 241 deletions(-) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 3839441ed975..feb1a5d3a80b 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.1/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.2/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index b41d381cbaf7..caa9494e7dbc 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,483 +4,483 @@ { aura-browser = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/aura-browser-5.27.1.tar.xz"; - sha256 = "1bq89mrfg82j03q9rrinwjc29qi1y7bz74d5k6f0s2f1ff0kvik9"; - name = "aura-browser-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/aura-browser-5.27.2.tar.xz"; + sha256 = "0ri1zv3xbd2wivnfi404zv8baf0h2a7wclmnbqjn0z5i898icmsr"; + name = "aura-browser-5.27.2.tar.xz"; }; }; bluedevil = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/bluedevil-5.27.1.tar.xz"; - sha256 = "17nx5f9sjwnb62vdkmiijaq62ayl08szrv889h7m7k7fsxfllyyh"; - name = "bluedevil-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/bluedevil-5.27.2.tar.xz"; + sha256 = "0v3nq4yiqiyh3crizv3nilriqxvhajm5hghhqdrgabw9a7svp001"; + name = "bluedevil-5.27.2.tar.xz"; }; }; breeze = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/breeze-5.27.1.tar.xz"; - sha256 = "0mripww2p0cvhbifq4vg25g7niv9cn2lpgbx2h3i5swhcbqzk7g1"; - name = "breeze-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/breeze-5.27.2.tar.xz"; + sha256 = "1ajr8ljn5nias0smjr3wlqwisgb59qzmmkmm4yc5il21ib20lp8l"; + name = "breeze-5.27.2.tar.xz"; }; }; breeze-grub = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/breeze-grub-5.27.1.tar.xz"; - sha256 = "1bn3n64xa84ymq4sdbhlra01i2d9zzbfkf8a1niq50fngf3lg3q8"; - name = "breeze-grub-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/breeze-grub-5.27.2.tar.xz"; + sha256 = "1fr84vylyvpba1z81sf6qj46ya7s853l7a2lflzrjrg41k84q7g4"; + name = "breeze-grub-5.27.2.tar.xz"; }; }; breeze-gtk = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/breeze-gtk-5.27.1.tar.xz"; - sha256 = "0f51g3aqms6jgvf7hzdwg8dhcirxahb5282f96p19m1nz77dc7vv"; - name = "breeze-gtk-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/breeze-gtk-5.27.2.tar.xz"; + sha256 = "00k5b2cmz9b5l0mabj47pjaw5wn13laga2z3m5p2dz4y6m8gm3f1"; + name = "breeze-gtk-5.27.2.tar.xz"; }; }; breeze-plymouth = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/breeze-plymouth-5.27.1.tar.xz"; - sha256 = "1x4ws9zxq3lrrrl062p0wp5ys78pv3m8jvyp9gs5rmm294hwrddx"; - name = "breeze-plymouth-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/breeze-plymouth-5.27.2.tar.xz"; + sha256 = "1zbkj0mjpzkgbkl47zbrg9cxfk68245jm5i5p3194sqbw9l104mx"; + name = "breeze-plymouth-5.27.2.tar.xz"; }; }; discover = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/discover-5.27.1.tar.xz"; - sha256 = "0705cz9sm8djgyjvplj65v2mv86j5hjkyiry00kcrmgvhv08psdv"; - name = "discover-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/discover-5.27.2.tar.xz"; + sha256 = "0bcnm1ccvwhhvcdz8a44canrzfjl03hkrqfjwrr89y0mxiws46rc"; + name = "discover-5.27.2.tar.xz"; }; }; drkonqi = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/drkonqi-5.27.1.tar.xz"; - sha256 = "1j09pzf67jzvw01j82icv7g6y11hr6j9m5xdk1r0cmq1wig5y506"; - name = "drkonqi-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/drkonqi-5.27.2.tar.xz"; + sha256 = "0fwjz7qxal0dixrh1wjb17vpr6jx8fki91xxbbdfnr8ykixfsx56"; + name = "drkonqi-5.27.2.tar.xz"; }; }; flatpak-kcm = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/flatpak-kcm-5.27.1.tar.xz"; - sha256 = "1b4ljs5zf49kmyaqkjn2bi0p07hbxr9m6v2c0rns1qkmni0kr0hw"; - name = "flatpak-kcm-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/flatpak-kcm-5.27.2.tar.xz"; + sha256 = "0rrw6v8vwgxj78v16wwa3d4gamymjvgpi27lmcqmf9588chnn8xf"; + name = "flatpak-kcm-5.27.2.tar.xz"; }; }; kactivitymanagerd = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/kactivitymanagerd-5.27.1.tar.xz"; - sha256 = "1x10vn7dcnxyal1g8755f3v0hzrgqncarng6psh1z4lk2a2ahjic"; - name = "kactivitymanagerd-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kactivitymanagerd-5.27.2.tar.xz"; + sha256 = "1ni2yqk51qf23ck6j4kbli6pqhbnlix2w51la4af45ma8wr2gvix"; + name = "kactivitymanagerd-5.27.2.tar.xz"; }; }; kde-cli-tools = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/kde-cli-tools-5.27.1.tar.xz"; - sha256 = "05zbqqby15b2d2ys94zkzy8c9lylcbz7z9gkwwxfhimail3yr7s1"; - name = "kde-cli-tools-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kde-cli-tools-5.27.2.tar.xz"; + sha256 = "189n92i79yxj6v2rwawg3grav4k5kdazh9fgnhijkwg2s6m7pdfm"; + name = "kde-cli-tools-5.27.2.tar.xz"; }; }; kde-gtk-config = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/kde-gtk-config-5.27.1.tar.xz"; - sha256 = "10f311ygvm9bj5c23kzrc3s9pyb82d0kfdfdpyxii44ndi9fgsfy"; - name = "kde-gtk-config-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kde-gtk-config-5.27.2.tar.xz"; + sha256 = "1m4qzv6haa9vq8z0m9v6i2y05syagazpg6inrgf6bvyrwh0zwbfa"; + name = "kde-gtk-config-5.27.2.tar.xz"; }; }; kdecoration = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/kdecoration-5.27.1.tar.xz"; - sha256 = "1bcprf2fijj459k73xk2j5yw4krwq770n8axxsckzv3a19a440rg"; - name = "kdecoration-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kdecoration-5.27.2.tar.xz"; + sha256 = "0xds1xx6jj6qy7jrl9wsnpcm1w4qd4im1bl21b9g1gmz7m53zvdm"; + name = "kdecoration-5.27.2.tar.xz"; }; }; kdeplasma-addons = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/kdeplasma-addons-5.27.1.tar.xz"; - sha256 = "0k9ghh945p4ha1kykw9m67x3p83k6c01gjqds6v7l8hsylazfwb9"; - name = "kdeplasma-addons-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kdeplasma-addons-5.27.2.tar.xz"; + sha256 = "1fr0fnw1k9jm55dhk22wxfxl4asyk7712gmyrmc8w93i1lnnwd19"; + name = "kdeplasma-addons-5.27.2.tar.xz"; }; }; kgamma5 = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/kgamma5-5.27.1.tar.xz"; - sha256 = "1rkr6546wlp5rqy9jibzkz3y24zp4ab2qxj2h2h61al0873566yp"; - name = "kgamma5-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kgamma5-5.27.2.tar.xz"; + sha256 = "03drd26nmy4q1vdw4kyzj6dvyfydzjybbzffyjdnnfc3yflhc32g"; + name = "kgamma5-5.27.2.tar.xz"; }; }; khotkeys = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/khotkeys-5.27.1.tar.xz"; - sha256 = "1q1fd4d5258n5d20hmcwr3vv7miarhmsv1k3jv9d9facvagcr5dw"; - name = "khotkeys-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/khotkeys-5.27.2.tar.xz"; + sha256 = "02fv67x68dlxk9q80qpfkyjrd4bgwqhzi6c6jari5f24ajl2kfqp"; + name = "khotkeys-5.27.2.tar.xz"; }; }; kinfocenter = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/kinfocenter-5.27.1.tar.xz"; - sha256 = "0d06kjfm2lagpf4wjsbkv17nlq0i9k6ywyyyn2fclcqayif82i68"; - name = "kinfocenter-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kinfocenter-5.27.2.tar.xz"; + sha256 = "1v10xfqcrj16ljasz8v0f0isjrc2brdmblfq6il4f4nckb23qmmw"; + name = "kinfocenter-5.27.2.tar.xz"; }; }; kmenuedit = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/kmenuedit-5.27.1.tar.xz"; - sha256 = "1r45rly95642k20fkn85rnnmpw6zwx4i0r0r0k9azjkp4akkhgg0"; - name = "kmenuedit-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kmenuedit-5.27.2.tar.xz"; + sha256 = "1v6147x23rbp9nfmznbwf550ycml8zh6xa85vjj8gw7dma0zfx97"; + name = "kmenuedit-5.27.2.tar.xz"; }; }; kpipewire = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/kpipewire-5.27.1.tar.xz"; - sha256 = "0gdj3ii7wcx6xgsrv3z78jj6j7xmm83qs3fil1ha38d26d6ym0r1"; - name = "kpipewire-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kpipewire-5.27.2.tar.xz"; + sha256 = "1w15w49ali3v8sf3ahcsbbaynd20an5jy5305diza0g5ivyz0xh9"; + name = "kpipewire-5.27.2.tar.xz"; }; }; kscreen = { - version = "5.27.1.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/kscreen-5.27.1.1.tar.xz"; - sha256 = "0i3xqxxzvmiq6awipkdn6mypgs7yl64j6nrgxk8vb6qfcgvq5z0d"; - name = "kscreen-5.27.1.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kscreen-5.27.2.tar.xz"; + sha256 = "0xfj57xszxyrfpn2wq9sbmy6psxk81zirwz5x85sdlbzdz9cz28w"; + name = "kscreen-5.27.2.tar.xz"; }; }; kscreenlocker = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/kscreenlocker-5.27.1.tar.xz"; - sha256 = "023dpw0liplgnzj3d98n789s51l6sm978jz3z0gp47ym8nd7h1a9"; - name = "kscreenlocker-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kscreenlocker-5.27.2.tar.xz"; + sha256 = "0683rr6jg6zf12h00hypwb2hsvbngfq3vpf08qms0lcl78r5c41s"; + name = "kscreenlocker-5.27.2.tar.xz"; }; }; ksshaskpass = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/ksshaskpass-5.27.1.tar.xz"; - sha256 = "1xvsji5fwgj3yqmlwivc2x7vncr38fpvr69bc6y9hfn20czm0pbw"; - name = "ksshaskpass-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/ksshaskpass-5.27.2.tar.xz"; + sha256 = "1ianh4zqdym9a8r2rzffryyn1bwv6v8fbcha5ac2qi57mdkhk5fr"; + name = "ksshaskpass-5.27.2.tar.xz"; }; }; ksystemstats = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/ksystemstats-5.27.1.tar.xz"; - sha256 = "1wkzklfkd7xc55bvm8a205bpjz449nil0a8yw3iql01im7bnsj67"; - name = "ksystemstats-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/ksystemstats-5.27.2.tar.xz"; + sha256 = "1wm3xf4h3y7cz8gpmyz3nm6lrdz31v7hf7cah9hzsk6i8ahc8bpr"; + name = "ksystemstats-5.27.2.tar.xz"; }; }; kwallet-pam = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/kwallet-pam-5.27.1.tar.xz"; - sha256 = "1k6i5yjc31xhp2pijygx2qs74lr2lh231c9j2cvgxsijdrm18mk6"; - name = "kwallet-pam-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kwallet-pam-5.27.2.tar.xz"; + sha256 = "04krmcvkbpm8m0yx7gr1n53w0j9ifi1yl4p3b9z5ammkbrw7xrb8"; + name = "kwallet-pam-5.27.2.tar.xz"; }; }; kwayland-integration = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/kwayland-integration-5.27.1.tar.xz"; - sha256 = "0b3i3wr9gnh0hf23fldvgxj5mjjc1g22ki1l9x592xzsxzvlx2yk"; - name = "kwayland-integration-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kwayland-integration-5.27.2.tar.xz"; + sha256 = "00qwrihgy2xxjpcshkhygvq15wyclsn4s9hl0m29y6d34j1m4awn"; + name = "kwayland-integration-5.27.2.tar.xz"; }; }; kwin = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/kwin-5.27.1.tar.xz"; - sha256 = "1c74jna3lmbrny2v0wc4rlghr1mrd2a6566qqi71zsxib64nf79y"; - name = "kwin-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kwin-5.27.2.tar.xz"; + sha256 = "1xanx9yx0gzn75mkns5dpp65hlvijr85lxapac0rj8nw1hkfrcnh"; + name = "kwin-5.27.2.tar.xz"; }; }; kwrited = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/kwrited-5.27.1.tar.xz"; - sha256 = "0j1vhzlf29s5i4hqb1mhakp5d9nkjbf2yx6az70n0ckwh999ljzm"; - name = "kwrited-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kwrited-5.27.2.tar.xz"; + sha256 = "12sb6g4dj5188iq7yv37js65999api8r60vcqcap3gjzsrxn1ilw"; + name = "kwrited-5.27.2.tar.xz"; }; }; layer-shell-qt = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/layer-shell-qt-5.27.1.tar.xz"; - sha256 = "0244ixslr52ssv7wm1icdm67akw2v59z2p12wa1fbjd8nwg3fgsy"; - name = "layer-shell-qt-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/layer-shell-qt-5.27.2.tar.xz"; + sha256 = "1zq82q035wf9dfs8imk2dbkxczjihlm23gc6pbnkpn1c3g7q1a1s"; + name = "layer-shell-qt-5.27.2.tar.xz"; }; }; libkscreen = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/libkscreen-5.27.1.tar.xz"; - sha256 = "044p4ngnhjjxlc468hjb9758yrraslr36hrhj46cq24s5z42bxz3"; - name = "libkscreen-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/libkscreen-5.27.2.tar.xz"; + sha256 = "1kr9nkxsa3a3d4pdwlv89rw9c8rqhh9wcr3ii4hh791179v82wkb"; + name = "libkscreen-5.27.2.tar.xz"; }; }; libksysguard = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/libksysguard-5.27.1.tar.xz"; - sha256 = "0krgmjwy4kl03hqsylfvrs0q9d9h34w3w4aacan40s6xwldvjwhj"; - name = "libksysguard-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/libksysguard-5.27.2.tar.xz"; + sha256 = "01ksfg07a2q6f1jisfrfk3j4zvcvpspc8xakc9a14dpzkib7ifnn"; + name = "libksysguard-5.27.2.tar.xz"; }; }; milou = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/milou-5.27.1.tar.xz"; - sha256 = "1vis4f4c1qicdg2z01spv0h1dvqkfsdjw7bxmh9rwpa0vlv082ac"; - name = "milou-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/milou-5.27.2.tar.xz"; + sha256 = "1qxsnqdxw3y3jpdnx1wz0q17ll3gwqq4jrx2sddz887yf8kmbhsk"; + name = "milou-5.27.2.tar.xz"; }; }; oxygen = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/oxygen-5.27.1.tar.xz"; - sha256 = "1p468lxmicnw4bn4svq58agmkvci5qkazjxkcjml2fsp79zw5r9j"; - name = "oxygen-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/oxygen-5.27.2.tar.xz"; + sha256 = "0gz03yskna0sjf4mpzpgh8s8xy9vxk2rp3w5d2vwvq798yqj4i36"; + name = "oxygen-5.27.2.tar.xz"; }; }; oxygen-sounds = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/oxygen-sounds-5.27.1.tar.xz"; - sha256 = "0iqmd7xqv8hc5v254hmi1mzw9f9yimf442bjmp05w17k2chrdg83"; - name = "oxygen-sounds-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/oxygen-sounds-5.27.2.tar.xz"; + sha256 = "0v0rdcd08fhjbh5lhl7n77pady278lxb6sid4486ip050wzgmdhk"; + name = "oxygen-sounds-5.27.2.tar.xz"; }; }; plank-player = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/plank-player-5.27.1.tar.xz"; - sha256 = "1nii6hc3cphl3946ps5jnz6bfcjp2pwj4nnqsqk6gbpyyyfvp2fm"; - name = "plank-player-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plank-player-5.27.2.tar.xz"; + sha256 = "1zksd833sm4khjm7qaaxf2zlg1lscf2mdcqqcgxa590kb6cdk4g7"; + name = "plank-player-5.27.2.tar.xz"; }; }; plasma-bigscreen = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/plasma-bigscreen-5.27.1.tar.xz"; - sha256 = "17iiyh9mjyc09sqv0agg33ibiva3p8vgv3z735l0gxjqfh0zhnw7"; - name = "plasma-bigscreen-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-bigscreen-5.27.2.tar.xz"; + sha256 = "1ap6w8s8lzsk4qlkjbig5vaq2kkghg4jc4rmmrmh55qb5805d29j"; + name = "plasma-bigscreen-5.27.2.tar.xz"; }; }; plasma-browser-integration = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/plasma-browser-integration-5.27.1.tar.xz"; - sha256 = "0150c7a9m0l8vx8dgm67acc6w4bnlbjcv6gazh9pbh7qh8rpy7ax"; - name = "plasma-browser-integration-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-browser-integration-5.27.2.tar.xz"; + sha256 = "0cj46jsd8piy773qdamhpihywdl9qk2qpiigyyhbnsbwxcvl4fbw"; + name = "plasma-browser-integration-5.27.2.tar.xz"; }; }; plasma-desktop = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/plasma-desktop-5.27.1.tar.xz"; - sha256 = "0pf0zwhh952fclmq19jg6c80jmbmzin8qcqqhn9xfdgxjx970yrf"; - name = "plasma-desktop-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-desktop-5.27.2.tar.xz"; + sha256 = "0dsic9had0nihw5k8a6vw5svdxsysa2kphk295kirf6k9qm2k2v5"; + name = "plasma-desktop-5.27.2.tar.xz"; }; }; plasma-disks = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/plasma-disks-5.27.1.tar.xz"; - sha256 = "0qxb0z6c52nalgg358355qwgqnb703n464ncsrwgma2jrq8d44dh"; - name = "plasma-disks-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-disks-5.27.2.tar.xz"; + sha256 = "0mapi9bclsnn6mv3gl5c87jxygm3pr3cc6ksvkpwqah46c76mmi3"; + name = "plasma-disks-5.27.2.tar.xz"; }; }; plasma-firewall = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/plasma-firewall-5.27.1.tar.xz"; - sha256 = "1cb6dgh86r2k2jnfk93yswyl9j53ak7hl25hdcbmmflwbdkc474x"; - name = "plasma-firewall-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-firewall-5.27.2.tar.xz"; + sha256 = "0vi64wkc9vxrfc2h1m4f8q8sqc2wl6s610ajs12r0sf8c4297fv1"; + name = "plasma-firewall-5.27.2.tar.xz"; }; }; plasma-integration = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/plasma-integration-5.27.1.tar.xz"; - sha256 = "1d00kch9a2bb5dyayxszrj3zydzfmbq1s3dpkqxc24nr2f9lxx87"; - name = "plasma-integration-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-integration-5.27.2.tar.xz"; + sha256 = "1220f4f2ykmrrxngmlc8xdjip63fidlhh42vslgy9bll6ag0qkys"; + name = "plasma-integration-5.27.2.tar.xz"; }; }; plasma-mobile = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/plasma-mobile-5.27.1.tar.xz"; - sha256 = "009psgg5svgrl0jmzv4fp35vj07nswn2ajj3vmcmp6y4m96n8fn9"; - name = "plasma-mobile-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-mobile-5.27.2.tar.xz"; + sha256 = "0v0cli1fyhzv80vhav4nablss0p9mzflll48f6lvx2sdqpiypcgq"; + name = "plasma-mobile-5.27.2.tar.xz"; }; }; plasma-nano = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/plasma-nano-5.27.1.tar.xz"; - sha256 = "0s804r3sy0md2mn28zjj65zsnjb1sfbnda1003rgfh7brhfly53k"; - name = "plasma-nano-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-nano-5.27.2.tar.xz"; + sha256 = "1lk7pg2j6fkvys849qfvd0crxkalrvmvqxl6ifw12d7kvdmz91nx"; + name = "plasma-nano-5.27.2.tar.xz"; }; }; plasma-nm = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/plasma-nm-5.27.1.tar.xz"; - sha256 = "19d8dcfw9dw9fw4mcpx12fr8mdj178fb2a28zhpyz90mwgip1l97"; - name = "plasma-nm-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-nm-5.27.2.tar.xz"; + sha256 = "15lh7nxryvv66hbf43bwarfw38jzr6405waf1z8dsvn5wckp093v"; + name = "plasma-nm-5.27.2.tar.xz"; }; }; plasma-pa = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/plasma-pa-5.27.1.tar.xz"; - sha256 = "173xkab86n87hgp4xs7xd1q7qkk7vqcb53vh391vhplpg841k6dx"; - name = "plasma-pa-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-pa-5.27.2.tar.xz"; + sha256 = "0imwyv0w6xkbcyafhqsg4h3w56sclfaxnjfjkjbzn1hgmizx7n7k"; + name = "plasma-pa-5.27.2.tar.xz"; }; }; plasma-remotecontrollers = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/plasma-remotecontrollers-5.27.1.tar.xz"; - sha256 = "1x2rbd6y9hwyxwvzpk3rdlp0qq1zyr9m0gz3pr78gxkk5ncznj75"; - name = "plasma-remotecontrollers-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-remotecontrollers-5.27.2.tar.xz"; + sha256 = "1ash4z6fi0kzdysnnlbh7vxpdwbfi0xyyyg845pmvhwhv6i82c7y"; + name = "plasma-remotecontrollers-5.27.2.tar.xz"; }; }; plasma-sdk = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/plasma-sdk-5.27.1.tar.xz"; - sha256 = "18qy4wkxmnmngh3jimbk5px0alf451hvyiawk2xdrc848n6yjnmf"; - name = "plasma-sdk-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-sdk-5.27.2.tar.xz"; + sha256 = "1p68hfa884jym5mb22lrssxg5xwdnwsichdvmmqfy50szsv2n7mf"; + name = "plasma-sdk-5.27.2.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/plasma-systemmonitor-5.27.1.tar.xz"; - sha256 = "0r03dbh372f626rn4p8bfzsk1ralxn9ha7dag7dvjf92d4azy088"; - name = "plasma-systemmonitor-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-systemmonitor-5.27.2.tar.xz"; + sha256 = "1kl9xjfkwy36nzva1hkq5pabczl174w29lxkzhim3q8laap6dql6"; + name = "plasma-systemmonitor-5.27.2.tar.xz"; }; }; plasma-tests = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/plasma-tests-5.27.1.tar.xz"; - sha256 = "0dc403xc929hfm2mb46x3hqr5518x0809dgbb01yfxwn0684g157"; - name = "plasma-tests-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-tests-5.27.2.tar.xz"; + sha256 = "0q5qb4c1lbd7jpww382h86h74llvpm1zdnjb8a66x1nfnnws7db3"; + name = "plasma-tests-5.27.2.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/plasma-thunderbolt-5.27.1.tar.xz"; - sha256 = "08v7sdkllynfkw93qvaq4f4kgc188swbh5p839kzvp2xmlxqabyf"; - name = "plasma-thunderbolt-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-thunderbolt-5.27.2.tar.xz"; + sha256 = "0aml4xx3bdnyx367lz3crnd21f08w239ps77wy41a0pdp47i5nfd"; + name = "plasma-thunderbolt-5.27.2.tar.xz"; }; }; plasma-vault = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/plasma-vault-5.27.1.tar.xz"; - sha256 = "0inxkj50n2r52k9wyyznz5qr1y01v6s8wphf39ffk7rrccw9ah3f"; - name = "plasma-vault-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-vault-5.27.2.tar.xz"; + sha256 = "0hqxjmm236bivvlhivrzcypsa0kki4pc44l46jzvm5a0dsljv827"; + name = "plasma-vault-5.27.2.tar.xz"; }; }; plasma-welcome = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/plasma-welcome-5.27.1.tar.xz"; - sha256 = "1ay5jk30vihnk7lhxvlwdgz2wqbjh3a1vdiywazc5dxilvhqwg2b"; - name = "plasma-welcome-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-welcome-5.27.2.tar.xz"; + sha256 = "06g8hnqnja2g17cx3vwx21zlrywmhiqb6zk0d72c02avr67px3gn"; + name = "plasma-welcome-5.27.2.tar.xz"; }; }; plasma-workspace = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/plasma-workspace-5.27.1.tar.xz"; - sha256 = "00gyfp12jcaap1i7y8h4pp9jkjddhrwxqyds20bvgi0mh7bkr237"; - name = "plasma-workspace-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-workspace-5.27.2.tar.xz"; + sha256 = "19hlbp2ihblw5ynk44lasfgr4nk5z2mqm3gza5zvf08zpzwc437i"; + name = "plasma-workspace-5.27.2.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/plasma-workspace-wallpapers-5.27.1.tar.xz"; - sha256 = "02cgabavzydfn52liqisdaxm1j6abpwk6n0cz5hcqvv574r6hb99"; - name = "plasma-workspace-wallpapers-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-workspace-wallpapers-5.27.2.tar.xz"; + sha256 = "1x4mxs6b90z0rz3lacxr20ii8ihjq3z36vi2y9rllhcdzvpcbzy6"; + name = "plasma-workspace-wallpapers-5.27.2.tar.xz"; }; }; plymouth-kcm = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/plymouth-kcm-5.27.1.tar.xz"; - sha256 = "150m73v1p5jwqm4piqzimm76abgf02mjvpl1pz0p8a4qppklq1fa"; - name = "plymouth-kcm-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plymouth-kcm-5.27.2.tar.xz"; + sha256 = "1nkxz8jmqwm8js16j9pcbbhjns7vhs98k70lsj0mc7mgh3y5bdf6"; + name = "plymouth-kcm-5.27.2.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.27.1"; + version = "1-5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/polkit-kde-agent-1-5.27.1.tar.xz"; - sha256 = "1chs9z51dr6dcfcxnvcv06z0ql5rm5xl36i54sxhwi41dkpgybbc"; - name = "polkit-kde-agent-1-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/polkit-kde-agent-1-5.27.2.tar.xz"; + sha256 = "0pz7dnrh10lzxlxnfsg06k012wb3qlqgvn0wwv7xb76yis75jmi4"; + name = "polkit-kde-agent-1-5.27.2.tar.xz"; }; }; powerdevil = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/powerdevil-5.27.1.tar.xz"; - sha256 = "09sflq629mfcqm92pa442qv2a3xnc4h1rxcm3px4c48c2halpdjk"; - name = "powerdevil-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/powerdevil-5.27.2.tar.xz"; + sha256 = "1awrfwki1ldmvwamdss4vkb5mlclw58zijpg6ip732ripiawhx1x"; + name = "powerdevil-5.27.2.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/qqc2-breeze-style-5.27.1.tar.xz"; - sha256 = "03gig61n3s5hg5sc01g35h9mxvhx25qsvlrkkq2px4qs7240ipfr"; - name = "qqc2-breeze-style-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/qqc2-breeze-style-5.27.2.tar.xz"; + sha256 = "0j2dy64sr0giagyi3yw9c40lnjmn1wsdi5vmj6cakvglhklnwl5w"; + name = "qqc2-breeze-style-5.27.2.tar.xz"; }; }; sddm-kcm = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/sddm-kcm-5.27.1.tar.xz"; - sha256 = "04j9awyqlicdfsim60zs5n0mmsk3jd6ihxv34di41x850rmcz2gi"; - name = "sddm-kcm-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/sddm-kcm-5.27.2.tar.xz"; + sha256 = "1lnciz566iz7alpz51j27cvdpkxnv88v5nnfjlql80d8a74gq3vs"; + name = "sddm-kcm-5.27.2.tar.xz"; }; }; systemsettings = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/systemsettings-5.27.1.tar.xz"; - sha256 = "16hpgqgszy05dah0c77amvlc7c5z53drcanj10l02znk7nh97ccy"; - name = "systemsettings-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/systemsettings-5.27.2.tar.xz"; + sha256 = "1qdj18plsi4l3z4hlm4c41gz3xmv9rkishs9a45kib2avd0sxvnd"; + name = "systemsettings-5.27.2.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.27.1"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.1/xdg-desktop-portal-kde-5.27.1.tar.xz"; - sha256 = "0ig1xvfwfnvgp5fq4ac520wznllbg78bwaac9vsz4jwflv70axdh"; - name = "xdg-desktop-portal-kde-5.27.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/xdg-desktop-portal-kde-5.27.2.tar.xz"; + sha256 = "05rjm8h375bmmsslpm6nl1m7zsd8f7n3vm15nq4771hnlv8dml4p"; + name = "xdg-desktop-portal-kde-5.27.2.tar.xz"; }; }; } From b71b395f62abad9e11bb12a1c079d6e6969eedc1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Feb 2023 19:11:09 +0100 Subject: [PATCH 51/54] jira_cli: remove Project is unmaintained https://github.com/alisaifee/jira-cli#this-project-needs-a-new-owner Requires suds-jurko which was removed (due to the usage of use_2to3) --- pkgs/development/tools/jira_cli/default.nix | 37 --------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 pkgs/development/tools/jira_cli/default.nix diff --git a/pkgs/development/tools/jira_cli/default.nix b/pkgs/development/tools/jira_cli/default.nix deleted file mode 100644 index 3a3b82e79e90..000000000000 --- a/pkgs/development/tools/jira_cli/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, libffi, openssl, python3Packages }: -let - inherit (python3Packages) fetchPypi buildPythonApplication; -in - buildPythonApplication rec { - pname = "jira-cli"; - version = "3.0"; - src = fetchPypi { - inherit pname version; - sha256 = "86f7d4ad7292c9a27bbc265d09e7bcd00ef8159f20172998d85f25aad53b0df6"; - }; - - postPatch = '' - substituteInPlace requirements/main.txt --replace "argparse" "" - ''; - - # Tests rely on VCR cassettes being written during tests. R/O nix store prevents this. - doCheck = false; - nativeCheckInputs = with python3Packages; [ vcrpy mock hiro ]; - buildInputs = [ libffi openssl ]; - propagatedBuildInputs = with python3Packages; [ - requests six suds-jurko termcolor keyring - jira keyrings-alt - ]; - - meta = with lib; { - description = "A command line interface to Jira"; - homepage = "https://github.com/alisaifee/jira-cli"; - maintainers = with maintainers; [ nyarly ]; - license = licenses.mit; - # Project is unmaintained - # https://github.com/alisaifee/jira-cli#this-project-needs-a-new-owner - # Requires suds-jurko which was removed (due to the usage of use_2to3) - # Checked on 2023-02-27 - broken = true; - }; - } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 44e95775573c..efcad38414ca 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -703,6 +703,7 @@ mapAliases ({ jbuilder = throw "'jbuilder' has been renamed to/replaced by 'dune_1'"; # Converted to throw 2022-02-22 jd = throw "jd has been dropped due to the lack of maintenance from upstream since 2016"; # Added 2022-06-03 jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version"; # Added 2021-04-26 + jira-cli = throw "jira-cli was removed because it is no longer maintained"; # Added 2023-02-28 joseki = throw "'joseki' has been renamed to/replaced by 'apache-jena-fuseki'"; # Converted to throw 2022-02-22 journalbeat7 = throw "journalbeat has been removed upstream. Use filebeat with the journald input instead"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26db9c75aa1f..1c352b6776c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8651,8 +8651,6 @@ with pkgs; jdk_headless = jdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - jira-cli = callPackage ../development/tools/jira_cli { }; - jira-cli-go = callPackage ../development/tools/jira-cli-go { }; jirafeau = callPackage ../servers/web-apps/jirafeau { }; From 1aab159514d58256b0e5235fdd795b48d886e793 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Feb 2023 19:12:35 +0000 Subject: [PATCH 52/54] werf: 1.2.199 -> 1.2.202 --- pkgs/applications/networking/cluster/werf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index c93480694a9f..13d097c5b4bf 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.199"; + version = "1.2.202"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-oUdqaoIvYTpJXWzfmgCwDJza5mTQItHgf2p9/HBMc/g="; + hash = "sha256-jBsANHQ+l5zD3Liq7V/y+WzFQxRWzOC43UN5ES6D7PE="; }; - vendorHash = "sha256-GjcmpHyjhjCWE5gQR/oTHfhHYg5WRu8uhgAuWhdxlYk="; + vendorHash = "sha256-SzqGcbfDtBfgnu6CRPyk2tPdwNDhM1RfteKTXVvivw4="; proxyVendor = true; From 19a122e092517d5530154c7f85117a9840b9125d Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Tue, 28 Feb 2023 11:17:29 -0800 Subject: [PATCH 53/54] ci: editorconfig: use nix-shell instead of nix-env --- .github/workflows/editorconfig.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 549563d4ec26..9c3ee597d1cd 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -33,11 +33,9 @@ jobs: # nixpkgs commit is pinned so that it doesn't break # editorconfig-checker 2.4.0 nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/c473cc8714710179df205b153f4e9fa007107ff9.tar.gz - - name: install editorconfig-checker - run: nix-env -iA editorconfig-checker -f '' - name: Checking EditorConfig run: | - cat "$HOME/changed_files" | xargs -r editorconfig-checker -disable-indent-size + cat "$HOME/changed_files" | nix-shell -p editorconfig-checker --run 'xargs -r editorconfig-checker -disable-indent-size' - if: ${{ failure() }} run: | echo "::error :: Hey! It looks like your changes don't follow our editorconfig settings. Read https://editorconfig.org/#download to configure your editor so you never see this error again." From 3563c178ca7d45d028c095b2a3ba35ee28294eea Mon Sep 17 00:00:00 2001 From: pennae Date: Tue, 28 Feb 2023 21:49:32 +0100 Subject: [PATCH 54/54] workflows: pin install-nix-action to use nix 2.13.3 same reasoning as #218858, only now for an action we depend on and can't fix quite as easily. cachix-action also uses nix-env and will thus not work correctly, so pin the nix version used to the last known good one. --- .github/workflows/basic-eval.yml | 2 ++ .github/workflows/editorconfig.yml | 1 + .github/workflows/manual-nixos.yml | 1 + .github/workflows/manual-nixpkgs.yml | 1 + .github/workflows/manual-rendering.yml | 1 + .github/workflows/update-terraform-providers.yml | 1 + 6 files changed, 7 insertions(+) diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index fcc07b633b3e..1199a699c74c 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -20,6 +20,8 @@ jobs: steps: - uses: actions/checkout@v3 - uses: cachix/install-nix-action@v19 + with: + install_url: https://releases.nixos.org/nix/nix-2.13.3/install - uses: cachix/cachix-action@v12 with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 9c3ee597d1cd..597a5bf1fa3a 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -33,6 +33,7 @@ jobs: # nixpkgs commit is pinned so that it doesn't break # editorconfig-checker 2.4.0 nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/c473cc8714710179df205b153f4e9fa007107ff9.tar.gz + install_url: https://releases.nixos.org/nix/nix-2.13.3/install - name: Checking EditorConfig run: | cat "$HOME/changed_files" | nix-shell -p editorconfig-checker --run 'xargs -r editorconfig-checker -disable-indent-size' diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index 99f14562d50e..559a290ab396 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -22,6 +22,7 @@ jobs: with: # explicitly enable sandbox extra_nix_config: sandbox = true + install_url: https://releases.nixos.org/nix/nix-2.13.3/install - uses: cachix/cachix-action@v12 with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index 63b504f670f8..fb01d7504b15 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -22,6 +22,7 @@ jobs: with: # explicitly enable sandbox extra_nix_config: sandbox = true + install_url: https://releases.nixos.org/nix/nix-2.13.3/install - uses: cachix/cachix-action@v12 with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. diff --git a/.github/workflows/manual-rendering.yml b/.github/workflows/manual-rendering.yml index 5534d23416eb..f54553049bb7 100644 --- a/.github/workflows/manual-rendering.yml +++ b/.github/workflows/manual-rendering.yml @@ -22,6 +22,7 @@ jobs: with: # explicitly enable sandbox extra_nix_config: sandbox = true + install_url: https://releases.nixos.org/nix/nix-2.13.3/install - uses: cachix/cachix-action@v12 with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml index c57102b0aa0c..2808cee9155e 100644 --- a/.github/workflows/update-terraform-providers.yml +++ b/.github/workflows/update-terraform-providers.yml @@ -20,6 +20,7 @@ jobs: - uses: cachix/install-nix-action@v19 with: nix_path: nixpkgs=channel:nixpkgs-unstable + install_url: https://releases.nixos.org/nix/nix-2.13.3/install - name: setup id: setup run: |