From 26b1c14ebba41f0b1635b14f0262bb883c49aaf7 Mon Sep 17 00:00:00 2001 From: Zebreus Date: Mon, 3 Jun 2024 13:45:51 +0200 Subject: [PATCH 001/151] shoreline: init at 0-unstable-2021-08-21 --- pkgs/by-name/sh/shoreline/package.nix | 49 +++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/sh/shoreline/package.nix diff --git a/pkgs/by-name/sh/shoreline/package.nix b/pkgs/by-name/sh/shoreline/package.nix new file mode 100644 index 000000000000..b0eac0002385 --- /dev/null +++ b/pkgs/by-name/sh/shoreline/package.nix @@ -0,0 +1,49 @@ +{ + stdenv, + lib, + pkg-config, + imagemagick, + fetchFromGitHub, + SDL2, + numactl, + libvncserver, + freetype, + unstableGitUpdater, +}: +stdenv.mkDerivation { + pname = "shoreline"; + version = "0-unstable-2021-08-24"; + + src = fetchFromGitHub { + owner = "TobleMiner"; + repo = "shoreline"; + rev = "05a2bbfb4559090727c51673e1fb47d20eac5672"; + hash = "sha256-fWzk1gM8vmqkM9hwl6Jnut2AAMQQ91hAYu41xgoI1Jk="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + SDL2 + numactl + libvncserver + freetype + ]; + + installPhase = '' + runHook preInstall + install -m755 -D shoreline $out/bin/shoreline + runHook postInstall + ''; + + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + + meta = { + description = "Very fast (200+ Gbit/s) pixelflut server written in C with full IPv6 support"; + homepage = "https://github.com/TobleMiner/shoreline"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ zebreus ]; + platforms = lib.platforms.linux; + mainProgram = "shoreline"; + }; +} From 96c1637f91e147c9f5b7e953c09d3a7898b38e7c Mon Sep 17 00:00:00 2001 From: Spencer Heywood Date: Tue, 13 Aug 2024 14:17:24 -0600 Subject: [PATCH 002/151] ts-warp: init 1.5.4 --- pkgs/by-name/ts/ts-warp/package.nix | 32 +++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/ts/ts-warp/package.nix diff --git a/pkgs/by-name/ts/ts-warp/package.nix b/pkgs/by-name/ts/ts-warp/package.nix new file mode 100644 index 000000000000..4a6f7c5707d4 --- /dev/null +++ b/pkgs/by-name/ts/ts-warp/package.nix @@ -0,0 +1,32 @@ +{ + fetchFromGitHub, + lib, + stdenv, + which, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ts-warp"; + version = "1.5.4"; + + src = fetchFromGitHub { + owner = "mezantrop"; + repo = "ts-warp"; + rev = finalAttrs.version; + hash = "sha256-iozjUHdiiP9Wg86W/LGUucd3sLC8gHMcYAbyAHT7WrQ="; + }; + + nativeBuildInputs = [ which ]; + + env.PREFIX = "$(out)"; + + meta = { + description = "Transparent proxy server and traffic wrapper"; + homepage = "https://github.com/mezantrop/ts-warp"; + license = lib.licenses.bsd2; + platforms = lib.platforms.unix; + changelog = "https://github.com/mezantrop/ts-warp/blob/${finalAttrs.version}/CHANGELOG.md"; + maintainers = with lib.maintainers; [ heywoodlh ]; + mainProgram = "ts-warp"; + }; +}) From 14ef7f785008728e99c2e7695ec618785e8a82ce Mon Sep 17 00:00:00 2001 From: novenary Date: Tue, 9 Jul 2024 12:11:32 +0300 Subject: [PATCH 003/151] unar: 1.10.7 -> 1.10.8 --- pkgs/tools/archivers/unar/default.nix | 35 ++++++++++++++++++--------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/archivers/unar/default.nix b/pkgs/tools/archivers/unar/default.nix index 96090b88f6b2..445683555dc7 100644 --- a/pkgs/tools/archivers/unar/default.nix +++ b/pkgs/tools/archivers/unar/default.nix @@ -15,18 +15,29 @@ stdenv.mkDerivation rec { pname = "unar"; - version = "1.10.7"; + version = "1.10.8"; - src = fetchFromGitHub { - owner = "MacPaw"; - # the unar repo contains a shallow clone of both XADMaster and universal-detector - repo = "unar"; - rev = "v${version}"; - sha256 = "0p846q1l66k3rnd512sncp26zpv411b8ahi145sghfcsz9w8abc4"; - }; + srcs = [ + (fetchFromGitHub rec { + owner = "MacPaw"; + repo = "XADMaster"; + name = repo; + rev = "v${version}"; + hash = "sha256-dmIyxpa3pq4ls4Grp0gy/6ZjcaA7rmobMn4h1inVgns="; + }) + (fetchFromGitHub { + owner = "MacPaw"; + repo = "universal-detector"; + name = "UniversalDetector"; + rev = "1.1"; + hash = "sha256-6X1HtXhRuRwBOq5TAtL1I/vBBZokZOXIQ+oaRFigtv8="; + }) + ]; - postPatch = - if stdenv.hostPlatform.isDarwin then '' + postPatch = '' + substituteInPlace unar.m lsar.m \ + --replace-fail "v1.10.7" "v${version}" + '' + (if stdenv.hostPlatform.isDarwin then '' substituteInPlace "./XADMaster.xcodeproj/project.pbxproj" \ --replace "libstdc++.6.dylib" "libc++.1.dylib" '' else '' @@ -40,7 +51,7 @@ stdenv.mkDerivation rec { # we need to build inside this directory as well, so we have to make it writeable chmod +w ../UniversalDetector -R - ''; + ''); buildInputs = [ bzip2 icu openssl wavpack zlib ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gnustep.base ] ++ @@ -63,7 +74,7 @@ stdenv.mkDerivation rec { dontConfigure = true; - sourceRoot = "${src.name}/XADMaster"; + sourceRoot = "XADMaster"; installPhase = '' runHook preInstall From 93c30427d92025c7f3983bdfeb9add22198aed62 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 2 Oct 2024 19:37:41 -0400 Subject: [PATCH 004/151] python312Packages.torchio: 0.19.6 -> 0.20.0 --- pkgs/development/python-modules/torchio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torchio/default.nix b/pkgs/development/python-modules/torchio/default.nix index 3fbfe404febc..1be64b66d1d2 100644 --- a/pkgs/development/python-modules/torchio/default.nix +++ b/pkgs/development/python-modules/torchio/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "torchio"; - version = "0.19.6"; + version = "0.20.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "fepegar"; repo = "torchio"; rev = "refs/tags/v${version}"; - hash = "sha256-FlsjDgthXDGVjj4L0Yw+8UzBROw9jiM4Z+qi67D5ygU="; + hash = "sha256-Soew23+Skpc2IpVBMuOnC5LBW0vFL/9LszLijkJgQoQ="; }; propagatedBuildInputs = [ From 9485a4d94b5576556bd171826fd3cf2e8ef4635f Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 2 Oct 2024 19:42:20 -0400 Subject: [PATCH 005/151] python312Packages.nitransforms: 23.0.1 -> 24.0.2 --- .../python-modules/nitransforms/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/nitransforms/default.nix b/pkgs/development/python-modules/nitransforms/default.nix index 51f499d6ab17..91828a5cbb89 100644 --- a/pkgs/development/python-modules/nitransforms/default.nix +++ b/pkgs/development/python-modules/nitransforms/default.nix @@ -13,28 +13,28 @@ buildPythonPackage rec { pname = "nitransforms"; - version = "23.0.1"; - format = "setuptools"; - disabled = pythonOlder "3.7"; + version = "24.0.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Lty4aPzSlwRJSqCXeIVICF+gudYqto1OS4cVZyrB2nY="; + hash = "sha256-7C0HaGmJhlABzGZ90glx865SnVNmt2wDlmOX3bnnJXI="; }; - buildInputs = [ + build-system = [ setuptools-scm toml ]; - propagatedBuildInputs = [ + + dependencies = [ h5py nibabel numpy scipy ]; - pythonRelaxDeps = [ "scipy" ]; - doCheck = false; # relies on data repo (https://github.com/nipreps-data/nitransforms-tests); # probably too heavy From e55e5f40dd0c3492a77e3577672444a17bfb88a4 Mon Sep 17 00:00:00 2001 From: ppenguin Date: Thu, 10 Oct 2024 16:15:22 +0200 Subject: [PATCH 006/151] rubyPackages.pandocomatic: 1.1.2 -> 2.0.1 Includes (new?) dependency csv for paru (a pandocomatic dependency) and updated paru and optimist (both sole deps of pandocomatic) --- pkgs/top-level/ruby-packages.nix | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 05a7be580b0e..ebe3c745a048 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -727,6 +727,16 @@ }; version = "1.0.6"; }; + csv = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "sha256-C70d79wxE0q+/tAnpjmzcjwnU4YhUPTD7mHKtxsg1n0="; + type = "gem"; + }; + version = "3.3.0"; + }; curb = { groups = ["default"]; platforms = []; @@ -2543,10 +2553,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk"; + sha256 = "sha256-gYhvU+6JGfMwqjAHbTINiO75vIWq4idTdrSvsAfGkmA="; type = "gem"; }; - version = "3.0.1"; + version = "3.1.0"; }; opus-ruby = { dependencies = ["ffi"]; @@ -2586,10 +2596,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04gq05mgy3v8gac0dk8ldr59865vbjhkzna51w8wh900512lakyq"; + sha256 = "sha256-Gf4ySW/iE1UP5TWm6/oXsi9lo654hrfa7LBY+nZSTaw="; type = "gem"; }; - version = "1.1.2"; + version = "2.0.1"; }; pango = { dependencies = ["cairo-gobject" "gobject-introspection"]; @@ -2624,14 +2634,15 @@ version = "3.3.0.5"; }; paru = { + dependencies = ["csv"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10jiv4c28bdvp4r98s042ilzks8wx36qw5a4byragwa1fzwy87va"; + sha256 = "sha256-Q0iafTt/9NuoAyxm2U6mWq9J4v1QR0D73ERsqnbIYOs="; type = "gem"; }; - version = "1.2.0"; + version = "1.4.1"; }; pastel = { dependencies = ["tty-color"]; From 787e3e6fdbae411e40cb4c6b852faf488eb0006e Mon Sep 17 00:00:00 2001 From: flakeuser Date: Tue, 1 Oct 2024 07:22:59 -0700 Subject: [PATCH 007/151] isync: add post-1.5.0 commits and build from git --- pkgs/tools/networking/isync/default.nix | 62 +++++++++++++++++++------ 1 file changed, 47 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 280be724a8aa..14d57703a320 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -1,32 +1,64 @@ -{ lib, stdenv, fetchurl, pkg-config, perl -, openssl, db, cyrus_sasl, zlib -, Security -# Disabled by default as XOAUTH2 is an "OBSOLETE" SASL mechanism and this relies -# on a package that isn't really maintained anymore: -, withCyrusSaslXoauth2 ? false, cyrus-sasl-xoauth2, makeWrapper +{ + lib, + stdenv, + fetchgit, + pkg-config, + perl, + openssl, + db, + cyrus_sasl, + zlib, + perl538Packages, + autoreconfHook, + Security, + # Disabled by default as XOAUTH2 is an "OBSOLETE" SASL mechanism and this relies + # on a package that isn't really maintained anymore: + withCyrusSaslXoauth2 ? false, + cyrus-sasl-xoauth2, + makeWrapper, }: stdenv.mkDerivation (finalAttrs: { pname = "isync"; - version = "1.5.0"; + version = "1.5.0-unstable-2024-09-29"; - src = fetchurl { - url = "mirror://sourceforge/isync/isync-${finalAttrs.version}.tar.gz"; - hash = "sha256-oMgeEJOHvyedoWFFMQM5nneUav7PXFH5QTxedzVX940="; + src = fetchgit { + url = "https://git.code.sf.net/p/isync/isync"; + rev = "3c4b5f1c83a568f18c14c93aab95c9a853edfd15"; + hash = "sha256-MRjWr88sxd3C+YTMCqEymxmLj5h+uJKh9mcG+aEqf64="; }; # Fixes "Fatal: buffer too small" error # see https://sourceforge.net/p/isync/mailman/isync-devel/thread/87fsevvebj.fsf%40steelpick.2x.cz/ env.NIX_CFLAGS_COMPILE = "-DQPRINTF_BUFF=4000"; - nativeBuildInputs = [ pkg-config perl ] - ++ lib.optionals withCyrusSaslXoauth2 [ makeWrapper ]; - buildInputs = [ openssl db cyrus_sasl zlib ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + autoreconfPhase = '' + echo "1.5.0-3c4b5" > VERSION + echo "See https://sourceforge.net/p/isync/isync/ci/3c4b5f1c83a568f18c14c93aab95c9a853edfd15/log/?path=" > ChangeLog + ./autogen.sh + ''; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + perl + ] ++ lib.optionals withCyrusSaslXoauth2 [ makeWrapper ]; + buildInputs = [ + perl538Packages.TimeDate + openssl + db + cyrus_sasl + zlib + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; postInstall = lib.optionalString withCyrusSaslXoauth2 '' wrapProgram "$out/bin/mbsync" \ - --prefix SASL_PATH : "${lib.makeSearchPath "lib/sasl2" [ cyrus-sasl-xoauth2 cyrus_sasl.out ]}" + --prefix SASL_PATH : "${ + lib.makeSearchPath "lib/sasl2" [ + cyrus-sasl-xoauth2 + cyrus_sasl.out + ] + }" ''; meta = with lib; { From 1ce786273addfdb330bc791a3a7f20022a238dcc Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 20 Aug 2024 13:41:14 -0400 Subject: [PATCH 008/151] niimath: init at 1.0.20240905 --- pkgs/by-name/ni/niimath/package.nix | 60 +++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 pkgs/by-name/ni/niimath/package.nix diff --git a/pkgs/by-name/ni/niimath/package.nix b/pkgs/by-name/ni/niimath/package.nix new file mode 100644 index 000000000000..b94fcb7b1fdf --- /dev/null +++ b/pkgs/by-name/ni/niimath/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + coreutils, + git, + zlib, +}: + +let + niimathTestsSrc = fetchFromGitHub { + owner = "rordenlab"; + repo = "niimath_tests"; + rev = "e482edf54fb5bea6e08047ba731600d26925d493"; + hash = "sha256-FC9NHogt4Cmq7/9mao12LN7du9CoXVnonkwhafIpIQo="; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "niimath"; + version = "1.0.20240905"; + + src = fetchFromGitHub { + owner = "rordenlab"; + repo = "niimath"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-3XgB4q0HXLo9rEQBzC+2dxN81r9n8kkj2OC5d+WFmEs="; + }; + + postPatch = '' + cp -r ${niimathTestsSrc} niimath_tests + chmod -R +w niimath_tests + patchShebangs niimath_tests/canonical_test.sh + ''; + + nativeBuildInputs = [ + cmake + git + ]; + + buildInputs = [ zlib ]; + + cmakeFlags = [ "-DZLIB_IMPLEMENTATION=System" ]; + + doCheck = true; + checkPhase = '' + PATH=bin:$PATH ../niimath_tests/canonical_test.sh + ''; + nativeCheckInputs = [ coreutils ]; + + meta = { + description = "Open-source clone of fslmaths"; + homepage = "https://github.com/rordenlab/niimath"; + changelog = "https://github.com/rordenlab/niimath/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ bcdarwin ]; + mainProgram = "niimath"; + platforms = lib.platforms.all; + }; +}) From 1a749ea80c06c937b85af6c8ec86a7c75e04c9b0 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Jul 2024 21:51:44 +0300 Subject: [PATCH 009/151] ios-safari-remote-debug: init at unstable-2024-09-09 --- ...-permissions-to-the-output-directory.patch | 25 ++++++++++++ .../io/ios-safari-remote-debug/package.nix | 40 +++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 pkgs/by-name/io/ios-safari-remote-debug/add-permissions-to-the-output-directory.patch create mode 100644 pkgs/by-name/io/ios-safari-remote-debug/package.nix diff --git a/pkgs/by-name/io/ios-safari-remote-debug/add-permissions-to-the-output-directory.patch b/pkgs/by-name/io/ios-safari-remote-debug/add-permissions-to-the-output-directory.patch new file mode 100644 index 000000000000..b3790dc01454 --- /dev/null +++ b/pkgs/by-name/io/ios-safari-remote-debug/add-permissions-to-the-output-directory.patch @@ -0,0 +1,25 @@ +From 16ea1a197c4b154fcd481728fbea24a4722ba5d3 Mon Sep 17 00:00:00 2001 +From: Pavel Sobolev +Date: Sat, 13 Jul 2024 18:44:36 +0300 +Subject: [PATCH] Add permissions to the output directory. + +--- + build/build.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/build.go b/build/build.go +index 3ee59ab..97932ed 100644 +--- a/build/build.go ++++ b/build/build.go +@@ -67,7 +67,7 @@ func Build(cloneDir string, outputDir string) error { + log.Debug().TimeDiff("getRelevantFiles", time.Now(), getRelevantFilesTime).Send() + bundleTime := time.Now() + +- cp.Copy("views", outputDir) ++ cp.Copy("views", outputDir, cp.Options{PermissionControl: cp.AddPermission(0200)}) + os.Mkdir(fmt.Sprintf("%s/debug", outputDir), os.ModePerm) + os.Mkdir(fmt.Sprintf("%s/debug/Lib", outputDir), os.ModePerm) + os.Mkdir(fmt.Sprintf("%s/debug/Protocols", outputDir), os.ModePerm) +-- +2.45.2 + diff --git a/pkgs/by-name/io/ios-safari-remote-debug/package.nix b/pkgs/by-name/io/ios-safari-remote-debug/package.nix new file mode 100644 index 000000000000..216c4ed15cdd --- /dev/null +++ b/pkgs/by-name/io/ios-safari-remote-debug/package.nix @@ -0,0 +1,40 @@ +{ + lib, + buildGoModule, + fetchFromGitea, +}: + +buildGoModule rec { + pname = "ios-safari-remote-debug"; + version = "unstable-2024-09-09"; + + src = fetchFromGitea { + domain = "git.gay"; + owner = "besties"; + repo = "ios-safari-remote-debug"; + rev = "b3c69873997c08fce83c48a5ab42f5a2354efdf2"; + hash = "sha256-Hh/CeH0ba4uPMlEo+OZ3w36pTpsW6OLtYIE5v6dkUjo="; + }; + + vendorHash = "sha256-O8Dr4UAISZmCUGao0cBnAx4dUJm6+u4Swiw0H5NVeeA="; + + patches = [ ./add-permissions-to-the-output-directory.patch ]; + + postPatch = '' + substituteInPlace build/build.go \ + --replace-fail 'cp.Copy("' 'cp.Copy("${placeholder "out"}/share/${pname}/' + ''; + + postBuild = '' + mkdir -p $out/share/${pname} + cp -r injectedCode views $out/share/${pname} + ''; + + meta = { + description = "Remote debugger for iOS Safari"; + homepage = "https://git.gay/besties/ios-safari-remote-debug"; + license = lib.licenses.agpl3Plus; + mainProgram = "ios-safari-remote-debug"; + maintainers = with lib.maintainers; [ paveloom ]; + }; +} From 627542ea2d292dd79151edaca5aea9bf6dd06f7d Mon Sep 17 00:00:00 2001 From: Lan Tian Date: Sun, 19 May 2024 11:53:46 -0700 Subject: [PATCH 010/151] cloudpan189-go: init at 0.1.3 --- pkgs/by-name/cl/cloudpan189-go/package.nix | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 pkgs/by-name/cl/cloudpan189-go/package.nix diff --git a/pkgs/by-name/cl/cloudpan189-go/package.nix b/pkgs/by-name/cl/cloudpan189-go/package.nix new file mode 100644 index 000000000000..e3f61182d052 --- /dev/null +++ b/pkgs/by-name/cl/cloudpan189-go/package.nix @@ -0,0 +1,50 @@ +{ + buildGo122Module, + lib, + fetchFromGitHub, + versionCheckHook, +}: +buildGo122Module rec { + pname = "cloudpan189-go"; + version = "0.1.3"; + src = fetchFromGitHub { + owner = "tickstep"; + repo = "cloudpan189-go"; + rev = "v${version}"; + hash = "sha256-CJCTfzcLw5e41RZXhgbJhZVOP4FDDYM74Oo9my/liZk="; + }; + vendorHash = "sha256-6t4wJqUGJneR6Hv7Dotr4P9MTA1oQcCe/ujDojS0g8s="; + + # Dirty way to fix dependency issue + overrideModAttrs = _: { + postInstall = '' + sed -i '/go:linkname/d' $out/github.com/tickstep/library-go/expires/expires.go + ''; + }; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; + + postFixup = '' + mv $out/bin/cloudpan189-go $out/bin/.cloudpan189-go-wrapped + + cat <$out/bin/cloudpan189-go + #!/bin/sh + export CLOUD189_CONFIG_DIR="\''${CLOUD189_CONFIG_DIR:-\''${HOME}/.config/cloudpan189-go}" + mkdir -p \''${CLOUD189_CONFIG_DIR} + exec $out/bin/.cloudpan189-go-wrapped "\$@" + EOF + + chmod +x $out/bin/cloudpan189-go + ''; + + meta = { + mainProgram = "cloudpan189-go"; + maintainers = with lib.maintainers; [ xddxdd ]; + description = "CLI for China Telecom 189 Cloud Drive service, implemented in Go"; + homepage = "https://github.com/tickstep/cloudpan189-go"; + license = lib.licenses.asl20; + }; +} From c243f041aa2b0b6a99f9a2828d83bb451e89cf2b Mon Sep 17 00:00:00 2001 From: Isidor Zeuner Date: Fri, 1 Nov 2024 11:33:21 +0100 Subject: [PATCH 011/151] python312Packages.torch: unroll recursive git retrieval --- .../python-modules/torch/default.nix | 39 +- pkgs/development/python-modules/torch/src.nix | 683 ++++++++++++++++++ 2 files changed, 716 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/python-modules/torch/src.nix diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 25698776d83f..2673bddf8dd1 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -2,8 +2,12 @@ stdenv, lib, fetchFromGitHub, + fetchFromGitLab, + fetchFromGitea, buildPythonPackage, python, + runCommand, + writeShellScript, config, cudaSupport ? config.cudaSupport, cudaPackages, @@ -219,6 +223,27 @@ let "Rocm support is currently broken because `rocmPackages.hipblaslt` is unpackaged. (2024-06-09)" = rocmSupport; }; + + git-unroll = fetchFromGitea { + domain = "codeberg.org"; + owner = "gm6k"; + repo = "git-unroll"; + rev = "96bf24f2af153310ec59979c123a8cefda8636db"; + hash = "sha256-BTlq2Pm4l/oypBzKKpxExVPyQ0CcAP8llUnl/fd3DUU="; + }; + + unroll-src = writeShellScript "unroll-src" '' + echo "{ + version, + fetchFromGitLab, + fetchFromGitHub, + runCommand, + }: + assert version == "'"'$1'"'";" + ${git-unroll}/unroll https://github.com/pytorch/pytorch v$1 + echo + echo "# Update using: unroll-src [version]" + ''; in buildPythonPackage rec { pname = "torch"; @@ -234,12 +259,13 @@ buildPythonPackage rec { ]; cudaPropagateToOutput = "cxxdev"; - src = fetchFromGitHub { - owner = "pytorch"; - repo = "pytorch"; - rev = "refs/tags/v${version}"; - fetchSubmodules = true; - hash = "sha256-17lgAcqJN+vir+Zvffy5cXRmNjd5Y80ev8b8pOj9F+g="; + src = callPackage ./src.nix { + inherit + version + fetchFromGitHub + fetchFromGitLab + runCommand + ; }; patches = @@ -669,6 +695,7 @@ buildPythonPackage rec { cudaPackages rocmSupport rocmPackages + unroll-src ; cudaCapabilities = if cudaSupport then supportedCudaCapabilities else [ ]; # At least for 1.10.2 `torch.fft` is unavailable unless BLAS provider is MKL. This attribute allows for easy detection of its availability. diff --git a/pkgs/development/python-modules/torch/src.nix b/pkgs/development/python-modules/torch/src.nix new file mode 100644 index 000000000000..1bfb797e0693 --- /dev/null +++ b/pkgs/development/python-modules/torch/src.nix @@ -0,0 +1,683 @@ +{ + version, + fetchFromGitLab, + fetchFromGitHub, + runCommand, +}: +assert version == "2.5.1"; +(rec { + src_DCGM = fetchFromGitHub { + owner = "NVIDIA"; + repo = "DCGM"; + rev = "ffde4e54bc7249a6039a5e6b45b395141e1217f9"; + hash = "sha256-jlnq25byEep7wRF3luOIGaiaYjqSVaTBx02N6gE/ox8="; + }; + src_FP16 = fetchFromGitHub { + owner = "Maratyszcza"; + repo = "FP16"; + rev = "4dfe081cf6bcd15db339cf2680b9281b8451eeb3"; + hash = "sha256-B27LtVnL52niaFgPW0pp5Uulub/Q3NvtSDkJNahrSBk="; + }; + src_FXdiv = fetchFromGitHub { + owner = "Maratyszcza"; + repo = "FXdiv"; + rev = "b408327ac2a15ec3e43352421954f5b1967701d1"; + hash = "sha256-BEjscsejYVhRxDAmah5DT3+bglp8G5wUTTYL7+HjWds="; + }; + src_GSL = fetchFromGitHub { + owner = "microsoft"; + repo = "GSL"; + rev = "6f4529395c5b7c2d661812257cd6780c67e54afa"; + hash = "sha256-sNTDH1ohz+rcnBvA5KkarHKdRMQPW0c2LeSVPdEYx6Q="; + }; + src_NNPACK = fetchFromGitHub { + owner = "Maratyszcza"; + repo = "NNPACK"; + rev = "c07e3a0400713d546e0dea2d5466dd22ea389c73"; + hash = "sha256-GzF53u1ELtmEH3WbBzGBemlQhjj3EIKB+37wMtSYE2g="; + }; + src_NVTX = fetchFromGitHub { + owner = "NVIDIA"; + repo = "NVTX"; + rev = "e170594ac7cf1dac584da473d4ca9301087090c1"; + hash = "sha256-n34BPxRnAW301ba1lXqSlGh7jaPqNjpp45GnJ+yDapI="; + }; + src_PeachPy = fetchFromGitHub { + owner = "malfet"; + repo = "PeachPy"; + rev = "f45429b087dd7d5bc78bb40dc7cf06425c252d67"; + hash = "sha256-eyhfnOOZPtsJwjkF6ybv3F77fyjaV6wzgu+LxadZVw0="; + }; + src_VulkanMemoryAllocator = fetchFromGitHub { + owner = "GPUOpen-LibrariesAndSDKs"; + repo = "VulkanMemoryAllocator"; + rev = "a6bfc237255a6bac1513f7c1ebde6d8aed6b5191"; + hash = "sha256-urUebQaPTgCECmm4Espri1HqYGy0ueAqTBu/VSiX/8I="; + }; + src_XNNPACK = fetchFromGitHub { + owner = "google"; + repo = "XNNPACK"; + rev = "fcbf55af6cf28a4627bcd1f703ab7ad843f0f3a2"; + hash = "sha256-lnycZPoswZQwRWJjR4if4qp8O9KhgYNbtwjNuoem48w="; + }; + src_asmjit = fetchFromGitHub { + owner = "asmjit"; + repo = "asmjit"; + rev = "d3fbf7c9bc7c1d1365a94a45614b91c5a3706b81"; + hash = "sha256-0Wv9dxrh9GfajTFb+NpguqqSWH0mqJAj03bxFVJbft8="; + }; + src_benchmark = fetchFromGitHub { + owner = "google"; + repo = "benchmark"; + rev = "0d98dba29d66e93259db7daa53a9327df767a415"; + hash = "sha256-yUiFxi80FWBmTZgqmqTMf9oqcBeg3o4I4vKd4djyRWY="; + }; + src_benchmark_onnx = fetchFromGitHub { + owner = "google"; + repo = "benchmark"; + rev = "2dd015dfef425c866d9a43f2c67d8b52d709acb6"; + hash = "sha256-pUW9YVaujs/y00/SiPqDgK4wvVsaM7QUp/65k0t7Yr0="; + }; + src_benchmark_opentelemetry-cpp = fetchFromGitHub { + owner = "google"; + repo = "benchmark"; + rev = "d572f4777349d43653b21d6c2fc63020ab326db2"; + hash = "sha256-gg3g/0Ki29FnGqKv9lDTs5oA9NjH23qQ+hTdVtSU+zo="; + }; + src_benchmark_protobuf = fetchFromGitHub { + owner = "google"; + repo = "benchmark"; + rev = "5b7683f49e1e9223cf9927b24f6fd3d6bd82e3f8"; + hash = "sha256-iFRgjLkftuszAqBnmS9GXU8BwYnabmwMAQyw19sfjb4="; + }; + src_civetweb = fetchFromGitHub { + owner = "civetweb"; + repo = "civetweb"; + rev = "eefb26f82b233268fc98577d265352720d477ba4"; + hash = "sha256-Qh6BGPk7a01YzCeX42+Og9M+fjXRs7kzNUCyT4mYab4="; + }; + src_clang-cindex-python3 = fetchFromGitHub { + owner = "wjakob"; + repo = "clang-cindex-python3"; + rev = "6a00cbc4a9b8e68b71caf7f774b3f9c753ae84d5"; + hash = "sha256-IDUIuAvgCzWaHoTJUZrH15bqoVcP8bZk+Gs1Ae6/CpY="; + }; + src_cpp-httplib = fetchFromGitHub { + owner = "yhirose"; + repo = "cpp-httplib"; + rev = "3b6597bba913d51161383657829b7e644e59c006"; + hash = "sha256-dd9NckF1mGhQOyV1LO07QyP51l1kSpYQOH0GkG4v2eE="; + }; + src_cpr = fetchFromGitHub { + owner = "libcpr"; + repo = "cpr"; + rev = "871ed52d350214a034f6ef8a3b8f51c5ce1bd400"; + hash = "sha256-TxoDCIa7pS+nfI8hNiGIRQKpYNrKSd1yCXPfVXPcRW8="; + }; + src_cpuinfo = fetchFromGitHub { + owner = "pytorch"; + repo = "cpuinfo"; + rev = "094fc30b9256f54dad5ad23bcbfb5de74781422f"; + hash = "sha256-JbIEQ6jFprbMpeH8IBhuRo3VXxo8a32lmT4yfxSIEj0="; + }; + src_cpuinfo_fbgemm = fetchFromGitHub { + owner = "pytorch"; + repo = "cpuinfo"; + rev = "ed8b86a253800bafdb7b25c5c399f91bff9cb1f3"; + hash = "sha256-YRqBU83AjxbSE5zquhi4iIiJna/qFWA0jo2GBifqzi8="; + }; + src_cudnn-frontend = fetchFromGitHub { + owner = "NVIDIA"; + repo = "cudnn-frontend"; + rev = "2533f5e5c1877fd76266133c1479ef1643ce3a8b"; + hash = "sha256-z9HH/ZEPv+Nf0eB0npjJiakjXx6cwoesKKnYNS1r9TE="; + }; + src_cutlass = fetchFromGitHub { + owner = "NVIDIA"; + repo = "cutlass"; + rev = "bbe579a9e3beb6ea6626d9227ec32d0dae119a49"; + hash = "sha256-81O80F3MMOn22N9UaXLU6/9DTVWenYvKhLTHoxw8EEU="; + }; + src_cutlass_fbgemm = fetchFromGitHub { + owner = "NVIDIA"; + repo = "cutlass"; + rev = "fc9ebc645b63f3a6bc80aaefde5c063fb72110d6"; + hash = "sha256-e2SwXNNwjl/1fV64b+mOJvwGDYeO1LFcqZGbNten37U="; + }; + src_dynolog = fetchFromGitHub { + owner = "facebookincubator"; + repo = "dynolog"; + rev = "7d04a0053a845370ae06ce317a22a48e9edcc74e"; + hash = "sha256-Je6wAz+uJ/AiAnSZVQ4+pGajZ8DymS0qI9ekB8fGYOo="; + }; + src_eigen = fetchFromGitLab { + domain = "gitlab.com"; + owner = "libeigen"; + repo = "eigen"; + rev = "3147391d946bb4b6c68edd901f2add6ac1f31f8c"; + hash = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw="; + }; + src_fbgemm = fetchFromGitHub { + owner = "pytorch"; + repo = "fbgemm"; + rev = "dbc3157bf256f1339b3fa1fef2be89ac4078be0e"; + hash = "sha256-PJiFtLnPA6IgxZ2sXIcyyjFRGtb+sG5y2hiWEwFuBOU="; + }; + src_fbjni = fetchFromGitHub { + owner = "facebookincubator"; + repo = "fbjni"; + rev = "7e1e1fe3858c63c251c637ae41a20de425dde96f"; + hash = "sha256-PsgUHtCE3dNR2QdUnRjrXb0ZKZNGwFkA8RWYkZEklEY="; + }; + src_flatbuffers = fetchFromGitHub { + owner = "google"; + repo = "flatbuffers"; + rev = "01834de25e4bf3975a9a00e816292b1ad0fe184b"; + hash = "sha256-h0lF7jf1cDVVyqhUCi7D0NoZ3b4X/vWXsFplND80lGs="; + }; + src_fmt = fetchFromGitHub { + owner = "fmtlib"; + repo = "fmt"; + rev = "0c9fce2ffefecfdce794e1859584e25877b7b592"; + hash = "sha256-IKNt4xUoVi750zBti5iJJcCk3zivTt7nU12RIf8pM+0="; + }; + src_fmt_dynolog = fetchFromGitHub { + owner = "fmtlib"; + repo = "fmt"; + rev = "cd4af11efc9c622896a3e4cb599fa28668ca3d05"; + hash = "sha256-Ks3UG3V0Pz6qkKYFhy71ZYlZ9CPijO6GBrfMqX5zAp8="; + }; + src_fmt_kineto = fetchFromGitHub { + owner = "fmtlib"; + repo = "fmt"; + rev = "0041a40c1350ba702d475b9c4ad62da77caea164"; + hash = "sha256-PtzSB2mekUT7bjhXC/+F5UpSUvcdIkXTWnIz+jkAUuU="; + }; + src_gemmlowp = fetchFromGitHub { + owner = "google"; + repo = "gemmlowp"; + rev = "3fb5c176c17c765a3492cd2f0321b0dab712f350"; + hash = "sha256-G3PAf9j7Tb4dUoaV9Tmxkkfu3v+w0uFbZ+MWS68tlRw="; + }; + src_gflags = fetchFromGitHub { + owner = "gflags"; + repo = "gflags"; + rev = "e171aa2d15ed9eb17054558e0b3a6a413bb01067"; + hash = "sha256-4NLd/p72H7ZiFCCVjTfM/rDvZ8CVPMxYpnJ2O1od8ZA="; + }; + src_gflags_gflags = fetchFromGitHub { + owner = "gflags"; + repo = "gflags"; + rev = "8411df715cf522606e3b1aca386ddfc0b63d34b4"; + hash = "sha256-Bb4g64u5a0QRWwDl1ryNXmht6NKFWPW9bAF07yYRJ6I="; + }; + src_glog = fetchFromGitHub { + owner = "google"; + repo = "glog"; + rev = "b33e3bad4c46c8a6345525fd822af355e5ef9446"; + hash = "sha256-xqRp9vaauBkKz2CXbh/Z4TWqhaUtqfbsSlbYZR/kW9s="; + }; + src_gloo = fetchFromGitHub { + owner = "facebookincubator"; + repo = "gloo"; + rev = "5354032ea08eadd7fc4456477f7f7c6308818509"; + hash = "sha256-JMLtxyQz7jechJ5DmMq0guOfL9leI6khdI9g/5Ckgfc="; + }; + src_googletest = fetchFromGitHub { + owner = "google"; + repo = "googletest"; + rev = "e2239ee6043f73722e7aa812a459f54a28552929"; + hash = "sha256-SjlJxushfry13RGA7BCjYC9oZqV4z6x8dOiHfl/wpF0="; + }; + src_googletest_dynolog = fetchFromGitHub { + owner = "google"; + repo = "googletest"; + rev = "58d77fa8070e8cec2dc1ed015d66b454c8d78850"; + hash = "sha256-W+OxRTVtemt2esw4P7IyGWXOonUN5ZuscjvzqkYvZbM="; + }; + src_googletest_fbgemm = fetchFromGitHub { + owner = "google"; + repo = "googletest"; + rev = "cbf019de22c8dd37b2108da35b2748fd702d1796"; + hash = "sha256-G6NihPly7czG2NOX66kFfcf5ya+XRrUWt4SP1Y9JPzs="; + }; + src_googletest_kineto = fetchFromGitHub { + owner = "google"; + repo = "googletest"; + rev = "7aca84427f224eeed3144123d5230d5871e93347"; + hash = "sha256-ML144v86Kb9KSyxpqn8+XdKeU8r53PiMyh2ZzNYDyZU="; + }; + src_googletest_opentelemetry-cpp = fetchFromGitHub { + owner = "google"; + repo = "googletest"; + rev = "b796f7d44681514f58a683a3a71ff17c94edb0c1"; + hash = "sha256-LVLEn+e7c8013pwiLzJiiIObyrlbBHYaioO/SWbItPQ="; + }; + src_googletest_protobuf = fetchFromGitHub { + owner = "google"; + repo = "googletest"; + rev = "5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081"; + hash = "sha256-Zh7t6kOabEZxIuTwREerNSgbZLPnGWv78h0wQQAIuT4="; + }; + src_googletest_tensorpipe = fetchFromGitHub { + owner = "google"; + repo = "googletest"; + rev = "aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e"; + hash = "sha256-L2HR+QTQmagk92JiuW3TRx47so33xQvewdeYL1ipUPs="; + }; + src_hipify_torch = fetchFromGitHub { + owner = "ROCmSoftwarePlatform"; + repo = "hipify_torch"; + rev = "23f53b025b466d8ec3c45d52290d3442f7fbe6b1"; + hash = "sha256-ohbGKy0sxa5pQy9EwsZk2UWmjveCZaJu/PEK2MLbjII="; + }; + src_ideep = fetchFromGitHub { + owner = "intel"; + repo = "ideep"; + rev = "41d636c2bbcea6bff0faf97cdb65a48cdde987af"; + hash = "sha256-i4MK6zTScB0healwSoTNBP+UY2dHUfyyDUfBhDDSBCc="; + }; + src_ittapi = fetchFromGitHub { + owner = "intel"; + repo = "ittapi"; + rev = "5b8a7d7422611c3a0d799fb5fc5dd4abfae35b42"; + hash = "sha256-VxJky2TF3RcIMqjNaAK/mvpC0afkwpAsY0cD6Ergkls="; + }; + src_json = fetchFromGitHub { + owner = "nlohmann"; + repo = "json"; + rev = "87cda1d6646592ac5866dc703c8e1839046a6806"; + hash = "sha256-lXYJGWwLyQPqvxnDRWoDLXdjiD81r1eNHi7vRdbIuJ0="; + }; + src_json_dynolog = fetchFromGitHub { + owner = "nlohmann"; + repo = "json"; + rev = "4f8fba14066156b73f1189a2b8bd568bde5284c5"; + hash = "sha256-DTsZrdB9GcaNkx7ZKxcgCA3A9ShM5icSF0xyGguJNbk="; + }; + src_json_opentelemetry-cpp = fetchFromGitHub { + owner = "nlohmann"; + repo = "json"; + rev = "bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d"; + hash = "sha256-SUdhIV7tjtacf5DkoWk9cnkfyMlrkg8ZU7XnPZd22Tw="; + }; + src_kineto = fetchFromGitHub { + owner = "pytorch"; + repo = "kineto"; + rev = "d9753139d181b9ff42872465aac0e5d3018be415"; + hash = "sha256-m1Uul9HKZLAiST7GQmvd9+9ziJSU+9Hjq8D24KiAyto="; + }; + src_libnop = fetchFromGitHub { + owner = "google"; + repo = "libnop"; + rev = "910b55815be16109f04f4180e9adee14fb4ce281"; + hash = "sha256-AsPZt+ylfdGpytQ1RoQljKeXE2uGkGONCaWzLK2sZhA="; + }; + src_libuv = fetchFromGitHub { + owner = "libuv"; + repo = "libuv"; + rev = "1dff88e5161cba5c59276d2070d2e304e4dcb242"; + hash = "sha256-i6AYD1Ony0L2+3yWK6bxOfwoZEvd9qCg33QSqA7bRXI="; + }; + src_mimalloc = fetchFromGitHub { + owner = "microsoft"; + repo = "mimalloc"; + rev = "b66e3214d8a104669c2ec05ae91ebc26a8f5ab78"; + hash = "sha256-uwuqln08Hx1d2l7GNn8/8hzOA1Pmzob5g17XgFb+blg="; + }; + src_mkl-dnn = fetchFromGitHub { + owner = "intel"; + repo = "mkl-dnn"; + rev = "66f0cb9eb66affd2da3bf5f8d897376f04aae6af"; + hash = "sha256-/ERkk6bgGEKoJEVdnBxMFEzB8pii71t3zQZNtyg+TdQ="; + }; + src_nccl = fetchFromGitHub { + owner = "NVIDIA"; + repo = "nccl"; + rev = "ab2b89c4c339bd7f816fbc114a4b05d386b66290"; + hash = "sha256-IF2tILwW8XnzSmfn7N1CO7jXL95gUp02guIW5n1eaig="; + }; + src_onnx = fetchFromGitHub { + owner = "onnx"; + repo = "onnx"; + rev = "3bf92c03a9f27eba3bda1e5b9e63ea20ec213557"; + hash = "sha256-JmxnsHRrzj2QzPz3Yndw0MmgZJ8MDYxHjuQ7PQkQsDg="; + }; + src_opentelemetry-cpp = fetchFromGitHub { + owner = "open-telemetry"; + repo = "opentelemetry-cpp"; + rev = "a799f4aed9c94b765dcdaabaeab7d5e7e2310878"; + hash = "sha256-jLRUpB9aDvxsc7B42b08vN2rygN/ycgOyt78i2Hms0Q="; + }; + src_opentelemetry-proto = fetchFromGitHub { + owner = "open-telemetry"; + repo = "opentelemetry-proto"; + rev = "4ca4f0335c63cda7ab31ea7ed70d6553aee14dce"; + hash = "sha256-A14YrqvBAEBBPzvxcNVY2sJok+54/mHKNQPRaf9QLzs="; + }; + src_opentracing-cpp = fetchFromGitHub { + owner = "opentracing"; + repo = "opentracing-cpp"; + rev = "06b57f48ded1fa3bdd3d4346f6ef29e40e08eaf5"; + hash = "sha256-XlQi26ynXKDwA86DwsDw+hhKR8bcdnrtFH1CpAzVlLs="; + }; + src_pfs = fetchFromGitHub { + owner = "dtrugman"; + repo = "pfs"; + rev = "f68a2fa8ea36c783bdd760371411fcb495aa3150"; + hash = "sha256-VB7/7hi4vZKgpjpgir+CyWIMwoNLHGRIXPJvVOn8Pq4="; + }; + src_pocketfft = fetchFromGitHub { + owner = "mreineck"; + repo = "pocketfft"; + rev = "9d3ab05a7fffbc71a492bc6a17be034e83e8f0fe"; + hash = "sha256-RSbimayr8Np7YP0aUo1MNusFmhi9jjDfgGXbiISR+/8="; + }; + src_prometheus-cpp = fetchFromGitHub { + owner = "jupp0r"; + repo = "prometheus-cpp"; + rev = "c9ffcdda9086ffd9e1283ea7a0276d831f3c8a8d"; + hash = "sha256-qx6oBxd0YrUyFq+7ArnKBqOwrl5X8RS9nErhRDUJ7+8="; + }; + src_protobuf = fetchFromGitHub { + owner = "protocolbuffers"; + repo = "protobuf"; + rev = "d1eca4e4b421cd2997495c4b4e65cea6be4e9b8a"; + hash = "sha256-InCW/Sb4E7dQeg3VHgpCtm91qqfh0Qpmu4ZzKffacOQ="; + }; + src_psimd = fetchFromGitHub { + owner = "Maratyszcza"; + repo = "psimd"; + rev = "072586a71b55b7f8c584153d223e95687148a900"; + hash = "sha256-lV+VZi2b4SQlRYrhKx9Dxc6HlDEFz3newvcBjTekupo="; + }; + src_pthreadpool = fetchFromGitHub { + owner = "Maratyszcza"; + repo = "pthreadpool"; + rev = "4fe0e1e183925bf8cfa6aae24237e724a96479b8"; + hash = "sha256-R4YmNzWEELSkAws/ejmNVxqXDTJwcqjLU/o/HvgRn2E="; + }; + src_pybind11 = fetchFromGitHub { + owner = "pybind"; + repo = "pybind11"; + rev = "7c33cdc2d39c7b99a122579f53bc94c8eb3332ff"; + hash = "sha256-cpxhrTFihA+gWmX62a+EQF3lccUyvu+d1MU2IC/CN6Q="; + }; + src_pybind11_onnx = fetchFromGitHub { + owner = "pybind"; + repo = "pybind11"; + rev = "5b0a6fc2017fcc176545afe3e09c9f9885283242"; + hash = "sha256-n7nLEG2+sSR9wnxM+C8FWc2B+Mx74Pan1+IQf+h2bGU="; + }; + src_pybind11_tensorpipe = fetchFromGitHub { + owner = "pybind"; + repo = "pybind11"; + rev = "a23996fce38ff6ccfbcdc09f1e63f2c4be5ea2ef"; + hash = "sha256-3TALLHJAeWCSf88oBgLyyUoI/HyWGasAcAy4fGOQt04="; + }; + src_pytorch = fetchFromGitHub { + owner = "pytorch"; + repo = "pytorch"; + rev = "v2.5.1"; + hash = "sha256-GknW0DZAx2at+SwjKm2HrjCPuvaeXXm1PD7Vep/aTBQ="; + }; + src_sleef = fetchFromGitHub { + owner = "shibatch"; + repo = "sleef"; + rev = "60e76d2bce17d278b439d9da17177c8f957a9e9b"; + hash = "sha256-JfARLkdt4je8ll+oqPGJqzUCQbsXoJ0bbX3jf0aHd0o="; + }; + src_tensorpipe = fetchFromGitHub { + owner = "pytorch"; + repo = "tensorpipe"; + rev = "52791a2fd214b2a9dc5759d36725909c1daa7f2e"; + hash = "sha256-i+CtjNFPDUzFCPxP0//jMLJDrQoorg0On9NfoVaMUxI="; + }; + src_vcpkg = fetchFromGitHub { + owner = "Microsoft"; + repo = "vcpkg"; + rev = "8eb57355a4ffb410a2e94c07b4dca2dffbee8e50"; + hash = "sha256-u+4vyOphnowoaZgfkCbzF7Q4tuz2GN1bHylaKw352Lc="; + }; + src_DCGM_recursive = src_DCGM; + src_FP16_recursive = src_FP16; + src_FXdiv_recursive = src_FXdiv; + src_GSL_recursive = src_GSL; + src_NNPACK_recursive = src_NNPACK; + src_NVTX_recursive = src_NVTX; + src_PeachPy_recursive = src_PeachPy; + src_VulkanMemoryAllocator_recursive = src_VulkanMemoryAllocator; + src_XNNPACK_recursive = src_XNNPACK; + src_asmjit_recursive = src_asmjit; + src_benchmark_recursive = src_benchmark; + src_benchmark_onnx_recursive = src_benchmark_onnx; + src_benchmark_opentelemetry-cpp_recursive = src_benchmark_opentelemetry-cpp; + src_benchmark_protobuf_recursive = src_benchmark_protobuf; + src_civetweb_recursive = src_civetweb; + src_clang-cindex-python3_recursive = src_clang-cindex-python3; + src_cpp-httplib_recursive = src_cpp-httplib; + src_cpr_recursive = src_cpr; + src_cpuinfo_recursive = src_cpuinfo; + src_cpuinfo_fbgemm_recursive = src_cpuinfo_fbgemm; + src_cudnn-frontend_recursive = src_cudnn-frontend; + src_cutlass_recursive = src_cutlass; + src_cutlass_fbgemm_recursive = src_cutlass_fbgemm; + src_dynolog_recursive = runCommand "dynolog" { } '' + cp -r ${src_dynolog} $out + chmod u+w $out/third_party/DCGM + cp -r ${src_DCGM_recursive}/* $out/third_party/DCGM + chmod u+w $out/third_party/cpr + cp -r ${src_cpr_recursive}/* $out/third_party/cpr + chmod u+w $out/third_party/fmt + cp -r ${src_fmt_dynolog_recursive}/* $out/third_party/fmt + chmod u+w $out/third_party/gflags + cp -r ${src_gflags_recursive}/* $out/third_party/gflags + chmod u+w $out/third_party/glog + cp -r ${src_glog_recursive}/* $out/third_party/glog + chmod u+w $out/third_party/googletest + cp -r ${src_googletest_dynolog_recursive}/* $out/third_party/googletest + chmod u+w $out/third_party/json + cp -r ${src_json_dynolog_recursive}/* $out/third_party/json + chmod u+w $out/third_party/pfs + cp -r ${src_pfs_recursive}/* $out/third_party/pfs + ''; + src_eigen_recursive = src_eigen; + src_fbgemm_recursive = runCommand "fbgemm" { } '' + cp -r ${src_fbgemm} $out + chmod u+w $out/third_party/asmjit + cp -r ${src_asmjit_recursive}/* $out/third_party/asmjit + chmod u+w $out/third_party/cpuinfo + cp -r ${src_cpuinfo_fbgemm_recursive}/* $out/third_party/cpuinfo + chmod u+w $out/third_party/cutlass + cp -r ${src_cutlass_fbgemm_recursive}/* $out/third_party/cutlass + chmod u+w $out/third_party/googletest + cp -r ${src_googletest_fbgemm_recursive}/* $out/third_party/googletest + chmod u+w $out/third_party/hipify_torch + cp -r ${src_hipify_torch_recursive}/* $out/third_party/hipify_torch + ''; + src_fbjni_recursive = src_fbjni; + src_flatbuffers_recursive = src_flatbuffers; + src_fmt_recursive = src_fmt; + src_fmt_dynolog_recursive = src_fmt_dynolog; + src_fmt_kineto_recursive = src_fmt_kineto; + src_gemmlowp_recursive = src_gemmlowp; + src_gflags_recursive = runCommand "gflags" { } '' + cp -r ${src_gflags} $out + chmod u+w $out/doc + cp -r ${src_gflags_gflags_recursive}/* $out/doc + ''; + src_gflags_gflags_recursive = src_gflags_gflags; + src_glog_recursive = src_glog; + src_gloo_recursive = src_gloo; + src_googletest_recursive = src_googletest; + src_googletest_dynolog_recursive = src_googletest_dynolog; + src_googletest_fbgemm_recursive = src_googletest_fbgemm; + src_googletest_kineto_recursive = src_googletest_kineto; + src_googletest_opentelemetry-cpp_recursive = src_googletest_opentelemetry-cpp; + src_googletest_protobuf_recursive = src_googletest_protobuf; + src_googletest_tensorpipe_recursive = src_googletest_tensorpipe; + src_hipify_torch_recursive = src_hipify_torch; + src_ideep_recursive = runCommand "ideep" { } '' + cp -r ${src_ideep} $out + chmod u+w $out/mkl-dnn + cp -r ${src_mkl-dnn_recursive}/* $out/mkl-dnn + ''; + src_ittapi_recursive = src_ittapi; + src_json_recursive = src_json; + src_json_dynolog_recursive = src_json_dynolog; + src_json_opentelemetry-cpp_recursive = src_json_opentelemetry-cpp; + src_kineto_recursive = runCommand "kineto" { } '' + cp -r ${src_kineto} $out + chmod u+w $out/libkineto/third_party/dynolog + cp -r ${src_dynolog_recursive}/* $out/libkineto/third_party/dynolog + chmod u+w $out/libkineto/third_party/fmt + cp -r ${src_fmt_kineto_recursive}/* $out/libkineto/third_party/fmt + chmod u+w $out/libkineto/third_party/googletest + cp -r ${src_googletest_kineto_recursive}/* $out/libkineto/third_party/googletest + ''; + src_libnop_recursive = src_libnop; + src_libuv_recursive = src_libuv; + src_mimalloc_recursive = src_mimalloc; + src_mkl-dnn_recursive = src_mkl-dnn; + src_nccl_recursive = src_nccl; + src_onnx_recursive = runCommand "onnx" { } '' + cp -r ${src_onnx} $out + chmod u+w $out/third_party/benchmark + cp -r ${src_benchmark_onnx_recursive}/* $out/third_party/benchmark + chmod u+w $out/third_party/pybind11 + cp -r ${src_pybind11_onnx_recursive}/* $out/third_party/pybind11 + ''; + src_opentelemetry-cpp_recursive = runCommand "opentelemetry-cpp" { } '' + cp -r ${src_opentelemetry-cpp} $out + chmod u+w $out/third_party/benchmark + cp -r ${src_benchmark_opentelemetry-cpp_recursive}/* $out/third_party/benchmark + chmod u+w $out/third_party/googletest + cp -r ${src_googletest_opentelemetry-cpp_recursive}/* $out/third_party/googletest + chmod u+w $out/third_party/ms-gsl + cp -r ${src_GSL_recursive}/* $out/third_party/ms-gsl + chmod u+w $out/third_party/nlohmann-json + cp -r ${src_json_opentelemetry-cpp_recursive}/* $out/third_party/nlohmann-json + chmod u+w $out/third_party/opentelemetry-proto + cp -r ${src_opentelemetry-proto_recursive}/* $out/third_party/opentelemetry-proto + chmod u+w $out/third_party/opentracing-cpp + cp -r ${src_opentracing-cpp_recursive}/* $out/third_party/opentracing-cpp + chmod u+w $out/third_party/prometheus-cpp + cp -r ${src_prometheus-cpp_recursive}/* $out/third_party/prometheus-cpp + chmod u+w $out/tools/vcpkg + cp -r ${src_vcpkg_recursive}/* $out/tools/vcpkg + ''; + src_opentelemetry-proto_recursive = src_opentelemetry-proto; + src_opentracing-cpp_recursive = src_opentracing-cpp; + src_pfs_recursive = src_pfs; + src_pocketfft_recursive = src_pocketfft; + src_prometheus-cpp_recursive = runCommand "prometheus-cpp" { } '' + cp -r ${src_prometheus-cpp} $out + chmod u+w $out/3rdparty/civetweb + cp -r ${src_civetweb_recursive}/* $out/3rdparty/civetweb + chmod u+w $out/3rdparty/googletest + cp -r ${src_googletest_recursive}/* $out/3rdparty/googletest + ''; + src_protobuf_recursive = runCommand "protobuf" { } '' + cp -r ${src_protobuf} $out + chmod u+w $out/third_party/benchmark + cp -r ${src_benchmark_protobuf_recursive}/* $out/third_party/benchmark + chmod u+w $out/third_party/googletest + cp -r ${src_googletest_protobuf_recursive}/* $out/third_party/googletest + ''; + src_psimd_recursive = src_psimd; + src_pthreadpool_recursive = src_pthreadpool; + src_pybind11_recursive = src_pybind11; + src_pybind11_onnx_recursive = src_pybind11_onnx; + src_pybind11_tensorpipe_recursive = runCommand "pybind11_tensorpipe" { } '' + cp -r ${src_pybind11_tensorpipe} $out + chmod u+w $out/tools/clang + cp -r ${src_clang-cindex-python3_recursive}/* $out/tools/clang + ''; + src_pytorch_recursive = runCommand "pytorch" { } '' + cp -r ${src_pytorch} $out + chmod u+w $out/android/libs/fbjni + cp -r ${src_fbjni_recursive}/* $out/android/libs/fbjni + chmod u+w $out/third_party/FP16 + cp -r ${src_FP16_recursive}/* $out/third_party/FP16 + chmod u+w $out/third_party/FXdiv + cp -r ${src_FXdiv_recursive}/* $out/third_party/FXdiv + chmod u+w $out/third_party/NNPACK + cp -r ${src_NNPACK_recursive}/* $out/third_party/NNPACK + chmod u+w $out/third_party/NVTX + cp -r ${src_NVTX_recursive}/* $out/third_party/NVTX + chmod u+w $out/third_party/VulkanMemoryAllocator + cp -r ${src_VulkanMemoryAllocator_recursive}/* $out/third_party/VulkanMemoryAllocator + chmod u+w $out/third_party/XNNPACK + cp -r ${src_XNNPACK_recursive}/* $out/third_party/XNNPACK + chmod u+w $out/third_party/benchmark + cp -r ${src_benchmark_recursive}/* $out/third_party/benchmark + chmod u+w $out/third_party/cpp-httplib + cp -r ${src_cpp-httplib_recursive}/* $out/third_party/cpp-httplib + chmod u+w $out/third_party/cpuinfo + cp -r ${src_cpuinfo_recursive}/* $out/third_party/cpuinfo + chmod u+w $out/third_party/cudnn_frontend + cp -r ${src_cudnn-frontend_recursive}/* $out/third_party/cudnn_frontend + chmod u+w $out/third_party/cutlass + cp -r ${src_cutlass_recursive}/* $out/third_party/cutlass + chmod u+w $out/third_party/eigen + cp -r ${src_eigen_recursive}/* $out/third_party/eigen + chmod u+w $out/third_party/fbgemm + cp -r ${src_fbgemm_recursive}/* $out/third_party/fbgemm + chmod u+w $out/third_party/flatbuffers + cp -r ${src_flatbuffers_recursive}/* $out/third_party/flatbuffers + chmod u+w $out/third_party/fmt + cp -r ${src_fmt_recursive}/* $out/third_party/fmt + chmod u+w $out/third_party/gemmlowp/gemmlowp + cp -r ${src_gemmlowp_recursive}/* $out/third_party/gemmlowp/gemmlowp + chmod u+w $out/third_party/gloo + cp -r ${src_gloo_recursive}/* $out/third_party/gloo + chmod u+w $out/third_party/googletest + cp -r ${src_googletest_recursive}/* $out/third_party/googletest + chmod u+w $out/third_party/ideep + cp -r ${src_ideep_recursive}/* $out/third_party/ideep + chmod u+w $out/third_party/ittapi + cp -r ${src_ittapi_recursive}/* $out/third_party/ittapi + chmod u+w $out/third_party/kineto + cp -r ${src_kineto_recursive}/* $out/third_party/kineto + chmod u+w $out/third_party/mimalloc + cp -r ${src_mimalloc_recursive}/* $out/third_party/mimalloc + chmod u+w $out/third_party/nccl/nccl + cp -r ${src_nccl_recursive}/* $out/third_party/nccl/nccl + chmod u+w $out/third_party/nlohmann + cp -r ${src_json_recursive}/* $out/third_party/nlohmann + chmod u+w $out/third_party/onnx + cp -r ${src_onnx_recursive}/* $out/third_party/onnx + chmod u+w $out/third_party/opentelemetry-cpp + cp -r ${src_opentelemetry-cpp_recursive}/* $out/third_party/opentelemetry-cpp + chmod u+w $out/third_party/pocketfft + cp -r ${src_pocketfft_recursive}/* $out/third_party/pocketfft + chmod u+w $out/third_party/protobuf + cp -r ${src_protobuf_recursive}/* $out/third_party/protobuf + chmod u+w $out/third_party/psimd + cp -r ${src_psimd_recursive}/* $out/third_party/psimd + chmod u+w $out/third_party/pthreadpool + cp -r ${src_pthreadpool_recursive}/* $out/third_party/pthreadpool + chmod u+w $out/third_party/pybind11 + cp -r ${src_pybind11_recursive}/* $out/third_party/pybind11 + chmod u+w $out/third_party/python-peachpy + cp -r ${src_PeachPy_recursive}/* $out/third_party/python-peachpy + chmod u+w $out/third_party/sleef + cp -r ${src_sleef_recursive}/* $out/third_party/sleef + chmod u+w $out/third_party/tensorpipe + cp -r ${src_tensorpipe_recursive}/* $out/third_party/tensorpipe + ''; + src_sleef_recursive = src_sleef; + src_tensorpipe_recursive = runCommand "tensorpipe" { } '' + cp -r ${src_tensorpipe} $out + chmod u+w $out/third_party/googletest + cp -r ${src_googletest_tensorpipe_recursive}/* $out/third_party/googletest + chmod u+w $out/third_party/libnop + cp -r ${src_libnop_recursive}/* $out/third_party/libnop + chmod u+w $out/third_party/libuv + cp -r ${src_libuv_recursive}/* $out/third_party/libuv + chmod u+w $out/third_party/pybind11 + cp -r ${src_pybind11_tensorpipe_recursive}/* $out/third_party/pybind11 + ''; + src_vcpkg_recursive = src_vcpkg; +}).src_pytorch_recursive +# Update using: unroll-src [version] From 9a2dbfc20945eee3e77b6c870c800151511c22c8 Mon Sep 17 00:00:00 2001 From: Felix Uhl Date: Mon, 7 Oct 2024 17:41:23 +0200 Subject: [PATCH 012/151] persepolis: 4.0.1 -> 5.0.1 The persepolis team did some great work cleaning up a few quirks that required us to patch it. Fixes #346951 --- ...003-Search-PATH-for-aria2c-on-darwin.patch | 29 ---------------- ...004-Search-PATH-for-ffmpeg-on-darwin.patch | 34 ------------------- pkgs/by-name/pe/persepolis/package.nix | 24 +++---------- 3 files changed, 5 insertions(+), 82 deletions(-) delete mode 100644 pkgs/by-name/pe/persepolis/0003-Search-PATH-for-aria2c-on-darwin.patch delete mode 100644 pkgs/by-name/pe/persepolis/0004-Search-PATH-for-ffmpeg-on-darwin.patch diff --git a/pkgs/by-name/pe/persepolis/0003-Search-PATH-for-aria2c-on-darwin.patch b/pkgs/by-name/pe/persepolis/0003-Search-PATH-for-aria2c-on-darwin.patch deleted file mode 100644 index 505961d1ce6b..000000000000 --- a/pkgs/by-name/pe/persepolis/0003-Search-PATH-for-aria2c-on-darwin.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- - persepolis/scripts/download.py | 10 +--------- - 1 file changed, 1 insertion(+), 9 deletions(-) - -diff --git a/persepolis/scripts/download.py b/persepolis/scripts/download.py -index aaabb35..69676d3 100644 ---- a/persepolis/scripts/download.py -+++ b/persepolis/scripts/download.py -@@ -72,16 +72,8 @@ def startAria(): - - # in macintosh - elif os_type == OS.OSX: -- if aria2_path == "" or aria2_path == None or os.path.isfile(str(aria2_path)) == False: -- -- cwd = sys.argv[0] -- current_directory = os.path.dirname(cwd) -- aria2d = os.path.join(current_directory, 'aria2c') - -- else: -- aria2d = aria2_path -- -- subprocess.Popen([aria2d, '--no-conf', -+ subprocess.Popen(['aria2c', '--no-conf', - '--enable-rpc', '--rpc-listen-port=' + str(port), - '--rpc-max-request-size=2M', - '--rpc-listen-all', '--quiet=true'], --- -2.39.3 (Apple Git-145) - diff --git a/pkgs/by-name/pe/persepolis/0004-Search-PATH-for-ffmpeg-on-darwin.patch b/pkgs/by-name/pe/persepolis/0004-Search-PATH-for-ffmpeg-on-darwin.patch deleted file mode 100644 index 800f7bddd408..000000000000 --- a/pkgs/by-name/pe/persepolis/0004-Search-PATH-for-ffmpeg-on-darwin.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- - persepolis/scripts/mainwindow.py | 2 +- - persepolis/scripts/useful_tools.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/persepolis/scripts/mainwindow.py b/persepolis/scripts/mainwindow.py -index d21f3f4..a0e3674 100644 ---- a/persepolis/scripts/mainwindow.py -+++ b/persepolis/scripts/mainwindow.py -@@ -161,7 +161,7 @@ class CheckVersionsThread(QThread): - - else: - pipe = subprocess.Popen( -- [ffmpeg_path, '-version'], -+ ['ffmpeg', '-version'], - stdout=subprocess.PIPE, - stdin=subprocess.PIPE, - stderr=subprocess.PIPE, -diff --git a/persepolis/scripts/useful_tools.py b/persepolis/scripts/useful_tools.py -index b780967..31733eb 100644 ---- a/persepolis/scripts/useful_tools.py -+++ b/persepolis/scripts/useful_tools.py -@@ -342,7 +342,7 @@ def muxer(parent, video_finder_dictionary): - current_directory = os.path.dirname(cwd) - ffmpeg_path = os.path.join(current_directory, 'ffmpeg') - -- pipe = subprocess.Popen([ffmpeg_path, '-i', video_file_path, -+ pipe = subprocess.Popen(['ffmpeg', '-i', video_file_path, - '-i', audio_file_path, - '-c', 'copy', - '-shortest', --- -2.39.3 (Apple Git-145) - diff --git a/pkgs/by-name/pe/persepolis/package.nix b/pkgs/by-name/pe/persepolis/package.nix index 105af13a299e..b16e08a3f564 100644 --- a/pkgs/by-name/pe/persepolis/package.nix +++ b/pkgs/by-name/pe/persepolis/package.nix @@ -2,7 +2,6 @@ , qt5 , python3 , fetchFromGitHub -, aria2 , ffmpeg , libnotify , pulseaudio @@ -14,47 +13,34 @@ python3.pkgs.buildPythonApplication rec { pname = "persepolis"; - version = "4.0.1"; + version = "5.0.1"; format = "other"; src = fetchFromGitHub { owner = "persepolisdm"; repo = "persepolis"; - rev = "57dc9d438bb3f126070a17c7a3677c45ea4dd332"; - hash = "sha256-7OXAITFQJ2/aY0QmqlAo7if7cY7+T3j6PUjfJJV8Z2Q="; + rev = "refs/tags/${version}"; + hash = "sha256-ffEXPkpHGwvVzUxO6sjAEKYbxRod7o8f7DWR5AN+SkA="; }; - patches = [ - # Upstream does currently not allow building from source on macOS. These patches can likely - # be removed if https://github.com/persepolisdm/persepolis/issues/943 is fixed upstream - ./0003-Search-PATH-for-aria2c-on-darwin.patch - ./0004-Search-PATH-for-ffmpeg-on-darwin.patch - ]; - postPatch = '' # Ensure dependencies with hard-coded FHS dependencies are properly detected substituteInPlace check_dependencies.py --replace-fail "isdir(notifications_path)" "isdir('${sound-theme-freedesktop}/share/sounds/freedesktop')" ''; - postInstall = '' - mkdir -p $out/share/applications - cp $src/xdg/com.github.persepolisdm.persepolis.desktop $out/share/applications - ''; - # prevent double wrapping dontWrapQtApps = true; nativeBuildInputs = [ meson ninja pkg-config qt5.wrapQtAppsHook ]; # feed args to wrapPythonApp makeWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ aria2 ffmpeg libnotify ]}" + "--prefix PATH : ${lib.makeBinPath [ ffmpeg libnotify ]}" "\${qtWrapperArgs[@]}" ]; # The presence of these dependencies is checked during setuptoolsCheckPhase, # but apart from that, they're not required during build, only runtime nativeCheckInputs = [ - aria2 libnotify pulseaudio sound-theme-freedesktop @@ -74,7 +60,7 @@ python3.pkgs.buildPythonApplication rec { ]); meta = with lib; { - description = "GUI for aria2"; + description = "Download manager GUI written in Python"; mainProgram = "persepolis"; homepage = "https://persepolisdm.github.io/"; license = licenses.gpl3Plus; From 0f1b0e982e5cf25623b1ea9a27cfe1a45a1e898a Mon Sep 17 00:00:00 2001 From: Pavel Anpin Date: Mon, 18 Dec 2023 23:02:24 +0100 Subject: [PATCH 013/151] azure-artifacts-credprovider: init at 1.0.9 --- .../az/azure-artifacts-credprovider/deps.nix | 267 ++++++++++++++++++ .../azure-artifacts-credprovider/package.nix | 39 +++ .../az/azure-artifacts-credprovider/update.sh | 35 +++ 3 files changed, 341 insertions(+) create mode 100644 pkgs/by-name/az/azure-artifacts-credprovider/deps.nix create mode 100644 pkgs/by-name/az/azure-artifacts-credprovider/package.nix create mode 100755 pkgs/by-name/az/azure-artifacts-credprovider/update.sh diff --git a/pkgs/by-name/az/azure-artifacts-credprovider/deps.nix b/pkgs/by-name/az/azure-artifacts-credprovider/deps.nix new file mode 100644 index 000000000000..0e91a9f08996 --- /dev/null +++ b/pkgs/by-name/az/azure-artifacts-credprovider/deps.nix @@ -0,0 +1,267 @@ +{ fetchNuGet }: [ + (fetchNuGet { pname = "Castle.Core"; version = "4.4.0"; sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; }) + (fetchNuGet { pname = "Castle.Core"; version = "5.1.1"; sha256 = "1caf4878nvjid3cw3rw18p9cn53brfs5x8dkvf82xvcdwc3i0nd1"; }) + (fetchNuGet { pname = "FluentAssertions"; version = "5.9.0"; sha256 = "11mpnl6aar2yn7l6b1k4m3rdnl82ydmqbsja4rn84dhz1qdzfp8x"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.1.32"; sha256 = "0ywz63q8vrdp25ix2j9b7h2jp5grc68hqfl64c6lqk26q9xwhp9r"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.18"; sha256 = "002jll4a28j1rxn1sbhnfp0rlkx70hh0i91y2yzxj10hbnpvylbq"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) + (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.0.0-beta2-19554-01"; sha256 = "1ry7vaknwvidycxg76mbwwz4i981zcxqvlsgiqgz602jgx9qsn48"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.3.0"; sha256 = "1ppwmmwcfkkf1mz06r1xhr7jbp18gx2ajaqxwyg7s4ay0b49i1zi"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.5.0"; sha256 = "0briw00gb5bz9k9kx00p6ghq47w501db7gb6ig5zzmz9hb8lw4a4"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "6.0.0"; sha256 = "15hb2rbzgri1fq8wpj4ll7czm3rxqzszs02phnhjnncp90m5rmpc"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.3"; sha256 = "1lpr7bwandzvppjsx75b1nsh52whlsq2ddgwv1ncwdbi595jrkpc"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "6.0.0"; sha256 = "0plx785hk61arjxf0m3ywy9hl5nii25raj4523n3ql7mmv6hxqr1"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "6.0.0"; sha256 = "1383b0r33dzz0hrch9cqzzxr9vxr21qq0a5vnrpkfq71m2fky31d"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Debug"; version = "6.0.0"; sha256 = "0aql9kc45g2d6z1hmwr3p1a2qy9m3f36bds3054givsnpnis81wk"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "6.0.0"; sha256 = "1k6q91vrhq1r74l4skibn7wzxzww9l74ibxb2i8gg4q6fzbiivba"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) + (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.54.1"; sha256 = "1g7bgklz71vwamr4w2rw3k07h6vzwkl0jqlz0cxnp98pfi8k9c17"; }) + (fetchNuGet { pname = "Microsoft.Identity.Client.Broker"; version = "4.54.1"; sha256 = "03gk40sqnf5kj7gfl8wc3a2ash29sxkw76fs48b29qznzhbi4s77"; }) + (fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "2.31.0"; sha256 = "1x9xbcm1dq7y1mmldqd1ga7ayczz7ydjj1bfbmx65bi46z63am5r"; }) + (fetchNuGet { pname = "Microsoft.Identity.Client.NativeInterop"; version = "0.13.8"; sha256 = "1rf52n2rr2cb7hhcracszkkl876ylr9zn8jpa9s1r9fc44bzgvwd"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.22.0"; sha256 = "06495i2i9cabys4s0dkaz0rby8k47gy627v9ivp7aa3k6xmypviz"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Clients.ActiveDirectory"; version = "5.2.9"; sha256 = "177sl279yknxvvrq32aqjhyfr42k22rc3gm13x5kg46hwxv28cga"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.3.0"; sha256 = "129kdyjg491g4rjrxhz4bq7kq35w1wd7w9x1pp9c7cchjrq98gkw"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.5.0"; sha256 = "00gz2i8kx4mlq1ywj3imvf7wc6qzh0bsnynhw06z0mgyha1a21jy"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.32"; sha256 = "08sar3s7j6z1q5prjmz2jrbsq5ms81mrsi1c1zbfrkplkfjpld3a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "3.1.32"; sha256 = "0mmc57dl8plrspdxwb7209wz29vhiwqds4nfbdfws7zg35yy70c7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.18"; sha256 = "0p77flwzh7002yl88270b05l549mk708h4bqpaa28j556l9jri2b"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.3"; sha256 = "05smkcyxir59rgrmp7d6327vvrlacdgldfxhmyr1azclvga1zfsq"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.2"; sha256 = "0i42rn8xmvhn08799manpym06kpw89qy9080myyy2ngy565pqh0a"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.2"; sha256 = "0js3dp26nszx82q0phv7hmsm5z23dva7javbmk6a91lbkm07y8p2"; }) + (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "1.0.0-beta2-19554-01"; sha256 = "14g7c5j85vlxcpwh2xs92ix1c6gxlpl22zfjp4vp55n8q73f1q4n"; }) + (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "1.0.0-beta2-19554-01"; sha256 = "0bpcy6129pk9znhs8dfaxwrknpmzh6w49z83971m4cvbgq0vh9iy"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.3.0"; sha256 = "122wp1x7qjswiv4kmqn6wl570kdvrmxcb0ic0j1jx4rmwmb046cp"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.3.0"; sha256 = "05vlfanirm3l3gd9znlm0k9knjinx5dx40y2yhmzqwvmmizhfbfd"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.5.0"; sha256 = "17g0k3r5n8grba8kg4nghjyhnq9w8v0w6c2nkyyygvfh8k8x9wh3"; }) + (fetchNuGet { pname = "Microsoft.VisualStudioEng.MicroBuild.Core"; version = "1.0.0"; sha256 = "0i7qyqjn0xj5vsyskcp33d3r2f3hk0cw2rzy3hbkbsgi1wyjxxyh"; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { pname = "Moq"; version = "4.13.1"; sha256 = "04fyzgz6zz42x7m4h21mmkb7xkdz2a9q2f6zwmdx0jya0cx4rxd4"; }) + (fetchNuGet { pname = "Moq"; version = "4.18.4"; sha256 = "0x439pcaqg8kv0an4cjbspw8d98gq144yrqwhnnh6xf9qjaris94"; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "2.0.0"; sha256 = "18by991sykgdi63rj9w49s7r62l3dj9n8czkw5c1lmpbycpf1bzx"; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "2.2.10"; sha256 = "0w6c55n30w6imm0rjafl2sg0x8vf9852xmil9dzqb4h36cs7v6y6"; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "2.0.0"; sha256 = "0l1l04hw7v5fd34n2dh518piazsk05qwwrrspzyih1linf5z1cqn"; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "2.2.10"; sha256 = "0j5p3p5a0pr3rmzg7va21z3w0lb929zqj5xcdd81iys5vvh1hjiw"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "10.0.3"; sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) + (fetchNuGet { pname = "NuGet.Common"; version = "5.11.3"; sha256 = "0kb0y5p3zr7686yvd8y39zm5z39bhp88lm8d6gp1yndb3pm2k27z"; }) + (fetchNuGet { pname = "NuGet.Configuration"; version = "5.11.3"; sha256 = "0wff9m8f8xqkllm1v6xkxw7dbysw1jhv68fqsw88a0n7b7nwkajb"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.3"; sha256 = "08q2fbb1s034p227qafkc15vv450ma7zc3n9vhdixi88wsx6svh1"; }) + (fetchNuGet { pname = "NuGet.Packaging"; version = "5.11.3"; sha256 = "0xw8gkr7lj3d0xa5dzyz8332i4gaddirdxf85fl98kgdjkl10rgn"; }) + (fetchNuGet { pname = "NuGet.Protocol"; version = "5.11.3"; sha256 = "1b0pnbgdnf2mypppckb1534rjw78s39lfq3707ba91rp7gsf0939"; }) + (fetchNuGet { pname = "NuGet.Versioning"; version = "5.11.3"; sha256 = "0ax6c26yhl54pc05rv9hd5fby5rpcgrlzgccwpbrwy8kd8zbndcp"; }) + (fetchNuGet { pname = "PowerArgs"; version = "3.6.0"; sha256 = "1rxb4ljx4paf9ms3hcn5mspa0ki051l2w2ajrqjkyf9cmqrpks0h"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.1"; sha256 = "15kfi3761mk2i29zg135ipsvavm50nwm4334cy5m5q7iagzsf73p"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.4.0"; sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) + (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) + (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) + (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) + (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.4.0"; sha256 = "1hjgmz47v5229cbzd2pwz2h0dkq78lb2wp9grx8qr72pb5i0dk7v"; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) + (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "6.0.0"; sha256 = "08y1x2d5w2hnhkh9r1998pjc7r4qp0rmzax062abha85s11chifd"; }) + (fetchNuGet { pname = "System.Diagnostics.TextWriterTraceListener"; version = "4.3.0"; sha256 = "09db74f36wkwg30f7v7zhz1yhkyrnl5v6bdwljq1jdfgzcfch7c3"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) + (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) + (fetchNuGet { pname = "System.Formats.Asn1"; version = "5.0.0"; sha256 = "1axc8z0839yvqi2cb63l73l6d9j6wd20lsbdymwddz9hvrsgfwpn"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "5.0.0"; sha256 = "0ixl68plva0fsj3byv76bai7vkin86s6wyzr8vcav3szl862blvk"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.0"; sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { pname = "System.Private.DataContractSerialization"; version = "4.3.0"; sha256 = "06fjipqvjp559rrm825x6pll8gimdj9x1n3larigh5hsm584gndw"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.2"; sha256 = "019s7jz73d236p23mnpfaxxwib019i0v1fbwbkys0hskgddvw7cc"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Formatters"; version = "4.3.0"; sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Json"; version = "4.3.0"; sha256 = "1qp8ghr70smspnjdmlcbl5vwb7fm2iy1b7wx1p53lbpl35w4kz4a"; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) + (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.1"; sha256 = "1m2wnzg3m3c0s11jg4lshcl2a47d78zri8khc21yrz34jjkbyls2"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "5.0.0"; sha256 = "06hkx2za8jifpslkh491dfwzm5dxrsyxzj5lsc0achb6yzg4zqlw"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "5.0.0"; sha256 = "0hb2mndac3xrw3786bsjxjfh19bwnr991qib54k6wsqjhjyyvbwj"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.5.0"; sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) + (fetchNuGet { pname = "System.Security.SecureString"; version = "4.3.0"; sha256 = "1dypfbw7mxd8cbpcxs3jrp7i5wm1vnp43bv823mk2z94r36ixqfc"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "6.0.0"; sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.1"; sha256 = "1ikrplvw4m6pzjbq3bfbpr572n4i9mni577zvmrkaygvx85q3myw"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.4.0"; sha256 = "1wydfgszs00yxga57sam66vzv9fshk2pw7gim57saplsnkfliaif"; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) + (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) + (fetchNuGet { pname = "System.Xml.XmlSerializer"; version = "4.3.0"; sha256 = "07pa4sx196vxkgl3csvdmw94nydlsm9ir38xxcs84qjn8cycd912"; }) +] diff --git a/pkgs/by-name/az/azure-artifacts-credprovider/package.nix b/pkgs/by-name/az/azure-artifacts-credprovider/package.nix new file mode 100644 index 000000000000..17f736af13a1 --- /dev/null +++ b/pkgs/by-name/az/azure-artifacts-credprovider/package.nix @@ -0,0 +1,39 @@ +{ lib +, buildDotnetModule +, dotnetCorePackages +, stdenv +, libunwind +, libuuid +, icu +, openssl +, zlib +, curl +, dotnet-sdk_6 +, fetchFromGitHub +}: +buildDotnetModule rec { + inherit dotnet-sdk_6; + version = "1.0.9"; + src = fetchFromGitHub { + owner = "microsoft"; + repo = "artifacts-credprovider"; + rev = "v${version}"; + sha256 = "sha256-ZlTwxesEP0N2yVCuroaTcq+pRylU4fF+RojbhMzTGyw="; + }; + pname = "azure-artifacts-credprovider"; + projectFile = "CredentialProvider.Microsoft/CredentialProvider.Microsoft.csproj"; + testProjectFile = "CredentialProvider.Microsoft.Tests/CredentialProvider.Microsoft.Tests.csproj"; + nugetDeps = ./deps.nix; + passthru.updateScript = ./update.sh; + dotnetInstallFlags = [ + "-f:net6.0" + ]; + meta = with lib; { + homepage = "https://github.com/microsoft/artifacts-credprovider"; + description = "Azure Artifacts Credential Provider"; + license = licenses.mit; + maintainers = with maintainers; [ anpin ]; + mainProgram = "CredentialProvider.Microsoft"; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/az/azure-artifacts-credprovider/update.sh b/pkgs/by-name/az/azure-artifacts-credprovider/update.sh new file mode 100755 index 000000000000..f02c7600081c --- /dev/null +++ b/pkgs/by-name/az/azure-artifacts-credprovider/update.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused gawk nix-prefetch jq dotnet-sdk_6 nuget-to-nix + +set -euo pipefail +URL="https://github.com/microsoft/artifacts-credprovider" + +ROOT="$(dirname "$(readlink -f "$0")")" +NIX_DRV="$ROOT/package.nix" +if [ ! -f "$NIX_DRV" ]; then + echo "ERROR: cannot find package.nix in $ROOT" + exit 1 +fi + +TMP="$(mktemp -d)" +clean_up() { + rm -rf "$TMP" +} +trap clean_up EXIT SIGINT SIGTERM +PACKAGES="$TMP/packages" +SRC_RW="$TMP/src" + +mkdir -p $SRC_RW +mkdir -p $PACKAGES + + +VER=$(curl -s "https://api.github.com/repos/microsoft/artifacts-credprovider/releases/latest" | jq -r .tag_name | grep -oP '\d+\.\d+\.\d+' ) +HASH=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-git --url $URL --rev "v$VER" --quiet | jq -r .sha256)") + +sed -i "s/version = \".*\"/version = \"$VER\"/" "$NIX_DRV" +sed -i "s#sha256 = \"sha256-.\{44\}\"#sha256 = \"$HASH\"#" "$NIX_DRV" + +nix-prefetch-git --url $URL --rev "v$VER" --out $SRC_RW --builder --quiet +rm $SRC_RW/nuget.config +dotnet restore "$SRC_RW/MicrosoftCredentialProvider.sln" --packages $PACKAGES -r:linux-x64 +nuget-to-nix $PACKAGES > deps.nix From 8a3d2277f5add78cbe8c51d6bb352fae44b5edc2 Mon Sep 17 00:00:00 2001 From: Pavel Anpin Date: Wed, 6 Nov 2024 09:08:33 -0300 Subject: [PATCH 014/151] azure-artifacts-credprovider: 1.0.9 -> 1.3.0 --- .../az/azure-artifacts-credprovider/deps.nix | 141 +++++------------- .../azure-artifacts-credprovider/package.nix | 21 +-- .../az/azure-artifacts-credprovider/update.sh | 2 +- 3 files changed, 48 insertions(+), 116 deletions(-) diff --git a/pkgs/by-name/az/azure-artifacts-credprovider/deps.nix b/pkgs/by-name/az/azure-artifacts-credprovider/deps.nix index 0e91a9f08996..d8afd5d2125d 100644 --- a/pkgs/by-name/az/azure-artifacts-credprovider/deps.nix +++ b/pkgs/by-name/az/azure-artifacts-credprovider/deps.nix @@ -1,23 +1,20 @@ { fetchNuGet }: [ - (fetchNuGet { pname = "Castle.Core"; version = "4.4.0"; sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; }) (fetchNuGet { pname = "Castle.Core"; version = "5.1.1"; sha256 = "1caf4878nvjid3cw3rw18p9cn53brfs5x8dkvf82xvcdwc3i0nd1"; }) (fetchNuGet { pname = "FluentAssertions"; version = "5.9.0"; sha256 = "11mpnl6aar2yn7l6b1k4m3rdnl82ydmqbsja4rn84dhz1qdzfp8x"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.29"; sha256 = "1ld7aipybxbhwnybimsnhv09ib9ib824zkj11qk3aq7ncz6pfazr"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.1.32"; sha256 = "0ywz63q8vrdp25ix2j9b7h2jp5grc68hqfl64c6lqk26q9xwhp9r"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.18"; sha256 = "002jll4a28j1rxn1sbhnfp0rlkx70hh0i91y2yzxj10hbnpvylbq"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.29"; sha256 = "0z359wbz3014rwz7cdcr60qr6mrcwsbwwh36g59a5hncxb1g73rj"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.4"; sha256 = "0g2sjwgkgni797p6ay51brvc9snbnrbsmv88002lnvqnz9zgbifr"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.0.0-beta2-19554-01"; sha256 = "1ry7vaknwvidycxg76mbwwz4i981zcxqvlsgiqgz602jgx9qsn48"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.3.0"; sha256 = "1ppwmmwcfkkf1mz06r1xhr7jbp18gx2ajaqxwyg7s4ay0b49i1zi"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.5.0"; sha256 = "0briw00gb5bz9k9kx00p6ghq47w501db7gb6ig5zzmz9hb8lw4a4"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "6.0.0"; sha256 = "15hb2rbzgri1fq8wpj4ll7czm3rxqzszs02phnhjnncp90m5rmpc"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.3"; sha256 = "1lpr7bwandzvppjsx75b1nsh52whlsq2ddgwv1ncwdbi595jrkpc"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "6.0.0"; sha256 = "0plx785hk61arjxf0m3ywy9hl5nii25raj4523n3ql7mmv6hxqr1"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "6.0.0"; sha256 = "1383b0r33dzz0hrch9cqzzxr9vxr21qq0a5vnrpkfq71m2fky31d"; }) @@ -25,56 +22,49 @@ (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "6.0.0"; sha256 = "1k6q91vrhq1r74l4skibn7wzxzww9l74ibxb2i8gg4q6fzbiivba"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) - (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.54.1"; sha256 = "1g7bgklz71vwamr4w2rw3k07h6vzwkl0jqlz0cxnp98pfi8k9c17"; }) - (fetchNuGet { pname = "Microsoft.Identity.Client.Broker"; version = "4.54.1"; sha256 = "03gk40sqnf5kj7gfl8wc3a2ash29sxkw76fs48b29qznzhbi4s77"; }) - (fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "2.31.0"; sha256 = "1x9xbcm1dq7y1mmldqd1ga7ayczz7ydjj1bfbmx65bi46z63am5r"; }) - (fetchNuGet { pname = "Microsoft.Identity.Client.NativeInterop"; version = "0.13.8"; sha256 = "1rf52n2rr2cb7hhcracszkkl876ylr9zn8jpa9s1r9fc44bzgvwd"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.22.0"; sha256 = "06495i2i9cabys4s0dkaz0rby8k47gy627v9ivp7aa3k6xmypviz"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Clients.ActiveDirectory"; version = "5.2.9"; sha256 = "177sl279yknxvvrq32aqjhyfr42k22rc3gm13x5kg46hwxv28cga"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.3.0"; sha256 = "129kdyjg491g4rjrxhz4bq7kq35w1wd7w9x1pp9c7cchjrq98gkw"; }) + (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.64.0"; sha256 = "1xfliq7fnz3rqfcmjg8329bf253pjw6xnjnfmm1aq9c4xzc7ph2n"; }) + (fetchNuGet { pname = "Microsoft.Identity.Client.Broker"; version = "4.64.0"; sha256 = "08zsp4cgx4kw90x7zy7klgasc36mpsfy1jr3vj9wpd3cv5ns3m0m"; }) + (fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "4.64.0"; sha256 = "0s00hczrhzxy9psw690wrw996gvbivcdvrypdyiqhmxfnh8hhdkl"; }) + (fetchNuGet { pname = "Microsoft.Identity.Client.NativeInterop"; version = "0.16.2"; sha256 = "1mbw5wlnha0ac8rhfsr8f0dpi3r2lmqvgasv9z8gkylskqpcall6"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.35.0"; sha256 = "0i6kdvqdbzynzrr4g5idx4ph4ckggsbsy0869lwa10fhmyxrh73g"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.5.0"; sha256 = "00gz2i8kx4mlq1ywj3imvf7wc6qzh0bsnynhw06z0mgyha1a21jy"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.32"; sha256 = "08sar3s7j6z1q5prjmz2jrbsq5ms81mrsi1c1zbfrkplkfjpld3a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.29"; sha256 = "1g9qlb4k3i8zq5kn4y8v7lc9mqhy3ikh2bla30nqv86iwaclrwb7"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.29"; sha256 = "0d0xy3zmrlfzc7zk6hpx69mr5b6p28aj944403c7akhzpg1zz2r1"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "3.1.32"; sha256 = "0mmc57dl8plrspdxwb7209wz29vhiwqds4nfbdfws7zg35yy70c7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.18"; sha256 = "0p77flwzh7002yl88270b05l549mk708h4bqpaa28j556l9jri2b"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.29"; sha256 = "0gv5dnd44xj1yidzd70b01s5a19khbq757llkfykgwf7wl4a89cf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.4"; sha256 = "0pi459crkny9bwjl2z4znj9kgnkwl00bnc54jq9asi8zvssvcbfm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.1.0"; sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.3"; sha256 = "05smkcyxir59rgrmp7d6327vvrlacdgldfxhmyr1azclvga1zfsq"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.2"; sha256 = "0i42rn8xmvhn08799manpym06kpw89qy9080myyy2ngy565pqh0a"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.2"; sha256 = "0js3dp26nszx82q0phv7hmsm5z23dva7javbmk6a91lbkm07y8p2"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.3"; sha256 = "0hc4d4d4358g5192mf8faijwk0bpf9pjwcfd3h85sr67j0zhj6hl"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.3"; sha256 = "1jcc552rwpaybd2ql0b31063ayj70sd3k6qqpf850xmqbyg2hlmx"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net481"; version = "1.0.3"; sha256 = "0i6gsrxvybhrnb8l7fk00zcm4z33bv7kikfm8anya89h4yxlhy4i"; }) (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "1.0.0-beta2-19554-01"; sha256 = "14g7c5j85vlxcpwh2xs92ix1c6gxlpl22zfjp4vp55n8q73f1q4n"; }) (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "1.0.0-beta2-19554-01"; sha256 = "0bpcy6129pk9znhs8dfaxwrknpmzh6w49z83971m4cvbgq0vh9iy"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.3.0"; sha256 = "122wp1x7qjswiv4kmqn6wl570kdvrmxcb0ic0j1jx4rmwmb046cp"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.3.0"; sha256 = "05vlfanirm3l3gd9znlm0k9knjinx5dx40y2yhmzqwvmmizhfbfd"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.5.0"; sha256 = "17g0k3r5n8grba8kg4nghjyhnq9w8v0w6c2nkyyygvfh8k8x9wh3"; }) (fetchNuGet { pname = "Microsoft.VisualStudioEng.MicroBuild.Core"; version = "1.0.0"; sha256 = "0i7qyqjn0xj5vsyskcp33d3r2f3hk0cw2rzy3hbkbsgi1wyjxxyh"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Moq"; version = "4.13.1"; sha256 = "04fyzgz6zz42x7m4h21mmkb7xkdz2a9q2f6zwmdx0jya0cx4rxd4"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.7.0"; sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) (fetchNuGet { pname = "Moq"; version = "4.18.4"; sha256 = "0x439pcaqg8kv0an4cjbspw8d98gq144yrqwhnnh6xf9qjaris94"; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "2.0.0"; sha256 = "18by991sykgdi63rj9w49s7r62l3dj9n8czkw5c1lmpbycpf1bzx"; }) (fetchNuGet { pname = "MSTest.TestAdapter"; version = "2.2.10"; sha256 = "0w6c55n30w6imm0rjafl2sg0x8vf9852xmil9dzqb4h36cs7v6y6"; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "2.0.0"; sha256 = "0l1l04hw7v5fd34n2dh518piazsk05qwwrrspzyih1linf5z1cqn"; }) (fetchNuGet { pname = "MSTest.TestFramework"; version = "2.2.10"; sha256 = "0j5p3p5a0pr3rmzg7va21z3w0lb929zqj5xcdd81iys5vvh1hjiw"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "10.0.3"; sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) - (fetchNuGet { pname = "NuGet.Common"; version = "5.11.3"; sha256 = "0kb0y5p3zr7686yvd8y39zm5z39bhp88lm8d6gp1yndb3pm2k27z"; }) - (fetchNuGet { pname = "NuGet.Configuration"; version = "5.11.3"; sha256 = "0wff9m8f8xqkllm1v6xkxw7dbysw1jhv68fqsw88a0n7b7nwkajb"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) + (fetchNuGet { pname = "NuGet.Common"; version = "6.7.1"; sha256 = "0walcb2pkbzmf5j06b23zpbrpha8bb0waq6jv9vdz68d4wzxqgxm"; }) + (fetchNuGet { pname = "NuGet.Configuration"; version = "6.7.1"; sha256 = "1ii5c7x0in4h6ax8ldpgaca53ybj30k8qs7lmrp3fflf07a18bq0"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.3"; sha256 = "08q2fbb1s034p227qafkc15vv450ma7zc3n9vhdixi88wsx6svh1"; }) - (fetchNuGet { pname = "NuGet.Packaging"; version = "5.11.3"; sha256 = "0xw8gkr7lj3d0xa5dzyz8332i4gaddirdxf85fl98kgdjkl10rgn"; }) - (fetchNuGet { pname = "NuGet.Protocol"; version = "5.11.3"; sha256 = "1b0pnbgdnf2mypppckb1534rjw78s39lfq3707ba91rp7gsf0939"; }) - (fetchNuGet { pname = "NuGet.Versioning"; version = "5.11.3"; sha256 = "0ax6c26yhl54pc05rv9hd5fby5rpcgrlzgccwpbrwy8kd8zbndcp"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.7.1"; sha256 = "1rwn91i2kizwc716zw45yqp0wbls0q2y8r38h7vnsrzr7y6glk3x"; }) + (fetchNuGet { pname = "NuGet.Packaging"; version = "6.7.1"; sha256 = "1slnwh9n7g6q0lvbj0wvrdix600hn2f0sazh3zwsw3mhdxwywghf"; }) + (fetchNuGet { pname = "NuGet.Protocol"; version = "6.7.1"; sha256 = "0gxlkgp14lvrz8jcj9nn5dprlql3bsl6kzkvm3dmajlb56ip23sw"; }) + (fetchNuGet { pname = "NuGet.Versioning"; version = "6.7.1"; sha256 = "195rywflfwwwlfsil0zc6zf5pdzvkh3ii6311dfwl7wsvdiam4dn"; }) (fetchNuGet { pname = "PowerArgs"; version = "3.6.0"; sha256 = "1rxb4ljx4paf9ms3hcn5mspa0ki051l2w2ajrqjkyf9cmqrpks0h"; }) + (fetchNuGet { pname = "ReferenceTrimmer"; version = "3.1.17"; sha256 = "1y36xqbr53mm54f4sg341fig0lym27002bn9j1xrvj07sla63ipg"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) @@ -93,35 +83,23 @@ (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; }) (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; }) (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; }) (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; }) (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; }) (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; }) (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; }) (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; }) (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; }) (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; }) (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; }) (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) - (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.1"; sha256 = "15kfi3761mk2i29zg135ipsvavm50nwm4334cy5m5q7iagzsf73p"; }) (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) @@ -132,136 +110,97 @@ (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.4.0"; sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) - (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) - (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) - (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) - (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) - (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.4.0"; sha256 = "1hjgmz47v5229cbzd2pwz2h0dkq78lb2wp9grx8qr72pb5i0dk7v"; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; sha256 = "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"; }) (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.1"; sha256 = "17h8bkcv0vf9a7gp9ajkd107zid98wql5kzlzwrjm5nm92nk0bsy"; }) + (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "4.7.0"; sha256 = "11pqwbs8pchdqhh9438cp3pf28izzv12h60121h7z99ihhql7n97"; }) (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "6.0.0"; sha256 = "08y1x2d5w2hnhkh9r1998pjc7r4qp0rmzax062abha85s11chifd"; }) (fetchNuGet { pname = "System.Diagnostics.TextWriterTraceListener"; version = "4.3.0"; sha256 = "09db74f36wkwg30f7v7zhz1yhkyrnl5v6bdwljq1jdfgzcfch7c3"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) - (fetchNuGet { pname = "System.Formats.Asn1"; version = "5.0.0"; sha256 = "1axc8z0839yvqi2cb63l73l6d9j6wd20lsbdymwddz9hvrsgfwpn"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) + (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.1"; sha256 = "02hs45gzkx3b3jvjrbdn0m54lkwbay5dprcs0ivfym59lmqv3wc1"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "5.0.0"; sha256 = "0ixl68plva0fsj3byv76bai7vkin86s6wyzr8vcav3szl862blvk"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.0"; sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; }) (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.DataContractSerialization"; version = "4.3.0"; sha256 = "06fjipqvjp559rrm825x6pll8gimdj9x1n3larigh5hsm584gndw"; }) (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.2"; sha256 = "019s7jz73d236p23mnpfaxxwib019i0v1fbwbkys0hskgddvw7cc"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Formatters"; version = "4.3.0"; sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Json"; version = "4.3.0"; sha256 = "1qp8ghr70smspnjdmlcbl5vwb7fm2iy1b7wx1p53lbpl35w4kz4a"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.7.0"; sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; }) (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.1"; sha256 = "1m2wnzg3m3c0s11jg4lshcl2a47d78zri8khc21yrz34jjkbyls2"; }) (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "5.0.0"; sha256 = "06hkx2za8jifpslkh491dfwzm5dxrsyxzj5lsc0achb6yzg4zqlw"; }) (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "5.0.0"; sha256 = "0hb2mndac3xrw3786bsjxjfh19bwnr991qib54k6wsqjhjyyvbwj"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.4"; sha256 = "0hh5h38pnxmlrnvs72f2hzzpz4b2caiiv6xf8y7fzdg84r3imvfr"; }) (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.5.0"; sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; }) (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) - (fetchNuGet { pname = "System.Security.SecureString"; version = "4.3.0"; sha256 = "1dypfbw7mxd8cbpcxs3jrp7i5wm1vnp43bv823mk2z94r36ixqfc"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "6.0.0"; sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "6.0.7"; sha256 = "0sp80yysfm4s0zcrk7f6b2dvkq6civlwn86swv0d537qf75r2vrv"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.1"; sha256 = "1ikrplvw4m6pzjbq3bfbpr572n4i9mni577zvmrkaygvx85q3myw"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) (fetchNuGet { pname = "System.ValueTuple"; version = "4.4.0"; sha256 = "1wydfgszs00yxga57sam66vzv9fshk2pw7gim57saplsnkfliaif"; }) (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) - (fetchNuGet { pname = "System.Xml.XmlSerializer"; version = "4.3.0"; sha256 = "07pa4sx196vxkgl3csvdmw94nydlsm9ir38xxcs84qjn8cycd912"; }) ] diff --git a/pkgs/by-name/az/azure-artifacts-credprovider/package.nix b/pkgs/by-name/az/azure-artifacts-credprovider/package.nix index 17f736af13a1..0d07a65eb6df 100644 --- a/pkgs/by-name/az/azure-artifacts-credprovider/package.nix +++ b/pkgs/by-name/az/azure-artifacts-credprovider/package.nix @@ -1,33 +1,26 @@ { lib , buildDotnetModule , dotnetCorePackages -, stdenv -, libunwind -, libuuid -, icu -, openssl -, zlib -, curl -, dotnet-sdk_6 , fetchFromGitHub }: buildDotnetModule rec { - inherit dotnet-sdk_6; - version = "1.0.9"; + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; + version = "1.3.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "artifacts-credprovider"; rev = "v${version}"; - sha256 = "sha256-ZlTwxesEP0N2yVCuroaTcq+pRylU4fF+RojbhMzTGyw="; + sha256 = "sha256-JbcoDs4c/+uKIgVWZkuo4jqd1hlqe+H949jNfkDwZls="; }; pname = "azure-artifacts-credprovider"; projectFile = "CredentialProvider.Microsoft/CredentialProvider.Microsoft.csproj"; testProjectFile = "CredentialProvider.Microsoft.Tests/CredentialProvider.Microsoft.Tests.csproj"; nugetDeps = ./deps.nix; passthru.updateScript = ./update.sh; - dotnetInstallFlags = [ - "-f:net6.0" - ]; + patchPhase = '' + sed -i 's|.*|net8.0|' Build.props + ''; meta = with lib; { homepage = "https://github.com/microsoft/artifacts-credprovider"; description = "Azure Artifacts Credential Provider"; diff --git a/pkgs/by-name/az/azure-artifacts-credprovider/update.sh b/pkgs/by-name/az/azure-artifacts-credprovider/update.sh index f02c7600081c..591c97e51cc0 100755 --- a/pkgs/by-name/az/azure-artifacts-credprovider/update.sh +++ b/pkgs/by-name/az/azure-artifacts-credprovider/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused gawk nix-prefetch jq dotnet-sdk_6 nuget-to-nix +#!nix-shell -i bash -p curl gnused gawk nix-prefetch jq dotnet-sdk_8 nuget-to-nix set -euo pipefail URL="https://github.com/microsoft/artifacts-credprovider" From 27ecc78052d39551bb142c678b91e04102a64b0b Mon Sep 17 00:00:00 2001 From: Pavel Anpin Date: Wed, 6 Nov 2024 09:11:59 -0300 Subject: [PATCH 015/151] azure-artifacts-credprovider: fix formating --- .../az/azure-artifacts-credprovider/deps.nix | 1227 ++++++++++++++--- .../azure-artifacts-credprovider/package.nix | 25 +- 2 files changed, 1035 insertions(+), 217 deletions(-) diff --git a/pkgs/by-name/az/azure-artifacts-credprovider/deps.nix b/pkgs/by-name/az/azure-artifacts-credprovider/deps.nix index d8afd5d2125d..782305b35bba 100644 --- a/pkgs/by-name/az/azure-artifacts-credprovider/deps.nix +++ b/pkgs/by-name/az/azure-artifacts-credprovider/deps.nix @@ -1,206 +1,1023 @@ -{ fetchNuGet }: [ - (fetchNuGet { pname = "Castle.Core"; version = "5.1.1"; sha256 = "1caf4878nvjid3cw3rw18p9cn53brfs5x8dkvf82xvcdwc3i0nd1"; }) - (fetchNuGet { pname = "FluentAssertions"; version = "5.9.0"; sha256 = "11mpnl6aar2yn7l6b1k4m3rdnl82ydmqbsja4rn84dhz1qdzfp8x"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.29"; sha256 = "1ld7aipybxbhwnybimsnhv09ib9ib824zkj11qk3aq7ncz6pfazr"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.1.32"; sha256 = "0ywz63q8vrdp25ix2j9b7h2jp5grc68hqfl64c6lqk26q9xwhp9r"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.29"; sha256 = "0z359wbz3014rwz7cdcr60qr6mrcwsbwwh36g59a5hncxb1g73rj"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.4"; sha256 = "0g2sjwgkgni797p6ay51brvc9snbnrbsmv88002lnvqnz9zgbifr"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.0.0-beta2-19554-01"; sha256 = "1ry7vaknwvidycxg76mbwwz4i981zcxqvlsgiqgz602jgx9qsn48"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.5.0"; sha256 = "0briw00gb5bz9k9kx00p6ghq47w501db7gb6ig5zzmz9hb8lw4a4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "6.0.0"; sha256 = "15hb2rbzgri1fq8wpj4ll7czm3rxqzszs02phnhjnncp90m5rmpc"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.3"; sha256 = "1lpr7bwandzvppjsx75b1nsh52whlsq2ddgwv1ncwdbi595jrkpc"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "6.0.0"; sha256 = "0plx785hk61arjxf0m3ywy9hl5nii25raj4523n3ql7mmv6hxqr1"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "6.0.0"; sha256 = "1383b0r33dzz0hrch9cqzzxr9vxr21qq0a5vnrpkfq71m2fky31d"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Debug"; version = "6.0.0"; sha256 = "0aql9kc45g2d6z1hmwr3p1a2qy9m3f36bds3054givsnpnis81wk"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "6.0.0"; sha256 = "1k6q91vrhq1r74l4skibn7wzxzww9l74ibxb2i8gg4q6fzbiivba"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) - (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.64.0"; sha256 = "1xfliq7fnz3rqfcmjg8329bf253pjw6xnjnfmm1aq9c4xzc7ph2n"; }) - (fetchNuGet { pname = "Microsoft.Identity.Client.Broker"; version = "4.64.0"; sha256 = "08zsp4cgx4kw90x7zy7klgasc36mpsfy1jr3vj9wpd3cv5ns3m0m"; }) - (fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "4.64.0"; sha256 = "0s00hczrhzxy9psw690wrw996gvbivcdvrypdyiqhmxfnh8hhdkl"; }) - (fetchNuGet { pname = "Microsoft.Identity.Client.NativeInterop"; version = "0.16.2"; sha256 = "1mbw5wlnha0ac8rhfsr8f0dpi3r2lmqvgasv9z8gkylskqpcall6"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.35.0"; sha256 = "0i6kdvqdbzynzrr4g5idx4ph4ckggsbsy0869lwa10fhmyxrh73g"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.5.0"; sha256 = "00gz2i8kx4mlq1ywj3imvf7wc6qzh0bsnynhw06z0mgyha1a21jy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.32"; sha256 = "08sar3s7j6z1q5prjmz2jrbsq5ms81mrsi1c1zbfrkplkfjpld3a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.29"; sha256 = "1g9qlb4k3i8zq5kn4y8v7lc9mqhy3ikh2bla30nqv86iwaclrwb7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.29"; sha256 = "0d0xy3zmrlfzc7zk6hpx69mr5b6p28aj944403c7akhzpg1zz2r1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "3.1.32"; sha256 = "0mmc57dl8plrspdxwb7209wz29vhiwqds4nfbdfws7zg35yy70c7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.29"; sha256 = "0gv5dnd44xj1yidzd70b01s5a19khbq757llkfykgwf7wl4a89cf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.4"; sha256 = "0pi459crkny9bwjl2z4znj9kgnkwl00bnc54jq9asi8zvssvcbfm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.1.0"; sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.3"; sha256 = "0hc4d4d4358g5192mf8faijwk0bpf9pjwcfd3h85sr67j0zhj6hl"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.3"; sha256 = "1jcc552rwpaybd2ql0b31063ayj70sd3k6qqpf850xmqbyg2hlmx"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net481"; version = "1.0.3"; sha256 = "0i6gsrxvybhrnb8l7fk00zcm4z33bv7kikfm8anya89h4yxlhy4i"; }) - (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "1.0.0-beta2-19554-01"; sha256 = "14g7c5j85vlxcpwh2xs92ix1c6gxlpl22zfjp4vp55n8q73f1q4n"; }) - (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "1.0.0-beta2-19554-01"; sha256 = "0bpcy6129pk9znhs8dfaxwrknpmzh6w49z83971m4cvbgq0vh9iy"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.5.0"; sha256 = "17g0k3r5n8grba8kg4nghjyhnq9w8v0w6c2nkyyygvfh8k8x9wh3"; }) - (fetchNuGet { pname = "Microsoft.VisualStudioEng.MicroBuild.Core"; version = "1.0.0"; sha256 = "0i7qyqjn0xj5vsyskcp33d3r2f3hk0cw2rzy3hbkbsgi1wyjxxyh"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.7.0"; sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) - (fetchNuGet { pname = "Moq"; version = "4.18.4"; sha256 = "0x439pcaqg8kv0an4cjbspw8d98gq144yrqwhnnh6xf9qjaris94"; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "2.2.10"; sha256 = "0w6c55n30w6imm0rjafl2sg0x8vf9852xmil9dzqb4h36cs7v6y6"; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "2.2.10"; sha256 = "0j5p3p5a0pr3rmzg7va21z3w0lb929zqj5xcdd81iys5vvh1hjiw"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) - (fetchNuGet { pname = "NuGet.Common"; version = "6.7.1"; sha256 = "0walcb2pkbzmf5j06b23zpbrpha8bb0waq6jv9vdz68d4wzxqgxm"; }) - (fetchNuGet { pname = "NuGet.Configuration"; version = "6.7.1"; sha256 = "1ii5c7x0in4h6ax8ldpgaca53ybj30k8qs7lmrp3fflf07a18bq0"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.7.1"; sha256 = "1rwn91i2kizwc716zw45yqp0wbls0q2y8r38h7vnsrzr7y6glk3x"; }) - (fetchNuGet { pname = "NuGet.Packaging"; version = "6.7.1"; sha256 = "1slnwh9n7g6q0lvbj0wvrdix600hn2f0sazh3zwsw3mhdxwywghf"; }) - (fetchNuGet { pname = "NuGet.Protocol"; version = "6.7.1"; sha256 = "0gxlkgp14lvrz8jcj9nn5dprlql3bsl6kzkvm3dmajlb56ip23sw"; }) - (fetchNuGet { pname = "NuGet.Versioning"; version = "6.7.1"; sha256 = "195rywflfwwwlfsil0zc6zf5pdzvkh3ii6311dfwl7wsvdiam4dn"; }) - (fetchNuGet { pname = "PowerArgs"; version = "3.6.0"; sha256 = "1rxb4ljx4paf9ms3hcn5mspa0ki051l2w2ajrqjkyf9cmqrpks0h"; }) - (fetchNuGet { pname = "ReferenceTrimmer"; version = "3.1.17"; sha256 = "1y36xqbr53mm54f4sg341fig0lym27002bn9j1xrvj07sla63ipg"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) - (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.4.0"; sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; sha256 = "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"; }) - (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.1"; sha256 = "17h8bkcv0vf9a7gp9ajkd107zid98wql5kzlzwrjm5nm92nk0bsy"; }) - (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "4.7.0"; sha256 = "11pqwbs8pchdqhh9438cp3pf28izzv12h60121h7z99ihhql7n97"; }) - (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "6.0.0"; sha256 = "08y1x2d5w2hnhkh9r1998pjc7r4qp0rmzax062abha85s11chifd"; }) - (fetchNuGet { pname = "System.Diagnostics.TextWriterTraceListener"; version = "4.3.0"; sha256 = "09db74f36wkwg30f7v7zhz1yhkyrnl5v6bdwljq1jdfgzcfch7c3"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) - (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) - (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.1"; sha256 = "02hs45gzkx3b3jvjrbdn0m54lkwbay5dprcs0ivfym59lmqv3wc1"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) - (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "5.0.0"; sha256 = "0ixl68plva0fsj3byv76bai7vkin86s6wyzr8vcav3szl862blvk"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.0"; sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) - (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.7.0"; sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; }) - (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "5.0.0"; sha256 = "06hkx2za8jifpslkh491dfwzm5dxrsyxzj5lsc0achb6yzg4zqlw"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.4"; sha256 = "0hh5h38pnxmlrnvs72f2hzzpz4b2caiiv6xf8y7fzdg84r3imvfr"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.5.0"; sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; }) - (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "6.0.7"; sha256 = "0sp80yysfm4s0zcrk7f6b2dvkq6civlwn86swv0d537qf75r2vrv"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { pname = "System.ValueTuple"; version = "4.4.0"; sha256 = "1wydfgszs00yxga57sam66vzv9fshk2pw7gim57saplsnkfliaif"; }) - (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) - (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) +{ fetchNuGet }: +[ + (fetchNuGet { + pname = "Castle.Core"; + version = "5.1.1"; + sha256 = "1caf4878nvjid3cw3rw18p9cn53brfs5x8dkvf82xvcdwc3i0nd1"; + }) + (fetchNuGet { + pname = "FluentAssertions"; + version = "5.9.0"; + sha256 = "11mpnl6aar2yn7l6b1k4m3rdnl82ydmqbsja4rn84dhz1qdzfp8x"; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.App.Ref"; + version = "3.1.10"; + sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.App.Ref"; + version = "6.0.29"; + sha256 = "1ld7aipybxbhwnybimsnhv09ib9ib824zkj11qk3aq7ncz6pfazr"; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; + version = "3.1.32"; + sha256 = "0ywz63q8vrdp25ix2j9b7h2jp5grc68hqfl64c6lqk26q9xwhp9r"; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; + version = "6.0.29"; + sha256 = "0z359wbz3014rwz7cdcr60qr6mrcwsbwwh36g59a5hncxb1g73rj"; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; + version = "8.0.4"; + sha256 = "0g2sjwgkgni797p6ay51brvc9snbnrbsmv88002lnvqnz9zgbifr"; + }) + (fetchNuGet { + pname = "Microsoft.Bcl.AsyncInterfaces"; + version = "6.0.0"; + sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; + }) + (fetchNuGet { + pname = "Microsoft.Build.Tasks.Git"; + version = "1.0.0-beta2-19554-01"; + sha256 = "1ry7vaknwvidycxg76mbwwz4i981zcxqvlsgiqgz602jgx9qsn48"; + }) + (fetchNuGet { + pname = "Microsoft.CodeCoverage"; + version = "17.5.0"; + sha256 = "0briw00gb5bz9k9kx00p6ghq47w501db7gb6ig5zzmz9hb8lw4a4"; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Configuration"; + version = "6.0.0"; + sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Configuration.Abstractions"; + version = "6.0.0"; + sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Configuration.Binder"; + version = "6.0.0"; + sha256 = "15hb2rbzgri1fq8wpj4ll7czm3rxqzszs02phnhjnncp90m5rmpc"; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.DependencyInjection"; + version = "6.0.0"; + sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "6.0.0"; + sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Logging"; + version = "6.0.0"; + sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Logging.Abstractions"; + version = "6.0.3"; + sha256 = "1lpr7bwandzvppjsx75b1nsh52whlsq2ddgwv1ncwdbi595jrkpc"; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Logging.Configuration"; + version = "6.0.0"; + sha256 = "0plx785hk61arjxf0m3ywy9hl5nii25raj4523n3ql7mmv6hxqr1"; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Logging.Console"; + version = "6.0.0"; + sha256 = "1383b0r33dzz0hrch9cqzzxr9vxr21qq0a5vnrpkfq71m2fky31d"; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Logging.Debug"; + version = "6.0.0"; + sha256 = "0aql9kc45g2d6z1hmwr3p1a2qy9m3f36bds3054givsnpnis81wk"; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Options"; + version = "6.0.0"; + sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; + version = "6.0.0"; + sha256 = "1k6q91vrhq1r74l4skibn7wzxzww9l74ibxb2i8gg4q6fzbiivba"; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Primitives"; + version = "6.0.0"; + sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; + }) + (fetchNuGet { + pname = "Microsoft.Identity.Client"; + version = "4.64.0"; + sha256 = "1xfliq7fnz3rqfcmjg8329bf253pjw6xnjnfmm1aq9c4xzc7ph2n"; + }) + (fetchNuGet { + pname = "Microsoft.Identity.Client.Broker"; + version = "4.64.0"; + sha256 = "08zsp4cgx4kw90x7zy7klgasc36mpsfy1jr3vj9wpd3cv5ns3m0m"; + }) + (fetchNuGet { + pname = "Microsoft.Identity.Client.Extensions.Msal"; + version = "4.64.0"; + sha256 = "0s00hczrhzxy9psw690wrw996gvbivcdvrypdyiqhmxfnh8hhdkl"; + }) + (fetchNuGet { + pname = "Microsoft.Identity.Client.NativeInterop"; + version = "0.16.2"; + sha256 = "1mbw5wlnha0ac8rhfsr8f0dpi3r2lmqvgasv9z8gkylskqpcall6"; + }) + (fetchNuGet { + pname = "Microsoft.IdentityModel.Abstractions"; + version = "6.35.0"; + sha256 = "0i6kdvqdbzynzrr4g5idx4ph4ckggsbsy0869lwa10fhmyxrh73g"; + }) + (fetchNuGet { + pname = "Microsoft.NET.Test.Sdk"; + version = "17.5.0"; + sha256 = "00gz2i8kx4mlq1ywj3imvf7wc6qzh0bsnynhw06z0mgyha1a21jy"; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Host.linux-x64"; + version = "3.1.32"; + sha256 = "08sar3s7j6z1q5prjmz2jrbsq5ms81mrsi1c1zbfrkplkfjpld3a"; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Host.linux-x64"; + version = "6.0.29"; + sha256 = "1g9qlb4k3i8zq5kn4y8v7lc9mqhy3ikh2bla30nqv86iwaclrwb7"; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Ref"; + version = "3.1.0"; + sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Ref"; + version = "6.0.29"; + sha256 = "0d0xy3zmrlfzc7zk6hpx69mr5b6p28aj944403c7akhzpg1zz2r1"; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Runtime.linux-x64"; + version = "3.1.32"; + sha256 = "0mmc57dl8plrspdxwb7209wz29vhiwqds4nfbdfws7zg35yy70c7"; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Runtime.linux-x64"; + version = "6.0.29"; + sha256 = "0gv5dnd44xj1yidzd70b01s5a19khbq757llkfykgwf7wl4a89cf"; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Runtime.linux-x64"; + version = "8.0.4"; + sha256 = "0pi459crkny9bwjl2z4znj9kgnkwl00bnc54jq9asi8zvssvcbfm"; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "1.1.0"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "3.1.0"; + sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "5.0.0"; + sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Targets"; + version = "1.1.0"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + }) + (fetchNuGet { + pname = "Microsoft.NETFramework.ReferenceAssemblies"; + version = "1.0.3"; + sha256 = "0hc4d4d4358g5192mf8faijwk0bpf9pjwcfd3h85sr67j0zhj6hl"; + }) + (fetchNuGet { + pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; + version = "1.0.3"; + sha256 = "1jcc552rwpaybd2ql0b31063ayj70sd3k6qqpf850xmqbyg2hlmx"; + }) + (fetchNuGet { + pname = "Microsoft.NETFramework.ReferenceAssemblies.net481"; + version = "1.0.3"; + sha256 = "0i6gsrxvybhrnb8l7fk00zcm4z33bv7kikfm8anya89h4yxlhy4i"; + }) + (fetchNuGet { + pname = "Microsoft.SourceLink.Common"; + version = "1.0.0-beta2-19554-01"; + sha256 = "14g7c5j85vlxcpwh2xs92ix1c6gxlpl22zfjp4vp55n8q73f1q4n"; + }) + (fetchNuGet { + pname = "Microsoft.SourceLink.GitHub"; + version = "1.0.0-beta2-19554-01"; + sha256 = "0bpcy6129pk9znhs8dfaxwrknpmzh6w49z83971m4cvbgq0vh9iy"; + }) + (fetchNuGet { + pname = "Microsoft.TestPlatform.ObjectModel"; + version = "17.5.0"; + sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; + }) + (fetchNuGet { + pname = "Microsoft.TestPlatform.TestHost"; + version = "17.5.0"; + sha256 = "17g0k3r5n8grba8kg4nghjyhnq9w8v0w6c2nkyyygvfh8k8x9wh3"; + }) + (fetchNuGet { + pname = "Microsoft.VisualStudioEng.MicroBuild.Core"; + version = "1.0.0"; + sha256 = "0i7qyqjn0xj5vsyskcp33d3r2f3hk0cw2rzy3hbkbsgi1wyjxxyh"; + }) + (fetchNuGet { + pname = "Microsoft.Win32.Primitives"; + version = "4.3.0"; + sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; + }) + (fetchNuGet { + pname = "Microsoft.Win32.Registry"; + version = "4.7.0"; + sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; + }) + (fetchNuGet { + pname = "Microsoft.Win32.SystemEvents"; + version = "6.0.0"; + sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; + }) + (fetchNuGet { + pname = "Moq"; + version = "4.18.4"; + sha256 = "0x439pcaqg8kv0an4cjbspw8d98gq144yrqwhnnh6xf9qjaris94"; + }) + (fetchNuGet { + pname = "MSTest.TestAdapter"; + version = "2.2.10"; + sha256 = "0w6c55n30w6imm0rjafl2sg0x8vf9852xmil9dzqb4h36cs7v6y6"; + }) + (fetchNuGet { + pname = "MSTest.TestFramework"; + version = "2.2.10"; + sha256 = "0j5p3p5a0pr3rmzg7va21z3w0lb929zqj5xcdd81iys5vvh1hjiw"; + }) + (fetchNuGet { + pname = "NETStandard.Library"; + version = "1.6.1"; + sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; + }) + (fetchNuGet { + pname = "NETStandard.Library"; + version = "2.0.3"; + sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; + }) + (fetchNuGet { + pname = "Newtonsoft.Json"; + version = "13.0.3"; + sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; + }) + (fetchNuGet { + pname = "NuGet.Common"; + version = "6.7.1"; + sha256 = "0walcb2pkbzmf5j06b23zpbrpha8bb0waq6jv9vdz68d4wzxqgxm"; + }) + (fetchNuGet { + pname = "NuGet.Configuration"; + version = "6.7.1"; + sha256 = "1ii5c7x0in4h6ax8ldpgaca53ybj30k8qs7lmrp3fflf07a18bq0"; + }) + (fetchNuGet { + pname = "NuGet.Frameworks"; + version = "5.11.0"; + sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; + }) + (fetchNuGet { + pname = "NuGet.Frameworks"; + version = "6.7.1"; + sha256 = "1rwn91i2kizwc716zw45yqp0wbls0q2y8r38h7vnsrzr7y6glk3x"; + }) + (fetchNuGet { + pname = "NuGet.Packaging"; + version = "6.7.1"; + sha256 = "1slnwh9n7g6q0lvbj0wvrdix600hn2f0sazh3zwsw3mhdxwywghf"; + }) + (fetchNuGet { + pname = "NuGet.Protocol"; + version = "6.7.1"; + sha256 = "0gxlkgp14lvrz8jcj9nn5dprlql3bsl6kzkvm3dmajlb56ip23sw"; + }) + (fetchNuGet { + pname = "NuGet.Versioning"; + version = "6.7.1"; + sha256 = "195rywflfwwwlfsil0zc6zf5pdzvkh3ii6311dfwl7wsvdiam4dn"; + }) + (fetchNuGet { + pname = "PowerArgs"; + version = "3.6.0"; + sha256 = "1rxb4ljx4paf9ms3hcn5mspa0ki051l2w2ajrqjkyf9cmqrpks0h"; + }) + (fetchNuGet { + pname = "ReferenceTrimmer"; + version = "3.1.17"; + sha256 = "1y36xqbr53mm54f4sg341fig0lym27002bn9j1xrvj07sla63ipg"; + }) + (fetchNuGet { + pname = "runtime.any.System.Collections"; + version = "4.3.0"; + sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; + }) + (fetchNuGet { + pname = "runtime.any.System.Diagnostics.Tools"; + version = "4.3.0"; + sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; + }) + (fetchNuGet { + pname = "runtime.any.System.Diagnostics.Tracing"; + version = "4.3.0"; + sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; + }) + (fetchNuGet { + pname = "runtime.any.System.Globalization"; + version = "4.3.0"; + sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; + }) + (fetchNuGet { + pname = "runtime.any.System.Globalization.Calendars"; + version = "4.3.0"; + sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; + }) + (fetchNuGet { + pname = "runtime.any.System.IO"; + version = "4.3.0"; + sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection"; + version = "4.3.0"; + sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection.Extensions"; + version = "4.3.0"; + sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection.Primitives"; + version = "4.3.0"; + sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; + }) + (fetchNuGet { + pname = "runtime.any.System.Resources.ResourceManager"; + version = "4.3.0"; + sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime"; + version = "4.3.0"; + sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime.Handles"; + version = "4.3.0"; + sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; + }) + (fetchNuGet { + pname = "runtime.any.System.Text.Encoding"; + version = "4.3.0"; + sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; + }) + (fetchNuGet { + pname = "runtime.any.System.Text.Encoding.Extensions"; + version = "4.3.0"; + sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; + }) + (fetchNuGet { + pname = "runtime.any.System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; + }) + (fetchNuGet { + pname = "runtime.any.System.Threading.Timer"; + version = "4.3.0"; + sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; + }) + (fetchNuGet { + pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; + }) + (fetchNuGet { + pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; + }) + (fetchNuGet { + pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; + }) + (fetchNuGet { + pname = "runtime.native.System"; + version = "4.3.0"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + }) + (fetchNuGet { + pname = "runtime.native.System.IO.Compression"; + version = "4.3.0"; + sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; + }) + (fetchNuGet { + pname = "runtime.native.System.Net.Http"; + version = "4.3.0"; + sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; + }) + (fetchNuGet { + pname = "runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; + }) + (fetchNuGet { + pname = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + }) + (fetchNuGet { + pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; + }) + (fetchNuGet { + pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; + }) + (fetchNuGet { + pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; + }) + (fetchNuGet { + pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; + }) + (fetchNuGet { + pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; + }) + (fetchNuGet { + pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; + }) + (fetchNuGet { + pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; + }) + (fetchNuGet { + pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; + }) + (fetchNuGet { + pname = "runtime.unix.Microsoft.Win32.Primitives"; + version = "4.3.0"; + sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; + }) + (fetchNuGet { + pname = "runtime.unix.System.Console"; + version = "4.3.0"; + sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; + }) + (fetchNuGet { + pname = "runtime.unix.System.Diagnostics.Debug"; + version = "4.3.0"; + sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; + }) + (fetchNuGet { + pname = "runtime.unix.System.IO.FileSystem"; + version = "4.3.0"; + sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; + }) + (fetchNuGet { + pname = "runtime.unix.System.Net.Primitives"; + version = "4.3.0"; + sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; + }) + (fetchNuGet { + pname = "runtime.unix.System.Net.Sockets"; + version = "4.3.0"; + sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; + }) + (fetchNuGet { + pname = "runtime.unix.System.Private.Uri"; + version = "4.3.0"; + sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; + }) + (fetchNuGet { + pname = "runtime.unix.System.Runtime.Extensions"; + version = "4.3.0"; + sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; + }) + (fetchNuGet { + pname = "System.AppContext"; + version = "4.3.0"; + sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; + }) + (fetchNuGet { + pname = "System.Buffers"; + version = "4.3.0"; + sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; + }) + (fetchNuGet { + pname = "System.Buffers"; + version = "4.4.0"; + sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; + }) + (fetchNuGet { + pname = "System.Buffers"; + version = "4.5.1"; + sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; + }) + (fetchNuGet { + pname = "System.Collections"; + version = "4.3.0"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }) + (fetchNuGet { + pname = "System.Collections.Concurrent"; + version = "4.3.0"; + sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; + }) + (fetchNuGet { + pname = "System.Configuration.ConfigurationManager"; + version = "6.0.0"; + sha256 = "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"; + }) + (fetchNuGet { + pname = "System.Console"; + version = "4.3.0"; + sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; + }) + (fetchNuGet { + pname = "System.Diagnostics.Debug"; + version = "4.3.0"; + sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; + }) + (fetchNuGet { + pname = "System.Diagnostics.DiagnosticSource"; + version = "4.3.0"; + sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; + }) + (fetchNuGet { + pname = "System.Diagnostics.DiagnosticSource"; + version = "6.0.0"; + sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; + }) + (fetchNuGet { + pname = "System.Diagnostics.DiagnosticSource"; + version = "6.0.1"; + sha256 = "17h8bkcv0vf9a7gp9ajkd107zid98wql5kzlzwrjm5nm92nk0bsy"; + }) + (fetchNuGet { + pname = "System.Diagnostics.EventLog"; + version = "4.7.0"; + sha256 = "11pqwbs8pchdqhh9438cp3pf28izzv12h60121h7z99ihhql7n97"; + }) + (fetchNuGet { + pname = "System.Diagnostics.EventLog"; + version = "6.0.0"; + sha256 = "08y1x2d5w2hnhkh9r1998pjc7r4qp0rmzax062abha85s11chifd"; + }) + (fetchNuGet { + pname = "System.Diagnostics.TextWriterTraceListener"; + version = "4.3.0"; + sha256 = "09db74f36wkwg30f7v7zhz1yhkyrnl5v6bdwljq1jdfgzcfch7c3"; + }) + (fetchNuGet { + pname = "System.Diagnostics.Tools"; + version = "4.3.0"; + sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; + }) + (fetchNuGet { + pname = "System.Diagnostics.TraceSource"; + version = "4.3.0"; + sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; + }) + (fetchNuGet { + pname = "System.Diagnostics.Tracing"; + version = "4.3.0"; + sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; + }) + (fetchNuGet { + pname = "System.Drawing.Common"; + version = "6.0.0"; + sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; + }) + (fetchNuGet { + pname = "System.Formats.Asn1"; + version = "6.0.1"; + sha256 = "02hs45gzkx3b3jvjrbdn0m54lkwbay5dprcs0ivfym59lmqv3wc1"; + }) + (fetchNuGet { + pname = "System.Globalization"; + version = "4.3.0"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }) + (fetchNuGet { + pname = "System.Globalization.Calendars"; + version = "4.3.0"; + sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; + }) + (fetchNuGet { + pname = "System.Globalization.Extensions"; + version = "4.3.0"; + sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; + }) + (fetchNuGet { + pname = "System.IO"; + version = "4.3.0"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + }) + (fetchNuGet { + pname = "System.IO.Compression"; + version = "4.3.0"; + sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; + }) + (fetchNuGet { + pname = "System.IO.Compression.ZipFile"; + version = "4.3.0"; + sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; + }) + (fetchNuGet { + pname = "System.IO.FileSystem"; + version = "4.3.0"; + sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; + }) + (fetchNuGet { + pname = "System.IO.FileSystem.AccessControl"; + version = "5.0.0"; + sha256 = "0ixl68plva0fsj3byv76bai7vkin86s6wyzr8vcav3szl862blvk"; + }) + (fetchNuGet { + pname = "System.IO.FileSystem.Primitives"; + version = "4.3.0"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + }) + (fetchNuGet { + pname = "System.Linq"; + version = "4.3.0"; + sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; + }) + (fetchNuGet { + pname = "System.Linq.Expressions"; + version = "4.3.0"; + sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; + }) + (fetchNuGet { + pname = "System.Memory"; + version = "4.5.0"; + sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; + }) + (fetchNuGet { + pname = "System.Memory"; + version = "4.5.4"; + sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; + }) + (fetchNuGet { + pname = "System.Net.Http"; + version = "4.3.0"; + sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; + }) + (fetchNuGet { + pname = "System.Net.NameResolution"; + version = "4.3.0"; + sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; + }) + (fetchNuGet { + pname = "System.Net.Primitives"; + version = "4.3.0"; + sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; + }) + (fetchNuGet { + pname = "System.Net.Sockets"; + version = "4.3.0"; + sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; + }) + (fetchNuGet { + pname = "System.Numerics.Vectors"; + version = "4.4.0"; + sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; + }) + (fetchNuGet { + pname = "System.Numerics.Vectors"; + version = "4.5.0"; + sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; + }) + (fetchNuGet { + pname = "System.ObjectModel"; + version = "4.3.0"; + sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; + }) + (fetchNuGet { + pname = "System.Private.Uri"; + version = "4.3.0"; + sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; + }) + (fetchNuGet { + pname = "System.Reflection"; + version = "4.3.0"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + }) + (fetchNuGet { + pname = "System.Reflection.Emit"; + version = "4.3.0"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + }) + (fetchNuGet { + pname = "System.Reflection.Emit"; + version = "4.7.0"; + sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; + }) + (fetchNuGet { + pname = "System.Reflection.Emit.ILGeneration"; + version = "4.3.0"; + sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; + }) + (fetchNuGet { + pname = "System.Reflection.Emit.Lightweight"; + version = "4.3.0"; + sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; + }) + (fetchNuGet { + pname = "System.Reflection.Extensions"; + version = "4.3.0"; + sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + }) + (fetchNuGet { + pname = "System.Reflection.Metadata"; + version = "1.6.0"; + sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; + }) + (fetchNuGet { + pname = "System.Reflection.Primitives"; + version = "4.3.0"; + sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; + }) + (fetchNuGet { + pname = "System.Reflection.TypeExtensions"; + version = "4.3.0"; + sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; + }) + (fetchNuGet { + pname = "System.Resources.ResourceManager"; + version = "4.3.0"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; + }) + (fetchNuGet { + pname = "System.Runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) + (fetchNuGet { + pname = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.0"; + sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; + }) + (fetchNuGet { + pname = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.3"; + sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; + }) + (fetchNuGet { + pname = "System.Runtime.CompilerServices.Unsafe"; + version = "6.0.0"; + sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; + }) + (fetchNuGet { + pname = "System.Runtime.Extensions"; + version = "4.3.0"; + sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + }) + (fetchNuGet { + pname = "System.Runtime.Handles"; + version = "4.3.0"; + sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; + }) + (fetchNuGet { + pname = "System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + }) + (fetchNuGet { + pname = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.3.0"; + sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; + }) + (fetchNuGet { + pname = "System.Runtime.Numerics"; + version = "4.3.0"; + sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; + }) + (fetchNuGet { + pname = "System.Security.AccessControl"; + version = "4.7.0"; + sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; + }) + (fetchNuGet { + pname = "System.Security.AccessControl"; + version = "5.0.0"; + sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; + }) + (fetchNuGet { + pname = "System.Security.AccessControl"; + version = "6.0.0"; + sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; + }) + (fetchNuGet { + pname = "System.Security.Claims"; + version = "4.3.0"; + sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Algorithms"; + version = "4.3.0"; + sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Cng"; + version = "4.3.0"; + sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Cng"; + version = "5.0.0"; + sha256 = "06hkx2za8jifpslkh491dfwzm5dxrsyxzj5lsc0achb6yzg4zqlw"; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Csp"; + version = "4.3.0"; + sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Encoding"; + version = "4.3.0"; + sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Pkcs"; + version = "6.0.4"; + sha256 = "0hh5h38pnxmlrnvs72f2hzzpz4b2caiiv6xf8y7fzdg84r3imvfr"; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Primitives"; + version = "4.3.0"; + sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.ProtectedData"; + version = "4.4.0"; + sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.ProtectedData"; + version = "4.5.0"; + sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.ProtectedData"; + version = "6.0.0"; + sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.X509Certificates"; + version = "4.3.0"; + sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; + }) + (fetchNuGet { + pname = "System.Security.Permissions"; + version = "6.0.0"; + sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; + }) + (fetchNuGet { + pname = "System.Security.Principal"; + version = "4.3.0"; + sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; + }) + (fetchNuGet { + pname = "System.Security.Principal.Windows"; + version = "4.3.0"; + sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; + }) + (fetchNuGet { + pname = "System.Security.Principal.Windows"; + version = "4.7.0"; + sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; + }) + (fetchNuGet { + pname = "System.Security.Principal.Windows"; + version = "5.0.0"; + sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; + }) + (fetchNuGet { + pname = "System.Text.Encoding"; + version = "4.3.0"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }) + (fetchNuGet { + pname = "System.Text.Encoding.Extensions"; + version = "4.3.0"; + sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + }) + (fetchNuGet { + pname = "System.Text.Encodings.Web"; + version = "6.0.0"; + sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; + }) + (fetchNuGet { + pname = "System.Text.Json"; + version = "6.0.7"; + sha256 = "0sp80yysfm4s0zcrk7f6b2dvkq6civlwn86swv0d537qf75r2vrv"; + }) + (fetchNuGet { + pname = "System.Text.RegularExpressions"; + version = "4.3.0"; + sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; + }) + (fetchNuGet { + pname = "System.Threading"; + version = "4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) + (fetchNuGet { + pname = "System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + }) + (fetchNuGet { + pname = "System.Threading.Tasks.Extensions"; + version = "4.3.0"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; + }) + (fetchNuGet { + pname = "System.Threading.Tasks.Extensions"; + version = "4.5.4"; + sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; + }) + (fetchNuGet { + pname = "System.Threading.ThreadPool"; + version = "4.3.0"; + sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; + }) + (fetchNuGet { + pname = "System.Threading.Timer"; + version = "4.3.0"; + sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; + }) + (fetchNuGet { + pname = "System.ValueTuple"; + version = "4.4.0"; + sha256 = "1wydfgszs00yxga57sam66vzv9fshk2pw7gim57saplsnkfliaif"; + }) + (fetchNuGet { + pname = "System.ValueTuple"; + version = "4.5.0"; + sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; + }) + (fetchNuGet { + pname = "System.Windows.Extensions"; + version = "6.0.0"; + sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; + }) + (fetchNuGet { + pname = "System.Xml.ReaderWriter"; + version = "4.3.0"; + sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; + }) + (fetchNuGet { + pname = "System.Xml.XDocument"; + version = "4.3.0"; + sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; + }) ] diff --git a/pkgs/by-name/az/azure-artifacts-credprovider/package.nix b/pkgs/by-name/az/azure-artifacts-credprovider/package.nix index 0d07a65eb6df..d58fc6be863e 100644 --- a/pkgs/by-name/az/azure-artifacts-credprovider/package.nix +++ b/pkgs/by-name/az/azure-artifacts-credprovider/package.nix @@ -1,31 +1,32 @@ -{ lib -, buildDotnetModule -, dotnetCorePackages -, fetchFromGitHub +{ + lib, + buildDotnetModule, + dotnetCorePackages, + fetchFromGitHub, }: buildDotnetModule rec { dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; version = "1.3.0"; src = fetchFromGitHub { - owner = "microsoft"; - repo = "artifacts-credprovider"; - rev = "v${version}"; - sha256 = "sha256-JbcoDs4c/+uKIgVWZkuo4jqd1hlqe+H949jNfkDwZls="; + owner = "microsoft"; + repo = "artifacts-credprovider"; + rev = "v${version}"; + sha256 = "sha256-JbcoDs4c/+uKIgVWZkuo4jqd1hlqe+H949jNfkDwZls="; }; pname = "azure-artifacts-credprovider"; - projectFile = "CredentialProvider.Microsoft/CredentialProvider.Microsoft.csproj"; + projectFile = "CredentialProvider.Microsoft/CredentialProvider.Microsoft.csproj"; testProjectFile = "CredentialProvider.Microsoft.Tests/CredentialProvider.Microsoft.Tests.csproj"; nugetDeps = ./deps.nix; passthru.updateScript = ./update.sh; patchPhase = '' sed -i 's|.*|net8.0|' Build.props ''; - meta = with lib; { + meta = { homepage = "https://github.com/microsoft/artifacts-credprovider"; description = "Azure Artifacts Credential Provider"; - license = licenses.mit; - maintainers = with maintainers; [ anpin ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ anpin ]; mainProgram = "CredentialProvider.Microsoft"; platforms = [ "x86_64-linux" ]; }; From b9fe3c3e1f3d56699956a652d5b5dcaab8aa9e12 Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Wed, 6 Nov 2024 10:49:02 +0000 Subject: [PATCH 016/151] python3Packages.pre-commit-po-hooks: init at 1.7.3 @moduon MT-1075 --- .../pre-commit-po-hooks/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/pre-commit-po-hooks/default.nix diff --git a/pkgs/development/python-modules/pre-commit-po-hooks/default.nix b/pkgs/development/python-modules/pre-commit-po-hooks/default.nix new file mode 100644 index 000000000000..1b682ad2c0a6 --- /dev/null +++ b/pkgs/development/python-modules/pre-commit-po-hooks/default.nix @@ -0,0 +1,32 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, +}: +buildPythonPackage rec { + pname = "pre-commit-po-hooks"; + version = "1.7.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mondeja"; + repo = "pre-commit-po-hooks"; + rev = "v${version}"; + hash = "sha256-wTmcV8KkoQLuK4EWDt0pbp+EQJRatxnQYeBfikK+vlA="; + }; + + nativeCheckInputs = [ pytestCheckHook ]; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "pre_commit_po_hooks" ]; + + meta = { + description = "Hooks for pre-commit useful working with PO files"; + homepage = "https://github.com/mondeja/pre-commit-po-hooks"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ yajo ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 41856355323d..ed4526edc30d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10033,6 +10033,8 @@ self: super: with self; { pre-commit-hooks = callPackage ../development/python-modules/pre-commit-hooks { }; + pre-commit-po-hooks = callPackage ../development/python-modules/pre-commit-po-hooks { }; + preggy = callPackage ../development/python-modules/preggy { }; premailer = callPackage ../development/python-modules/premailer { }; From db4f9004c8c40f79960c30b3afef2d7eb2f16586 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Tue, 18 Jul 2023 17:28:45 +0300 Subject: [PATCH 017/151] whisparr: init at 2.0.0.548 --- pkgs/by-name/wh/whisparr/package.nix | 96 ++++++++++++++++++++++++++++ pkgs/by-name/wh/whisparr/update.sh | 55 ++++++++++++++++ 2 files changed, 151 insertions(+) create mode 100644 pkgs/by-name/wh/whisparr/package.nix create mode 100755 pkgs/by-name/wh/whisparr/update.sh diff --git a/pkgs/by-name/wh/whisparr/package.nix b/pkgs/by-name/wh/whisparr/package.nix new file mode 100644 index 000000000000..b2db8c9e0f45 --- /dev/null +++ b/pkgs/by-name/wh/whisparr/package.nix @@ -0,0 +1,96 @@ +{ + lib, + stdenv, + + curl, + dotnet-runtime, + fetchurl, + icu, + libmediainfo, + makeWrapper, + mono, + openssl, + sqlite, + zlib, + + nixosTests, +}: + +let + os = if stdenv.hostPlatform.isDarwin then "osx" else "linux"; + system = stdenv.hostPlatform.system; + arch = + { + aarch64-darwin = "arm64"; + aarch64-linux = "arm64"; + x86_64-darwin = "x64"; + x86_64-linux = "x64"; + } + ."${system}" or (throw "Unsupported system: ${system}"); + hash = + { + arm64-linux-hash = "sha256-s0j3ZYqS0fp8yLxPXP25BvLzLt7Uisl2c+94saMWEMw="; + arm64-osx-hash = "sha256-vHUtrMHJ1g7ltGuf765/IVDAWfanSUGRQbVnzsuTgrQ="; + x64-linux-hash = "sha256-mYLDQxAS6WV8CWzG1gSjPl37SJaVoLV21Meh1cRk45w="; + x64-osx-hash = "sha256-YNUb5eOc0iMOjZ9vbYLodFp5jlqk1OcOyRi10REyVX4="; + } + ."${arch}-${os}-hash"; +in +stdenv.mkDerivation rec { + pname = "whisparr"; + version = "2.0.0.548"; + + src = fetchurl { + name = "${pname}-${arch}-${os}-${version}.tar.gz"; + url = "https://whisparr.servarr.com/v1/update/nightly/updatefile?runtime=netcore&version=${version}&arch=${arch}&os=${os}"; + inherit hash; + }; + + nativeBuildInputs = [ makeWrapper ]; + + runtimeLibs = lib.makeLibraryPath [ + curl + icu + libmediainfo + mono + openssl + sqlite + zlib + ]; + + installPhase = '' + runHook preInstall + + rm -rf "Whisparr.Update" + + mkdir -p $out/{bin,share/${pname}-${version}} + cp -r * $out/share/${pname}-${version}/ + + makeWrapper "${dotnet-runtime}/bin/dotnet" $out/bin/Whisparr \ + --add-flags "$out/share/${pname}-${version}/Whisparr.dll" \ + --prefix LD_LIBRARY_PATH : ${runtimeLibs} + + runHook postInstall + ''; + + passthru = { + updateScript = ./update.sh; + tests.smoke-test = nixosTests.whisparr; + }; + + meta = { + description = "Adult movie collection manager for Usenet and BitTorrent users"; + homepage = "https://wiki.servarr.com/en/whisparr"; + changelog = "https://whisparr.servarr.com/v1/update/nightly/changes"; + license = lib.licenses.gpl3Only; + platforms = [ + "aarch64-darwin" + "aarch64-linux" + "x86_64-darwin" + "x86_64-linux" + ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + mainProgram = "Whisparr"; + maintainers = [ lib.maintainers.paveloom ]; + }; +} diff --git a/pkgs/by-name/wh/whisparr/update.sh b/pkgs/by-name/wh/whisparr/update.sh new file mode 100755 index 000000000000..6e9b69e65a02 --- /dev/null +++ b/pkgs/by-name/wh/whisparr/update.sh @@ -0,0 +1,55 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused jq nix-prefetch +#shellcheck shell=bash + +set -e + +dirname="$(dirname "$0")" + +updateVersion() { + version=$1 + echo "Updating the version..." + sed -i "s#version = \"[0-9.]*\"#version = \"$version\"#" "$dirname/package.nix" +} + +updateHash() +{ + version=$1 + arch=$2 + os=$3 + + system="${arch}-${os}" + hashKey="${system}-hash" + + echo "Updating the hash for the \`${system}\` system..." + url="https://whisparr.servarr.com/v1/update/nightly/updatefile?runtime=netcore&version=${version}&arch=${arch}&os=${os}" + hash=$(nix-prefetch-url --type sha256 --name "whisparr-$system-$version.tar.gz" "$url") + sriHash="$(nix hash to-sri --type sha256 "$hash")" + + sed -i "s#$hashKey = \"[a-zA-Z0-9\/+-=]*\"#$hashKey = \"$sriHash\"#" "$dirname/package.nix" +} + +echo "Checking for updates of Whisparr..." + +currentVersion=$(nix eval --raw -f "$dirname"/../../../.. whisparr.version) +echo "Current version: \`$currentVersion\`." + +echo "Fetching the latest version..." +latestVersion=$( + curl -s "https://whisparr.servarr.com/v1/update/nightly/changes?runtime=netcore&os=linux" | + jq -r .[0].version +) + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "Whisparr is up-to-date." + exit 0 +else + echo "New version is available: \`$latestVersion\`." +fi + +updateHash "$latestVersion" arm64 linux +updateHash "$latestVersion" arm64 osx +updateHash "$latestVersion" x64 linux +updateHash "$latestVersion" x64 osx + +updateVersion "$latestVersion" From d6d7fe94d4465d8e507a36ae9a8f1cd58914a721 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 25 May 2024 22:32:17 +0300 Subject: [PATCH 018/151] nixos/whisparr: initial commit --- .../manual/release-notes/rl-2411.section.md | 2 + nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/whisparr.nix | 73 +++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/whisparr.nix | 19 +++++ 6 files changed, 98 insertions(+) create mode 100644 nixos/modules/services/misc/whisparr.nix create mode 100644 nixos/tests/whisparr.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 73ccad6714df..b712d949b4cf 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -83,6 +83,8 @@ - [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr), a proxy server to bypass Cloudflare protection. Available as [services.flaresolverr](#opt-services.flaresolverr.enable). +- [Whisparr](https://wiki.servarr.com/en/whisparr), an adult movie collection manager for Usenet and BitTorrent users. Available as [services.whisparr](#opt-services.whisparr.enable). + - [Gancio](https://gancio.org/), a shared agenda for local communities. Available as [services.gancio](#opt-services.gancio.enable). - [Goatcounter](https://www.goatcounter.com/), an easy web analytics platform with no tracking of personal data. Available as [services.goatcounter](options.html#opt-services.goatcocunter.enable). diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 814ee77c0119..d1347766420a 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -355,6 +355,7 @@ in rstudio-server = 324; localtimed = 325; automatic-timezoned = 326; + whisparr = 328; # When adding a uid, make sure it doesn't match an existing gid. # @@ -683,6 +684,7 @@ in localtimed = 325; automatic-timezoned = 326; uinput = 327; + whisparr = 328; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 0537dbf3ad1c..500b60cabf1d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -869,6 +869,7 @@ ./services/misc/wastebin.nix ./services/misc/weechat.nix ./services/misc/workout-tracker.nix + ./services/misc/whisparr.nix ./services/misc/xmrig.nix ./services/misc/zoneminder.nix ./services/misc/zookeeper.nix diff --git a/nixos/modules/services/misc/whisparr.nix b/nixos/modules/services/misc/whisparr.nix new file mode 100644 index 000000000000..8594a682ec9f --- /dev/null +++ b/nixos/modules/services/misc/whisparr.nix @@ -0,0 +1,73 @@ +{ + config, + pkgs, + lib, + ... +}: + +let + cfg = config.services.whisparr; +in +{ + options = { + services.whisparr = { + enable = lib.mkEnableOption "Whisparr"; + + package = lib.mkPackageOption pkgs "whisparr" { }; + + dataDir = lib.mkOption { + type = lib.types.path; + default = "/var/lib/whisparr/.config/Whisparr"; + description = "The directory where Whisparr stores its data files."; + }; + + openFirewall = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Open ports in the firewall for the Whisparr web interface."; + }; + + user = lib.mkOption { + type = lib.types.str; + default = "whisparr"; + description = "User account under which Whisparr runs."; + }; + + group = lib.mkOption { + type = lib.types.str; + default = "whisparr"; + description = "Group under which Whisparr runs."; + }; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.tmpfiles.rules = [ "d '${cfg.dataDir}' 0700 ${cfg.user} ${cfg.group} - -" ]; + + systemd.services.whisparr = { + description = "Whisparr"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "simple"; + User = cfg.user; + Group = cfg.group; + ExecStart = "${lib.getExe cfg.package} -nobrowser -data='${cfg.dataDir}'"; + Restart = "on-failure"; + }; + }; + + networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ 6969 ]; }; + + users.users = lib.mkIf (cfg.user == "whisparr") { + whisparr = { + group = cfg.group; + home = cfg.dataDir; + uid = config.ids.uids.whisparr; + }; + }; + + users.groups = lib.mkIf (cfg.group == "whisparr") { whisparr.gid = config.ids.gids.whisparr; }; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 1288955272aa..a237cfb187a8 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1123,6 +1123,7 @@ in { watchdogd = handleTest ./watchdogd.nix {}; webhook = runTest ./webhook.nix; weblate = handleTest ./web-apps/weblate.nix {}; + whisparr = handleTest ./whisparr.nix {}; wiki-js = handleTest ./wiki-js.nix {}; wine = handleTest ./wine.nix {}; wireguard = handleTest ./wireguard {}; diff --git a/nixos/tests/whisparr.nix b/nixos/tests/whisparr.nix new file mode 100644 index 000000000000..3d528a21c6e2 --- /dev/null +++ b/nixos/tests/whisparr.nix @@ -0,0 +1,19 @@ +import ./make-test-python.nix ( + { lib, ... }: + { + name = "whisparr"; + meta.maintainers = [ lib.maintainers.paveloom ]; + + nodes.machine = + { pkgs, ... }: + { + services.whisparr.enable = true; + }; + + testScript = '' + machine.wait_for_unit("whisparr.service") + machine.wait_for_open_port(6969) + machine.succeed("curl --fail http://localhost:6969/") + ''; + } +) From 6589625273010658818a00876012d3963dd27f63 Mon Sep 17 00:00:00 2001 From: DrymarchonShaun <40149778+DrymarchonShaun@users.noreply.github.com> Date: Thu, 7 Nov 2024 22:30:05 -0800 Subject: [PATCH 019/151] arma3-unix-launcher: replace curlpp.src with srcOnly curlpp to ensure patches are applied --- pkgs/by-name/ar/arma3-unix-launcher/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ar/arma3-unix-launcher/package.nix b/pkgs/by-name/ar/arma3-unix-launcher/package.nix index 104293c9be56..0a9a933c1c86 100644 --- a/pkgs/by-name/ar/arma3-unix-launcher/package.nix +++ b/pkgs/by-name/ar/arma3-unix-launcher/package.nix @@ -5,6 +5,7 @@ curl, curlpp, doctest, + srcOnly, fetchFromGitHub, fetchurl, fmt, @@ -36,8 +37,8 @@ stdenv.mkDerivation (finalAttrs: { rev = "45664c4e9f05ff287731a9ff8b724d0c89fb6e77"; hash = "sha256-qLD9zD6hbItDn6ZHHWBXrAWhySvqcs40xA5+C/5Fkhw="; }; - curlpp_src = curlpp.src; doctest_src = doctest; + curlpp_src = srcOnly curlpp; fmt_src = fmt; nlohmann_json_src = nlohmann_json; pugixml_src = fetchFromGitHub { From 3ab2140c5798083f6436ee5887653137b4ad3490 Mon Sep 17 00:00:00 2001 From: DrymarchonShaun <40149778+DrymarchonShaun@users.noreply.github.com> Date: Thu, 7 Nov 2024 22:55:34 -0800 Subject: [PATCH 020/151] arma3-unix-launcher: remove unused dependencies --- pkgs/by-name/ar/arma3-unix-launcher/package.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ar/arma3-unix-launcher/package.nix b/pkgs/by-name/ar/arma3-unix-launcher/package.nix index 0a9a933c1c86..6c15df4cd33a 100644 --- a/pkgs/by-name/ar/arma3-unix-launcher/package.nix +++ b/pkgs/by-name/ar/arma3-unix-launcher/package.nix @@ -4,7 +4,6 @@ cmake, curl, curlpp, - doctest, srcOnly, fetchFromGitHub, fetchurl, @@ -13,7 +12,6 @@ qt5, spdlog, substituteAll, - trompeloeil, buildDayZLauncher ? false, }: stdenv.mkDerivation (finalAttrs: { @@ -37,7 +35,6 @@ stdenv.mkDerivation (finalAttrs: { rev = "45664c4e9f05ff287731a9ff8b724d0c89fb6e77"; hash = "sha256-qLD9zD6hbItDn6ZHHWBXrAWhySvqcs40xA5+C/5Fkhw="; }; - doctest_src = doctest; curlpp_src = srcOnly curlpp; fmt_src = fmt; nlohmann_json_src = nlohmann_json; @@ -52,7 +49,9 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/julianxhokaxhiu/SteamworksSDKCI/releases/download/1.53/SteamworksSDK-v1.53.0_x64.zip"; hash = "sha256-6PQGaPsaxBg/MHVWw2ynYW6LaNSrE9Rd9Q9ZLKFGPFA="; }; - trompeloeil_src = trompeloeil; + # Only required for testing? + doctest_src = null; + trompeloeil_src = null; }) # game won't launch with steam integration anyways, disable it ./disable_steam_integration.patch @@ -61,14 +60,9 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ qt5.wrapQtAppsHook cmake - ]; - - buildInputs = [ spdlog - curlpp.src curl - qt5.qtbase - qt5.qtsvg + curlpp ]; cmakeFlags = [ "-Wno-dev" ] ++ lib.optionals buildDayZLauncher [ "-DBUILD_DAYZ_LAUNCHER=ON" ]; From 3a1817aaa9bb4502d68a4d0494fdf0943e9c1a6d Mon Sep 17 00:00:00 2001 From: Vladimir Panteleev Date: Sat, 9 Nov 2024 07:56:41 +0000 Subject: [PATCH 021/151] libblockdev: add updateScript --- pkgs/by-name/li/libblockdev/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/li/libblockdev/package.nix b/pkgs/by-name/li/libblockdev/package.nix index 6e0f9858f730..7aebb5159bc3 100644 --- a/pkgs/by-name/li/libblockdev/package.nix +++ b/pkgs/by-name/li/libblockdev/package.nix @@ -28,6 +28,7 @@ , e2fsprogs , libnvme , keyutils +, nix-update-script }: stdenv.mkDerivation (finalAttrs: { pname = "libblockdev"; @@ -89,6 +90,8 @@ stdenv.mkDerivation (finalAttrs: { ${lib.makeBinPath [ thin-provisioning-tools ]} ''; + passthru.updateScript = nix-update-script { }; + meta = { changelog = "https://github.com/storaged-project/libblockdev/raw/${finalAttrs.src.rev}/NEWS.rst"; description = "Library for manipulating block devices"; From 56197afc1422dd0f227085b23d31bbf8becccf0d Mon Sep 17 00:00:00 2001 From: Vladimir Panteleev Date: Sat, 9 Nov 2024 08:30:12 +0000 Subject: [PATCH 022/151] libblockdev: 3.1.1 -> 3.2.1 --- pkgs/by-name/li/libblockdev/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libblockdev/package.nix b/pkgs/by-name/li/libblockdev/package.nix index 7aebb5159bc3..f64d7bca737b 100644 --- a/pkgs/by-name/li/libblockdev/package.nix +++ b/pkgs/by-name/li/libblockdev/package.nix @@ -28,17 +28,19 @@ , e2fsprogs , libnvme , keyutils +, libatasmart +, json-glib , nix-update-script }: stdenv.mkDerivation (finalAttrs: { pname = "libblockdev"; - version = "3.1.1"; + version = "3.2.1"; src = fetchFromGitHub { owner = "storaged-project"; repo = "libblockdev"; - rev = "${finalAttrs.version}-1"; - hash = "sha256-WCMedMkaMMhZbB3iJu3c+CTT3AvOjzOSYP45J+NQEDQ="; + rev = finalAttrs.version; + hash = "sha256-85vfHHR6WqSPCW1QmD3HccIpOqNYrx1PDjTh297VA1A="; }; outputs = [ "out" "dev" "devdoc" "python" ]; @@ -71,8 +73,10 @@ stdenv.mkDerivation (finalAttrs: { e2fsprogs glib gptfdisk + json-glib keyutils kmod + libatasmart libbytesize libndctl libnvme From 5581748393b2afe4f2ad329d04032255a72eae03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Nov 2024 18:42:36 +0000 Subject: [PATCH 023/151] python312Packages.blivet: 3.10.1 -> 3.11.0 --- pkgs/development/python-modules/blivet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index e3ca43c8cd22..bcdd909f092a 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -35,14 +35,14 @@ let in buildPythonPackage rec { pname = "blivet"; - version = "3.10.1"; + version = "3.11.0"; format = "setuptools"; src = fetchFromGitHub { owner = "storaged-project"; repo = "blivet"; - rev = "blivet-${version}"; - hash = "sha256-Ooc63mf03ZO7zxm8s/Tm8jSQg5LWyKnHAqbyvn1UHB8="; + rev = "refs/tags/blivet-${version}"; + hash = "sha256-X5U6XFmcsTfetpxwH0ONSnTasnwh2USukYtx+8HwVGc="; }; postPatch = '' From 39e724960e5e139e8dbb1c702449527589a73212 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Mon, 11 Sep 2023 13:20:20 +0300 Subject: [PATCH 024/151] fopnu: init at 1.67 --- pkgs/by-name/fo/fopnu/package.nix | 54 +++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 pkgs/by-name/fo/fopnu/package.nix diff --git a/pkgs/by-name/fo/fopnu/package.nix b/pkgs/by-name/fo/fopnu/package.nix new file mode 100644 index 000000000000..db2a9a89a9b7 --- /dev/null +++ b/pkgs/by-name/fo/fopnu/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenvNoCC, + fetchurl, + + autoPatchelfHook, + wrapGAppsHook3, + + dbus-glib, + gtk3, +}: + +stdenvNoCC.mkDerivation rec { + pname = "fopnu"; + version = "1.67"; + + src = fetchurl { + url = "https://download2.fopnu.com/download/fopnu-${version}-1.x86_64.manualinstall.tar.gz"; + hash = "sha256-O8wmf+/moIZlxZfqozftWEABQR0qPbw41erCxfmV3Mc="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook3 + ]; + + buildInputs = [ + dbus-glib + gtk3 + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -D -m 0755 fopnu -t $out/bin + install -D -m 0444 fopnu.desktop -t $out/share/applications + install -D -m 0444 fopnu.png -t $out/share/icons/hicolor/48x48/apps + + runHook postInstall + ''; + + meta = with lib; { + description = "P2P file sharing system"; + homepage = "https://fopnu.com"; + license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + mainProgram = "fopnu"; + maintainers = with maintainers; [ paveloom ]; + platforms = [ "x86_64-linux" ]; + }; +} From b16b9e417317390c2cb7ae7d81b464b66a55a065 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Miramon?= Date: Sat, 9 Nov 2024 22:55:48 +0100 Subject: [PATCH 025/151] maintainers: add jmir --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b14f78609e47..67a11fe0b2f3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10420,6 +10420,12 @@ githubId = 54179289; name = "Jason Miller"; }; + jmir = { + email = "joel@miramon.de"; + github = "jmir1"; + githubId = 43830312; + name = "Joël Miramon"; + }; jn-sena = { email = "jn-sena@proton.me"; github = "jn-sena"; From 8f8932152128fc939774a708f4c7bd04bdb93c23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Miramon?= Date: Sat, 9 Nov 2024 22:56:14 +0100 Subject: [PATCH 026/151] leddy: init at 0.1.0-unstable-2024-04-05 --- pkgs/by-name/le/leddy/package.nix | 35 +++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/le/leddy/package.nix diff --git a/pkgs/by-name/le/leddy/package.nix b/pkgs/by-name/le/leddy/package.nix new file mode 100644 index 000000000000..b78b5a3b79ec --- /dev/null +++ b/pkgs/by-name/le/leddy/package.nix @@ -0,0 +1,35 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + hidapi, + udev, +}: + +rustPlatform.buildRustPackage rec { + pname = "leddy"; + version = "0.1.0-unstable-2024-10-15"; + src = fetchFromGitHub { + owner = "XanClic"; + repo = pname; + rev = "fd259425980df17bd761006a1ccef93e23bfdad6"; + hash = "sha256-7t+E47odtayw26AnhtkxIWr0TxDwruEjP3Af3ajmVAA="; + }; + cargoHash = "sha256-99qPo5Nsu8pLMT5EIpQ/+F0o/00Y5gQ9T0z5+gxUcww="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + hidapi + udev + ]; + doCheck = false; # no tests + + meta = { + description = "LED controller for the Fnatic miniStreak and Fnatic Streak keyboards"; + homepage = "https://github.com/XanClic/leddy"; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.jmir ]; + mainProgram = "leddy"; + }; +} From b4815cca25ae4517a4d527dc65ff9f07fd6440cc Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Tue, 3 Oct 2023 18:40:45 +0300 Subject: [PATCH 027/151] pvs-studio: init at 7.33.85330.89 --- pkgs/by-name/pv/pvs-studio/package.nix | 70 ++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 pkgs/by-name/pv/pvs-studio/package.nix diff --git a/pkgs/by-name/pv/pvs-studio/package.nix b/pkgs/by-name/pv/pvs-studio/package.nix new file mode 100644 index 000000000000..0d5144056f87 --- /dev/null +++ b/pkgs/by-name/pv/pvs-studio/package.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenv, + fetchzip, + + makeWrapper, + perl, + strace, + + testers, + pvs-studio, +}: + +stdenv.mkDerivation rec { + pname = "pvs-studio"; + version = "7.33.85330.89"; + + src = + let + system = stdenv.hostPlatform.system; + selectSystem = attrs: attrs.${system} or (throw "Unsupported system: ${system}"); + in + fetchzip { + url = selectSystem { + x86_64-darwin = "https://web.archive.org/web/20241115155106/https://cdn.pvs-studio.com/pvs-studio-7.33.85330.89-macos.tgz"; + x86_64-linux = "https://web.archive.org/web/20241115155538/https://cdn.pvs-studio.com/pvs-studio-7.33.85330.89-x86_64.tgz"; + }; + hash = selectSystem { + x86_64-darwin = "sha256-jhfW+uBexzYzzf3JVqRYqtDjE5+OoT3RcuRPJEOEs18="; + x86_64-linux = "sha256-rJQc8B2B7J0bcEI00auwIO/4PH2YMkuzSK/OyAnhdBA="; + }; + }; + + nativeBuildInputs = [ makeWrapper ]; + + nativeRuntimeInputs = lib.makeBinPath [ + perl + strace + ]; + + installPhase = '' + runHook preInstall + + install -D -m 0755 bin/* -t $out/bin + install -D -m 0644 etc/bash_completion.d/* -t $out/etc/bash_completion.d + + runHook postInstall + ''; + + postFixup = '' + wrapProgram "$out/bin/pvs-studio-analyzer" \ + --prefix PATH ":" ${nativeRuntimeInputs} + ''; + + passthru = { + tests.version = testers.testVersion { package = pvs-studio; }; + }; + + meta = { + description = "Static analyzer for C and C++"; + homepage = "https://pvs-studio.com/en/pvs-studio"; + license = lib.licenses.unfreeRedistributable; + platforms = [ + "x86_64-darwin" + "x86_64-linux" + ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ paveloom ]; + }; +} From 70c2f444e35d0909e334a6e2be27bd4fead81e44 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 20 Jun 2024 18:09:58 -0400 Subject: [PATCH 028/151] llvmPackages.bintuils: Hack ranlib to ignore `-t` Old versions of libtool for OpenBSD insist on adding the `-t` flag to ranlib, which updates the timestamp. llvm-ranlib does not support `-t` and as no plans to do so [1], since it makes builds less reproducable. OpenBSD upstream deals with this by patching ranlib to ignore the `-t` flag [2]. Instead of writing patches for all LLVM versions or re-running `autoreconf` on all packages that use libtool, we can wrap ranlib to ignore the flag. [1]: https://github.com/llvm/llvm-project/issues/57129 [2]: https://github.com/openbsd/src/commit/d00990cc11fce25520b9dde416bb8cf50990e992 --- pkgs/build-support/bintools-wrapper/default.nix | 12 ++++++++++++ .../bintools-wrapper/llvm-ranlib-wrapper.sh | 16 ++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/build-support/bintools-wrapper/llvm-ranlib-wrapper.sh diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 736494b5ee55..3ead71ebb698 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -382,6 +382,18 @@ stdenvNoCC.mkDerivation { substituteAll ${./add-darwin-ldflags-before.sh} $out/nix-support/add-local-ldflags-before.sh '' + ## + ## LLVM ranlab lacks -t option that libtool expects. We can just + ## skip it + ## + + + optionalString (isLLVM && targetPlatform.isOpenBSD) '' + rm $out/bin/${targetPrefix}ranlib + wrap \ + ${targetPrefix}ranlib ${./llvm-ranlib-wrapper.sh} \ + "${bintools_bin}/bin/${targetPrefix}ranlib" + '' + ## ## Extra custom steps ## diff --git a/pkgs/build-support/bintools-wrapper/llvm-ranlib-wrapper.sh b/pkgs/build-support/bintools-wrapper/llvm-ranlib-wrapper.sh new file mode 100644 index 000000000000..730424ce92e2 --- /dev/null +++ b/pkgs/build-support/bintools-wrapper/llvm-ranlib-wrapper.sh @@ -0,0 +1,16 @@ +#! @shell@ +# shellcheck shell=bash + +args=() +for p in "$@"; do + case "$p" in + -t) + # Skip, LLVM ranlib doesn't support + ;; + *) + args+=("$p") + ;; + esac +done + +@prog@ "${args[@]}" From 0e42c12065bbfa5e3dd4d4a810f3e59221bd611e Mon Sep 17 00:00:00 2001 From: Philipp Jungkamp Date: Thu, 28 Nov 2024 22:20:20 +0100 Subject: [PATCH 029/151] vpl-gpu-rt: Set platforms to x86_64-linux only The upstream README notes: > Operating System: > - Linux x86-64 fully supported > - Linux x86 only build But the SSE4 optimizations in the `ipp` library depend on x86_64 specific assembly. The only supported platform seems to be "x86_64-linux". --- pkgs/by-name/vp/vpl-gpu-rt/package.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/by-name/vp/vpl-gpu-rt/package.nix b/pkgs/by-name/vp/vpl-gpu-rt/package.nix index c5a9df335d5e..19db76b8fd67 100644 --- a/pkgs/by-name/vp/vpl-gpu-rt/package.nix +++ b/pkgs/by-name/vp/vpl-gpu-rt/package.nix @@ -29,10 +29,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/intel/vpl-gpu-rt"; changelog = "https://github.com/intel/vpl-gpu-rt/releases/tag/${src.rev}"; license = [ lib.licenses.mit ]; - platforms = lib.platforms.linux; - # CMake adds x86 specific compiler flags in /builder/FindGlobals.cmake - # NOTE: https://github.com/oneapi-src/oneVPL-intel-gpu/issues/303 - broken = !stdenv.hostPlatform.isx86; + platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ evanrichter pjungkamp ]; }; } From fb3b671d0dedb721ec5e2073033a6ee3256165a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Dec 2024 20:20:26 +0000 Subject: [PATCH 030/151] dqlite: 1.16.7 -> 1.18.0 --- pkgs/by-name/dq/dqlite/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dq/dqlite/package.nix b/pkgs/by-name/dq/dqlite/package.nix index 4ef75a9ee469..846bc338b8da 100644 --- a/pkgs/by-name/dq/dqlite/package.nix +++ b/pkgs/by-name/dq/dqlite/package.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dqlite"; - version = "1.16.7"; + version = "1.18.0"; src = fetchFromGitHub { owner = "canonical"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XQvJO4sFKRKDVdtoXP2Ue80otDC0Ry6EB1Z0shetuhw="; + hash = "sha256-sWA04CoVMR8380/PXSkMo/Ml2Gk1RNQxPC12CMVqxwE="; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; From 3d1b701d1177dc2fbe74e279118b52c92b981689 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Dec 2024 20:37:59 +0000 Subject: [PATCH 031/151] calamares-nixos: 3.3.10 -> 3.3.12 --- pkgs/tools/misc/calamares/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 427a595a4991..78458fa43b71 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -7,12 +7,12 @@ mkDerivation rec { pname = "calamares"; - version = "3.3.10"; + version = "3.3.12"; # release including submodule src = fetchurl { url = "https://github.com/calamares/calamares/releases/download/v${version}/calamares-${version}.tar.gz"; - sha256 = "sha256-iBf8APBLNOpntyn+9WQWl+j8oQ4iR3pOwbcZlK86g5Q="; + sha256 = "sha256-TelcQ0Mm8+5oNIDqvGqb4j7L4BIPme987IMWdLEvMKM="; }; # On major changes, or when otherwise required, you *must* : From 1532d55fed2dfe95a6c07f2a8ed7d820e6742af0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Dec 2024 20:39:37 +0000 Subject: [PATCH 032/151] calamares: 3.3.10 -> 3.3.12 --- pkgs/tools/misc/calamares/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 427a595a4991..78458fa43b71 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -7,12 +7,12 @@ mkDerivation rec { pname = "calamares"; - version = "3.3.10"; + version = "3.3.12"; # release including submodule src = fetchurl { url = "https://github.com/calamares/calamares/releases/download/v${version}/calamares-${version}.tar.gz"; - sha256 = "sha256-iBf8APBLNOpntyn+9WQWl+j8oQ4iR3pOwbcZlK86g5Q="; + sha256 = "sha256-TelcQ0Mm8+5oNIDqvGqb4j7L4BIPme987IMWdLEvMKM="; }; # On major changes, or when otherwise required, you *must* : From de9c3b95581e9cc7bfd58f989eb27a04d6a3b0ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 01:40:32 +0000 Subject: [PATCH 033/151] openrefine: 3.8.5 -> 3.8.7 --- pkgs/applications/science/misc/openrefine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/openrefine/default.nix b/pkgs/applications/science/misc/openrefine/default.nix index 78d312c4011e..6104fcc93930 100644 --- a/pkgs/applications/science/misc/openrefine/default.nix +++ b/pkgs/applications/science/misc/openrefine/default.nix @@ -10,12 +10,12 @@ }: let - version = "3.8.5"; + version = "3.8.7"; src = fetchFromGitHub { owner = "openrefine"; repo = "openrefine"; rev = version; - hash = "sha256-8QAnZCvSUMuRj/Rd85j79GXDQxl8HlEaiU4StsXDdpU="; + hash = "sha256-ViksKZ57DCIPShrK4PDBK0o8OttQKYt5wsnQ4+aPUDE="; }; npmPkg = buildNpmPackage { From a5046d85f78eb144522919b7e8da91f300865865 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 06:22:42 +0000 Subject: [PATCH 034/151] cadaver: 0.24 -> 0.26 --- pkgs/by-name/ca/cadaver/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/cadaver/package.nix b/pkgs/by-name/ca/cadaver/package.nix index 699b0d04dc86..f554aa280303 100644 --- a/pkgs/by-name/ca/cadaver/package.nix +++ b/pkgs/by-name/ca/cadaver/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "cadaver"; - version = "0.24"; + version = "0.26"; src = fetchurl { url = "https://notroj.github.io/cadaver/cadaver-${version}.tar.gz"; - hash = "sha256-Rs/y8+vTLNMoNoEspHvMdTU/wr51fwk9qIwN2PEP1fY="; + hash = "sha256-kjbkPN81BdnvBhhf2kMlKEAQXAwC2TcLbhB32GY1e1U="; }; configureFlags = [ From 1bd6c312a50fbb5432f87626e04753e57156efc1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 08:33:23 +0000 Subject: [PATCH 035/151] libowfat: 0.33 -> 0.34 --- pkgs/by-name/li/libowfat/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libowfat/package.nix b/pkgs/by-name/li/libowfat/package.nix index 9cf52b2cc04e..b1ce3864dd16 100644 --- a/pkgs/by-name/li/libowfat/package.nix +++ b/pkgs/by-name/li/libowfat/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libowfat"; - version = "0.33"; + version = "0.34"; src = fetchurl { url = "https://www.fefe.de/libowfat/${pname}-${version}.tar.xz"; - sha256 = "sha256-MR7Is/S3K7RC4yP7ATqY+Vb6dFVH8ryUVih7INAnzX0="; + sha256 = "sha256-1DMNNzrJWBs5e8JKIq0ff11Yp/422dI5/jUs7/xdMEs="; }; # Fix for glibc 2.34 from Gentoo From edf7918e697ac031c9893658b2b11bce1cc25994 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 09:01:46 +0000 Subject: [PATCH 036/151] likwid: 5.3.0 -> 5.4.0 --- pkgs/by-name/li/likwid/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/likwid/package.nix b/pkgs/by-name/li/likwid/package.nix index 8a8a492fa0f4..528df77d7e95 100644 --- a/pkgs/by-name/li/likwid/package.nix +++ b/pkgs/by-name/li/likwid/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "likwid"; - version = "5.3.0"; + version = "5.4.0"; src = fetchurl { url = "https://ftp.fau.de/pub/likwid/likwid-${version}.tar.gz"; - hash = "sha256-wpDlVMQlMSSsKriwVuFO5NI5ZrjJ+/oQuoH3WuVDzk4="; + hash = "sha256-DytnHGnKqZP+20gYezvcyUwiQA7ITJJv0ImNv/aKoD4="; }; nativeBuildInputs = [ perl ]; From 0f43a759dd38ef96560c59c8a11273c8147014cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 10:10:56 +0000 Subject: [PATCH 037/151] booster: 0.11 -> 0.12 --- pkgs/by-name/bo/booster/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bo/booster/package.nix b/pkgs/by-name/bo/booster/package.nix index c211a53bdc56..e1192094f717 100644 --- a/pkgs/by-name/bo/booster/package.nix +++ b/pkgs/by-name/bo/booster/package.nix @@ -16,16 +16,16 @@ buildGoModule rec { pname = "booster"; - version = "0.11"; + version = "0.12"; src = fetchFromGitHub { owner = "anatol"; repo = pname; rev = version; - hash = "sha256-+0pY4/f/qfIT1lLn2DXmJBZcDDEOil4H3zNY3911ACQ="; + hash = "sha256-uHxPzuD3PxKAI2JOZd7lcLvcqYqk9gW9yeZgOS1Y7x4="; }; - vendorHash = "sha256-RmRY+HoNuijfcK8gNbOIyWCOa50BVJd3IZv2+Pc3FYw="; + vendorHash = "sha256-uI6TvBtky7Bpt4SbbtwT3vdMYbI/Awy3wgPfOla1qMw="; postPatch = '' substituteInPlace init/main.go --replace "/usr/bin/fsck" "${unixtools.fsck}/bin/fsck" From 6f5bfa0416e68bb81b56f1b019c1a4b8200620b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 13:32:18 +0000 Subject: [PATCH 038/151] davfs2: 1.7.0 -> 1.7.1 --- pkgs/by-name/da/davfs2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/da/davfs2/package.nix b/pkgs/by-name/da/davfs2/package.nix index 529d963af304..ee7aca4f7d31 100644 --- a/pkgs/by-name/da/davfs2/package.nix +++ b/pkgs/by-name/da/davfs2/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "davfs2"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { url = "mirror://savannah/davfs2/davfs2-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-JR23Wic4DMoTMLG5cXAMXl3MDJDlpHYiKF8BQO3+Oi8="; + sha256 = "sha256-KY7dDGdzy+JY4VUqQxrK6msu7bcIeImnNdrviIX8saw="; }; nativeBuildInputs = [ From 1751934f580ef5fc06286095160f5d9b56ce303a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 13:53:27 +0000 Subject: [PATCH 039/151] kaffeine: 2.0.18 -> 2.0.19 --- pkgs/applications/video/kaffeine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kaffeine/default.nix b/pkgs/applications/video/kaffeine/default.nix index c2866e280f12..0dc3ecc66df4 100644 --- a/pkgs/applications/video/kaffeine/default.nix +++ b/pkgs/applications/video/kaffeine/default.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "kaffeine"; - version = "2.0.18"; + version = "2.0.19"; src = fetchFromGitLab { domain = "invent.kde.org"; repo = pname; owner = "Multimedia"; rev = "v${version}"; - hash = "sha256-FOaS9gkzkHglbsNBNMwjzbHCNQg3Mbf+9so/Vfbaquc="; + hash = "sha256-AHyUS2vyeuWFLRXdIoy1sbssDgzz7N957vyf5rWiooI="; }; nativeBuildInputs = [ From dbbb288fe155049552094c50fa9c9d1d62e792bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 14:03:35 +0000 Subject: [PATCH 040/151] throttled: 0.10.0 -> 0.11 --- pkgs/by-name/th/throttled/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/th/throttled/package.nix b/pkgs/by-name/th/throttled/package.nix index 1aa4c5ea1a2d..5131de66d1dd 100644 --- a/pkgs/by-name/th/throttled/package.nix +++ b/pkgs/by-name/th/throttled/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "throttled"; - version = "0.10.0"; + version = "0.11"; src = fetchFromGitHub { owner = "erpalma"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0MsPp6y4r/uZB2SplKV+SAiJoxIs2jgOQmQoQQ2ZKwI="; + sha256 = "sha256-+3ktDkr5hvOfHcch4+mjgJqcuw24UgWTkJqTyDQumyk="; }; nativeBuildInputs = [ From 4230118f13f6c7247a1b54a886aa7e5a2471d355 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 14:03:45 +0000 Subject: [PATCH 041/151] corosync: 3.1.8 -> 3.1.9 --- pkgs/by-name/co/corosync/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/corosync/package.nix b/pkgs/by-name/co/corosync/package.nix index f24838b2df66..f8011e973ee8 100644 --- a/pkgs/by-name/co/corosync/package.nix +++ b/pkgs/by-name/co/corosync/package.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "corosync"; - version = "3.1.8"; + version = "3.1.9"; src = fetchurl { url = "http://build.clusterlabs.org/corosync/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-cCNUT6O7NsALvKvZk1tyabQdiWc4oQjtMuqbnJsn7D0="; + sha256 = "sha256-IDNUu93uGpezxQoHbq6JxjX0Bt1nTMrvyUu5CSrNlTU="; }; nativeBuildInputs = [ makeWrapper pkg-config ]; From 0111d0a26494169b7ddb9550a9ead930ba441e7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 14:34:02 +0000 Subject: [PATCH 042/151] siege: 4.1.6 -> 4.1.7 --- pkgs/by-name/si/siege/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/siege/package.nix b/pkgs/by-name/si/siege/package.nix index b26b21146175..6a83e43c1efd 100644 --- a/pkgs/by-name/si/siege/package.nix +++ b/pkgs/by-name/si/siege/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "siege"; - version = "4.1.6"; + version = "4.1.7"; src = fetchurl { url = "http://download.joedog.org/siege/${pname}-${version}.tar.gz"; - hash = "sha256-MJ1Ym/yBm28V0uXoWRs8DG9pNiT1Bg7qwGek2ad1fek="; + hash = "sha256-7BQM7dFZl5OD1g2+h6AVHCwSraeHkQlaj6hK5jW5MCY="; }; NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux [ From 54d12a3009bd9f34c0e0669dae469dced0cbfbd1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 15:15:42 +0000 Subject: [PATCH 043/151] valentina: 0.7.52 -> 0.7.53 --- pkgs/applications/misc/valentina/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/valentina/default.nix b/pkgs/applications/misc/valentina/default.nix index 18109f96917e..b1db8c14788f 100644 --- a/pkgs/applications/misc/valentina/default.nix +++ b/pkgs/applications/misc/valentina/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "valentina"; - version = "0.7.52"; + version = "0.7.53"; src = fetchFromGitLab { owner = "smart-pattern"; repo = "valentina"; rev = "v${version}"; - hash = "sha256-DmNRBxqyBvDTdA7Sz9X04Dhejtxx7tOVpST+SkUNguM="; + hash = "sha256-vIlqrK7wyFaXKfvcJ3FtkAwUt6Xb/47qxcDGy1Ty2uk="; }; postPatch = '' From 6f1a52d0bffb982f42e7aa0e5f3fdeae680c5996 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 17:42:11 +0000 Subject: [PATCH 044/151] hugin: 2023.0.0 -> 2024.0.1 --- pkgs/applications/graphics/hugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 3ef74acca7d6..3674d45c53c7 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation rec { pname = "hugin"; - version = "2023.0.0"; + version = "2024.0.1"; src = fetchurl { url = "mirror://sourceforge/hugin/hugin-${version}.tar.bz2"; - hash = "sha256-BKOfzMYBfgVExjm9IjCUcsV001s0Vcut4fw4cOYxYys="; + hash = "sha256-E+wM3utOtjFJyDN2jT43Tnz1pqjY0C1QiFzklvBbp+Q="; }; buildInputs = [ From d9fa748b6ed361f3b6dde160eca14775709d50b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 18:52:12 +0000 Subject: [PATCH 045/151] swaysome: 2.1.1 -> 2.1.2 --- pkgs/by-name/sw/swaysome/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sw/swaysome/package.nix b/pkgs/by-name/sw/swaysome/package.nix index 791eaa2b5fc7..755456dad7a5 100644 --- a/pkgs/by-name/sw/swaysome/package.nix +++ b/pkgs/by-name/sw/swaysome/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "swaysome"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitLab { owner = "hyask"; repo = pname; rev = version; - hash = "sha256-HRLMfpnqjDgkOIaH/7DxeYzoZn/0c0KUAmir8XIwesg="; + hash = "sha256-2Q88/XgPN+byEo3e1yvwcwSQxPgPTtgy/rNc/Yduo3U="; }; - cargoHash = "sha256-e5B90tIiXxuaRseok69EN4xuoRlCyiTVgEcAqvVg/dM="; + cargoHash = "sha256-rGmQihmVGKOXgX2oEQiIagdyUwzOteJfh5jxfoeD5bs="; meta = with lib; { description = "Helper to make sway behave more like awesomewm"; From 345ee0e6ca177e87866ea59bb06c205c9d90a5da Mon Sep 17 00:00:00 2001 From: Alexander Nortung Date: Mon, 2 Dec 2024 21:51:43 +0100 Subject: [PATCH 046/151] factorio: 2.0.22 -> 2.0.23 --- pkgs/by-name/fa/factorio/versions.json | 64 +++++++++++++------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json index f230733a6d14..a39fbc165c7f 100644 --- a/pkgs/by-name/fa/factorio/versions.json +++ b/pkgs/by-name/fa/factorio/versions.json @@ -3,25 +3,25 @@ "alpha": { "experimental": { "candidateHashFilenames": [ - "factorio_linux_2.0.22.tar.xz" + "factorio_linux_2.0.23.tar.xz" ], - "name": "factorio_alpha_x64-2.0.22.tar.xz", + "name": "factorio_alpha_x64-2.0.23.tar.xz", "needsAuth": true, - "sha256": "469fb0bd5e6a30e9a282ca0b4522e1cfc514f5726b8e1b1f3b7b4bc1003d6ca3", + "sha256": "3a3f27a5364d33896c8b35d352d0d2d6086b4ba98627eda71b26e57127309bfb", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.22/alpha/linux64", - "version": "2.0.22" + "url": "https://factorio.com/get-download/2.0.23/alpha/linux64", + "version": "2.0.23" }, "stable": { "candidateHashFilenames": [ - "factorio_linux_2.0.21.tar.xz" + "factorio_linux_2.0.23.tar.xz" ], - "name": "factorio_alpha_x64-2.0.21.tar.xz", + "name": "factorio_alpha_x64-2.0.23.tar.xz", "needsAuth": true, - "sha256": "275e0d78d0671da28cf1fbc8d07c99239600ba2fe475ea49ce93436258cf6901", + "sha256": "3a3f27a5364d33896c8b35d352d0d2d6086b4ba98627eda71b26e57127309bfb", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.21/alpha/linux64", - "version": "2.0.21" + "url": "https://factorio.com/get-download/2.0.23/alpha/linux64", + "version": "2.0.23" } }, "demo": { @@ -51,51 +51,51 @@ "expansion": { "experimental": { "candidateHashFilenames": [ - "factorio-space-age_linux_2.0.22.tar.xz" + "factorio-space-age_linux_2.0.23.tar.xz" ], - "name": "factorio_expansion_x64-2.0.22.tar.xz", + "name": "factorio_expansion_x64-2.0.23.tar.xz", "needsAuth": true, - "sha256": "67ae6c12897519e9d6851b045a5bf6f7fc15c08b4d927832959399492ab18dde", + "sha256": "8c6bb2c3afd198b8d5e1042f2babcb2db2d55645d1e84d9cfbba77cd83ae9e6a", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.22/expansion/linux64", - "version": "2.0.22" + "url": "https://factorio.com/get-download/2.0.23/expansion/linux64", + "version": "2.0.23" }, "stable": { "candidateHashFilenames": [ - "factorio-space-age_linux_2.0.21.tar.xz" + "factorio-space-age_linux_2.0.23.tar.xz" ], - "name": "factorio_expansion_x64-2.0.21.tar.xz", + "name": "factorio_expansion_x64-2.0.23.tar.xz", "needsAuth": true, - "sha256": "55a55ae2bca596b8f4a2b8f72deb543d9b494d8f030f394efa4fd6d9bb0a9802", + "sha256": "8c6bb2c3afd198b8d5e1042f2babcb2db2d55645d1e84d9cfbba77cd83ae9e6a", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.21/expansion/linux64", - "version": "2.0.21" + "url": "https://factorio.com/get-download/2.0.23/expansion/linux64", + "version": "2.0.23" } }, "headless": { "experimental": { "candidateHashFilenames": [ - "factorio-headless_linux_2.0.22.tar.xz", - "factorio_headless_x64_2.0.22.tar.xz" + "factorio-headless_linux_2.0.23.tar.xz", + "factorio_headless_x64_2.0.23.tar.xz" ], - "name": "factorio_headless_x64-2.0.22.tar.xz", + "name": "factorio_headless_x64-2.0.23.tar.xz", "needsAuth": false, - "sha256": "14c3eea7600fbe7f35bca52fe4c277e8f5e23b34c35ebebaa46c6752c750cb85", + "sha256": "e819fc9ad6df061bf9d4bffc91988dd18d0e3982c8b1c22c0525d78bda3ef216", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.22/headless/linux64", - "version": "2.0.22" + "url": "https://factorio.com/get-download/2.0.23/headless/linux64", + "version": "2.0.23" }, "stable": { "candidateHashFilenames": [ - "factorio-headless_linux_2.0.21.tar.xz", - "factorio_headless_x64_2.0.21.tar.xz" + "factorio-headless_linux_2.0.23.tar.xz", + "factorio_headless_x64_2.0.23.tar.xz" ], - "name": "factorio_headless_x64-2.0.21.tar.xz", + "name": "factorio_headless_x64-2.0.23.tar.xz", "needsAuth": false, - "sha256": "1d6d2785006d6a8d9d5fdcdaa7097a189ec35ba95f3521025dc4e046f7a1398e", + "sha256": "e819fc9ad6df061bf9d4bffc91988dd18d0e3982c8b1c22c0525d78bda3ef216", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.21/headless/linux64", - "version": "2.0.21" + "url": "https://factorio.com/get-download/2.0.23/headless/linux64", + "version": "2.0.23" } } } From 3398fff9b8aee3baf962d195a21c91e89d37b6c3 Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Tue, 3 Dec 2024 15:03:17 +0100 Subject: [PATCH 047/151] linuxPackages.lkrg: use finalAttrs pattern --- pkgs/os-specific/linux/lkrg/default.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/lkrg/default.nix b/pkgs/os-specific/linux/lkrg/default.nix index 4d6118f8b9f8..4057b125f7fd 100644 --- a/pkgs/os-specific/linux/lkrg/default.nix +++ b/pkgs/os-specific/linux/lkrg/default.nix @@ -1,16 +1,24 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, kernel }: +{ + lib, + stdenv, + fetchpatch, + fetchFromGitHub, + kernel, +}: let - isKernelRT = (kernel.structuredExtraConfig ? PREEMPT_RT) && (kernel.structuredExtraConfig.PREEMPT_RT == lib.kernel.yes); + isKernelRT = + (kernel.structuredExtraConfig ? PREEMPT_RT) + && (kernel.structuredExtraConfig.PREEMPT_RT == lib.kernel.yes); in -stdenv.mkDerivation rec { - name = "${pname}-${version}-${kernel.version}"; +stdenv.mkDerivation (finalAttrs: { + name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}"; pname = "lkrg"; version = "0.9.5"; src = fetchFromGitHub { owner = "lkrg-org"; repo = "lkrg"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-+yIKkTvfVbLnFBoXSKGebB1A8KqpaRmsLh8SsNuI9Dc="; }; patches = [ @@ -50,4 +58,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; broken = kernel.kernelOlder "5.10" || kernel.kernelAtLeast "6.1" || isKernelRT; }; -} +}) From 5dca7395b70fc36491b5accf21159c62097060b1 Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Tue, 3 Dec 2024 15:14:15 +0100 Subject: [PATCH 048/151] linuxPackages.lkrg: 0.9.5 -> 0.9.9 --- pkgs/os-specific/linux/lkrg/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/lkrg/default.nix b/pkgs/os-specific/linux/lkrg/default.nix index 4057b125f7fd..9b5676037776 100644 --- a/pkgs/os-specific/linux/lkrg/default.nix +++ b/pkgs/os-specific/linux/lkrg/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, - fetchpatch, fetchFromGitHub, kernel, }: @@ -13,21 +12,14 @@ in stdenv.mkDerivation (finalAttrs: { name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}"; pname = "lkrg"; - version = "0.9.5"; + version = "0.9.9"; src = fetchFromGitHub { owner = "lkrg-org"; repo = "lkrg"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-+yIKkTvfVbLnFBoXSKGebB1A8KqpaRmsLh8SsNuI9Dc="; + hash = "sha256-dxgkEj8HGOX4AMZRNbhv3utrNjKDFpp7kZmj17Wp2HE="; }; - patches = [ - (fetchpatch { - name = "fix-aarch64.patch"; - url = "https://github.com/lkrg-org/lkrg/commit/a4e5c00f13f7081b346bc3736e4c035e3d17d3f7.patch"; - sha256 = "sha256-DPscqi+DySHwFxGuGe7P2itPkoyb3XGu5Xp2S/ezP4Y="; - }) - ]; hardeningDisable = [ "pic" ]; @@ -37,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: { "KERNEL=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + enableParallelBuilding = true; dontConfigure = true; prePatch = '' @@ -56,6 +49,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Only; maintainers = with maintainers; [ chivay ]; platforms = platforms.linux; - broken = kernel.kernelOlder "5.10" || kernel.kernelAtLeast "6.1" || isKernelRT; + broken = kernel.kernelOlder "5.10" || isKernelRT; }; }) From ec381eaaddbe7f1d3ed6c53698d4177ec856253d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 00:45:00 +0000 Subject: [PATCH 049/151] linuxPackages.corefreq: 1.98.4 -> 1.98.7 --- pkgs/os-specific/linux/corefreq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/corefreq/default.nix b/pkgs/os-specific/linux/corefreq/default.nix index 59da0e077069..0f716e145630 100644 --- a/pkgs/os-specific/linux/corefreq/default.nix +++ b/pkgs/os-specific/linux/corefreq/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "corefreq"; - version = "1.98.4"; + version = "1.98.7"; src = fetchFromGitHub { owner = "cyring"; repo = "CoreFreq"; rev = version; - hash = "sha256-ljo8EDoJmcdfVvC8s+Xbf5TsYruvSOU1OSYBPwQst1c="; + hash = "sha256-/kvDwIEUbcO80keG3w3x3IfLaXbrbaptUAJxvDh5rlY="; }; nativeBuildInputs = kernel.moduleBuildDependencies; From 9e0498419864168b9ce8df973ff35f9dc25e939e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 17:53:02 +0000 Subject: [PATCH 050/151] virtiofsd: 1.12.0 -> 1.13.0 --- pkgs/by-name/vi/virtiofsd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vi/virtiofsd/package.nix b/pkgs/by-name/vi/virtiofsd/package.nix index a5f93738f690..4c8fb25a8f68 100644 --- a/pkgs/by-name/vi/virtiofsd/package.nix +++ b/pkgs/by-name/vi/virtiofsd/package.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "virtiofsd"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitLab { owner = "virtio-fs"; repo = "virtiofsd"; rev = "v${version}"; - hash = "sha256-2+PiorzYHxShatFbfQCry1bjBNL65/TxEj9MmdKmqP0="; + hash = "sha256-IM1xdwiP2NhWpxnyHzwXhsSL4bw2jH0IZLcVhY+Gr50="; }; separateDebugInfo = true; - cargoHash = "sha256-hXQ/wDDDBV788SvZnYmjiPVrEGCPVusq0O+Uyupgfd0="; + cargoHash = "sha256-mD6hZxkqLGdzMfeD9BDZDObCm607mR6LTWhWwDsfRH8="; LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib"; LIBCAPNG_LINK_TYPE = From 3a4968884a2471d87096052554f1c16bf2bbe941 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 20:47:30 +0000 Subject: [PATCH 051/151] opera: 114.0.5282.102 -> 115.0.5322.77 --- pkgs/by-name/op/opera/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/opera/package.nix b/pkgs/by-name/op/opera/package.nix index c2ca46cf3373..21c63c0a4346 100644 --- a/pkgs/by-name/op/opera/package.nix +++ b/pkgs/by-name/op/opera/package.nix @@ -51,11 +51,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "114.0.5282.102"; + version = "115.0.5322.77"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - hash = "sha256-PBbozIdA+cfEzGIyL1P+25FZtrnd7ldctOtZYomKd/8="; + hash = "sha256-mMXwshT15+5R2/jCSAutO4UVFGAV2Enc4IjvUeqyCCU="; }; nativeBuildInputs = [ From 1ff76edc0aeb17d602f156aa52ba3e7e98bf1592 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 22:46:44 +0000 Subject: [PATCH 052/151] datovka: 4.24.1 -> 4.24.2 --- pkgs/applications/networking/datovka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix index b445676ca378..5f65436b76bc 100644 --- a/pkgs/applications/networking/datovka/default.nix +++ b/pkgs/applications/networking/datovka/default.nix @@ -12,11 +12,11 @@ mkDerivation rec { pname = "datovka"; - version = "4.24.1"; + version = "4.24.2"; src = fetchurl { url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz"; - sha256 = "sha256-/thevIj3nliVkkFGQ0fr6qAprkNj1FgHsXx7Wmn10xI="; + sha256 = "sha256-5wgtL3j/3BdYxHTGrK1KCK1t8GTiERaH2nIlRYm5XQU="; }; buildInputs = [ libdatovka qmake qtbase qtsvg libxml2 qtwebsockets ]; From c71e8a269d2e8dfc68137bcbe941a92ec065bb3b Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Fri, 6 Dec 2024 08:03:58 -0700 Subject: [PATCH 053/151] linuxPackages.virtio_vmmci: 0.6.0 -> 0.6.2 This actually builds on 6.12 kernels. Resolves #361728. --- pkgs/os-specific/linux/virtio_vmmci/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/virtio_vmmci/default.nix b/pkgs/os-specific/linux/virtio_vmmci/default.nix index abb359fe06e4..7b0853f4dca0 100644 --- a/pkgs/os-specific/linux/virtio_vmmci/default.nix +++ b/pkgs/os-specific/linux/virtio_vmmci/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "virtio_vmmci"; - version = "0.6.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "voutilad"; repo = "virtio_vmmci"; rev = version; - hash = "sha256-dMh6bqlhsp/cWKqiJ9xjVI9yJj2w1ap7agKSnRjadXA="; + hash = "sha256-h8yu4+vTgpAD+sKa1KnVD+qubiIlkYtG2nmQnXOi/sk="; }; hardeningDisable = [ "pic" "format" ]; From 1c4001f9cbb52de31412ab52b3951551a4ae007e Mon Sep 17 00:00:00 2001 From: Marco Rebhan Date: Mon, 2 Dec 2024 14:23:04 +0100 Subject: [PATCH 054/151] cplex: set meta.mainProgram --- pkgs/applications/science/math/cplex/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index e80444b70b27..bdb8afb9dc02 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -81,6 +81,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Optimization solver for mathematical programming"; homepage = "https://www.ibm.com/be-en/marketplace/ibm-ilog-cplex"; + mainProgram = "cplex"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; From 1f75f5cd8092b6dd7216be9dd5d2793e99e5d0b5 Mon Sep 17 00:00:00 2001 From: Marco Rebhan Date: Mon, 2 Dec 2024 14:23:04 +0100 Subject: [PATCH 055/151] cplex: fix phase hooks --- pkgs/applications/science/math/cplex/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index bdb8afb9dc02..9b0bbcfdd244 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -31,16 +31,22 @@ stdenv.mkDerivation rec { unpackPhase = "cp $src $name"; - patchPhase = '' + postPatch = '' sed -i -e 's|/usr/bin/tr"|tr" |' $name ''; buildPhase = '' + runHook preBuild + export JAVA_TOOL_OPTIONS=-Djdk.util.zip.disableZip64ExtraFieldValidation=true sh $name LAX_VM ${openjdk}/bin/java -i silent -DLICENSE_ACCEPTED=TRUE -DUSER_INSTALL_DIR=$out + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin ln -s $out/opl/bin/x86-64_linux/oplrun\ $out/opl/bin/x86-64_linux/oplrunjava\ @@ -48,12 +54,16 @@ stdenv.mkDerivation rec { $out/cplex/bin/x86-64_linux/cplex\ $out/cpoptimizer/bin/x86-64_linux/cpoptimizer\ $out/bin + + runHook postInstall ''; fixupPhase = let libraryPath = lib.makeLibraryPath [ stdenv.cc.cc gtk2 xorg.libXtst ]; in '' + runHook preFixup + interpreter=${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 for pgm in $out/opl/bin/x86-64_linux/oplrun $out/opl/bin/x86-64_linux/oplrunjava $out/opl/oplide/oplide; @@ -71,6 +81,8 @@ stdenv.mkDerivation rec { patchelf --set-interpreter "$interpreter" $pgm; fi done + + runHook postFixup ''; passthru = { From b48264149acecc5b4e43679d0c758f70e874c387 Mon Sep 17 00:00:00 2001 From: Marco Rebhan Date: Mon, 2 Dec 2024 14:23:04 +0100 Subject: [PATCH 056/151] cplex: move doc and license to share, remove uninstall dir --- pkgs/applications/science/math/cplex/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index 9b0bbcfdd244..27568cdb2144 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -55,6 +55,12 @@ stdenv.mkDerivation rec { $out/cpoptimizer/bin/x86-64_linux/cpoptimizer\ $out/bin + mkdir -p $out/share/doc + mv $out/doc $out/share/doc/$name + + mkdir -p $out/share/licenses + mv $out/license $out/share/licenses/$name + runHook postInstall ''; @@ -64,6 +70,8 @@ stdenv.mkDerivation rec { in '' runHook preFixup + rm -r $out/Uninstall + interpreter=${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 for pgm in $out/opl/bin/x86-64_linux/oplrun $out/opl/bin/x86-64_linux/oplrunjava $out/opl/oplide/oplide; From e5e587880922d00fa025d5b1d13f3fd55577ba9c Mon Sep 17 00:00:00 2001 From: Marco Rebhan Date: Mon, 2 Dec 2024 14:23:04 +0100 Subject: [PATCH 057/151] cplex: install desktop entry --- .../science/math/cplex/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index 27568cdb2144..01309b6db7c3 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeWrapper, openjdk, gtk2, xorg, glibcLocales, releasePath ? null }: +{ lib, stdenv, makeDesktopItem, copyDesktopItems, makeWrapper, openjdk, gtk2, xorg, glibcLocales, releasePath ? null }: # To use this package, you need to download your own cplex installer from IBM # and override the releasePath attribute to point to the location of the file. @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { else releasePath; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ copyDesktopItems makeWrapper ]; buildInputs = [ openjdk gtk2 xorg.libXtst glibcLocales ]; unpackPhase = "cp $src $name"; @@ -55,6 +55,9 @@ stdenv.mkDerivation rec { $out/cpoptimizer/bin/x86-64_linux/cpoptimizer\ $out/bin + mkdir -p $out/share/pixmaps + ln -s $out/opl/oplide/icon.xpm $out/share/pixmaps/oplide.xpm + mkdir -p $out/share/doc mv $out/doc $out/share/doc/$name @@ -64,6 +67,17 @@ stdenv.mkDerivation rec { runHook postInstall ''; + desktopItems = [ + (makeDesktopItem { + name = "oplide"; + desktopName = "IBM ILOG CPLEX Optimization Studio"; + genericName = "Optimization Software"; + icon = "oplide"; + exec = "oplide"; + categories = [ "Development" "IDE" "Math" "Science" ]; + }) + ]; + fixupPhase = let libraryPath = lib.makeLibraryPath [ stdenv.cc.cc gtk2 xorg.libXtst ]; From 9351aae45269f888708711d25e2fd8e60a7a7e7c Mon Sep 17 00:00:00 2001 From: Marco Rebhan Date: Mon, 2 Dec 2024 16:49:12 +0100 Subject: [PATCH 058/151] cplex: put openjdk in nativeBuildInputs --- pkgs/applications/science/math/cplex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index 01309b6db7c3..70f5cbbb266a 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { else releasePath; - nativeBuildInputs = [ copyDesktopItems makeWrapper ]; - buildInputs = [ openjdk gtk2 xorg.libXtst glibcLocales ]; + nativeBuildInputs = [ copyDesktopItems makeWrapper openjdk ]; + buildInputs = [ gtk2 xorg.libXtst glibcLocales ]; unpackPhase = "cp $src $name"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { runHook preBuild export JAVA_TOOL_OPTIONS=-Djdk.util.zip.disableZip64ExtraFieldValidation=true - sh $name LAX_VM ${openjdk}/bin/java -i silent -DLICENSE_ACCEPTED=TRUE -DUSER_INSTALL_DIR=$out + sh $name LAX_VM "$(command -v java)" -i silent -DLICENSE_ACCEPTED=TRUE -DUSER_INSTALL_DIR=$out runHook postBuild ''; From a4f8586a70208c5c579d80dea03910f91771bd86 Mon Sep 17 00:00:00 2001 From: Marco Rebhan Date: Mon, 2 Dec 2024 15:23:04 +0100 Subject: [PATCH 059/151] cplex: use autoPatchelfHook --- .../applications/science/math/cplex/default.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index 70f5cbbb266a..1293a3235e3c 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeDesktopItem, copyDesktopItems, makeWrapper, openjdk, gtk2, xorg, glibcLocales, releasePath ? null }: +{ lib, stdenv, autoPatchelfHook, makeDesktopItem, copyDesktopItems, makeWrapper, alsa-lib, openjdk, sqlite, unixODBC, gtk2, xorg, glibcLocales, releasePath ? null }: # To use this package, you need to download your own cplex installer from IBM # and override the releasePath attribute to point to the location of the file. @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { else releasePath; - nativeBuildInputs = [ copyDesktopItems makeWrapper openjdk ]; - buildInputs = [ gtk2 xorg.libXtst glibcLocales ]; + nativeBuildInputs = [ autoPatchelfHook copyDesktopItems makeWrapper openjdk ]; + buildInputs = [ alsa-lib gtk2 sqlite unixODBC xorg.libXtst glibcLocales ]; unpackPhase = "cp $src $name"; @@ -86,24 +86,13 @@ stdenv.mkDerivation rec { rm -r $out/Uninstall - interpreter=${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 - for pgm in $out/opl/bin/x86-64_linux/oplrun $out/opl/bin/x86-64_linux/oplrunjava $out/opl/oplide/oplide; do - patchelf --set-interpreter "$interpreter" $pgm; wrapProgram $pgm \ --prefix LD_LIBRARY_PATH : $out/opl/bin/x86-64_linux:${libraryPath} \ --set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive; done - for pgm in $out/cplex/bin/x86-64_linux/cplex $out/cpoptimizer/bin/x86-64_linux/cpoptimizer $out/opl/oplide/jre/bin/*; - do - if grep ELF $pgm > /dev/null; - then - patchelf --set-interpreter "$interpreter" $pgm; - fi - done - runHook postFixup ''; From 7c3295abd5bcce3fd9570d59dbd64898bbb5826c Mon Sep 17 00:00:00 2001 From: Marco Rebhan Date: Mon, 2 Dec 2024 17:12:04 +0100 Subject: [PATCH 060/151] cplex: use makeWrapper instead of wrapProgram --- .../science/math/cplex/default.nix | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index 1293a3235e3c..0a209560e9f5 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -48,12 +48,17 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/bin - ln -s $out/opl/bin/x86-64_linux/oplrun\ - $out/opl/bin/x86-64_linux/oplrunjava\ - $out/opl/oplide/oplide\ - $out/cplex/bin/x86-64_linux/cplex\ - $out/cpoptimizer/bin/x86-64_linux/cpoptimizer\ - $out/bin + + for pgm in \ + $out/opl/bin/x86-64_linux/oplrun \ + $out/opl/bin/x86-64_linux/oplrunjava \ + $out/opl/oplide/oplide \ + $out/cplex/bin/x86-64_linux/cplex \ + $out/cpoptimizer/bin/x86-64_linux/cpoptimizer + do + makeWrapper "$pgm" "$out/bin/$(basename "$pgm")" \ + --set-default LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive + done mkdir -p $out/share/pixmaps ln -s $out/opl/oplide/icon.xpm $out/share/pixmaps/oplide.xpm @@ -78,21 +83,11 @@ stdenv.mkDerivation rec { }) ]; - fixupPhase = - let - libraryPath = lib.makeLibraryPath [ stdenv.cc.cc gtk2 xorg.libXtst ]; - in '' + fixupPhase = '' runHook preFixup rm -r $out/Uninstall - for pgm in $out/opl/bin/x86-64_linux/oplrun $out/opl/bin/x86-64_linux/oplrunjava $out/opl/oplide/oplide; - do - wrapProgram $pgm \ - --prefix LD_LIBRARY_PATH : $out/opl/bin/x86-64_linux:${libraryPath} \ - --set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive; - done - runHook postFixup ''; From 2df4affe417a3a822fc7688f925c766a9aa1d7bc Mon Sep 17 00:00:00 2001 From: Marco Rebhan Date: Mon, 2 Dec 2024 15:23:04 +0100 Subject: [PATCH 061/151] cplex: fix oplide --- .../science/math/cplex/default.nix | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index 0a209560e9f5..d0fb7dfb73fd 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoPatchelfHook, makeDesktopItem, copyDesktopItems, makeWrapper, alsa-lib, openjdk, sqlite, unixODBC, gtk2, xorg, glibcLocales, releasePath ? null }: +{ lib, stdenv, autoPatchelfHook, makeDesktopItem, copyDesktopItems, makeWrapper, alsa-lib, glib, glib-networking, gsettings-desktop-schemas, gtk3, libsecret, openjdk, sqlite, unixODBC, gtk2, xorg, glibcLocales, releasePath ? null }: # To use this package, you need to download your own cplex installer from IBM # and override the releasePath attribute to point to the location of the file. @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { releasePath; nativeBuildInputs = [ autoPatchelfHook copyDesktopItems makeWrapper openjdk ]; - buildInputs = [ alsa-lib gtk2 sqlite unixODBC xorg.libXtst glibcLocales ]; + buildInputs = [ alsa-lib gsettings-desktop-schemas gtk2 sqlite unixODBC xorg.libXtst glibcLocales ]; unpackPhase = "cp $src $name"; @@ -44,7 +44,9 @@ stdenv.mkDerivation rec { runHook postBuild ''; - installPhase = '' + installPhase = let + libraryPath = lib.makeLibraryPath [ stdenv.cc.cc glib gtk2 gtk3 libsecret xorg.libXtst ]; + in '' runHook preInstall mkdir -p $out/bin @@ -56,8 +58,19 @@ stdenv.mkDerivation rec { $out/cplex/bin/x86-64_linux/cplex \ $out/cpoptimizer/bin/x86-64_linux/cpoptimizer do - makeWrapper "$pgm" "$out/bin/$(basename "$pgm")" \ + makeWrapperArgs=( --set-default LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive + ) + + if [[ "$pgm" = "$out/opl/oplide/oplide" ]]; then + makeWrapperArgs+=( + --prefix LD_LIBRARY_PATH : ${libraryPath} + --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + ) + fi + + makeWrapper "$pgm" "$out/bin/$(basename "$pgm")" "''${makeWrapperArgs[@]}" done mkdir -p $out/share/pixmaps From e7db63fb2c1188bb0ad99040a28380662f185573 Mon Sep 17 00:00:00 2001 From: Marco Rebhan Date: Mon, 2 Dec 2024 14:23:04 +0100 Subject: [PATCH 062/151] cplex: fix file permissions --- pkgs/applications/science/math/cplex/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index d0fb7dfb73fd..9e2fca3ad3ed 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -101,6 +101,21 @@ stdenv.mkDerivation rec { rm -r $out/Uninstall + bins=( + $out/bin/* + $out/cplex/bin/x86-64_linux/cplex + $out/cplex/bin/x86-64_linux/cplexamp + $out/cpoptimizer/bin/x86-64_linux/cpoptimizer + $out/opl/bin/x86-64_linux/oplrun + $out/opl/bin/x86-64_linux/oplrunjava + $out/opl/oplide/jre/bin/* + $out/opl/oplide/oplide + ) + + find $out -type d -exec chmod 755 {} \; + find $out -type f -exec chmod 644 {} \; + chmod +111 "''${bins[@]}" + runHook postFixup ''; From 67ac470441d3137e7182d10f4923c5b2dc41dd71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 09:27:07 +0000 Subject: [PATCH 063/151] alvr: 20.11.0 -> 20.11.1 --- pkgs/by-name/al/alvr/Cargo.lock | 241 +++++++++++++------------------ pkgs/by-name/al/alvr/package.nix | 6 +- 2 files changed, 102 insertions(+), 145 deletions(-) diff --git a/pkgs/by-name/al/alvr/Cargo.lock b/pkgs/by-name/al/alvr/Cargo.lock index cfa030ae627f..2132298cfc7a 100644 --- a/pkgs/by-name/al/alvr/Cargo.lock +++ b/pkgs/by-name/al/alvr/Cargo.lock @@ -166,7 +166,7 @@ dependencies = [ [[package]] name = "alvr_audio" -version = "20.11.0" +version = "20.11.1" dependencies = [ "alvr_common", "alvr_session", @@ -182,7 +182,7 @@ dependencies = [ [[package]] name = "alvr_client_core" -version = "20.11.0" +version = "20.11.1" dependencies = [ "alvr_audio", "alvr_common", @@ -192,7 +192,7 @@ dependencies = [ "android_logger", "app_dirs2", "bincode", - "bindgen", + "bindgen 0.70.1", "cc", "env_logger", "glow", @@ -217,7 +217,7 @@ dependencies = [ [[package]] name = "alvr_client_mock" -version = "20.11.0" +version = "20.11.1" dependencies = [ "alvr_client_core", "alvr_common", @@ -230,7 +230,7 @@ dependencies = [ [[package]] name = "alvr_client_openxr" -version = "20.11.0" +version = "20.11.1" dependencies = [ "alvr_client_core", "alvr_common", @@ -245,7 +245,7 @@ dependencies = [ [[package]] name = "alvr_common" -version = "20.11.0" +version = "20.11.1" dependencies = [ "anyhow", "backtrace", @@ -262,7 +262,7 @@ dependencies = [ [[package]] name = "alvr_dashboard" -version = "20.11.0" +version = "20.11.1" dependencies = [ "alvr_common", "alvr_events", @@ -273,15 +273,10 @@ dependencies = [ "alvr_session", "bincode", "chrono", - "console_error_panic_hook", "cros-libva", "eframe", "env_logger", - "ewebsock", - "futures", - "gloo-net", "ico", - "instant", "nvml-wrapper", "rand", "serde", @@ -289,17 +284,15 @@ dependencies = [ "settings-schema", "statrs", "sysinfo", - "tungstenite 0.23.0", + "tungstenite 0.24.0", "ureq", - "wasm-bindgen-futures", - "wasm-logger", "wgpu", "winres", ] [[package]] name = "alvr_events" -version = "20.11.0" +version = "20.11.1" dependencies = [ "alvr_common", "alvr_packets", @@ -310,7 +303,7 @@ dependencies = [ [[package]] name = "alvr_filesystem" -version = "20.11.0" +version = "20.11.1" dependencies = [ "dirs", "once_cell", @@ -318,7 +311,7 @@ dependencies = [ [[package]] name = "alvr_gui_common" -version = "20.11.0" +version = "20.11.1" dependencies = [ "alvr_common", "egui", @@ -326,7 +319,7 @@ dependencies = [ [[package]] name = "alvr_launcher" -version = "20.11.0" +version = "20.11.1" dependencies = [ "alvr_common", "alvr_gui_common", @@ -346,7 +339,7 @@ dependencies = [ [[package]] name = "alvr_packets" -version = "20.11.0" +version = "20.11.1" dependencies = [ "alvr_common", "alvr_session", @@ -356,7 +349,7 @@ dependencies = [ [[package]] name = "alvr_server_core" -version = "20.11.0" +version = "20.11.1" dependencies = [ "alvr_audio", "alvr_common", @@ -389,7 +382,7 @@ dependencies = [ [[package]] name = "alvr_server_io" -version = "20.11.0" +version = "20.11.1" dependencies = [ "alvr_common", "alvr_events", @@ -405,7 +398,7 @@ dependencies = [ [[package]] name = "alvr_server_openvr" -version = "20.11.0" +version = "20.11.1" dependencies = [ "alvr_common", "alvr_filesystem", @@ -413,7 +406,7 @@ dependencies = [ "alvr_server_core", "alvr_server_io", "alvr_session", - "bindgen", + "bindgen 0.70.1", "cc", "pkg-config", "walkdir", @@ -421,7 +414,7 @@ dependencies = [ [[package]] name = "alvr_session" -version = "20.11.0" +version = "20.11.1" dependencies = [ "alvr_common", "alvr_filesystem", @@ -434,7 +427,7 @@ dependencies = [ [[package]] name = "alvr_sockets" -version = "20.11.0" +version = "20.11.1" dependencies = [ "alvr_common", "alvr_session", @@ -447,7 +440,7 @@ dependencies = [ [[package]] name = "alvr_vrcompositor_wrapper" -version = "20.11.0" +version = "20.11.1" dependencies = [ "alvr_common", "alvr_filesystem", @@ -457,11 +450,11 @@ dependencies = [ [[package]] name = "alvr_vulkan_layer" -version = "20.11.0" +version = "20.11.1" dependencies = [ "alvr_common", "alvr_filesystem", - "bindgen", + "bindgen 0.70.1", "cc", "pkg-config", "walkdir", @@ -469,7 +462,7 @@ dependencies = [ [[package]] name = "alvr_xtask" -version = "20.11.0" +version = "20.11.1" dependencies = [ "alvr_filesystem", "pico-args", @@ -1063,6 +1056,24 @@ dependencies = [ "itertools", "lazy_static", "lazycell", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.70", +] + +[[package]] +name = "bindgen" +version = "0.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools", "log", "prettyplease", "proc-macro2", @@ -1071,7 +1082,6 @@ dependencies = [ "rustc-hash", "shlex", "syn 2.0.70", - "which", ] [[package]] @@ -1440,16 +1450,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "console_error_panic_hook" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" -dependencies = [ - "cfg-if", - "wasm-bindgen", -] - [[package]] name = "constant_time_eq" version = "0.3.0" @@ -1531,7 +1531,7 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9" dependencies = [ - "bindgen", + "bindgen 0.69.4", ] [[package]] @@ -1593,16 +1593,35 @@ dependencies = [ [[package]] name = "cros-libva" -version = "0.0.6" +version = "0.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f75943ee30eb2f8b4f3beb8f047e69ecc1c91d098c344b34a0fdd8dd8b2614a" +checksum = "1b1546af142fbf11a5cad3d1ee2ef64e4d7b69a28b244a79484024a1bc931c17" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "log", "pkg-config", "thiserror", ] +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" version = "0.8.20" @@ -2086,21 +2105,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "ewebsock" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6177769715c6ec5a324acee995183b22721ea23c58e49af14a828eadec85d120" -dependencies = [ - "document-features", - "js-sys", - "log", - "tungstenite 0.21.0", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "exec" version = "0.3.1" @@ -2418,9 +2422,9 @@ dependencies = [ [[package]] name = "glam" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94" +checksum = "c28091a37a5d09b555cb6628fd954da299b536433834f5b8e59eba78e0cbbf8a" dependencies = [ "serde", ] @@ -2431,40 +2435,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[package]] -name = "gloo-net" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43aaa242d1239a8822c15c645f02166398da4f8b5c4bae795c1f5b44e9eee173" -dependencies = [ - "futures-channel", - "futures-core", - "futures-sink", - "gloo-utils", - "http 0.2.12", - "js-sys", - "pin-project", - "serde", - "serde_json", - "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "gloo-utils" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" -dependencies = [ - "js-sys", - "serde", - "serde_json", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "glow" version = "0.13.1" @@ -3023,9 +2993,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", ] [[package]] @@ -3268,7 +3235,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf0d9716420364790e85cbb9d3ac2c950bde16a7dd36f3209b7dfdfc4a24d01f" dependencies = [ - "bindgen", + "bindgen 0.69.4", "cc", "system-deps", ] @@ -4089,8 +4056,8 @@ dependencies = [ [[package]] name = "openxr" -version = "0.19.0" -source = "git+https://github.com/Ralith/openxrs#d8ea5553d52c4bbaefe2537b8d70b8752f73694d" +version = "0.18.0" +source = "git+https://github.com/Ralith/openxrs?rev=9270509d23dc774b43a8b7289e8adf69fcac6828#9270509d23dc774b43a8b7289e8adf69fcac6828" dependencies = [ "libc", "libloading 0.8.4", @@ -4100,8 +4067,8 @@ dependencies = [ [[package]] name = "openxr-sys" -version = "0.11.0" -source = "git+https://github.com/Ralith/openxrs#d8ea5553d52c4bbaefe2537b8d70b8752f73694d" +version = "0.10.0" +source = "git+https://github.com/Ralith/openxrs?rev=9270509d23dc774b43a8b7289e8adf69fcac6828#9270509d23dc774b43a8b7289e8adf69fcac6828" dependencies = [ "libc", ] @@ -4275,7 +4242,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "849e188f90b1dda88fe2bfe1ad31fe5f158af2c98f80fb5d13726c44f3f01112" dependencies = [ - "bindgen", + "bindgen 0.69.4", "libspa-sys", "system-deps", ] @@ -4541,6 +4508,26 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + [[package]] name = "redox_syscall" version = "0.3.5" @@ -5340,16 +5327,16 @@ checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "sysinfo" -version = "0.30.13" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" +checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be" dependencies = [ - "cfg-if", "core-foundation-sys", "libc", + "memchr", "ntapi", - "once_cell", - "windows 0.52.0", + "rayon", + "windows 0.54.0", ] [[package]] @@ -5794,28 +5781,9 @@ dependencies = [ [[package]] name = "tungstenite" -version = "0.21.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http 1.1.0", - "httparse", - "log", - "rand", - "sha1", - "thiserror", - "url", - "utf-8", -] - -[[package]] -name = "tungstenite" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" +checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" dependencies = [ "byteorder", "bytes", @@ -6075,17 +6043,6 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" -[[package]] -name = "wasm-logger" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "074649a66bb306c8f2068c9016395fa65d8e08d2affcbf95acf3c24c3ab19718" -dependencies = [ - "log", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "wasm-streams" version = "0.4.0" diff --git a/pkgs/by-name/al/alvr/package.nix b/pkgs/by-name/al/alvr/package.nix index e1904ab6deff..8110d66e4d06 100644 --- a/pkgs/by-name/al/alvr/package.nix +++ b/pkgs/by-name/al/alvr/package.nix @@ -40,20 +40,20 @@ rustPlatform.buildRustPackage rec { pname = "alvr"; - version = "20.11.0"; + version = "20.11.1"; src = fetchFromGitHub { owner = "alvr-org"; repo = "ALVR"; rev = "refs/tags/v${version}"; fetchSubmodules = true; #TODO devendor openvr - hash = "sha256-zqeh9U0A/KHlRieq9Lf+7f04K3JG/vpE2gZ916ReXLc="; + hash = "sha256-d4KldPii8W1HcfnMSD8Fn+IGO/a3r8747APPjRCnbe8="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "openxr-0.19.0" = "sha256-bnMSjJh+zjLw4Pdxr7LLm6qYAJOK7hz5xORKZ2pVcGw="; + "openxr-0.18.0" = "sha256-v8sY9PROrqzkpuq3laIn2hPaX+DY7Fbca6i/Xiacd1g="; "settings-schema-0.2.0" = "sha256-luEdAKDTq76dMeo5kA+QDTHpRMFUg3n0qvyQ7DkId0k="; }; }; From fd5130310c55d195081d9b8839e741df1ae4ef38 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 23:22:04 +0000 Subject: [PATCH 064/151] calicoctl: 3.29.0 -> 3.29.1 --- pkgs/applications/networking/cluster/calico/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix index e776c537eccd..e4932bc8e8e0 100644 --- a/pkgs/applications/networking/cluster/calico/default.nix +++ b/pkgs/applications/networking/cluster/calico/default.nix @@ -2,16 +2,16 @@ builtins.mapAttrs (pname: { doCheck ? true, mainProgram ? pname, subPackages }: buildGoModule rec { inherit pname; - version = "3.29.0"; + version = "3.29.1"; src = fetchFromGitHub { owner = "projectcalico"; repo = "calico"; rev = "v${version}"; - hash = "sha256-bgcY/unCLAtPOeEwRJGl8u1dHYdO3tSzMTg47DHOsJM="; + hash = "sha256-e/xyrFJ9t+awpU8u8uYmXFRnk92/06vI5OoClyAMKTU="; }; - vendorHash = "sha256-9Kap6qHIttgMRSnSnTUvWj72jp5u2vIMy5l2sJRfKlU="; + vendorHash = "sha256-OP3J2NE491Aivzo80OmLAyQGe3hixLTz0p9FSA897ao="; inherit doCheck subPackages; From a67dc5b123f66fa2c6038d81285d34154a7c9714 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Dec 2024 03:27:40 +0000 Subject: [PATCH 065/151] srm-cuarzo: 0.8.0-1 -> 0.10.0-1 --- pkgs/by-name/sr/srm-cuarzo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sr/srm-cuarzo/package.nix b/pkgs/by-name/sr/srm-cuarzo/package.nix index edb84d89ca12..fd1d115ea763 100644 --- a/pkgs/by-name/sr/srm-cuarzo/package.nix +++ b/pkgs/by-name/sr/srm-cuarzo/package.nix @@ -14,9 +14,9 @@ }: stdenv.mkDerivation (self: { pname = "srm-cuarzo"; - version = "0.8.0-1"; + version = "0.10.0-1"; rev = "v${self.version}"; - hash = "sha256-QQYn7TR2+6nZHOohjqEg6uMt4OBvfYD4+bFiDIaC7SU="; + hash = "sha256-qkJVVoGU07wwcPsrIJi1gkl0uJaZM42kAX8PFQ68HDM="; src = fetchFromGitHub { inherit (self) rev hash; From afb7ab02601af18ab8926149bb8b6575144c82ee Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Sun, 8 Dec 2024 19:02:44 +0800 Subject: [PATCH 066/151] steam-devices-udev-rules: init at 1.0.0.61-unstable-2024-05-22 --- .../st/steam-devices-udev-rules/package.nix | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/st/steam-devices-udev-rules/package.nix diff --git a/pkgs/by-name/st/steam-devices-udev-rules/package.nix b/pkgs/by-name/st/steam-devices-udev-rules/package.nix new file mode 100644 index 000000000000..7290d0a5330a --- /dev/null +++ b/pkgs/by-name/st/steam-devices-udev-rules/package.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + bash, + nix-update-script, +}: + +stdenvNoCC.mkDerivation { + pname = "steam-devices-udev-rules"; + version = "1.0.0.61-unstable-2024-05-22"; + + src = fetchFromGitHub { + owner = "ValveSoftware"; + repo = "steam-devices"; + rev = "e2971e45063f6b327ccedbf18e168bda6749155c"; + hash = "sha256-kBqWw3TlCSWS7gJXgza2ghemypQ0AEg7NhWqAFnal04="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/udev/rules.d/ + cp *.rules $out/lib/udev/rules.d/ + substituteInPlace $out/lib/udev/rules.d/*.rules --replace-warn "/bin/sh" "${bash}/bin/sh" + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + + meta = with lib; { + description = "Udev rules list for gaming devices"; + homepage = "https://github.com/ValveSoftware/steam-devices"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ azuwis ]; + }; +} From 92b3ce1cdd5ec15d82d3ae61a34c87e3d6b8d5aa Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Sun, 8 Dec 2024 19:04:46 +0800 Subject: [PATCH 067/151] nixos/hardware.steam-hardware: use steam-devices-udev-rules ValveSoftware maintains an [udev rules repo][1] to help downstream distributions. `steam-devices-udev-rules` is created from that, and contains only udev rules. The udev rules contents are the some as `steam-unwrapped`. `hardware.steam-hardware.enable` option is also useful for apps like `cemu` and `rpcs3`, after this, it can be enabled without enabling `nixpkgs.config.allowUnfree` and installing `steam-unwrapped`. [1]: https://github.com/ValveSoftware/steam-devices --- nixos/modules/hardware/steam-hardware.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/hardware/steam-hardware.nix b/nixos/modules/hardware/steam-hardware.nix index bd1e6ae8f708..009bf3420825 100644 --- a/nixos/modules/hardware/steam-hardware.nix +++ b/nixos/modules/hardware/steam-hardware.nix @@ -16,7 +16,7 @@ in config = lib.mkIf cfg.enable { services.udev.packages = [ - pkgs.steam-unwrapped + pkgs.steam-devices-udev-rules ]; # The uinput module needs to be loaded in order to trigger the udev rules From f9e5ea91d89d126cadf07ae03fd985561a0cd783 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Dec 2024 12:52:49 +0000 Subject: [PATCH 068/151] flat-remix-gnome: 20240922 -> 20241208 --- pkgs/by-name/fl/flat-remix-gnome/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fl/flat-remix-gnome/package.nix b/pkgs/by-name/fl/flat-remix-gnome/package.nix index 8a6c2fc0e2c9..f7e57957a78c 100644 --- a/pkgs/by-name/fl/flat-remix-gnome/package.nix +++ b/pkgs/by-name/fl/flat-remix-gnome/package.nix @@ -7,25 +7,25 @@ let # make install will use dconf to find desktop background file uri. # consider adding an args to allow specify pictures manually. - # https://github.com/daniruiz/flat-remix-gnome/blob/20240922/Makefile#L38 + # https://github.com/daniruiz/flat-remix-gnome/blob/20241208/Makefile#L38 fake-dconf = writeScriptBin "dconf" "echo -n"; in stdenv.mkDerivation rec { pname = "flat-remix-gnome"; - version = "20240922"; + version = "20241208"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - hash = "sha256-/Md1CbEDe+N8Nu0WPrIUkEudqMvEARmHD9NtgE7sPLQ="; + hash = "sha256-pMxdx/D3M2DwEjrOZx/zY4zZjBUamo7+8/yvVOffxx0="; }; nativeBuildInputs = [ glib fake-dconf ]; makeFlags = [ "PREFIX=$(out)" ]; # make install will back up this file, it will fail if the file doesn't exist. - # https://github.com/daniruiz/flat-remix-gnome/blob/20240922/Makefile#L56 + # https://github.com/daniruiz/flat-remix-gnome/blob/20241208/Makefile#L56 preInstall = '' mkdir -p $out/share/gnome-shell/ touch $out/share/gnome-shell/gnome-shell-theme.gresource From 34e92a8fb3a2ca867bb89c6d0fac40fd4c518703 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Dec 2024 13:44:32 +0000 Subject: [PATCH 069/151] blivet-gui: 2.5.0 -> 2.6.0 --- pkgs/by-name/bl/blivet-gui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bl/blivet-gui/package.nix b/pkgs/by-name/bl/blivet-gui/package.nix index efe4fe2de785..69b5c03a9521 100644 --- a/pkgs/by-name/bl/blivet-gui/package.nix +++ b/pkgs/by-name/bl/blivet-gui/package.nix @@ -21,14 +21,14 @@ python3.pkgs.buildPythonApplication rec { pname = "blivet-gui"; - version = "2.5.0"; + version = "2.6.0"; format = "setuptools"; src = fetchFromGitHub { owner = "storaged-project"; repo = "blivet-gui"; - rev = version; - hash = "sha256-fKd2Vj8clZ6Q7bZipfN5umyMW2rBXMUnpAuDE70p67U="; + tag = version; + hash = "sha256-e9YdfFHmKXsbqkzs4++nNlvqm/p6lZmc01A+g+NtuDI="; }; postPatch = '' From 077c3cb19d9b2ca0e2ca87765b38961bbfc03cfe Mon Sep 17 00:00:00 2001 From: arthsmn Date: Sun, 8 Dec 2024 21:00:39 -0300 Subject: [PATCH 070/151] fzf: remove the unnecessary mkIf --- nixos/modules/programs/fzf.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/fzf.nix b/nixos/modules/programs/fzf.nix index b9258ab1e505..efebf503c6df 100644 --- a/nixos/modules/programs/fzf.nix +++ b/nixos/modules/programs/fzf.nix @@ -12,7 +12,7 @@ in }; config = lib.mkIf (cfg.keybindings || cfg.fuzzyCompletion) { - environment.systemPackages = lib.mkIf (cfg.keybindings || cfg.fuzzyCompletion) [ pkgs.fzf ]; + environment.systemPackages = [ pkgs.fzf ]; programs = { # load after programs.bash.completion.enable From a47317817d96a7e4136b782d84e710ff4cc8b585 Mon Sep 17 00:00:00 2001 From: arthsmn Date: Sun, 8 Dec 2024 21:01:45 -0300 Subject: [PATCH 071/151] fzf: add fish support --- nixos/modules/programs/fzf.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/programs/fzf.nix b/nixos/modules/programs/fzf.nix index efebf503c6df..dace24e91212 100644 --- a/nixos/modules/programs/fzf.nix +++ b/nixos/modules/programs/fzf.nix @@ -32,6 +32,10 @@ in ohMyZsh.plugins = lib.mkIf config.programs.zsh.ohMyZsh.enable [ "fzf" ]; }; + + fish.interactiveShellInit = lib.optionalString cfg.keybindings '' + source ${pkgs.fzf}/share/fzf/key-bindings.fish + ''; }; }; From 661e8cc5f8fac530e3a01848343a6fa76d11f386 Mon Sep 17 00:00:00 2001 From: arthsmn Date: Sun, 8 Dec 2024 21:09:09 -0300 Subject: [PATCH 072/151] fzf: update release notes with the change --- nixos/doc/manual/release-notes/rl-2505.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 982693d23f9b..0659d84bde30 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -115,4 +115,6 @@ - `bind.cacheNetworks` now only controls access for recursive queries, where it previously controlled access for all queries. +- `programs.fzf.keybindings` now supports the fish shell. + From 3c645ddc79251ba041c85a8bd21ebb1e9fdc2b0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Dec 2024 05:54:29 +0000 Subject: [PATCH 073/151] passt: 2024_10_30.ee7d0b6 -> 2024_11_27.c0fbc7e --- pkgs/by-name/pa/passt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/passt/package.nix b/pkgs/by-name/pa/passt/package.nix index ad04ac2b30ed..108315cc2049 100644 --- a/pkgs/by-name/pa/passt/package.nix +++ b/pkgs/by-name/pa/passt/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "passt"; - version = "2024_10_30.ee7d0b6"; + version = "2024_11_27.c0fbc7e"; src = fetchurl { url = "https://passt.top/passt/snapshot/passt-${finalAttrs.version}.tar.gz"; - hash = "sha256-x5WIqtWBfVt7+u47bfT2g92ghhaIjYt2GW279+sbKdE="; + hash = "sha256-S1UlQio4EtyzkJJ8e30+wwo6VFYfcscc6g/S1Qfgp18="; }; postPatch = '' From f868235eb7faeb7ff54d88e695815ae1e36ebcf2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Dec 2024 06:34:08 +0000 Subject: [PATCH 074/151] quisk: 4.2.39 -> 4.2.40 --- pkgs/by-name/qu/quisk/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quisk/package.nix b/pkgs/by-name/qu/quisk/package.nix index b364b6fd6336..9f8bfb14f89b 100644 --- a/pkgs/by-name/qu/quisk/package.nix +++ b/pkgs/by-name/qu/quisk/package.nix @@ -8,11 +8,11 @@ python3.pkgs.buildPythonApplication rec { pname = "quisk"; - version = "4.2.39"; + version = "4.2.40"; src = fetchPypi { inherit pname version; - hash = "sha256-LE7VPKzpDycUNHpdmO43GqlHnF/gwr6H7LWq8DpcXdk="; + hash = "sha256-0m6KtwXOH9ym9ZLhbHKmJvusy1GbTDN21DHykmOvG44="; }; buildInputs = [ From 3e0e5a0dce7ada4ed38b29e0aa9000ad99546574 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Mon, 9 Dec 2024 17:31:27 +0000 Subject: [PATCH 075/151] python3Packages.gevent: remove python3Packages.opentracing usage --- pkgs/development/python-modules/gevent/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index 02df1ed58604..95156b9b9d9a 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -21,7 +21,6 @@ # for passthru.tests dulwich, gunicorn, - opentracing, pika, }: @@ -71,7 +70,6 @@ buildPythonPackage rec { inherit dulwich gunicorn - opentracing pika ; } // lib.filterAttrs (k: v: lib.hasInfix "gevent" k) python.pkgs; From e4656b9d2a17e46498928435b6c5f841ca24f8af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Dec 2024 18:49:46 +0000 Subject: [PATCH 076/151] termius: 9.8.5 -> 9.9.0 --- pkgs/by-name/te/termius/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/termius/package.nix b/pkgs/by-name/te/termius/package.nix index 4456db2c652d..659a1a831877 100644 --- a/pkgs/by-name/te/termius/package.nix +++ b/pkgs/by-name/te/termius/package.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { pname = "termius"; - version = "9.8.5"; - revision = "208"; + version = "9.9.0"; + revision = "211"; src = fetchurl { # find the latest version with @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # and the sha512 with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_${revision}.snap"; - hash = "sha512-Kdw3TiVDX3vXxlNxBT2Lhg0QMjO712XVFF7RqaYVZ//iirk+DLGgkefMJC5sN/Y0Fc1Vciw0AazpXxbtkL8n2Q=="; + hash = "sha512-7oaVWe0H4y3tiSD8Cgj14fEaJQj3ekoczJjv5JvrU5I9ylRoe8XHNqD0MwOYFIpICyyKfoj0UonyVgggGLUq5A=="; }; desktopItem = makeDesktopItem { From e5634777f16ae8a48be1239ae556f5918f88b9c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Nov 2024 05:53:10 +0000 Subject: [PATCH 077/151] mstflint: 4.29.0-1 -> 4.30.0-1 --- pkgs/by-name/ms/mstflint/package.nix | 4 ++-- pkgs/os-specific/linux/mstflint_access/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ms/mstflint/package.nix b/pkgs/by-name/ms/mstflint/package.nix index 5ab999792f56..94b752e662d5 100644 --- a/pkgs/by-name/ms/mstflint/package.nix +++ b/pkgs/by-name/ms/mstflint/package.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "mstflint"; # if you update the version of this package, also update the input hash in mstflint_access! - version = "4.29.0-1"; + version = "4.30.0-1"; src = fetchurl { url = "https://github.com/Mellanox/mstflint/releases/download/v${version}/mstflint-${version}.tar.gz"; - hash = "sha256-G9BIFG8f4Ek9R3CyRLAuMpgbScrtBo/ZaiJwAQMiBlQ="; + hash = "sha256-8v0aeVy1ZGbzNdL71V1qm6sgEy0e3eb2F1DP8L3m2ns="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/mstflint_access/default.nix b/pkgs/os-specific/linux/mstflint_access/default.nix index a423f38506d6..ee84b2508e66 100644 --- a/pkgs/os-specific/linux/mstflint_access/default.nix +++ b/pkgs/os-specific/linux/mstflint_access/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/Mellanox/mstflint/releases/download/v${version}/kernel-mstflint-${version}.tar.gz"; - hash = "sha256-D++AnLUEB8d9WlReY/Ewp8E2cvbapJ3QrvYySKwaszk="; + hash = "sha256-DfXaU31itartFgTeCtWNZrskjUqc1a62dRO/gTfgCHk="; }; nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; From f67cd331d197c0175c71cb40271514829fa3ee7b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Dec 2024 20:54:47 +0000 Subject: [PATCH 078/151] hubstaff: 1.6.28-fafb0aba -> 1.6.29-7f771670 --- pkgs/by-name/hu/hubstaff/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hu/hubstaff/package.nix b/pkgs/by-name/hu/hubstaff/package.nix index eaf3183e2fe5..71a81a35ad07 100644 --- a/pkgs/by-name/hu/hubstaff/package.nix +++ b/pkgs/by-name/hu/hubstaff/package.nix @@ -4,9 +4,9 @@ , curl, writeShellScript, common-updater-scripts, xmlstarlet }: let - url = "https://app.hubstaff.com/download/8495-standard-linux-1-6-28-release/sh"; - version = "1.6.28-fafb0aba"; - sha256 = "sha256:1y757477hhyflk3da11fvmyyglwlp6hrii1qn3ycb0l81xyxg9s0"; + url = "https://app.hubstaff.com/download/8792-standard-linux-1-6-29-release/sh"; + version = "1.6.29-7f771670"; + sha256 = "sha256:09vdpsmaj26bmnbsyxp76g3677lzi8p86gz66qbdvxly6a4x1hq9"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft From 12c0a74afb0a2203db403dd3dbb6a4a7a387a014 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Mon, 2 Dec 2024 06:14:56 +0100 Subject: [PATCH 079/151] remind: use gitUpdater --- pkgs/by-name/re/remind/package.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/re/remind/package.nix b/pkgs/by-name/re/remind/package.nix index b460c651b6b3..92fbbe740539 100644 --- a/pkgs/by-name/re/remind/package.nix +++ b/pkgs/by-name/re/remind/package.nix @@ -1,7 +1,8 @@ { lib, stdenv, - fetchurl, + fetchFromGitea, + gitUpdater, tk, tclPackages, tcl, @@ -17,9 +18,12 @@ tcl.mkTclDerivation rec { pname = "remind"; version = "05.01.01"; - src = fetchurl { - url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - hash = "sha256-906V9QdFHKJ1+uXv9zrFz9swfeVr/kxgkgKkGsscUY0="; + src = fetchFromGitea { + domain = "git.skoll.ca"; + owner = "Skollsoft-Public"; + repo = "Remind"; + rev = version; + hash = "sha256-2qsJIdBsIttgofjB9Zd566I95mxkO7BTwUNPe50+bEY="; }; propagatedBuildInputs = lib.optionals withGui [ @@ -44,6 +48,8 @@ tcl.mkTclDerivation rec { "-DHAVE_UNSETENV" ]); + passthru.updateScript = gitUpdater { }; + meta = with lib; { homepage = "https://dianne.skoll.ca/projects/remind/"; description = "Sophisticated calendar and alarm program for the console"; From 79c0d76742a48d6936a0d407bedf226aea405436 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Dec 2024 00:47:05 +0000 Subject: [PATCH 080/151] monit: 5.34.2 -> 5.34.3 --- pkgs/by-name/mo/monit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/monit/package.nix b/pkgs/by-name/mo/monit/package.nix index a2a41ef70548..fac5c22b0716 100644 --- a/pkgs/by-name/mo/monit/package.nix +++ b/pkgs/by-name/mo/monit/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "monit"; - version = "5.34.2"; + version = "5.34.3"; src = fetchurl { url = "https://mmonit.com/monit/dist/monit-${version}.tar.gz"; - sha256 = "sha256-KRyj2JjptCW20MF2hyj+zWwc9MJox52xX9omKFrVuDI="; + sha256 = "sha256-Zp2Lld3sEk0URLpSZPZ/3q6OkOU7KSlxn0dQ/F/zumA="; }; nativeBuildInputs = From f902fdcb1bdeae42b4db5638bf8da5b3623d7163 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Dec 2024 04:06:41 +0000 Subject: [PATCH 081/151] xlights: 2024.18 -> 2024.19 --- pkgs/by-name/xl/xlights/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xl/xlights/package.nix b/pkgs/by-name/xl/xlights/package.nix index 81f6b886d83c..10585522ef4a 100644 --- a/pkgs/by-name/xl/xlights/package.nix +++ b/pkgs/by-name/xl/xlights/package.nix @@ -6,11 +6,11 @@ appimageTools.wrapType2 rec { pname = "xlights"; - version = "2024.18"; + version = "2024.19"; src = fetchurl { url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage"; - hash = "sha256-zwOsZG7YU00wz2ZUbOVgGNQxRU81nURjW+B+XTruOuQ="; + hash = "sha256-pq+Xe2PRmQ1XpxH1gQi2zTpJlFABTer3g52PNgSOFnw="; }; meta = { From 5a371d85378d8f6d6285f1c7ed2b6bcdf2e5e736 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Dec 2024 17:27:09 +0000 Subject: [PATCH 082/151] python312Packages.cantools: 39.4.11 -> 39.4.13 --- pkgs/development/python-modules/cantools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cantools/default.nix b/pkgs/development/python-modules/cantools/default.nix index af203e8a9470..ffa4dbbed010 100644 --- a/pkgs/development/python-modules/cantools/default.nix +++ b/pkgs/development/python-modules/cantools/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "cantools"; - version = "39.4.11"; + version = "39.4.13"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-C3vYiiNrst39faXdcTBY6Xt0kYXp0SV0E7J71M/n2Co="; + hash = "sha256-rYT7Vh9asgzNKkW3/LKQkwCPbImByfY28tlGE+03w9E="; }; nativeBuildInputs = [ From df2fffe82020edde8210b360986c744e22aca650 Mon Sep 17 00:00:00 2001 From: Levi Gross Date: Wed, 11 Dec 2024 15:20:39 -0500 Subject: [PATCH 083/151] maintainers: add levigross --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 80478f7b5985..62ef311b20e4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12595,6 +12595,12 @@ githubId = 29217594; name = "Brian Leung"; }; + levigross = { + email = "levi@levigross.com"; + github = "levigross"; + githubId = 80920; + name = "Levi Gross"; + }; lewo = { email = "lewo@abesis.fr"; matrix = "@lewo:matrix.org"; From 6f5a3bf187115a82fd0896415ebf142be3114d20 Mon Sep 17 00:00:00 2001 From: a-kenji Date: Wed, 11 Dec 2024 21:35:03 +0100 Subject: [PATCH 084/151] xdg-desktop-portal-cosmic: 1.0.0-alpha.3 -> 1.0.0-alpha.4 --- pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix index 8c640acd7f55..d01567042041 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix @@ -13,20 +13,20 @@ rustPlatform.buildRustPackage rec { pname = "xdg-desktop-portal-cosmic"; - version = "1.0.0-alpha.3"; + version = "1.0.0-alpha.4"; src = fetchFromGitHub { owner = "pop-os"; repo = "xdg-desktop-portal-cosmic"; rev = "epoch-${version}"; - hash = "sha256-IlMcgzhli61QWjdovj5BpOxOebV3RytBeHPhxzWNXqg="; + hash = "sha256-4FdgavjxRKbU5/WBw9lcpWYLxCH6IJr7LaGkEXYUGbw="; }; env.VERGEN_GIT_COMMIT_DATE = "2024-10-10"; env.VERGEN_GIT_SHA = src.rev; useFetchCargoVendor = true; - cargoHash = "sha256-z1vySlaAFW0stxzJ4n5jzyDFDDiN07l9lUT5jLyJnco="; + cargoHash = "sha256-FgfUkU9sv5mq4+pou2myQn6+DkLzPacjUhQ4pL8hntM="; separateDebugInfo = true; From a8e7af67b7b3763e12347f11bcfcf46d3460cc8a Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Thu, 12 Dec 2024 00:21:55 +0100 Subject: [PATCH 085/151] openrct2: 0.4.15 -> 0.4.17 - https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.4.16 - https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.4.17 Closes #363331. --- pkgs/by-name/op/openrct2/package.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/op/openrct2/package.nix b/pkgs/by-name/op/openrct2/package.nix index 025b8018d230..5966b001e0b4 100644 --- a/pkgs/by-name/op/openrct2/package.nix +++ b/pkgs/by-name/op/openrct2/package.nix @@ -30,11 +30,11 @@ }: let - openrct2-version = "0.4.15"; + openrct2-version = "0.4.17"; # Those versions MUST match the pinned versions within the CMakeLists.txt # file. The REPLAYS repository from the CMakeLists.txt is not necessary. - objects-version = "1.4.8"; + objects-version = "1.4.11"; openmsx-version = "1.6"; opensfx-version = "1.0.5"; title-sequences-version = "0.4.14"; @@ -43,14 +43,14 @@ let owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${openrct2-version}"; - hash = "sha256-VumjJGAur+2A7n0pFcNM7brYaoeaVCPBtRGFIZmq5QY="; + hash = "sha256-lyphYKPkS1DQj7OAvswI/zNMUZmvEevvtDar951AXwg="; }; objects-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "objects"; rev = "v${objects-version}"; - hash = "sha256-A6iFaWda5qiFirGqOP6H9w0PP5Me8BRr2HXKZPHJImE="; + hash = "sha256-V06lh3h3sCKmLat4OWSOmrzpiFlOu8HhaSQSqsfkjds="; }; openmsx-src = fetchFromGitHub { @@ -117,11 +117,6 @@ stdenv.mkDerivation { "-DDOWNLOAD_TITLE_SEQUENCES=OFF" ]; - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=maybe-uninitialized" - ]; - postUnpack = '' mkdir -p $sourceRoot/data/assetpack @@ -146,8 +141,6 @@ stdenv.mkDerivation { + (versionCheck "TITLE_SEQUENCE" title-sequences-version) ); - preFixup = "ln -s $out/share/openrct2 $out/bin/data"; - meta = with lib; { description = "Open source re-implementation of RollerCoaster Tycoon 2 (original game required)"; homepage = "https://openrct2.io/"; From 77dca0fc1160f3a432ae47ed96b0689509187c92 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Wed, 11 Dec 2024 17:44:37 -0700 Subject: [PATCH 086/151] freebsd.libsysdecode: mark that it only produces a static library --- pkgs/os-specific/bsd/freebsd/pkgs/libsysdecode.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libsysdecode.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libsysdecode.nix index da78404e2a58..9d27a1577031 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libsysdecode.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libsysdecode.nix @@ -11,4 +11,6 @@ mkDerivation { ''; MK_TESTS = "no"; + + alwaysKeepStatic = true; } From 4c8e23b5798bc8be94f90d3742a6778a2fd35860 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Dec 2024 12:55:20 +0000 Subject: [PATCH 087/151] osmo-bsc: 1.12.1 -> 1.12.2 --- pkgs/by-name/os/osmo-bsc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/os/osmo-bsc/package.nix b/pkgs/by-name/os/osmo-bsc/package.nix index 9caae7094789..1ced78422a66 100644 --- a/pkgs/by-name/os/osmo-bsc/package.nix +++ b/pkgs/by-name/os/osmo-bsc/package.nix @@ -17,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "osmo-bsc"; - version = "1.12.1"; + version = "1.12.2"; src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-bsc"; rev = version; - hash = "sha256-4ELOkxgtqV30r7xD1XcYXpscswvCQacJWUYcbfDNPhI="; + hash = "sha256-V1URXatXYaItv1X5VAuWpaeTNJjK6qb9DqmecDm2PQ0="; }; postPatch = '' From e9bf28edaaec7d7a7ad417cfabeb847f9afc3f6a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 16:29:06 +0100 Subject: [PATCH 088/151] home-assistant-custom-lovelace-modules.plotly-graph-card: init at 2.34.0 Highly customisable Lovelace card to plot interactive graphs. Brings scrolling, zooming, and much more! --- .../plotly-chart-card/package.nix | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 pkgs/servers/home-assistant/custom-lovelace-modules/plotly-chart-card/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/plotly-chart-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/plotly-chart-card/package.nix new file mode 100644 index 000000000000..d868f674497c --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/plotly-chart-card/package.nix @@ -0,0 +1,60 @@ +{ + lib, + buildNpmPackage, + buildGoModule, + fetchFromGitHub, +}: + +let + # The node build requires its pinned esbuild version + esbuild = buildGoModule rec { + pname = "esbuild"; + version = "0.16.10"; + + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + tag = "v${version}"; + hash = "sha256-plcI3p/m1tPODZNcBoP/kc3avO11oXww7NIA9wdX+Pc="; + }; + + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + + meta.mainProgram = "esbuild"; + }; +in + +buildNpmPackage rec { + pname = "plotly-graph-card"; + version = "3.3.5"; + + src = fetchFromGitHub { + owner = "dbuezas"; + repo = "lovelace-plotly-graph-card"; + tag = "v${version}"; + hash = "sha256-I0lP0Z0tUiuJ4cC2Ud4uePS8zEZIBNP5X3EEa9ZVQ24="; + }; + + npmDepsHash = "sha256-CwIx5/kAAY+PAjEkJi7/7NpApzFSoIfuIl7zmsaqicE="; + + # for ml-regression-logarithmic + forceGitDeps = true; + makeCacheWritable = true; + + # custom pinned esbuild version + env.ESBUILD_BINARY_PATH = lib.getExe esbuild; + + installPhase = '' + install -d $out + install -m0644 dist/plotly-graph-card.js $out/ + ''; + + meta = { + description = "Highly customisable Lovelace card to plot interactive graphs. Brings scrolling, zooming, and much more"; + homepage = "https://github.com/dbuezas/lovelace-plotly-graph-card"; + changelog = "https://github.com/dbuezas/lovelace-plotly-graph-card/releases/tag/${src.tag}"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ hexa ]; + platforms = lib.platforms.all; + }; +} From eb30a6b668d9bff9a8b06a096e6ccdd4bc016b23 Mon Sep 17 00:00:00 2001 From: Julian Lobbes Date: Thu, 12 Dec 2024 23:01:28 +0100 Subject: [PATCH 089/151] maintainers: add ulinja --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b7fc737a9cd4..17e9b60dee1d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -23141,6 +23141,13 @@ github = "uku3lig"; githubId = 61147779; }; + ulinja = { + email = "julian@lobbes.dev"; + github = "ulinja"; + githubId = 56582668; + name = "Julian Lobbes"; + keys = [ { fingerprint = "24D9 B20A 65C2 DFB9 8E6A 754C 8EC4 6A5E 6743 3524"; } ]; + }; ulrikstrid = { email = "ulrik.strid@outlook.com"; github = "ulrikstrid"; From 4d3f87be22697576a2bbd4500202e0adad59c8d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Dec 2024 22:45:32 +0000 Subject: [PATCH 090/151] tutanota-desktop: 253.241126.2 -> 253.241203.1 --- pkgs/by-name/tu/tutanota-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix index 87aeccd8c390..770317c2189b 100644 --- a/pkgs/by-name/tu/tutanota-desktop/package.nix +++ b/pkgs/by-name/tu/tutanota-desktop/package.nix @@ -7,11 +7,11 @@ appimageTools.wrapType2 rec { pname = "tutanota-desktop"; - version = "253.241126.2"; + version = "253.241203.1"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; - hash = "sha256-M6mUv0gwJotFd8Y3eTbeUupTw/9s+7ydZ9d6Q2HC9rg="; + hash = "sha256-UtryT5nd8zZQ4Bz3BBes4eL/AchEoIVE6BZ5ZHG/874="; }; extraPkgs = pkgs: [ pkgs.libsecret ]; From 10d295b7d442ead5d3e621ff539359528efaf1ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Dec 2024 23:16:33 +0000 Subject: [PATCH 091/151] alfaview: 9.18.1 -> 9.19.0 --- pkgs/by-name/al/alfaview/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/alfaview/package.nix b/pkgs/by-name/al/alfaview/package.nix index 7bcfe3c95fb6..2d77f145060e 100644 --- a/pkgs/by-name/al/alfaview/package.nix +++ b/pkgs/by-name/al/alfaview/package.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "9.18.1"; + version = "9.19.0"; src = fetchurl { url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb"; - hash = "sha256-O0lFDyIL+BJBRfPKsEm7+sdoyPBojgN3uVSe6e75HqI="; + hash = "sha256-o0sB+JLwemUNRflp8cR0exc5QvCkpxIAVd/g4vwix6Q="; }; nativeBuildInputs = [ From ca18582e2bf5ebe043a5b87a20bfbbd90da1b8ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Dec 2024 23:38:01 +0000 Subject: [PATCH 092/151] apt: 2.9.16 -> 2.9.17 --- pkgs/by-name/ap/apt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix index 0daef9943250..b539b6d01e7f 100644 --- a/pkgs/by-name/ap/apt/package.nix +++ b/pkgs/by-name/ap/apt/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "apt"; - version = "2.9.16"; + version = "2.9.17"; src = fetchurl { url = "mirror://debian/pool/main/a/apt/apt_${finalAttrs.version}.tar.xz"; - hash = "sha256-9ncx162Jm4WZBYFPvtO03ic8/rhcGEUEPxR4x1LsnvQ="; + hash = "sha256-MKD1u2blDmY1XqqBAJcZL5d9/rXCqle5xPWYcL57DQQ="; }; # cycle detection; lib can't be split From 80ac49a0d8e99594d9420e0bb640b0ec10d270a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Dec 2024 02:38:22 +0000 Subject: [PATCH 093/151] suricata: 7.0.7 -> 7.0.8 --- pkgs/by-name/su/suricata/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/su/suricata/package.nix b/pkgs/by-name/su/suricata/package.nix index 4b120c718118..6c7006d32715 100644 --- a/pkgs/by-name/su/suricata/package.nix +++ b/pkgs/by-name/su/suricata/package.nix @@ -40,11 +40,11 @@ let in stdenv.mkDerivation rec { pname = "suricata"; - version = "7.0.7"; + version = "7.0.8"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - hash = "sha256-JtCjYZTVMID8iwm5mbK1qDxASfQK0H72rmnHIlpyi4Y="; + hash = "sha256-SSkoxiLhcL2cRdNTC8KxAzxVgtwYCFxDb86vtigp084="; }; nativeBuildInputs = From ad253f9d6731003d90c367daa8043b8105fbf65b Mon Sep 17 00:00:00 2001 From: Levi Gross Date: Wed, 11 Dec 2024 14:28:42 -0500 Subject: [PATCH 094/151] python3Packages.splunk-sdk: init at 2.1.0 --- .../python-modules/splunk-sdk/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/splunk-sdk/default.nix diff --git a/pkgs/development/python-modules/splunk-sdk/default.nix b/pkgs/development/python-modules/splunk-sdk/default.nix new file mode 100644 index 000000000000..0a486725425a --- /dev/null +++ b/pkgs/development/python-modules/splunk-sdk/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + deprecation, +}: + +buildPythonPackage rec { + pname = "splunk-sdk"; + version = "2.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "splunk"; + repo = "splunk-sdk-python"; + tag = version; + hash = "sha256-N+QQ4DSkx7yakROhcJ2ISXPWFa7BXDeSUULNquhDPrg="; + }; + + build-system = [ setuptools ]; + + dependencies = [ deprecation ]; + + pythonImportsCheck = [ "splunklib" ]; + + meta = { + description = "The Splunk Enterprise Software Development Kit (SDK) for Python"; + homepage = "https://github.com/splunk/splunk-sdk-python"; + changelog = "https://github.com/splunk/splunk-sdk-python/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ levigross ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6db89daf2769..3a75d4ea955c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15233,6 +15233,8 @@ self: super: with self; { splinter = callPackage ../development/python-modules/splinter { }; + splunk-sdk = callPackage ../development/python-modules/splunk-sdk { }; + spotifyaio = callPackage ../development/python-modules/spotifyaio { }; spotipy = callPackage ../development/python-modules/spotipy { }; From 210faf516688a2c66ed7bac07dd072d34b4f0b11 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 12 Dec 2024 17:33:40 +0000 Subject: [PATCH 095/151] nixos-rebuild-ng: change copy closure logic when copying from_host -> to_host - If user is using Nix 2.18+ (the default), we will switch to use `nix copy` since it supports using `--from` and `--to` at the same time - If user is using older versions of Nix, we will call `nix-copy-closure` twice, once with `--from` and another with `--to` The reason for this change is because the previous logic, that SSH'd to from_host to copy to to_host using `nix-copy-closure --to` means that `from_host` needs to have credentials to communicate with `to_host`, that is not always possible nor expected. It breaks even in simple cases like `--from` and `--to` is the same host because it is not common for a host to SSH'd itself. This also makes the behavior more consistent, since `--from` and `--to` is interpreted from the eval host point of view EXCEPT when they're used together. This may of course break in the cases where this old behavior was assumed, e.g.: deploying with a bastion host. I am not sure how common this was, and I think this change in behavior should enable more cases than break, but let's see. For that particular case, running `nixos-rebuild-ng` inside SSH command (e.g.: `ssh build_host -- nixos-rebuild-ng switch --target-host target_host`) should do the trick. --- pkgs/by-name/ni/nixos-rebuild-ng/package.nix | 8 +- .../src/nixos_rebuild/__init__.py | 14 ++-- .../src/nixos_rebuild/constants.py | 6 ++ .../nixos-rebuild-ng/src/nixos_rebuild/nix.py | 71 +++++++++++------ .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 77 +++++++++++++------ 5 files changed, 120 insertions(+), 56 deletions(-) create mode 100644 pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/constants.py diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix index 7dc84de9984e..6cd7eca28691 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix +++ b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix @@ -19,6 +19,11 @@ }: let executable = if withNgSuffix then "nixos-rebuild-ng" else "nixos-rebuild"; + # This version is kind of arbitrary, we use some features that were + # implemented in newer versions of Nix, but not necessary 2.18. + # However, Lix is a fork of Nix 2.18, so this looks like a good version + # to cut specific functionality. + withNix218 = lib.versionAtLeast nix.version "2.18"; in python3Packages.buildPythonApplication rec { pname = "nixos-rebuild-ng"; @@ -53,8 +58,9 @@ python3Packages.buildPythonApplication rec { ]; postPatch = '' - substituteInPlace nixos_rebuild/__init__.py \ + substituteInPlace nixos_rebuild/constants.py \ --subst-var-by executable ${executable} \ + --subst-var-by withNix218 ${lib.boolToString withNix218} \ --subst-var-by withReexec ${lib.boolToString withReexec} \ --subst-var-by withShellFiles ${lib.boolToString withShellFiles} diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 49ba193a03ad..8ce9c9b2d7f0 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -9,6 +9,7 @@ from subprocess import CalledProcessError, run from typing import assert_never from . import nix +from .constants import EXECUTABLE, WITH_NIX_2_18, WITH_REEXEC, WITH_SHELL_FILES from .models import Action, BuildAttr, Flake, NRError, Profile from .process import Remote, cleanup_ssh from .utils import Args, LogFormatter @@ -16,12 +17,6 @@ from .utils import Args, LogFormatter logger = logging.getLogger() logger.setLevel(logging.INFO) -# Build-time flags -# Strings to avoid breaking standalone (e.g.: `python -m nixos_rebuild`) usage -EXECUTABLE = "@executable@" -WITH_REEXEC = "@withReexec@" -WITH_SHELL_FILES = "@withShellFiles@" - def get_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.ArgumentParser]]: common_flags = argparse.ArgumentParser(add_help=False) @@ -187,7 +182,7 @@ def parse_args( } if args.help or args.action is None: - if WITH_SHELL_FILES == "true": + if WITH_SHELL_FILES: r = run(["man", "8", EXECUTABLE], check=False) parser.exit(r.returncode) else: @@ -281,6 +276,9 @@ def reexec( def execute(argv: list[str]) -> None: args, args_groups = parse_args(argv) + if not WITH_NIX_2_18: + logger.warning("you're using Nix <2.18, some features will not work correctly") + atexit.register(cleanup_ssh) common_flags = vars(args_groups["common_flags"]) @@ -303,7 +301,7 @@ def execute(argv: list[str]) -> None: # Re-exec to a newer version of the script before building to ensure we get # the latest fixes if ( - WITH_REEXEC == "true" + WITH_REEXEC and can_run and not args.fast and not os.environ.get("_NIXOS_REBUILD_REEXEC") diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/constants.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/constants.py new file mode 100644 index 000000000000..883c8b41b360 --- /dev/null +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/constants.py @@ -0,0 +1,6 @@ +# Build-time flags +# Strings to avoid breaking standalone (e.g.: `python -m nixos_rebuild`) usage +EXECUTABLE = "@executable@" +WITH_NIX_2_18 = "@withNix218@" == "true" # type: ignore +WITH_REEXEC = "@withReexec@" == "true" # type: ignore +WITH_SHELL_FILES = "@withShellFiles@" == "true" # type: ignore diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index 3100496e2eee..bca9a5b12c71 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -7,6 +7,7 @@ from string import Template from subprocess import PIPE, CalledProcessError from typing import Final +from .constants import WITH_NIX_2_18 from .models import ( Action, BuildAttr, @@ -139,30 +140,56 @@ def copy_closure( """Copy a nix closure to or from host to localhost. Also supports copying a closure from a remote to another remote.""" - host = to_host or from_host - if not host: - return sshopts = os.getenv("NIX_SSHOPTS", "") - run_wrapper( - [ - "nix-copy-closure", - *dict_to_flags(copy_flags), - "--to" if to_host else "--from", - host.host, - closure, - ], - extra_env={ - # Using raw NIX_SSHOPTS here to avoid messing up with the passed - # parameters, and we do not add the SSH_DEFAULT_OPTS in the remote - # to remote case, otherwise it will fail because of ControlPath - # will not exist in remote - "NIX_SSHOPTS": sshopts - if from_host and to_host - else " ".join(filter(lambda x: x, [*SSH_DEFAULT_OPTS, sshopts])) - }, - remote=from_host if to_host else None, - ) + extra_env = { + "NIX_SSHOPTS": " ".join(filter(lambda x: x, [*SSH_DEFAULT_OPTS, sshopts])) + } + + def nix_copy_closure(host: Remote, to: bool) -> None: + run_wrapper( + [ + "nix-copy-closure", + *dict_to_flags(copy_flags), + "--to" if to else "--from", + host.host, + closure, + ], + extra_env=extra_env, + ) + + def nix_copy(to_host: Remote, from_host: Remote) -> None: + run_wrapper( + [ + "nix", + "copy", + "--from", + f"ssh://{from_host.host}", + "--to", + f"ssh://{to_host.host}", + closure, + ], + extra_env=extra_env, + ) + + match (to_host, from_host): + case (None, None): + return + case (Remote(_) as host, None) | (None, Remote(_) as host): + nix_copy_closure(host, to=bool(to_host)) + case (Remote(_), Remote(_)): + if WITH_NIX_2_18: + # With newer Nix, use `nix copy` instead of `nix-copy-closure` + # since it supports `--to` and `--from` at the same time + # TODO: once we drop Nix 2.3 from nixpkgs, remove support for + # `nix-copy-closure` + nix_copy(to_host, from_host) + else: + # With older Nix, we need to copy from to local and local to + # host. This means it is slower and need additional disk space + # in local + nix_copy_closure(from_host, to=False) + nix_copy_closure(to_host, to=True) def edit(flake: Flake | None, **flake_flags: Args) -> None: diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index a5310a1df8a8..0e1a0ecdcc68 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -112,7 +112,6 @@ def test_remote_build(mock_run: Any, monkeypatch: Any) -> None: extra_env={ "NIX_SSHOPTS": " ".join(p.SSH_DEFAULT_OPTS + ["--ssh opts"]) }, - remote=None, ), call( ["nix-store", "--realise", Path("/path/to/file"), "--build"], @@ -166,7 +165,6 @@ def test_remote_build_flake(mock_run: Any, monkeypatch: Any) -> None: extra_env={ "NIX_SSHOPTS": " ".join(p.SSH_DEFAULT_OPTS + ["--ssh opts"]) }, - remote=None, ), call( [ @@ -185,37 +183,66 @@ def test_remote_build_flake(mock_run: Any, monkeypatch: Any) -> None: ) -@patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_copy_closure(mock_run: Any, monkeypatch: Any) -> None: +def test_copy_closure(monkeypatch: Any) -> None: closure = Path("/path/to/closure") - n.copy_closure(closure, None) - mock_run.assert_not_called() + with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: + n.copy_closure(closure, None) + mock_run.assert_not_called() target_host = m.Remote("user@target.host", [], None) build_host = m.Remote("user@build.host", [], None) - - n.copy_closure(closure, target_host) - mock_run.assert_called_with( - ["nix-copy-closure", "--to", "user@target.host", closure], - extra_env={"NIX_SSHOPTS": " ".join(p.SSH_DEFAULT_OPTS)}, - remote=None, - ) + with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: + n.copy_closure(closure, target_host) + mock_run.assert_called_with( + ["nix-copy-closure", "--to", "user@target.host", closure], + extra_env={"NIX_SSHOPTS": " ".join(p.SSH_DEFAULT_OPTS)}, + ) monkeypatch.setenv("NIX_SSHOPTS", "--ssh build-opt") - n.copy_closure(closure, None, build_host) - mock_run.assert_called_with( - ["nix-copy-closure", "--from", "user@build.host", closure], - extra_env={"NIX_SSHOPTS": " ".join(p.SSH_DEFAULT_OPTS + ["--ssh build-opt"])}, - remote=None, - ) + with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: + n.copy_closure(closure, None, build_host) + mock_run.assert_called_with( + ["nix-copy-closure", "--from", "user@build.host", closure], + extra_env={ + "NIX_SSHOPTS": " ".join(p.SSH_DEFAULT_OPTS + ["--ssh build-opt"]) + }, + ) monkeypatch.setenv("NIX_SSHOPTS", "--ssh build-target-opt") - n.copy_closure(closure, target_host, build_host) - mock_run.assert_called_with( - ["nix-copy-closure", "--to", "user@target.host", closure], - remote=build_host, - extra_env={"NIX_SSHOPTS": "--ssh build-target-opt"}, - ) + monkeypatch.setattr(n, "WITH_NIX_2_18", True) + extra_env = { + "NIX_SSHOPTS": " ".join(p.SSH_DEFAULT_OPTS + ["--ssh build-target-opt"]) + } + with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: + n.copy_closure(closure, target_host, build_host) + mock_run.assert_called_with( + [ + "nix", + "copy", + "--from", + "ssh://user@build.host", + "--to", + "ssh://user@target.host", + closure, + ], + extra_env=extra_env, + ) + + monkeypatch.setattr(n, "WITH_NIX_2_18", False) + with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: + n.copy_closure(closure, target_host, build_host) + mock_run.assert_has_calls( + [ + call( + ["nix-copy-closure", "--from", "user@build.host", closure], + extra_env=extra_env, + ), + call( + ["nix-copy-closure", "--to", "user@target.host", closure], + extra_env=extra_env, + ), + ] + ) @patch(get_qualified_name(n.run_wrapper, n), autospec=True) From 0051a3dc9a83a1436aed830645f75eefeab52be1 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 12 Dec 2024 19:19:20 +0000 Subject: [PATCH 096/151] nixos-rebuild-ng: use -s as copy_flags --- .../ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py | 8 +++++++- .../ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py | 6 +++++- pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_utils.py | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 8ce9c9b2d7f0..11ebd6dfdfa0 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -56,7 +56,13 @@ def get_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.ArgumentPa copy_flags = argparse.ArgumentParser(add_help=False) copy_flags.add_argument( - "--use-substitutes", "--substitute-on-destination", "-s", action="store_true" + "--use-substitutes", + "--substitute-on-destination", + "-s", + action="store_true", + # `-s` is the destination since it has the same meaning in + # `nix-copy-closure` and `nix copy` + dest="s", ) sub_parsers = { diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py index cd89435f2d4f..b1d94114fa51 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py @@ -1,5 +1,5 @@ import logging -from typing import TypeAlias, override +from typing import TypeAlias, assert_never, override Args: TypeAlias = bool | str | list[str] | int | None @@ -25,6 +25,8 @@ def dict_to_flags(d: dict[str, Args]) -> list[str]: match value: case None | False | 0 | []: continue + case True if len(key) == 1: + flags.append(f"-{key}") case True: flags.append(flag) case int(): @@ -36,4 +38,6 @@ def dict_to_flags(d: dict[str, Args]) -> list[str]: flags.append(flag) for v in value: flags.append(v) + case _: + assert_never(value) return flags diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_utils.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_utils.py index 0e5eb7437f65..36b8024a4e56 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_utils.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_utils.py @@ -9,6 +9,7 @@ def test_dict_to_flags() -> None: "test_flag_3": "value", "test_flag_4": ["v1", "v2"], "test_flag_5": None, + "t": True, "verbose": 5, } ) @@ -19,6 +20,7 @@ def test_dict_to_flags() -> None: "--test-flag-4", "v1", "v2", + "-t", "-vvvvv", ] r2 = u.dict_to_flags({"verbose": 0, "empty_list": []}) From 84c6a4e1cc80bc1cdba942e093fc7665c156e6c3 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 12 Dec 2024 19:21:18 +0000 Subject: [PATCH 097/151] nixos-rebuild-ng: add --debug flag --- .../ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 11ebd6dfdfa0..59e563a7ae22 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -81,6 +81,9 @@ def get_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.ArgumentPa allow_abbrev=False, ) main_parser.add_argument("--help", "-h", action="store_true", help="Show manpage") + main_parser.add_argument( + "--debug", action="store_true", help="Enable debug logging" + ) main_parser.add_argument( "--file", "-f", help="Enable and build the NixOS system from the specified file" ) @@ -198,8 +201,8 @@ def parse_args( def parser_warn(msg: str) -> None: print(f"{parser.prog}: warning: {msg}", file=sys.stderr) - # This flag affects both nix and this script - if args.verbose: + # verbose affects both nix commands and this script, debug only this script + if args.verbose or args.debug: logger.setLevel(logging.DEBUG) # https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh#L56 From 49afd97aab9c4504bc9c81f5f8be0dfccd9d5ea4 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 12 Dec 2024 22:06:36 +0000 Subject: [PATCH 098/151] nixos-rebuild-ng: run list_generations in parallel --- .../nixos-rebuild-ng/src/nixos_rebuild/nix.py | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index bca9a5b12c71..54ba8ab6d6b4 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -1,5 +1,6 @@ import logging import os +from concurrent.futures import ThreadPoolExecutor from datetime import datetime from importlib.resources import files from pathlib import Path @@ -337,9 +338,8 @@ def list_generations(profile: Profile) -> list[GenerationJson]: Will be formatted in a way that is expected by the output of `nixos-rebuild list-generations --json`. """ - generations = get_generations(profile) - result = [] - for generation in reversed(generations): + + def get_generation_info(generation: Generation) -> GenerationJson: generation_path = ( profile.path.parent / f"{profile.path.name}-{generation.id}-link" ) @@ -367,19 +367,24 @@ def list_generations(profile: Profile) -> list[GenerationJson]: logger.debug("could not get configuration revision: %s", ex) configuration_revision = "Unknown" - result.append( - GenerationJson( - generation=generation.id, - date=generation.timestamp, - nixosVersion=nixos_version, - kernelVersion=kernel_version, - configurationRevision=configuration_revision, - specialisations=specialisations, - current=generation.current, - ) + return GenerationJson( + generation=generation.id, + date=generation.timestamp, + nixosVersion=nixos_version, + kernelVersion=kernel_version, + configurationRevision=configuration_revision, + specialisations=specialisations, + current=generation.current, ) - return result + # This can be surprisingly slow, especially with lots of generations, + # but it is basically IO work so we can run in parallel + with ThreadPoolExecutor() as executor: + return sorted( + executor.map(get_generation_info, get_generations(profile)), + key=lambda x: x["generation"], + reverse=True, + ) def repl(attr: str, build_attr: BuildAttr, **nix_flags: Args) -> None: From 92346e19ed8b06e810f0e5ca5d5ab79a2b9ef313 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Dec 2024 19:09:41 +0000 Subject: [PATCH 099/151] qxmpp: 1.8.2 -> 1.9.2 --- pkgs/development/libraries/qxmpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qxmpp/default.nix b/pkgs/development/libraries/qxmpp/default.nix index 20730810d9cd..7f4804c194ee 100644 --- a/pkgs/development/libraries/qxmpp/default.nix +++ b/pkgs/development/libraries/qxmpp/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "qxmpp"; - version = "1.8.2"; + version = "1.9.2"; src = fetchFromGitHub { owner = "qxmpp-project"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fxTlxlnqttZZWRkt+vo4MJJz7DR/FMXcOqUv+/nlV18="; + sha256 = "sha256-xqQUDFZgnBpUIv8kYvsNrJrIF259p3CccNn7u4vpxmY="; }; nativeBuildInputs = [ From df1de458e0a18f1f3bde8b95c1910d4ccf216348 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 13 Dec 2024 20:43:19 +0000 Subject: [PATCH 100/151] nixos-rebuild-ng: remove --verbose flag hack --- .../ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py | 4 ++-- pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py | 5 ++++- pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py | 4 ++-- pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_utils.py | 5 ++++- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 59e563a7ae22..b2f9cf22dfe5 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -20,7 +20,7 @@ logger.setLevel(logging.INFO) def get_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.ArgumentParser]]: common_flags = argparse.ArgumentParser(add_help=False) - common_flags.add_argument("--verbose", "-v", action="count", default=0) + common_flags.add_argument("--verbose", "-v", action="count", dest="v", default=0) common_flags.add_argument("--max-jobs", "-j") common_flags.add_argument("--cores") common_flags.add_argument("--log-format") @@ -202,7 +202,7 @@ def parse_args( print(f"{parser.prog}: warning: {msg}", file=sys.stderr) # verbose affects both nix commands and this script, debug only this script - if args.verbose or args.debug: + if args.v or args.debug: logger.setLevel(logging.DEBUG) # https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh#L56 diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py index b1d94114fa51..87d3f21596a3 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py @@ -29,8 +29,11 @@ def dict_to_flags(d: dict[str, Args]) -> list[str]: flags.append(f"-{key}") case True: flags.append(flag) + case int() if len(key) == 1: + flags.append(f"-{key * value}") case int(): - flags.append(f"-{key[0] * value}") + for i in range(value): + flags.append(flag) case str(): flags.append(flag) flags.append(value) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index 2c06b128da86..dff9c24fb1d2 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -67,12 +67,12 @@ def test_parse_args() -> None: ] ) assert nr.logger.level == logging.DEBUG - assert r2.verbose == 3 + assert r2.v == 3 assert r2.flake is False assert r2.action == "dry-build" assert r2.file == "foo" assert r2.attr == "bar" - assert g2["common_flags"].verbose == 3 + assert g2["common_flags"].v == 3 @patch.dict(nr.process.os.environ, {}, clear=True) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_utils.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_utils.py index 36b8024a4e56..5f73c33acf98 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_utils.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_utils.py @@ -10,7 +10,8 @@ def test_dict_to_flags() -> None: "test_flag_4": ["v1", "v2"], "test_flag_5": None, "t": True, - "verbose": 5, + "v": 5, + "verbose": 2, } ) assert r1 == [ @@ -22,6 +23,8 @@ def test_dict_to_flags() -> None: "v2", "-t", "-vvvvv", + "--verbose", + "--verbose", ] r2 = u.dict_to_flags({"verbose": 0, "empty_list": []}) assert r2 == [] From abda7147ff534761e1059d811edf09e97c12e871 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 12 Dec 2024 23:36:02 +0000 Subject: [PATCH 101/151] nixos-rebuild-ng: remove tabulate as dependency --- pkgs/by-name/ni/nixos-rebuild-ng/package.nix | 7 --- .../src/nixos_rebuild/__init__.py | 16 +----- .../src/nixos_rebuild/utils.py | 51 ++++++++++++++++++- .../nixos-rebuild-ng/src/tests/test_utils.py | 21 ++++++++ 4 files changed, 72 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix index 6cd7eca28691..df33313193fe 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix +++ b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix @@ -35,10 +35,6 @@ python3Packages.buildPythonApplication rec { setuptools ]; - dependencies = with python3Packages; [ - tabulate - ]; - nativeBuildInputs = lib.optionals withShellFiles [ installShellFiles python3Packages.shtab @@ -94,9 +90,6 @@ python3Packages.buildPythonApplication rec { mypy pytest ruff - types-tabulate - # dependencies - tabulate ] ); in diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index b2f9cf22dfe5..dec1a5a252d9 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -12,7 +12,7 @@ from . import nix from .constants import EXECUTABLE, WITH_NIX_2_18, WITH_REEXEC, WITH_SHELL_FILES from .models import Action, BuildAttr, Flake, NRError, Profile from .process import Remote, cleanup_ssh -from .utils import Args, LogFormatter +from .utils import Args, LogFormatter, tabulate logger = logging.getLogger() logger.setLevel(logging.INFO) @@ -448,8 +448,6 @@ def execute(argv: list[str]) -> None: if args.json: print(json.dumps(generations, indent=2)) else: - from tabulate import tabulate - headers = { "generation": "Generation", "date": "Build-date", @@ -459,17 +457,7 @@ def execute(argv: list[str]) -> None: "specialisations": "Specialisation", "current": "Current", } - # Not exactly the same format as legacy nixos-rebuild but close - # enough - table = tabulate( - generations, - headers=headers, - tablefmt="plain", - numalign="left", - stralign="left", - disable_numparse=True, - ) - print(table) + print(tabulate(generations, headers=headers)) case Action.REPL: if flake: nix.repl_flake("toplevel", flake, **flake_build_flags) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py index 87d3f21596a3..11a0d9188294 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py @@ -1,5 +1,6 @@ import logging -from typing import TypeAlias, assert_never, override +from collections.abc import Mapping, Sequence +from typing import Any, TypeAlias, assert_never, override Args: TypeAlias = bool | str | list[str] | int | None @@ -18,7 +19,7 @@ class LogFormatter(logging.Formatter): return formatter.format(record) -def dict_to_flags(d: dict[str, Args]) -> list[str]: +def dict_to_flags(d: Mapping[str, Args]) -> list[str]: flags = [] for key, value in d.items(): flag = f"--{'-'.join(key.split('_'))}" @@ -44,3 +45,49 @@ def dict_to_flags(d: dict[str, Args]) -> list[str]: case _: assert_never(value) return flags + + +def remap_dicts( + dicts: Sequence[Mapping[str, Any]], + mappings: Mapping[str, str], +) -> list[dict[str, Any]]: + return [{mappings.get(k, k): v for k, v in d.items()} for d in dicts] + + +def tabulate( + data: Sequence[Mapping[str, Any]], + headers: Mapping[str, str] | None = None, +) -> str: + """Convert a sequence of mappings in a tabular-style format for terminal. + + It expects that all mappings (dicts) have the same keys as the first one, + otherwise it will misbehave. + """ + if not data: + return "" + + if headers: + data = remap_dicts(data, headers) + + data_headers = list(data[0].keys()) + + column_widths = [ + max( + len(str(header)), + *(len(str(row.get(header, ""))) for row in data), + ) + for header in data_headers + ] + + def format_row(row: Mapping[str, Any]) -> str: + s = (2 * " ").join( + f"{str(row[header]).ljust(width)}" + for header, width in zip(data_headers, column_widths) + ) + return s.strip() + + result = [format_row(dict(zip(data_headers, data_headers)))] + for row in data: + result.append(format_row(row)) + + return "\n".join(result) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_utils.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_utils.py index 5f73c33acf98..b1cd52e0b121 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_utils.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_utils.py @@ -1,3 +1,5 @@ +import textwrap + import nixos_rebuild.utils as u @@ -28,3 +30,22 @@ def test_dict_to_flags() -> None: ] r2 = u.dict_to_flags({"verbose": 0, "empty_list": []}) assert r2 == [] + + +def test_remap_dicts() -> None: + assert u.remap_dicts( + [{"foo": 1, "bar": True}, {"qux": "keep"}], + {"foo": "Foo", "bar": "Bar"}, + ) == [{"Foo": 1, "Bar": True}, {"qux": "keep"}] + + +def test_tabulate() -> None: + assert u.tabulate([]) == "" + assert u.tabulate([{}]) == "\n" + assert u.tabulate( + [{"foo": 12345, "bar": ["abc", "cde"]}, {"foo": 345, "bar": 456}], + {"foo": "Foo", "bar": "Bar"}, + ) == textwrap.dedent("""\ + Foo Bar + 12345 ['abc', 'cde'] + 345 456""") From 5e5d231a45156f25c00c37e17c86539fefd61fd9 Mon Sep 17 00:00:00 2001 From: Julian Lobbes Date: Thu, 12 Dec 2024 23:02:52 +0100 Subject: [PATCH 102/151] gobatmon: init at 0.4.0 --- pkgs/by-name/go/gobatmon/package.nix | 30 ++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/by-name/go/gobatmon/package.nix diff --git a/pkgs/by-name/go/gobatmon/package.nix b/pkgs/by-name/go/gobatmon/package.nix new file mode 100644 index 000000000000..a8b15ec0e07d --- /dev/null +++ b/pkgs/by-name/go/gobatmon/package.nix @@ -0,0 +1,30 @@ +{ + buildGoModule, + fetchFromGitHub, + lib, +}: + +buildGoModule rec { + pname = "gobatmon"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "ulinja"; + repo = "gobatmon"; + tag = "v${version}"; + hash = "sha256-morcsU9RhY17XlaDC6J0uDRYiSYjnXquFjuOh7AEKkA="; + }; + + vendorHash = "sha256-WUTGAYigUjuZLHO1YpVhFSWpvULDZfGMfOXZQqVYAfs="; + + meta = { + description = "Simple battery level monitor for Linux written in Go"; + homepage = "https://github.com/ulinja/gobatmon"; + license = lib.licenses.wtfpl; + maintainers = with lib.maintainers; [ ulinja ]; + mainProgram = "gobatmon"; + downloadPage = "https://github.com/ulinja/gobatmon/releases/latest"; + changelog = "https://github.com/ulinja/gobatmon/blob/v${version}/CHANGELOG.md"; + platforms = lib.platforms.linux; + }; +} From b1203ae015f84805f73b5824d557faae96c98826 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 13 Dec 2024 22:13:08 +0000 Subject: [PATCH 103/151] nixos-rebuild-ng: add "Breaking changes" section --- pkgs/by-name/ni/nixos-rebuild-ng/README.md | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/README.md b/pkgs/by-name/ni/nixos-rebuild-ng/README.md index 0bf680f0cced..f6aa75a12b35 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/README.md +++ b/pkgs/by-name/ni/nixos-rebuild-ng/README.md @@ -101,6 +101,47 @@ ruff check --fix . ruff format . ``` +## Breaking changes + +While `nixos-rebuild-ng` tries to be as much of a clone of the original as +possible, there are still some breaking changes that were done in other to +improve the user experience. If they break your workflow in some way that is +not possible to fix, please open an issue and we can discuss a solution. + +- For `--build-host` and `--target-host`, `nixos-rebuild-ng` does not allocate + a pseudo-TTY via SSH (e.g.: `ssh -t`) anymore. The reason for this is because + pseudo-TTY breaks some expectations from SSH, like it mangles stdout and + stderr, and can + [break terminal output](https://github.com/NixOS/nixpkgs/issues/336967) in + some situations. + The issue is that `sudo` needs a TTY to ask for password, otherwise it will + fail. The solution for this is a new flag, `--ask-sudo-password`, that when + used with `--target-host` (`--build-host` doesn't need `sudo`), will ask for + the `sudo` password for the target host using Python's + [getpass](https://docs.python.org/3/library/getpass.html) and forward it to + every `sudo` request. Keep in mind that there is no check, so if you type + your password wrong, it will fail during activation (this can be improved + though) +- When `--build-host` and `--target-host` is used together, we will use `nix + copy` (or 2 `nix-copy-closure` if you're using Nix <2.18) instead of SSH'ing + to build host and using `nix-copy-closure --to target-host`. The reason for + this is documented in PR + [#364698](https://github.com/NixOS/nixpkgs/pull/364698). If you do need the + previous behavior, you can simulate it using `ssh build-host -- + nixos-rebuild-ng switch --target-host target-host`. If that is not the case, + please open an issue +- We do some additional validation of flags, like exiting with an error when + `--build-host` or `--target-host` is used with `repl`, since the user could + assume that the `repl` would be run remotely while it always run the local + machine. `nixos-rebuild` silently ignored those flags, so this + [may cause some issues](https://github.com/NixOS/nixpkgs/pull/363922) for + wrappers +- For now we are not supporting `build-vm` or `build-vm-with-bootloader` with + `--build-host` anymore. Support for this should be easy to add if you have + a use case, the only reason is that this is not supported is because in the + original the result would not be symlinked in the current directory, making + it kind useless (unless you looked at the result in `/nix/store`) + ## Caveats - Bugs in the profile manipulation can cause corruption of your profile that From 772ad025ecec551be8d09a26514092f5d7b9e740 Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 14 Dec 2024 12:30:39 +0100 Subject: [PATCH 104/151] klee: Fix invalid string escape --- pkgs/applications/science/logic/klee/default.nix | 2 +- pkgs/applications/science/logic/klee/klee-uclibc.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/klee/default.nix b/pkgs/applications/science/logic/klee/default.nix index 54c9cdc30c80..fd618fec2026 100644 --- a/pkgs/applications/science/logic/klee/default.nix +++ b/pkgs/applications/science/logic/klee/default.nix @@ -133,7 +133,7 @@ llvmPackages.stdenv.mkDerivation rec { updateScript = nix-update-script { extraArgs = [ "--version-regex" - "v(\d\.\d)" + "v(\\d\\.\\d)" ]; }; # Let the user access the chosen uClibc outside the derivation. diff --git a/pkgs/applications/science/logic/klee/klee-uclibc.nix b/pkgs/applications/science/logic/klee/klee-uclibc.nix index 61cb5892edd5..695ff369d96c 100644 --- a/pkgs/applications/science/logic/klee/klee-uclibc.nix +++ b/pkgs/applications/science/logic/klee/klee-uclibc.nix @@ -99,7 +99,7 @@ llvmPackages.stdenv.mkDerivation rec { passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" - "v(\d\.\d)" + "v(\\d\\.\\d)" ]; }; From 13342caa6438459ffd382cd88c6794a53b4ab77f Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 14 Dec 2024 12:59:09 +0100 Subject: [PATCH 105/151] saw-tools: format --- pkgs/by-name/sa/saw-tools/package.nix | 43 +++++++++++++++++---------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/sa/saw-tools/package.nix b/pkgs/by-name/sa/saw-tools/package.nix index ca2e3d303571..4efe3de58735 100644 --- a/pkgs/by-name/sa/saw-tools/package.nix +++ b/pkgs/by-name/sa/saw-tools/package.nix @@ -1,26 +1,37 @@ -{ lib, stdenv, fetchurl, gmp4, ncurses, zlib, clang }: +{ + lib, + stdenv, + fetchurl, + gmp4, + ncurses, + zlib, + clang, +}: let - libPath = lib.makeLibraryPath - [ stdenv.cc.libc + libPath = + lib.makeLibraryPath [ + stdenv.cc.libc stdenv.cc.cc gmp4 ncurses zlib - ] + ":${lib.getLib stdenv.cc.cc}/lib64"; + ] + + ":${lib.getLib stdenv.cc.cc}/lib64"; url = "https://github.com/GaloisInc/saw-script/releases/download"; saw-bin = - if stdenv.hostPlatform.system == "i686-linux" - then fetchurl { - url = url + "/v0.1.1-dev/saw-0.1.1-dev-2015-07-31-CentOS6-32.tar.gz"; - sha256 = "126iag5nnvndi78c921z7vjrjfwcspn1hlxwwhzmqm4rvbhhr9v9"; - } - else fetchurl { - url = url + "/v0.1.1-dev/saw-0.1.1-dev-2015-07-31-CentOS6-64.tar.gz"; - sha256 = "07gyf319v6ama6n1aj96403as04bixi8mbisfy7f7va689zklflr"; - }; + if stdenv.hostPlatform.system == "i686-linux" then + fetchurl { + url = url + "/v0.1.1-dev/saw-0.1.1-dev-2015-07-31-CentOS6-32.tar.gz"; + sha256 = "126iag5nnvndi78c921z7vjrjfwcspn1hlxwwhzmqm4rvbhhr9v9"; + } + else + fetchurl { + url = url + "/v0.1.1-dev/saw-0.1.1-dev-2015-07-31-CentOS6-64.tar.gz"; + sha256 = "07gyf319v6ama6n1aj96403as04bixi8mbisfy7f7va689zklflr"; + }; in stdenv.mkDerivation { pname = "saw-tools"; @@ -50,10 +61,10 @@ stdenv.mkDerivation { meta = { description = "Tools for software verification and analysis"; - homepage = "https://saw.galois.com"; + homepage = "https://saw.galois.com"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.bsd3; - platforms = lib.platforms.linux; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; maintainers = [ lib.maintainers.thoughtpolice ]; }; } From e19a2b9722c9116045526da1f0726880c08af2fb Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 30 Oct 2024 23:25:44 +0100 Subject: [PATCH 106/151] saw-tools: 0.1.1-20150731 -> 1.2 Changes: https://github.com/GaloisInc/saw-script/blob/v1.2/CHANGES.md --- pkgs/by-name/sa/saw-tools/package.nix | 74 +++++++++++---------------- 1 file changed, 31 insertions(+), 43 deletions(-) diff --git a/pkgs/by-name/sa/saw-tools/package.nix b/pkgs/by-name/sa/saw-tools/package.nix index 4efe3de58735..bd0f2d31f885 100644 --- a/pkgs/by-name/sa/saw-tools/package.nix +++ b/pkgs/by-name/sa/saw-tools/package.nix @@ -2,42 +2,36 @@ lib, stdenv, fetchurl, - gmp4, + autoPatchelfHook, + makeWrapper, + gmp, ncurses, zlib, - clang, + readline, + testers, }: -let - libPath = - lib.makeLibraryPath [ - stdenv.cc.libc - stdenv.cc.cc - gmp4 - ncurses - zlib - ] - + ":${lib.getLib stdenv.cc.cc}/lib64"; - - url = "https://github.com/GaloisInc/saw-script/releases/download"; - - saw-bin = - if stdenv.hostPlatform.system == "i686-linux" then - fetchurl { - url = url + "/v0.1.1-dev/saw-0.1.1-dev-2015-07-31-CentOS6-32.tar.gz"; - sha256 = "126iag5nnvndi78c921z7vjrjfwcspn1hlxwwhzmqm4rvbhhr9v9"; - } - else - fetchurl { - url = url + "/v0.1.1-dev/saw-0.1.1-dev-2015-07-31-CentOS6-64.tar.gz"; - sha256 = "07gyf319v6ama6n1aj96403as04bixi8mbisfy7f7va689zklflr"; - }; -in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "saw-tools"; - version = "0.1.1-20150731"; + version = "1.2"; - src = saw-bin; + src = fetchurl { + url = "https://github.com/GaloisInc/saw-script/releases/download/v${finalAttrs.version}/saw-${finalAttrs.version}-ubuntu-22.04-X64-with-solvers.tar.gz"; + hash = "sha256-A99BCiVV5Ep/PL7VSDNYcvr177Q+FKdDrxhFJLW/iU4="; + }; + + buildInputs = [ + gmp + ncurses + readline + stdenv.cc.libc + zlib + ]; + + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + ]; installPhase = '' mkdir -p $out/lib $out/share @@ -45,26 +39,20 @@ stdenv.mkDerivation { mv bin $out/bin mv doc $out/share - ln -s ${ncurses.out}/lib/libtinfo.so.5 $out/lib/libtinfo.so.5 - ln -s ${stdenv.cc.libc}/lib/libpthread.so.0 $out/lib/libpthread.so.0 - - # Add a clang symlink for easy building with a suitable compiler. - ln -s ${clang}/bin/clang $out/bin/saw-clang + wrapProgram "$out/bin/saw" --prefix PATH : "$out/bin/" ''; - fixupPhase = '' - for x in bin/bcdump bin/extcore-info bin/jss bin/llvm-disasm bin/lss bin/saw; do - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out/lib:${libPath}" $out/$x; - done - ''; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "saw --version"; + }; meta = { description = "Tools for software verification and analysis"; homepage = "https://saw.galois.com"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.bsd3; - platforms = lib.platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = [ lib.maintainers.thoughtpolice ]; }; -} +}) From 11bbfac1c9f27310afc56114d145cfc53b57335e Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 14 Dec 2024 12:16:42 +0000 Subject: [PATCH 107/151] nixos-rebuild-ng: support --target-host for build-vm/build-vm-with-bootloader --- pkgs/by-name/ni/nixos-rebuild-ng/README.md | 5 --- .../src/nixos_rebuild/__init__.py | 34 +++++++++---------- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/README.md b/pkgs/by-name/ni/nixos-rebuild-ng/README.md index f6aa75a12b35..52df11d42400 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/README.md +++ b/pkgs/by-name/ni/nixos-rebuild-ng/README.md @@ -136,11 +136,6 @@ not possible to fix, please open an issue and we can discuss a solution. machine. `nixos-rebuild` silently ignored those flags, so this [may cause some issues](https://github.com/NixOS/nixpkgs/pull/363922) for wrappers -- For now we are not supporting `build-vm` or `build-vm-with-bootloader` with - `--build-host` anymore. Support for this should be easy to add if you have - a use case, the only reason is that this is not supported is because in the - original the result would not be symlinked in the current directory, making - it kind useless (unless you looked at the result in `/nix/store`) ## Caveats diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index dec1a5a252d9..d24b1a8afa71 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -240,6 +240,8 @@ def parse_args( Action.BUILD.value, Action.DRY_BUILD.value, Action.DRY_ACTIVATE.value, + Action.BUILD_VM.value, + Action.BUILD_VM_WITH_BOOTLOADER.value, ): parser.error( f"--target-host/--build-host is not supported with '{args.action}'" @@ -337,13 +339,21 @@ def execute(argv: list[str]) -> None: | Action.BUILD | Action.DRY_BUILD | Action.DRY_ACTIVATE + | Action.BUILD_VM + | Action.BUILD_VM_WITH_BOOTLOADER ): logger.info("building the system configuration...") - attr = "config.system.build.toplevel" dry_run = action == Action.DRY_BUILD no_link = action in (Action.SWITCH, Action.BOOT) rollback = bool(args.rollback) + match action: + case Action.BUILD_VM: + attr = "config.system.build.vm" + case Action.BUILD_VM_WITH_BOOTLOADER: + attr = "config.system.build.vmWithBootLoader" + case _: + attr = "config.system.build.toplevel" match (action, rollback, build_host, flake): case (Action.SWITCH | Action.BOOT, True, _, _): @@ -413,6 +423,7 @@ def execute(argv: list[str]) -> None: target_host=target_host, sudo=args.sudo, ) + if action in (Action.SWITCH, Action.BOOT, Action.TEST, Action.DRY_ACTIVATE): nix.switch_to_configuration( path_to_config, @@ -422,23 +433,12 @@ def execute(argv: list[str]) -> None: specialisation=args.specialisation, install_bootloader=args.install_bootloader, ) - case Action.BUILD_VM | Action.BUILD_VM_WITH_BOOTLOADER: - logger.info("building the system configuration...") - attr = "vm" if action == Action.BUILD_VM else "vmWithBootLoader" - if flake: - path_to_config = nix.build_flake( - f"config.system.build.{attr}", - flake, - **flake_build_flags, + elif action in (Action.BUILD_VM, Action.BUILD_VM_WITH_BOOTLOADER): + # If you get `not-found`, please open an issue + vm_path = next(path_to_config.glob("bin/run-*-vm"), "not-found") + print( + f"Done. The virtual machine can be started by running '{vm_path}'" ) - else: - path_to_config = nix.build( - f"config.system.build.{attr}", - build_attr, - **build_flags, - ) - vm_path = next(path_to_config.glob("bin/run-*-vm"), "./result/bin/run-*-vm") - print(f"Done. The virtual machine can be started by running '{vm_path}'") case Action.EDIT: nix.edit(flake, **flake_build_flags) case Action.DRY_RUN: From ac27331127ab250e61442aae10db18aad642bd38 Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 14 Dec 2024 12:32:43 +0100 Subject: [PATCH 108/151] mlton: Fix invalid string escape --- pkgs/development/compilers/mlton/20210117-binary.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/mlton/20210117-binary.nix b/pkgs/development/compilers/mlton/20210117-binary.nix index 523d46ed8c39..f95c6e330b6f 100644 --- a/pkgs/development/compilers/mlton/20210117-binary.nix +++ b/pkgs/development/compilers/mlton/20210117-binary.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { (fetchpatch { name = "remove-duplicate-if.patch"; url = "https://github.com/MLton/mlton/commit/22002cd0a53a1ab84491d74cb8dc6a4e50c1f7b7.patch"; - decode = "sed -e 's|Makefile\.binary|Makefile|g'"; + decode = "sed -e 's|Makefile\\.binary|Makefile|g'"; hash = "sha256-Gtmc+OIh+m7ordSn74fpOKVDQDtYyLHe6Le2snNCBYQ="; }) ]; From 69f9bc37c77029490c81c8813da8c343ed917a9f Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 14 Dec 2024 14:03:09 +0100 Subject: [PATCH 109/151] renode-unstable: Fix invalid string escape --- pkgs/by-name/re/renode-unstable/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix index 7164233f7559..2c4653391fc6 100644 --- a/pkgs/by-name/re/renode-unstable/package.nix +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -16,7 +16,7 @@ renode.overrideAttrs ( passthru.updateScript = let - versionRegex = "[0-9\.\+]+[^\+]*."; + versionRegex = "[0-9\\.\\+]+[^\\+]*."; in writeScript "${finalAttrs.pname}-updater" '' #!/usr/bin/env nix-shell From 09bd9f1e596e5d7c8ffc265ef1b93787b6d6ed95 Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Sat, 14 Dec 2024 13:05:30 +0000 Subject: [PATCH 110/151] texlive.tlpdb.nix: escape special characters in short description --- pkgs/tools/typesetting/tex/texlive/tl2nix.sed | 3 + pkgs/tools/typesetting/tex/texlive/tlpdb.nix | 132 +++++++++--------- 2 files changed, 69 insertions(+), 66 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/tl2nix.sed b/pkgs/tools/typesetting/tex/texlive/tl2nix.sed index 4e236f2f263a..5f52a45a079d 100644 --- a/pkgs/tools/typesetting/tex/texlive/tl2nix.sed +++ b/pkgs/tools/typesetting/tex/texlive/tl2nix.sed @@ -25,6 +25,9 @@ $a} # extract short description /^shortdesc (.+)$/{ + # escape special characters ", \, ${ + s/\\/\\\\/g # escape backslashes + s/\$\{/\\${/g # escape '${' s/"/\\"/g # escape quotes s/^shortdesc (.+)/ shortdesc = "\1";/p } diff --git a/pkgs/tools/typesetting/tex/texlive/tlpdb.nix b/pkgs/tools/typesetting/tex/texlive/tlpdb.nix index c37e752881ec..7bce4ced3624 100644 --- a/pkgs/tools/typesetting/tex/texlive/tlpdb.nix +++ b/pkgs/tools/typesetting/tex/texlive/tlpdb.nix @@ -391,7 +391,7 @@ addliga = { }; addlines = { revision = 49326; - shortdesc = "A user-friendly wrapper around \enlargethispage"; + shortdesc = "A user-friendly wrapper around \\enlargethispage"; stripPrefix = 0; sha512.run = "5d0a438fceef1481633f37824b686422e5000cf232b7dd24bba0f30c8d62b583daf01a67242283f2e4fe971438c061acad2860f50ce1438ca32677d497db8b2a"; sha512.doc = "2993c6caae1d2f230d144c9f93f7694adcb2e17d9bcd60eb3aa3144806a522258fd4c44a314d40cc767b3b069c4c929b8e458e74bebc746771b975b77bba34d2"; @@ -450,7 +450,7 @@ adfsymbols = { }; adhocfilelist = { revision = 29349; - shortdesc = "'\listfiles' entries from the command line"; + shortdesc = "'\\listfiles' entries from the command line"; sha512.run = "57436dae1489c0f614c4b002f83d34a711398a762ac532b44b1d91a51d068462aaedb5b034923629f7630f039988452eb833d1e98af389c788091517bbee8954"; sha512.doc = "14bde143bf3ffa3f2b972f93544089e4c0314c7696e1d711719549b7e831278c66fee0676665fe6eaaac744689d613dce159e4eee2e3f9c24dbbe602794fc62e"; sha512.source = "15e7f652408c5975ba47131109e0d18bcb1d270e0ea630a9a3ff385e499cf3607a366e708a5ec9559d7ccc2a5e0b2d3d0f5f615142978a918b0bd1bd0218a30d"; @@ -876,7 +876,7 @@ algxpar = { }; aligned-overset = { revision = 47290; - shortdesc = "Fix alignment at \overset or \underset"; + shortdesc = "Fix alignment at \\overset or \\underset"; stripPrefix = 0; sha512.run = "3998cd5515ad43e559da91bd1f25b835743299ec13fcf22ee9cb3aadc44c285f428ee701f5b27141c4d03c97b31a31e8620a2911854a1781ee5543a99073fed4"; sha512.doc = "d44ff38fe36352e1498e12eb56652e935cfeeb9ce6af5711bebe7844b1b7ba16864c8dac3c3b5f2e2bd6fee86de38c7555d5796940b834ce1ad396f5d2cb536e"; @@ -1950,7 +1950,7 @@ ascmac = { }; askinclude = { revision = 54725; - shortdesc = "Interactive use of \includeonly"; + shortdesc = "Interactive use of \\includeonly"; stripPrefix = 0; sha512.run = "828a18ff7c2d997f25b46b9ce8626a749ce1a18989a292f7f44e9eff0c28d5819e6e017398e76a6872da6498a4ff8306d8f8e701b87b80f57f455d28389f7aa8"; sha512.doc = "a06a9170ad1637c35a25c9a0d89f3721ec350a0053cb5b85374fdb5cc67e7d4653e75c2a5f9b47d19700e3e9ab2d70e5c0c419f68715e664185bd30759dc0291"; @@ -2122,7 +2122,7 @@ asypictureb = { }; atbegshi = { revision = 53051; - shortdesc = "Execute stuff at \shipout time"; + shortdesc = "Execute stuff at \\shipout time"; stripPrefix = 0; sha512.run = "7e03a9a73d8790f6603d53c11aacd01fb7108546e2d3b6ddbd5fce1e42d68ed9c23dfe41794b943eeea67ce0c598851132dd23faa95289789911cd059a8caad8"; sha512.doc = "8f6402dd0f36d4cc4a4674c0d0b37f012a7d6e557174ca3b58a7a2b33d89475d1e47028cc39d2b77c496bfae0751275369c5f4f49cf53b8c36fb60fce47a6bd3"; @@ -2133,7 +2133,7 @@ atbegshi = { }; atenddvi = { revision = 56922; - shortdesc = "Provides the \AtEndDvi command"; + shortdesc = "Provides the \\AtEndDvi command"; stripPrefix = 0; sha512.run = "49b0a69eb308e19e3ed97406fc1ded6e80f15d7787031e2b71cc41ca2e1c74c19d3f3832ae13c5f1af70abf9f2f201c9a7ef669ed2e58349a584ddc767059c54"; sha512.doc = "d60dae681800be4495c2690f78513475d98a4480364306eb26c16c551b0e984f135aefccdcff549e6702b2b62bb185ccbdacd85dd3c12e5b20c128d9397c0e8c"; @@ -2260,7 +2260,7 @@ aurl = { }; authoraftertitle = { revision = 55889; - shortdesc = "Make author, etc., available after \maketitle"; + shortdesc = "Make author, etc., available after \\maketitle"; stripPrefix = 0; sha512.run = "b7496b1ff5dc7544afa6e2181b9c86814671d42603c1f9aa08cc6d45e02dc402e225c44fe554649251b8cdb3dfd81f1b0fb245cc8ed56204d2bcad16e5e9f9bc"; sha512.doc = "a1cda29730615ec8b81082f14462c5864033e1b4cbe0b071e5cdc6d9b5393b2e701ba6e6665963170bb99408f03c8fae38fc17aeb2de83fe9c8fbdad8273482d"; @@ -5586,7 +5586,7 @@ bmstu-iu8 = { }; bnumexpr = { revision = 59244; - shortdesc = "Extends eTeX's \numexpr...\relax construct to big integers"; + shortdesc = "Extends eTeX's \\numexpr...\\relax construct to big integers"; stripPrefix = 0; sha512.run = "a868239dada7f16d52c5d16705ad796d6bc536b1943b5c0bb9538fc72242f3fdbe2cd579367e9230e20e2b3e53725ba8cf25d7d2aaca660a338d7863f4661d46"; sha512.doc = "a367968a29bfe0d1496a8d444d6809a1ddb6f91031f1aafed30fdd2cd8ba929972554b186dfc897b273cb347f569922b7d59d3c472b385bd2ac1fadfadaa122e"; @@ -6016,7 +6016,7 @@ breakcites = { }; breakurl = { revision = 29901; - shortdesc = "Line-breakable \url-like links in hyperref when compiling via dvips/ps2pdf"; + shortdesc = "Line-breakable \\url-like links in hyperref when compiling via dvips/ps2pdf"; stripPrefix = 0; sha512.run = "fa1fa9e3ac50f305ae5b82eb63997d1674b3f640f36d502a1000b439dd52dcaf6b539d153a2c7022f3a00fc0042bcfe341e850ed6b01f7058b1f8f6fd92b4d9b"; sha512.doc = "38f7847274cbee0a6e7c536a982d0110670cf6af54bfa99718a862e1974fdd839f6ef6871cbe2c40bcd0b2a9036c806eb2b57c8adaee583ef316da367ed854f5"; @@ -6293,7 +6293,7 @@ bxjscls = { }; bxnewfont = { revision = 44173; - shortdesc = "Enhanced \newfont command"; + shortdesc = "Enhanced \\newfont command"; stripPrefix = 0; sha512.run = "83775ee72fceb4de0037327561ea2f1723db89dc23ccc42245390212ae1fb849c92c75b2e7b4b23440c62086116b8f0a14b12b27f97c9277c55a7454b231826f"; sha512.doc = "f09fde7abd39a4df52175eff90363a469270ab1385f3600e654535cc90d7b4b5ba704be734323dffca512f5942c45a9ffb5cd19a73026c224cee3be33eaa5b65"; @@ -6622,7 +6622,7 @@ captcont = { }; captdef = { revision = 17353; - shortdesc = "Declare free-standing \caption commands"; + shortdesc = "Declare free-standing \\caption commands"; stripPrefix = 0; sha512.run = "c24a7d66c1daa3a9c336a8555286876aea9e969a4107c42c258f0f4c9a88070316df70e0f2a860adb6335a33e49cdd7a9ba8391255f1e1fb283bd2f6a7e7b343"; sha512.doc = "c0a1a4584d0802eda39812d2c293fabed2487b0cedb57df622519d5857c2ef10e54e66032e9e9ee9ab81c757fb827eabf422b1bf2ab0ae6f7c22ab3aecb49a8f"; @@ -7569,7 +7569,7 @@ chifoot = { }; childdoc = { revision = 49543; - shortdesc = "Directly compile \include'd child documents"; + shortdesc = "Directly compile \\include'd child documents"; stripPrefix = 0; sha512.run = "b268695b1d91b49ba6a0179124cafa5e5cfed56672424ab40cc31924c07879b4f50be47f9fe9d574f2adb3f183c71d799cde8854a2942b530c40a1e101d399ef"; sha512.doc = "1a74059d946b82da211f5fed7cb120453049ceaf5f10841a78ff8864b41444064b223939bd2296142bde9c7bececc0ca8bed141be02431fd60f069ecab998d87"; @@ -8191,7 +8191,7 @@ cloze = { }; clrdblpg = { revision = 47511; - shortdesc = "Control pagestyle of pages left blank by \cleardoublepage"; + shortdesc = "Control pagestyle of pages left blank by \\cleardoublepage"; stripPrefix = 0; sha512.run = "bdd3de3ea16cb5d24879bcf2255bbe01612f8af70f663b9ac578a4ac98910119ea96b8a5b4a59d25c0406c1b33786997ee2940da0273b025455e334b48f17b7d"; sha512.doc = "53ba8c83224ee6573cd1549e7e425fd524b5caf65ab139b67e7de9b32bdd5c3c87f5af63c2c43696554fcc33c8bff4690373ad25582b23bf51134b9cb6301409"; @@ -15860,7 +15860,7 @@ datax = { }; dateiliste = { revision = 27974; - shortdesc = "Extensions of the \listfiles concept"; + shortdesc = "Extensions of the \\listfiles concept"; stripPrefix = 0; sha512.run = "6da6a802994a06e040d43ac7fc9db0515d9273ba9d4cac061e04b05922f9eb9fecaf138eb641b3149be7b98f9139c428084b6470bc177a020386e0dc053427b6"; sha512.doc = "53ca32cabd7e3a32d02c77beb076b08ccaa782b6a2ae249b932242987741f0e255bdc83a2b6ccc7ed2e0efbec66923798026040745152f7244984a0843c8c23d"; @@ -15893,7 +15893,7 @@ datestamp = { }; datetime = { revision = 36650; - shortdesc = "Change format of \today with commands for current time"; + shortdesc = "Change format of \\today with commands for current time"; stripPrefix = 0; sha512.run = "3d033ee164d52f7085bffdc12f2062be7e94a644d9ed731b4d1b97a3a46838dabadcf6687063e165c65fc938a51a4adf8078339b720a305175d6cd6a3b889f07"; sha512.doc = "510449d17b09d9207b76e732b5d426121888cf653f29bb3be8872b74a243596ac339f09d11a14a4a3007f8818171aab28727cd1713ee35c8908d2d168a57d9b0"; @@ -18335,7 +18335,7 @@ eepic = { }; efbox = { revision = 33236; - shortdesc = "Extension of \fbox, with controllable frames and colours"; + shortdesc = "Extension of \\fbox, with controllable frames and colours"; stripPrefix = 0; sha512.run = "5091324e7f5c05385296d570027a8546db4220a24da330ab85ef5d1185772f51b4f200f63eaad0cfa3eaeafd3d055509f4ffbdf798c1139a60c5e572ea46926e"; sha512.doc = "394387e09ecb0d497014a62fc1caedcb3e00148f6e0a9a16ae1b53efbb4d5cf749e154e4c905d197280e4ecd9bc88ea07ab7e0c004b8c30eadbe7f9f414c1345"; @@ -18377,7 +18377,7 @@ egplot = { }; ehhline = { revision = 54676; - shortdesc = "Extend the \hhline command"; + shortdesc = "Extend the \\hhline command"; stripPrefix = 0; sha512.run = "759e123a2418acd7239c4b897e64c146ffb84cc1646d331acc5ca498f707b916c1392f3fb9b97d2916d745e9afcf9c630a5a94e413ecd0c17fc2a8b13f773d3b"; sha512.doc = "79db947da1c51811e834999889c3d089e2c5077d2d21fe133f6879a87afae4e2c7fcf1f07981ef9335a6b7234f083e74e21364be3526448ebdeda6ba75815fac"; @@ -19898,7 +19898,7 @@ everypage = { }; everysel = { revision = 57489; - shortdesc = "Provides hooks into \selectfont"; + shortdesc = "Provides hooks into \\selectfont"; stripPrefix = 0; sha512.run = "79b83d48e3e6eedcf1673a30c28fc06eb2ed8e3bd292d6cf914faf5ce2929795e6dd11baae3a207c796abb67ced2a2442af11c2618fd7d565696f8bfd121a0a2"; sha512.doc = "5efdce418de6d29481a8a8a9bb89fa561e865f5628dd67ce88fd648f54a40c6a90c625700d053d741b650c568eb6b63da81b68bebf89bb618a398a223a5b08a1"; @@ -19909,7 +19909,7 @@ everysel = { }; everyshi = { revision = 57001; - shortdesc = "Take action at every \shipout"; + shortdesc = "Take action at every \\shipout"; stripPrefix = 0; sha512.run = "b6219fdc669847a30ad2359d6b0888eec0980114d5385c018e9ddfd0876dc52390e1e8ffae5d2850cfa140833365c30024456bfacde6615bdbe5101e7059d52f"; sha512.doc = "2a05f4b42c1a85b4af8fb3881d1e32d0cb8fad7070bd8eb83632b50e387083a5c8fd264b61b70416451f56a97e1c0702507bd50c534ab7baf975372d854a97a5"; @@ -20022,7 +20022,7 @@ exceltex.binfiles = [ ]; excludeonly = { revision = 17262; - shortdesc = "Prevent files being \include-ed"; + shortdesc = "Prevent files being \\include-ed"; stripPrefix = 0; sha512.run = "b83426d7ff334e64f8a5566fa905f1c03478ff68da5b74b85dfd6c872db7a63454f627db4e6bea48f8048da0d84bd80b269cf5cd3a5b487484dcd8f2e21c5058"; sha512.doc = "11f1a4e7b0bfeb5728ab632756fb612b784e7a8b46e68c2e5cb3681928811d394ac0b7f508e7c655945209b1e75837d4ec1a69bcaa6b0ac8d45d66302b4bcb13"; @@ -20106,7 +20106,7 @@ exframe = { }; exp-testopt = { revision = 15878; - shortdesc = "Expandable \@testopt (and related) macros"; + shortdesc = "Expandable \\@testopt (and related) macros"; stripPrefix = 0; sha512.run = "26b5af9bdd06a3bbd231b1b55c4ae8929efa06655656747b804425e802fa7d07355e510ac673590cef235cceaf88fc03e1493f4bee9c99ce2a32c32b9a3f9aca"; sha512.doc = "f4f7cda5cc8b3f8900cb12989834e5b1702f751248f58fe65a8d65ab69eb2a4118002212eefb609e251d4437579e635173366beb471e32d07d45c5c645ca506c"; @@ -20369,7 +20369,7 @@ familytree = { }; fancybox = { revision = 18304; - shortdesc = "Variants of \fbox and other games with boxes"; + shortdesc = "Variants of \\fbox and other games with boxes"; stripPrefix = 0; sha512.run = "752e26abee96dd2bbf77b30a6d98d48a1673632d5601d28bba5799e845a015357b96302f3f1d8977f0458003d3456df4694884a05ccb6124b76ca8f7fc84fcbf"; sha512.doc = "2c3e0466198d392af57b2bda16f80589a9aa9db992272980a2e7ab9d7d1842d7e8f2980003b3b09648cfe0b9a1977562534ca54fae120bd7e4d950d25a83c0c2"; @@ -20574,7 +20574,7 @@ fbithesis = { }; fbox = { revision = 69041; - shortdesc = "Extended \fbox macro from standard LaTeX"; + shortdesc = "Extended \\fbox macro from standard LaTeX"; stripPrefix = 0; sha512.run = "705a0f1f6d5009f0ac2fa1059f3029ef7bf7e8fdab6e85bddba822eb50dfcc049f94b7ff43afc97234d44f42505e1cd4e6caac1f22178949dcaea0a60e572281"; sha512.doc = "19a61ddc64c3c5108ec05089e988a07f0e10d772bed810898bf82046922eab58a389c3816b15055b5c2e8a4d1392305a351802eaf3f1e72799c9c192eb8c1484"; @@ -20690,7 +20690,7 @@ fenetrecas = { }; fenixpar = { revision = 24730; - shortdesc = "One-shot changes to token registers such as \everypar"; + shortdesc = "One-shot changes to token registers such as \\everypar"; stripPrefix = 0; sha512.run = "1b09294b430bb9ab6a4eae11549500b224514e55bb99329a4ee3d9d72ab906128063537302f672a772c02ff4372d46649656a88c4a303a9301976fc7a804387e"; sha512.doc = "6ee02d615438e99df82f939a8104097e43802b00af2a0e7be56f329061722cfc7df0edf84c82ac73754d63a703533bd6d5b88b6e648bedbc47be712ff86ec5c8"; @@ -21500,7 +21500,7 @@ fncychap = { }; fncylab = { revision = 52090; - shortdesc = "Alter the format of \label references"; + shortdesc = "Alter the format of \\label references"; stripPrefix = 0; sha512.run = "47aafab923d6455da7e63eb24e0fefa8b869efa5a04bb301000cb2eb658893927dd9f9aeb8e6919ea29e0caeca235b1883106228f6acddc667117a3ba1136974"; sha512.doc = "a987a6efd0964bd5ab5328658e011b5c8da56b404d233c55d96541ec2f37cc72faacd934908c7346041ec8bab3866dd1f171e1c5de5eb528b0f0e80969c0bba6"; @@ -22304,7 +22304,7 @@ ftc-notebook = { }; ftcap = { revision = 17275; - shortdesc = "Allows \caption at the beginning of a table-environment"; + shortdesc = "Allows \\caption at the beginning of a table-environment"; stripPrefix = 0; sha512.run = "1287e0bd63fc92ef3e3c77ae3a6113cfcca38dd63f4a90948baadd2a365c07b38631d916230baeaf550b1aeff07f9cac3a26a07301838716d8d70fcf0843953e"; sha512.doc = "afa317f10c600c88bb96fccb0383b291e1fb7c11abba5f6bd1efb05e7d2ce117c4ece7bdf9a9ea16c71c116143aa65ba26cf7c2e1dba68f225b655d122169001"; @@ -22314,7 +22314,7 @@ ftcap = { }; ftnxtra = { revision = 29652; - shortdesc = "Extend the applicability of the \footnote command"; + shortdesc = "Extend the applicability of the \\footnote command"; stripPrefix = 0; sha512.run = "df8395b996f96ed72505ef1ef7f0e8e6101d4b26059831b227344023514d377eb189961a240e83ba42ac4ef7e8086b8ffcda347290014fbb1cf1531371c20eff"; sha512.doc = "fc16ff992e3339480a4154169665be49f51e56f361d0b1f97842c555be59485fd7edf3cf815e32642826224e188c5377fdb2ab36746cdaef7f552399a4b7119c"; @@ -23081,7 +23081,7 @@ gillius = { }; gincltex = { revision = 64967; - shortdesc = "Include TeX files as graphics (.tex support for \includegraphics)"; + shortdesc = "Include TeX files as graphics (.tex support for \\includegraphics)"; stripPrefix = 0; sha512.run = "2137967697765b1167f36a858d2eda778b43ff1d681ec0d8af7963d2ab4a92448c6c1ad6933975afcc211d301cf168528e7ded7c3114c4b5ec580f42d8a7b664"; sha512.doc = "86ee14069c5522d7c0713a532627bf29e8cf71ec4c86184377cdcd8a73dcf0f034be9e92b8ff7c2caef8310f968c956d712f3281eb6e4d36e83a3464149489b9"; @@ -23491,7 +23491,7 @@ gmdoc-enhance = { }; gmiflink = { revision = 15878; - shortdesc = "Simplify usage of \hypertarget and \hyperlink"; + shortdesc = "Simplify usage of \\hypertarget and \\hyperlink"; stripPrefix = 0; sha512.run = "768353fee03e36d5f13e5ea8ca2cf0925fb5dc3c847680325a0961b78a3ed6c30859bc57de7b927cd9e782f85539c97183687755c31738e1da3cc27a08f52387"; sha512.doc = "4fea41151ea197efdacd9e5756043b87500af8445769d0d0f69560cb94decd4f097bcdd52041706ada9b1ee7826f3c56aa30db473c472b1c74553cebb5231072"; @@ -23522,7 +23522,7 @@ gmutils = { }; gmverb = { revision = 24288; - shortdesc = "A variant of LaTeX \verb, verbatim and shortvrb"; + shortdesc = "A variant of LaTeX \\verb, verbatim and shortvrb"; stripPrefix = 0; sha512.run = "18038202bca3493596925d9d7c65612434ccddde4b301134f1f57706e5d2978025fead598751e27a29d23f66ed12306e6092461aac1d9d921ce818b0a49cdfbd"; sha512.doc = "6dfcc27b38639d4a97ed311bf7c6f1faeb1a023abc27d53e272f334b232a52aa0edc030b0c53d6587845da64097496696ceb03cbd6aa13c8ca5ac12c1772860c"; @@ -27386,7 +27386,7 @@ iftex = { }; ifthenx = { revision = 25819; - shortdesc = "Extra tests for \ifthenelse"; + shortdesc = "Extra tests for \\ifthenelse"; stripPrefix = 0; sha512.run = "76235d3f8dc4e62604828beaf87327d11d4a9ff69061edf1a3ed4c874983251fba75d80973e54fb3daa2d160b27000089f4cdf1c29748124825fb4075b6f7148"; sha512.doc = "efc4fa3b5d6e91d1d5af27846bf2652672a233537810051b2858c1c4ffacafb9771b2c3a222cea4d490e0478eef96b205c4043f4957b876b7f4d57903b26454d"; @@ -30467,7 +30467,7 @@ latexmp = { }; latexpand = { revision = 66226; - shortdesc = "Expand \input and \include in a LaTeX document"; + shortdesc = "Expand \\input and \\include in a LaTeX document"; sha512.run = "e5b63c9aa31f3b5885b1a61503998ce949021b448199538ac385d3fe687156ce6669cd3610a7c3387592d968b0707f7122f35fd50402616470e34bb49f341bf4"; sha512.doc = "c06bbb57bc006aebb644fc4a8edc1f89e10617c67bb77193bd2f4dc3eb7b04b55fb1f239d7d6979f9b385134f3b1e584d9f10521efe704292b7e64865f78d156"; hasRunfiles = true; @@ -31707,7 +31707,7 @@ longmath = { }; longnamefilelist = { revision = 27889; - shortdesc = "Tidy \listfiles with long file names"; + shortdesc = "Tidy \\listfiles with long file names"; stripPrefix = 0; sha512.run = "1d16ee9c76784c5124de3abe62b6e916d0f65e979a18a721ef688a960e5d20382dc976de0b68d95c47e9651ad71a67ca97a828f1bdfba8e4a77ac084d7561386"; sha512.doc = "d909908d763342790b8ab56d333e60d7047894472f3922a2554581a5455539845af72d3867d0a55f5a27e982aa8128ae1a948f40e106fa127f2d01156b55ccf6"; @@ -32324,7 +32324,7 @@ lua-widow-control = { }; luaaddplot = { revision = 72350; - shortdesc = "An extension to pgfplots' \addplot macro"; + shortdesc = "An extension to pgfplots' \\addplot macro"; stripPrefix = 0; sha512.run = "859ca0bfd6c9c3dfb3feb406d6371c42ee336f1166db3e6401a7ee75f824e3c764a6251f4427b59c51eddfe24e6cdfcbbf3e4e943e7a594c0ff4cae77449f4bc"; sha512.doc = "1214a866a9da5b4a73aa211e0fcc0a239edef655299867fc27c7534d4be3bcadec359776f7b75cefcc93d799765cee8eccd610d45b9d4431bddb574d6a044666"; @@ -33198,7 +33198,7 @@ makebase = { }; makebox = { revision = 15878; - shortdesc = "Defines a \makebox* command"; + shortdesc = "Defines a \\makebox* command"; stripPrefix = 0; sha512.run = "918052ed5c358e12ac7ca7c93f25a43fcfa8f7ba261fdf652d7ccbbcc27e3e0f822813d8297d3b75450c443687bd97e93416624b51da61572557d6a337638bc7"; sha512.doc = "807d495fdef601fff666acb79c7f3fa43d1aeebf8aed77bebc02f90dca4fb9c36ae1bc911a9af1009538f3d3e2c4c7f9ceb0111d091dd4c1691a1520e089a697"; @@ -33229,7 +33229,7 @@ makecirc = { }; makecmds = { revision = 15878; - shortdesc = "The new \makecommand command always (re)defines a command"; + shortdesc = "The new \\makecommand command always (re)defines a command"; stripPrefix = 0; sha512.run = "fb63fdc9cc0aaa531b25417f0c23348971c306b1a93d99e7efdbbfd7c3907b50f28c67f36a88bb2a94154bcbde937e63246ece577ee2440ad4f5c2935eb25b99"; sha512.doc = "f69dbf682df7e3089727570417be3624b496b5ad7db627b344d32b106606cab5299dd23497e137770fdfb9f940503a65e1074e06dd67e0561b36729ab6c3d428"; @@ -33284,7 +33284,7 @@ makeindex.binfiles = [ ]; makelabels = { revision = 60255; - shortdesc = "Add a '\makelabels' feature to KOMA-Script letter classes and package"; + shortdesc = "Add a '\\makelabels' feature to KOMA-Script letter classes and package"; stripPrefix = 0; sha512.run = "4f58301507896c2e719f2607e1e456aeb25cc78913ed02d9eaa12489aeb643e73bccaafd1f219c1c8b485d77aa64e99d64166b63e8a2c7a7c3c8cfb77ac23bc6"; sha512.doc = "da01e167d1be1d4831c1bd0aca43472aae12a8204ab844f9964e60f57cf22312532c52cae85964f10780aaa0e4f84015f6ceee8ebfa042b184fb1ecc7c174585"; @@ -33435,7 +33435,7 @@ marginfit = { }; marginfix = { revision = 55064; - shortdesc = "Patch \marginpar to avoid overfull margins"; + shortdesc = "Patch \\marginpar to avoid overfull margins"; stripPrefix = 0; sha512.run = "70dc40b9823cd82a52a7e55e5af47e5b2373fd7cf16567f6eca2bb886d3612473141435444b538f81ab9467d1b3e5ba04424b1ca47d95cc0869dea02faf82b03"; sha512.doc = "16ab654dd8957bcf37351b7c766b787f27baddd4e73a6a4c3a07f5b1486f5ea73c9028675b5830b8dc1224eae29f50d61bb579aeecd9af4aaafaf78259bca900"; @@ -33446,7 +33446,7 @@ marginfix = { }; marginnote = { revision = 68204; - shortdesc = "Notes in the margin, even where \marginpar fails"; + shortdesc = "Notes in the margin, even where \\marginpar fails"; stripPrefix = 0; sha512.run = "6643a77d01d59bc371d301e738b59957bd63cfa0fc98a554f853d1599392ceb5e88663651563445633df704bbc3ef74510ebd6150c44911314225259982f114b"; sha512.doc = "18882e317048606324338ff765cd11e972c3dedcdbfe2407a3f9643b3efe6a7d173561726d4221618ac510a447cec7b1aa13a46ca45a091ac76e601c55c551e7"; @@ -33584,7 +33584,7 @@ mathastext = { }; mathcommand = { revision = 59512; - shortdesc = "\newcommand-like commands for defining math macros"; + shortdesc = "\\newcommand-like commands for defining math macros"; stripPrefix = 0; sha512.run = "4be34084705419757f92b8f31be35a606689c25786bc5b95a0531d572ce21601881cbd7548b7d380241089d4473fbfb70debeab9b30633671b3494d66bfbb9f6"; sha512.doc = "80191b36dd3e34193c2aff764b7ffcf274a4d9fc41b1d19fc92ac807e03809069efbcace953fdbddd481db7d6604a859eab44a2c93024ecd59968c9e24e2630f"; @@ -35873,7 +35873,7 @@ multienv = { }; multiexpand = { revision = 45943; - shortdesc = "Variations on the primitive command \expandafter"; + shortdesc = "Variations on the primitive command \\expandafter"; stripPrefix = 0; sha512.run = "63f512ca5b9649c86a6936cc2407737e41afd6c6a3b4810fe81155a5b4127aecc538303e26b91f53decee900fba7946e90a46a545b3c9caafb3e0863940e0009"; sha512.doc = "6b8a727aae2d314877df551ca5804e84be0bc530b4f09d8bfe6a9c1a4c1eb98647257beeb1813a183f0aa5422b0041443e817ce11b6db70e4129e3edc664e788"; @@ -36636,7 +36636,7 @@ newvbtm = { }; newverbs = { revision = 64833; - shortdesc = "Define new versions of \verb, including short verb versions"; + shortdesc = "Define new versions of \\verb, including short verb versions"; stripPrefix = 0; sha512.run = "f2e2cd3fd2712d3333c7caa9e74a16300d7f08327b9bc7f44362570377feed31a206e6b09df15c524dcbfe39ffc54388de4fca90e180e38d28cf9cfbba79ab2e"; sha512.doc = "7524a6e767edc5f55d96026f947e17e42f54138157bfd1851832dd139617939661ba5a4e759b4cf313990077dc9ed240c032cfe706b595af4d9a4197e519fd1f"; @@ -36667,7 +36667,7 @@ nfssext-cfr = { }; nicefilelist = { revision = 65842; - shortdesc = "Provide \listfiles alignment"; + shortdesc = "Provide \\listfiles alignment"; stripPrefix = 0; sha512.run = "deaf84bd004172584e0437f3f15dacbed3d49ef6bfdba15e77e0c888bc03e35a634107469ae979b38d1e5519f4c8236cafed71c0ec46b9e7735041f234c03f96"; sha512.doc = "efbc5965c9658e1f44182bf92f695b2d200cbdb8c5c70e23631b31603682168c0cfa5e114615483f7d897fec175267ef9d7fd0040f653e75defbe88bfb395bc5"; @@ -37025,7 +37025,7 @@ norasi-c90 = { }; normalcolor = { revision = 40125; - shortdesc = "Changing \normalcolor"; + shortdesc = "Changing \\normalcolor"; stripPrefix = 0; sha512.run = "013354a5f7514f6267d57d098ca93eb48970df0ce1cb2db0c60ecf664cbcea177b934ab8f252cfb9dd4c0979417937462ef55e51502bca7f32a7de1a0e820e32"; sha512.doc = "ca7a9c008f72aa1287092f881f9ffcbe58ed45bfc97ec3231fbeceeb007f6248629d9cf49598afe604ac8cc30a4e8117f54fe517fcbf52548add2f6ac6fdb662"; @@ -38456,7 +38456,7 @@ parsinevis = { }; parskip = { revision = 58358; - shortdesc = "Layout with zero \parindent, non-zero \parskip"; + shortdesc = "Layout with zero \\parindent, non-zero \\parskip"; stripPrefix = 0; sha512.run = "2d64232f41b2607712bc67ce77ebc987502924ebaad4f799b6ae2163862a8b833a9c1a7c8871a33b4ed9fdeb74c8368897e1b831c485ab82e084fe3ff0552af3"; sha512.doc = "759e9e8d698f8ad77ce388ec127f158a7280586338c6e56e1f9188a9a2e8106cb482f8ebc4e252749331e65ac2a771884124b16e3ea5e9ac76005439ca85876b"; @@ -38663,7 +38663,7 @@ pbibtex-manual = { }; pbox = { revision = 24807; - shortdesc = "A variable-width \parbox command"; + shortdesc = "A variable-width \\parbox command"; stripPrefix = 0; sha512.run = "cf2ea3781aac3d0b8619c46513bf9894c4b4efd8ba89eefe2e5fbe4e8f82fedd3b17f64467598080a577c65cc21713671c68763ff2600ce24fb6f6ddfae83a3e"; sha512.doc = "1955a1cd5336a7d71483f49bbc8c65426485fd38447282262b58b4633398cda0753c5574455421b19d92d5c88c599f9c227b54a7c340a35daf233a4f48a1c276"; @@ -39840,7 +39840,7 @@ pictex = { }; pictex2 = { revision = 15878; - shortdesc = "Adds relative coordinates and improves the \plot command"; + shortdesc = "Adds relative coordinates and improves the \\plot command"; stripPrefix = 0; sha512.run = "26b608cc8409c62f4c0130cc032f2ca5929886fafb9d22d93aa23af5a6dee62bbde83926bccbcb4fbd3d86a43810d751eb43a2a94be9528e1639c59fb61e5446"; hasRunfiles = true; @@ -43825,7 +43825,7 @@ rit-fonts = { }; rjlparshap = { revision = 15878; - shortdesc = "Support for use of \parshape in LaTeX"; + shortdesc = "Support for use of \\parshape in LaTeX"; stripPrefix = 0; sha512.run = "9a7f5f821635f110d9bad0015d9fdf489f836cc6ec0c101f63a3bf5bf9235d7446dad98db1325b0720bab85d68432f4cbdbc6dfc78456329a8c48b47d9212abb"; sha512.doc = "73987b63cd565766586dff08144bb9cfab13b7251053d5f008ccb7dd3091ec9d3bbe8ed92fd8e7dddce93afd13a649e68826468b87947a036a054fea76225921"; @@ -43899,7 +43899,7 @@ robust-externalize = { }; robustcommand = { revision = 15878; - shortdesc = "Declare robust command, with \newcommand checks"; + shortdesc = "Declare robust command, with \\newcommand checks"; stripPrefix = 0; sha512.run = "806f997cf6c0eceec0c8d9b8f8207014c4ab9243f8007fc688674af2fd778455a787b9cf998262fb7d0a92ba8e2ffb597d61950c22a6122ad957a62ea54d9a42"; sha512.doc = "4d5c8a994edf816d39af12d7881793f0fda0223a3545559255674fa5a08f2d0fc9ad8ea2779b3c8bfe476966045f996b8b8f5da6fdd028188d28ae724c24a222"; @@ -45204,7 +45204,7 @@ scrlttr2copy = { }; scrwfile = { revision = 66872; - shortdesc = "Use LaTeX .aux file in place of \newrite files"; + shortdesc = "Use LaTeX .aux file in place of \\newrite files"; stripPrefix = 0; sha512.run = "b4d306af1e0d3dcfa59ef14250f14125bfc4a0b9b0f3e6ab32b809f2e729cfa45e27549c8cb9c2dde2819d328c1a032eb6aae6f123f1c71efeba4c9d16611a34"; sha512.doc = "6aab0a6af0c3f989788673c44bb8a885ddb259f0be3f69f0a32b0bdebdc8e607b32c8f8530cb99d59b1c7739b2c33446f8b7c832384d07158c90bd347704a1a3"; @@ -45336,7 +45336,7 @@ sectsty = { }; seealso = { revision = 43595; - shortdesc = "Improve the performance of \see macros with makeindex"; + shortdesc = "Improve the performance of \\see macros with makeindex"; stripPrefix = 0; sha512.run = "4d52687aa57245d3be55bf486b100d61fe2e2d979447c2f123f566c3aeb13657e531ace55fe5d00eab57cebe89cfd3729a71dc7177831b5192b8c0fde452d7df"; sha512.doc = "6baba95b6b08ef95f2966d227161ea39a4084b46371967057266ddae155b115fbe4fcf148e1afc4629e33f54d0329ebb6169f1be4fdcb801d869b212d056cc61"; @@ -45846,7 +45846,7 @@ shorttoc = { }; show2e = { revision = 15878; - shortdesc = "Variants of \show for LaTeX2e"; + shortdesc = "Variants of \\show for LaTeX2e"; stripPrefix = 0; sha512.run = "702d0913a299b68bedec15c697868a70f058957dbd3a2dd2c503bc21c8a250dc7601e6348080bb394a38108bcd2f5ee67796a888183aa181c9f88a72e7666580"; sha512.doc = "a427f7126ded4251c255fcaf2c381f7c00d0d0e55253804cbe631ac59be1bd51e7ba2ee51110af86bcee27d73698bb7baa323fef8e23a41000928b242b0be282"; @@ -46238,7 +46238,7 @@ sistyle = { }; sitem = { revision = 22136; - shortdesc = "Save the optional argument of \item"; + shortdesc = "Save the optional argument of \\item"; stripPrefix = 0; sha512.run = "64a34fcf0769ed4ab4b201facc056b890a89009e1847e9ca65fb405e1c1144225e8fff59c1a906341521bba5d39e3338900a9a35aff5bb716a5aff5e6aa4d49a"; sha512.doc = "af74d7b4f4dfce45e543494344fa32f4f4d55435034cc1b23b24b333f89d54d0b8c9d0a1247561bb7182d3841fb04b7b3531be847a6fed3db212497ef2ccec3c"; @@ -46450,7 +46450,7 @@ smartdiagram = { }; smartref = { revision = 20311; - shortdesc = "Extend LaTeX's \ref capability"; + shortdesc = "Extend LaTeX's \\ref capability"; stripPrefix = 0; sha512.run = "149dd95ca0677a4e273df64a589d1424b8dd89983adf3a3ef81f8236d1b594d35b851b4255fd9f0d05b4feb82db59d816408e3ca59f2b86b73a5724a8e937367"; sha512.doc = "07eaecd9e924e5912e8e3a3ba6479412282e1408cbb59699b9e83006768c4042b173d38da2e8dd2c707b392cb48d99e4be25985023db4de80d69450fe95a338b"; @@ -46868,7 +46868,7 @@ spreadtab = { }; spverbatim = { revision = 15878; - shortdesc = "Allow line breaks within \verb and verbatim output"; + shortdesc = "Allow line breaks within \\verb and verbatim output"; stripPrefix = 0; sha512.run = "0b26e941f77264ae2db7cdcf2c4459c26601f6079e0bad24a3ea0edbd22157c324bbf50426a794655dc1aee710092cd9b662bb401838186e42657fcef5c1121f"; sha512.doc = "245825f18ae835b984eb6474b927a579f80b6c6feefbfe02a53f8b7ea5a48023e1bdb43b39f090afe4ae42937d053cbebfec6ff97d7732d754287401a95fc641"; @@ -47795,7 +47795,7 @@ svn-multi.binfiles = [ ]; svn-prov = { revision = 64967; - shortdesc = "Subversion variants of \Provides... macros"; + shortdesc = "Subversion variants of \\Provides... macros"; stripPrefix = 0; sha512.run = "319bd5de2870a3c8237aa5013f7807bf3c2c5ef7fa4618a400cd5ab60ec8cb88b94510b0129862c5d98a11e2241f9790f8c84473447df8e21cbe711d52268e98"; sha512.doc = "01cfb48533e07065f477724efe4c3fcff13691da0393a0d8a9dc9cf4b5d3e3953ce233f8331c1e5857c2259ac6dd7e4859793bb194d750f35ecf3723dd7b4b0d"; @@ -48324,7 +48324,7 @@ talos = { }; tamefloats = { revision = 27345; - shortdesc = "Experimentally use \holdinginserts with LaTeX floats"; + shortdesc = "Experimentally use \\holdinginserts with LaTeX floats"; stripPrefix = 0; sha512.run = "bd45962a9caa5b098b6a6a5c0bd3fb964e13cf2744a5fc960a97910183799d532aba24d5f4774ac29eef14bf1439e285010b2e22641167c826d5a36262fc39ef"; sha512.doc = "2b9d013fcb93682e9be0fb1758fc871b4784eef72a0892383a35073aa177ac29acfda5e54b6a919379b43a3dd0fb0b22dd44476857665efb59b2e9cf27bb679a"; @@ -49824,7 +49824,7 @@ thesis-titlepage-fhac = { }; thinsp = { revision = 39669; - shortdesc = "A stretchable \thinspace for LaTeX"; + shortdesc = "A stretchable \\thinspace for LaTeX"; stripPrefix = 0; sha512.run = "ddc80b4de32524ce76fe34e8f88d01e2db18a8bbf60a718454a0303aea8082fc2e495c89c2ad0a7459ed3151e890e30a1263267f249581e24bac87113a5fd266"; sha512.doc = "b5b50522a4a7b5f7772118d95fdf42e2f570ac35c49a8690560df27df0754a170acddd782b516fa185c0f6ef2abb3ff8a9f366370c2ad46e2e4d32dba21e634b"; @@ -50839,7 +50839,7 @@ titlepic = { }; titleref = { revision = 18729; - shortdesc = "A \"\titleref\" command to cross-reference section titles"; + shortdesc = "A \"\\titleref\" command to cross-reference section titles"; stripPrefix = 0; sha512.run = "73905fbe96bc095f602339e0c943048d775bf2a89ef9de3b7149dae7b76aef04e5c77803555450d931f3a4dfef16f5e72597a4d06052d4a852623516edd978f5"; sha512.doc = "70db133fb8a5fa38a6f0f82912d19afe84e0f68820fe62b3835a6d237582a32fe6c2ba5ad05e46f39540d52d0aafa5a88325e1050e6102164a5753fd9c68d6ad"; @@ -50859,7 +50859,7 @@ titlesec = { }; titling = { revision = 15878; - shortdesc = "Control over the typesetting of the \maketitle command"; + shortdesc = "Control over the typesetting of the \\maketitle command"; stripPrefix = 0; sha512.run = "2a321a17b1ff74f57e7bf3f9d72d1b66a0623ed286c8aa75df6d55f1e62b214954ff38456f27f172789bc4cb500688656ab156609933faef67e62954d05d0ce2"; sha512.doc = "e69af16331da73c2a61b063ca4dc4c5f70f7958c366b06e96745a2bc92397f89210ebfe598f445ff33ce7705d0f0b56fc3a46f93bcc89145d50b92d56820f61b"; @@ -51484,7 +51484,7 @@ transparent = { }; transparent-io = { revision = 64113; - shortdesc = "Show for approval the filenames used in \input, \openin, or \openout"; + shortdesc = "Show for approval the filenames used in \\input, \\openin, or \\openout"; stripPrefix = 0; sha512.run = "69d27356f57d5b610fc9e6e839f6df111f6b98b8bf446327ecfba473dea6bc997cb6802ca382b3438d44de85fd5f50f82bd4e5508bfa43d08223463b5436950c"; sha512.doc = "2e54e51744c482f98c1b35588cc934ba18e3358fc2be043459d7e16f8c85ee6aae7acf4b6c3b329cdfddcf1b3126000c6559d41d5b2c4e88d5018844717cb8eb"; @@ -51604,7 +51604,7 @@ truthtable = { }; tsemlines = { revision = 23440; - shortdesc = "Support for the ancient \emline macro"; + shortdesc = "Support for the ancient \\emline macro"; stripPrefix = 0; sha512.run = "d4b6a929a403ed7fea409aa618e7ca021c2c7138a6b11c980430ba18f952ffba44df951dbc7b7f3a5ffcdace3b5f3a455eedc2a50b6e0e003ae3e17e8e7f9969"; hasRunfiles = true; @@ -52100,7 +52100,7 @@ ucdavisthesis = { }; ucharcat = { revision = 38907; - shortdesc = "Implementation of the (new in 2015) XeTeX \Ucharcat command in lua, for LuaTeX"; + shortdesc = "Implementation of the (new in 2015) XeTeX \\Ucharcat command in lua, for LuaTeX"; stripPrefix = 0; sha512.run = "333e8f92394d89bdc3492606e467d4b664c5d87eb464e1c16ff293e3f87931c3c70308aeb523fb40f2e76e5d0aa2c1635402f40fc36ecfbb7ced98d232b8bcb5"; sha512.doc = "b4615cefd26201509c908c2719519f927d61ad96367a612d654917819b2ac973fff85d081dad6e1d092e634388b16e83e440d3cbad4fc7c16f638f5e2853bb7f"; @@ -53331,7 +53331,7 @@ variations = { }; varindex = { revision = 32262; - shortdesc = "Luxury frontend to the \index command"; + shortdesc = "Luxury frontend to the \\index command"; stripPrefix = 0; sha512.run = "fb7216b4cb06126970148788859d9c12a0626d25321cc591b2db5d7018ab2a76f5c6505d9cd47da6a3babc765dcedb6653a3ead2eea67f688cd883fe81d9f42a"; sha512.doc = "30b9f50b7357f12774f78f0792ee0321b5ba84d2c3dff96f5f98d87cf0bb811a2fee74b2bc691fef07a80eb65e13e42b657b74efb0ee334b4f04da7bfdd0b75e"; @@ -54730,7 +54730,7 @@ xgreek = { }; xhfill = { revision = 22575; - shortdesc = "Extending \hrulefill"; + shortdesc = "Extending \\hrulefill"; stripPrefix = 0; sha512.run = "cc0ea9e9d40a590444801359c455716856c807eb429aa01b460fd7566797490932bd3566a5c6f95bd6723e0b05bde1aa632b83383c8bcdeba8a455cb84ea9f1b"; sha512.doc = "027287d941c4576d7f55a3d618e13cde5348ac072f3e546dac6f8a8814efb982f9cd0c4162866403f946d07ecba0ea8cc15543cafbdf9008d60b78d0ea3d26fd"; @@ -55014,7 +55014,7 @@ xmuthesis = { }; xnewcommand = { revision = 15878; - shortdesc = "Define \global and \protected commands with \newcommand"; + shortdesc = "Define \\global and \\protected commands with \\newcommand"; stripPrefix = 0; sha512.run = "3296d6f9b580699e86ee01da444ec9b3cf7b76775f05529cc9c4dd931da5f887c914665651214a8107be612b18cb286ec039ad9ab3de520bd17090b38265d5c9"; sha512.doc = "e03b7027a3956829823e92bd4d8a3000d8f79f26558875ea3837adc9ca4a17ce75d9d4e9136d7ebda7bdc8fbbf4a1b44fc6f71d1bfad710d2e22bba8fab24292"; From 80947c24a8ce08e53ce407870fe4bf3a1dd76ade Mon Sep 17 00:00:00 2001 From: Alexander Kiselyov Date: Fri, 22 Nov 2024 22:08:19 +0300 Subject: [PATCH 111/151] python3Packages.pymanopt: 2.2.0-unstable-2024-07-10 -> 2.2.1 --- pkgs/development/python-modules/pymanopt/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pymanopt/default.nix b/pkgs/development/python-modules/pymanopt/default.nix index 0172ecc6540d..20cac6031746 100644 --- a/pkgs/development/python-modules/pymanopt/default.nix +++ b/pkgs/development/python-modules/pymanopt/default.nix @@ -13,16 +13,14 @@ buildPythonPackage rec { pname = "pymanopt"; - version = "2.2.0-unstable-2024-07-10"; + version = "2.2.1"; pyproject = true; - env.SETUPTOOLS_SCM_PRETEND_VERSION = "2.2.0"; - src = fetchFromGitHub { owner = pname; repo = pname; - rev = "1de3b6f47258820fdc072fceaeaa763b9fd263b0"; - hash = "sha256-j/fVeMgoLLBgRYFtSj2ZyNJb8iuWlnn2/YpBqUoCAFk="; + tag = version; + hash = "sha256-LOEulticgCWZBCf3qj5KFBHt0lMd4H85368IhG3DQ4g="; }; preConfigure = '' From 62fcc798988975fab297b87345d93919cd6f6389 Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 14 Dec 2024 14:10:46 +0100 Subject: [PATCH 112/151] awscli2: Fix invalid string escape --- pkgs/by-name/aw/awscli2/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix index cd7fd53de550..d5b0118bf66b 100644 --- a/pkgs/by-name/aw/awscli2/package.nix +++ b/pkgs/by-name/aw/awscli2/package.nix @@ -171,7 +171,7 @@ py.pkgs.buildPythonApplication rec { # Excludes 1.x versions from the Github tags list extraArgs = [ "--version-regex" - "^(2\.(.*))" + "^(2\\.(.*))" ]; }; tests.version = testers.testVersion { From 38c8c39b6d322634441addf3ba62dd93a7963173 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 14 Dec 2024 14:03:21 +0000 Subject: [PATCH 113/151] nixos-rebuild-ng: improve assertion for unreachable code --- .../ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index d24b1a8afa71..50c4d9ba787f 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -404,10 +404,14 @@ def execute(argv: list[str]) -> None: dry_run=dry_run, **build_flags, ) - case m: + case never: # should never happen, but mypy is not smart enough to # handle this with assert_never - raise NRError(f"invalid match for build: {m}") + # https://github.com/python/mypy/issues/16650 + # https://github.com/python/mypy/issues/16722 + raise AssertionError( + f"expected code to be unreachable, but got: {never}" + ) if not rollback: nix.copy_closure( From 50a57d5773aeedcca14e98a9d009955a0ce15914 Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 14 Dec 2024 14:11:25 +0100 Subject: [PATCH 114/151] circt: Fix invalid string escape --- pkgs/by-name/ci/circt/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix index d8865be0b754..9ea6dad79b34 100644 --- a/pkgs/by-name/ci/circt/package.nix +++ b/pkgs/by-name/ci/circt/package.nix @@ -63,17 +63,17 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/214945 discusses this issue. # # As a temporary fix, we disabled these tests when using clang stdenv - lib.optionals stdenv.cc.isClang [ "CIRCT :: Target/ExportSystemC/.*\.mlir" ] + lib.optionals stdenv.cc.isClang [ "CIRCT :: Target/ExportSystemC/.*\\.mlir" ] # Disable some tests on x86_64-darwin ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [ # These test seem to pass on hydra (rosetta) but not on x86_64-darwin machines - "CIRCT :: Target/ExportSMTLIB/.*\.mlir" - "CIRCT :: circt-bmc/.*\.mlir" + "CIRCT :: Target/ExportSMTLIB/.*\\.mlir" + "CIRCT :: circt-bmc/.*\\.mlir" # These tests were having issues on rosetta - "CIRCT :: Dialect/.*/Reduction/.*\.mlir" - "CIRCT :: Dialect/SMT/.*\.mlir" - "CIRCT :: circt-as-dis/.*\.mlir" - "CIRCT :: circt-reduce/.*\.mlir" + "CIRCT :: Dialect/.*/Reduction/.*\\.mlir" + "CIRCT :: Dialect/SMT/.*\\.mlir" + "CIRCT :: circt-as-dis/.*\\.mlir" + "CIRCT :: circt-reduce/.*\\.mlir" "CIRCT :: circt-test/basic.mlir" ]; in From 8b344a79c972292d8b5c6426aa90df4bc06f4e9c Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 14 Dec 2024 14:11:51 +0100 Subject: [PATCH 115/151] mattermost: Fix invalid string escape --- pkgs/by-name/ma/mattermost/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix index 910d26dd9ef6..67a6207f3f77 100644 --- a/pkgs/by-name/ma/mattermost/package.nix +++ b/pkgs/by-name/ma/mattermost/package.nix @@ -73,7 +73,7 @@ buildGoModule rec { passthru = { updateScript = nix-update-script { - extraArgs = [ "--version-regex" "^v(9\.11\.[0-9]+)$" ]; + extraArgs = [ "--version-regex" "^v(9\\.11\\.[0-9]+)$" ]; }; tests.mattermost = nixosTests.mattermost; }; From dfc3657f0f81391b743213794e9f3b1775e1031a Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 14 Dec 2024 14:12:40 +0100 Subject: [PATCH 116/151] paperjam: Fix invalid string escape --- pkgs/by-name/pa/paperjam/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/paperjam/package.nix b/pkgs/by-name/pa/paperjam/package.nix index f71bae04ae81..ca9cbffd062d 100644 --- a/pkgs/by-name/pa/paperjam/package.nix +++ b/pkgs/by-name/pa/paperjam/package.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=$(out)" # prevent real build date which is impure - "BUILD_DATE=\" - "BUILD_COMMIT=\" + "BUILD_DATE=\\" + "BUILD_COMMIT=\\" ]; # provide backward compatible PointerHolder, suppress deprecation warnings From 0bf626239109203cd714e740c7bd3dfaa708d00a Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 14 Dec 2024 14:13:23 +0100 Subject: [PATCH 117/151] turbo-unwrapped: Fix invalid string escape --- pkgs/by-name/tu/turbo-unwrapped/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix index 36e68b687da2..e91fb9a2603e 100644 --- a/pkgs/by-name/tu/turbo-unwrapped/package.nix +++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix @@ -64,7 +64,7 @@ rustPlatform.buildRustPackage rec { updateScript = nix-update-script { extraArgs = [ "--version-regex" - "'v(\d+\.\d+\.\d+)'" + "'v(\\d+\\.\\d+\\.\\d+)'" ]; }; }; From f9698477df7760f90f40d62a8185abf9da6e58f2 Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 14 Dec 2024 14:14:13 +0100 Subject: [PATCH 118/151] teams: Fix invalid string escape --- pkgs/by-name/te/teams/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/te/teams/package.nix b/pkgs/by-name/te/teams/package.nix index b1f8771a431d..6e52f351c704 100644 --- a/pkgs/by-name/te/teams/package.nix +++ b/pkgs/by-name/te/teams/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { zcat < Teams_osx_app.pkg/Payload | cpio -i ''; - sourceRoot = "Microsoft\ Teams.app"; + sourceRoot = "Microsoft\\ Teams.app"; dontPatch = true; dontConfigure = true; dontBuild = true; From 70e7ca4c3dd999edc78ab0ac0785f0eac2b54da3 Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 14 Dec 2024 14:14:47 +0100 Subject: [PATCH 119/151] uuu: Fix invalid string escape --- pkgs/by-name/uu/uuu/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/uu/uuu/package.nix b/pkgs/by-name/uu/uuu/package.nix index 6ddf35a37b2f..5f6bdfe368bf 100644 --- a/pkgs/by-name/uu/uuu/package.nix +++ b/pkgs/by-name/uu/uuu/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" - "uuu_\([0-9.]+\)" + "uuu_\\([0-9.]+\\)" ]; }; From bd2962950d2ba880bd1f02107ae02e61ecb3a256 Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 14 Dec 2024 14:15:28 +0100 Subject: [PATCH 120/151] av1an-unwrapped: Fix invalid string escape --- pkgs/by-name/av/av1an-unwrapped/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/av/av1an-unwrapped/package.nix b/pkgs/by-name/av/av1an-unwrapped/package.nix index 7c5280af9fa9..e89f7116e118 100644 --- a/pkgs/by-name/av/av1an-unwrapped/package.nix +++ b/pkgs/by-name/av/av1an-unwrapped/package.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { updateScript = nix-update-script { extraArgs = [ "--version-regex" - "'^(\d*\.\d*\.\d*)$'" + "'^(\\d*\\.\\d*\\.\\d*)$'" ]; }; }; From 6d815298c97fc3ccaef94a166dfa274736fcd0bc Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 14 Dec 2024 14:15:59 +0100 Subject: [PATCH 121/151] duplicity: Fix invalid string escape --- pkgs/by-name/du/duplicity/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/du/duplicity/package.nix b/pkgs/by-name/du/duplicity/package.nix index f821a73aa2bf..6417b0b8f1db 100644 --- a/pkgs/by-name/du/duplicity/package.nix +++ b/pkgs/by-name/du/duplicity/package.nix @@ -156,7 +156,7 @@ let updateScript = nix-update-script { extraArgs = [ "--version-regex" - "rel\.(.*)" + "rel\\.(.*)" ]; }; From e044fed9a9023d457abce3880e7fe99d03be8b6a Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 14 Dec 2024 14:16:37 +0100 Subject: [PATCH 122/151] pkcs11-provider: Fix invalid string escape --- pkgs/by-name/pk/pkcs11-provider/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pk/pkcs11-provider/package.nix b/pkgs/by-name/pk/pkcs11-provider/package.nix index f27bd11a934d..70f3f586cc3f 100644 --- a/pkgs/by-name/pk/pkcs11-provider/package.nix +++ b/pkgs/by-name/pk/pkcs11-provider/package.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" - "v(\d\.\d)" + "v(\\d\\.\\d)" ]; }; From 160f865b6bc4be9056ff0a6fd853c466aee62c59 Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 14 Dec 2024 14:17:16 +0100 Subject: [PATCH 123/151] vscode-js-debug: Fix invalid string escape --- pkgs/by-name/vs/vscode-js-debug/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/vs/vscode-js-debug/package.nix b/pkgs/by-name/vs/vscode-js-debug/package.nix index 9434ae1e361e..526ce42a96df 100644 --- a/pkgs/by-name/vs/vscode-js-debug/package.nix +++ b/pkgs/by-name/vs/vscode-js-debug/package.nix @@ -59,7 +59,7 @@ buildNpmPackage rec { passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" - "v((?!\d{4}\.\d\.\d{3}).*)" + "v((?!\\d{4}\\.\\d\\.\\d{3}).*)" ]; }; From 515a6a3386fe4b7b7dea97d72f41684d657c8235 Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 14 Dec 2024 14:09:44 +0100 Subject: [PATCH 124/151] treewide: Fix wrong string indentations --- pkgs/top-level/aliases.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b54542048572..2656b5769c25 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -864,7 +864,8 @@ mapAliases { nextcloud27Packages = throw "Nextcloud27 is EOL!"; # Added 2024-06-25 nagiosPluginsOfficial = monitoring-plugins; neochat = libsForQt5.kdeGear.neochat; # added 2022-05-10 - nerdfonts = throw ''nerdfonts has been separated into individual font packages under the namespace nerd-fonts. + nerdfonts = throw '' + nerdfonts has been separated into individual font packages under the namespace nerd-fonts. For example change: fonts.packages = [ ... From 591861f2b10f446efb5871d1467b245983b7e829 Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 14 Dec 2024 12:32:00 +0100 Subject: [PATCH 125/151] treewide: Fix invalid string escapes --- pkgs/build-support/trivial-builders/default.nix | 2 +- pkgs/pkgs-lib/formats/hocon/test/comprehensive/default.nix | 2 +- pkgs/pkgs-lib/formats/java-properties/test/default.nix | 2 +- pkgs/pkgs-lib/formats/libconfig/test/comprehensive/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 65685d44c75f..be67b7b177ac 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -719,7 +719,7 @@ rec { (name: value: { inherit value; - name = lib.head (builtins.match "${builtins.storeDir}/[${nixHashChars}]+-(.*)\.drv" name); + name = lib.head (builtins.match "${builtins.storeDir}/[${nixHashChars}]+-(.*)\\.drv" name); }) derivations; # The syntax of output paths differs between outputs named `out` diff --git a/pkgs/pkgs-lib/formats/hocon/test/comprehensive/default.nix b/pkgs/pkgs-lib/formats/hocon/test/comprehensive/default.nix index 14b708140eb5..c184b6bc72e4 100644 --- a/pkgs/pkgs-lib/formats/hocon/test/comprehensive/default.nix +++ b/pkgs/pkgs-lib/formats/hocon/test/comprehensive/default.nix @@ -37,7 +37,7 @@ let "b" ] ]; - nasty_string = "\"@\n\\\t^*\b\f\n\0\";'''$"; + nasty_string = "\"@\n\\\t^*bf\n0\";'''$"; "misc attrs" = { x = 1; diff --git a/pkgs/pkgs-lib/formats/java-properties/test/default.nix b/pkgs/pkgs-lib/formats/java-properties/test/default.nix index fdc589d2c1cd..2ea787a90341 100644 --- a/pkgs/pkgs-lib/formats/java-properties/test/default.nix +++ b/pkgs/pkgs-lib/formats/java-properties/test/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation { ); src = lib.sourceByRegex ./. [ - ".*\.java" + ".*\\.java" ]; # On Linux, this can be C.UTF-8, but darwin + zulu requires en_US.UTF-8 LANG = "en_US.UTF-8"; diff --git a/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/default.nix b/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/default.nix index 94b782f94328..efcee72117a9 100644 --- a/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/default.nix +++ b/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/default.nix @@ -61,7 +61,7 @@ let 1 ]) ]; - nasty_string = "\"@\n\\\t^*\b\f\n\0\";'''$"; + nasty_string = "\"@\n\\\t^*bf\n0\";'''$"; weirderTypes = { _includes = [ include_file ]; From 60ea6128cf4f1a1dae971869bc49bc7327f49255 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Dec 2024 11:01:45 +0000 Subject: [PATCH 126/151] gearlever: 2.1.0 -> 2.3.2 --- pkgs/by-name/ge/gearlever/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ge/gearlever/package.nix b/pkgs/by-name/ge/gearlever/package.nix index 4530bddb2e99..83f1765d671a 100644 --- a/pkgs/by-name/ge/gearlever/package.nix +++ b/pkgs/by-name/ge/gearlever/package.nix @@ -21,14 +21,14 @@ python3Packages.buildPythonApplication rec { pname = "gearlever"; - version = "2.1.0"; + version = "2.3.2"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "mijorus"; repo = "gearlever"; - rev = "refs/tags/${version}"; - hash = "sha256-OpNzJwEjLni/vG1RtRSH29wovMRwKzJn+Vep1vZDEFM="; + tag = version; + hash = "sha256-w+tCOMDNm99cAtA9AmADBc6dP4y5KDDP8iiRZS+5upQ="; }; postPatch = @@ -47,6 +47,8 @@ python3Packages.buildPythonApplication rec { + '' substituteInPlace src/AppDetails.py \ --replace-fail "sandbox_sh(['arch'])" '"${stdenv.hostPlatform.uname.processor}"' + substituteInPlace src/models/UpdateManager.py \ + --replace-fail "terminal.sandbox_sh(['arch'])" '"${stdenv.hostPlatform.uname.processor}"' ''; nativeBuildInputs = [ From a9accfaadb5d2caf4ae0cbbcb78a87ae323193f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Dec 2024 15:16:36 +0000 Subject: [PATCH 127/151] tuxguitar: 1.6.4 -> 1.6.5 --- pkgs/by-name/tu/tuxguitar/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tu/tuxguitar/package.nix b/pkgs/by-name/tu/tuxguitar/package.nix index a393c1a85d7c..72a8fbfda8a1 100644 --- a/pkgs/by-name/tu/tuxguitar/package.nix +++ b/pkgs/by-name/tu/tuxguitar/package.nix @@ -16,12 +16,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.6.4"; + version = "1.6.5"; pname = "tuxguitar"; src = fetchurl { url = "https://github.com/helge17/tuxguitar/releases/download/${finalAttrs.version}/tuxguitar-${finalAttrs.version}-linux-swt-amd64.tar.gz"; - hash = "sha256-FD1+7jV69E9AfTczjD6DOGD+pPlscg4o8A9ADBUM9B4="; + hash = "sha256-wxiLqNc20/AROZZWghzbrUz/VK++fEIKyP5ipomy1Po="; }; nativeBuildInputs = [ From a3fece4553aa99cfbf700dd6ca3fe3b2b3105161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 14 Dec 2024 11:53:03 -0800 Subject: [PATCH 128/151] bitwarden-desktop: 2024.11.1 -> 2024.12.0 Diff: https://github.com/bitwarden/clients/compare/desktop-v2024.11.1...desktop-v2024.12.0 Changelog: https://github.com/bitwarden/clients/releases/tag/desktop-v2024.12.0 --- pkgs/by-name/bi/bitwarden-desktop/package.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index d2179a650172..5c0a43804cd6 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -17,7 +17,6 @@ nodejs_20, patchutils_0_4_2, pkg-config, - python3, runCommand, rustc, rustPlatform, @@ -40,13 +39,13 @@ let in buildNpmPackage rec { pname = "bitwarden-desktop"; - version = "2024.11.1"; + version = "2024.12.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-4QTQgW8k3EMf07Xqs2B+VXQOUPzoOgaNvoC02x4zvu8="; + hash = "sha256-1XzIrZOTcFEuY/WqPGcFESBAZOiFcHA4ZvGXhDM7a54="; }; patches = [ @@ -71,11 +70,10 @@ buildNpmPackage rec { "--legacy-peer-deps" ]; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-YzhCyNMvfXGmgOpl3qWj1Pqd1hY8CJ9QLwQds5ZMnqg="; + npmDepsHash = "sha256-EtIcqbubAYN9I9wbw17oHiVshd3GtQayFtdgqWP7Pgg="; - cargoDeps = rustPlatform.fetchCargoTarball { - name = "${pname}-${version}"; - inherit src; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; patches = map ( patch: runCommand (builtins.baseNameOf patch) { nativeBuildInputs = [ patchutils_0_4_2 ]; } '' @@ -84,7 +82,7 @@ buildNpmPackage rec { ) patches; patchFlags = [ "-p4" ]; sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-aurjpVzWET30O+ysyE4ZzauMe8kHjOL169tfKUR1Vpg="; + hash = "sha256-Fh6pbmFof/qIhVETtBA1fGlC45fuu1n7g9hosvmfHZc="; }; cargoRoot = "apps/desktop/desktop_native"; @@ -97,7 +95,6 @@ buildNpmPackage rec { makeWrapper napi-rs-cli pkg-config - (python3.withPackages (ps: with ps; [ setuptools ])) rustc rustPlatform.cargoCheckHook rustPlatform.cargoSetupHook From dd22676dc21c32fb487976543ab670003640b21a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Dec 2024 21:13:13 +0000 Subject: [PATCH 129/151] python312Packages.google-cloud-network-connectivity: 2.5.1 -> 2.6.0 --- .../google-cloud-network-connectivity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix b/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix index 9c6782662931..d231c6ec3cab 100644 --- a/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix +++ b/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-network-connectivity"; - version = "2.5.1"; + version = "2.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "google_cloud_network_connectivity"; - hash = "sha256-n/E8kTwQrs/sdP9I374ieVc1CDt72a3rg+60Kf6TEqk="; + hash = "sha256-tEO50cklPrVOT6gUZ1uvTzyLx4XrysnPvDbD2Wgj7ZI="; }; build-system = [ setuptools ]; From 66ee521b92e252d260941631cf7e01ad347048d1 Mon Sep 17 00:00:00 2001 From: Josh Rickmar Date: Sat, 14 Dec 2024 15:47:44 -0500 Subject: [PATCH 130/151] oksh: 7.5 -> 7.6 --- pkgs/by-name/ok/oksh/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ok/oksh/package.nix b/pkgs/by-name/ok/oksh/package.nix index 8d73437a0cbe..b89897261658 100644 --- a/pkgs/by-name/ok/oksh/package.nix +++ b/pkgs/by-name/ok/oksh/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "oksh"; - version = "7.5"; + version = "7.6"; src = fetchFromGitHub { owner = "ibara"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-r75jjH1E7/36b0ebjsZK7rAuOHEyaIta5Bi8nB4zVjo="; + hash = "sha256-iEV0ibEXwJioBaKN2Tuy0+SaVs8q0Ac4bImP8zhI7oI="; }; strictDeps = true; From d6921048d6d6e56aba06f1e7077583a20cfba8fe Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Sat, 14 Dec 2024 23:08:47 +0100 Subject: [PATCH 131/151] hugin: enable strictDeps, update homepage --- pkgs/applications/graphics/hugin/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 3674d45c53c7..7e79fe18eb73 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -71,7 +71,9 @@ stdenv.mkDerivation rec { zlib ]; - nativeBuildInputs = [ cmake makeWrapper pkg-config wrapGAppsHook3 ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config wrapGAppsHook3 wxGTK ]; + + strictDeps = true; # disable installation of the python scripting interface cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ]; @@ -89,7 +91,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://hugin.sourceforge.net/"; + homepage = "https://hugin.sourceforge.io/"; description = "Toolkit for stitching photographs and assembling panoramas, together with an easy to use graphical front end"; license = licenses.gpl2Plus; maintainers = with maintainers; [ hrdinka ]; From 1cadc60c596595bdc983db773426de48fd5a4816 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Sat, 14 Dec 2024 23:37:44 +0100 Subject: [PATCH 132/151] remind: Add afh as another maintainer --- pkgs/by-name/re/remind/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/re/remind/package.nix b/pkgs/by-name/re/remind/package.nix index 92fbbe740539..d0cd03d6329f 100644 --- a/pkgs/by-name/re/remind/package.nix +++ b/pkgs/by-name/re/remind/package.nix @@ -55,6 +55,7 @@ tcl.mkTclDerivation rec { description = "Sophisticated calendar and alarm program for the console"; license = licenses.gpl2Only; maintainers = with maintainers; [ + afh raskin kovirobi ]; From 37422786020d0b66cb0e308dd34e08544116dd97 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 15 Dec 2024 00:24:36 +0000 Subject: [PATCH 133/151] nixos-rebuild-ng: capture output of `git rev-parse` Fixt #365222. --- pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py | 3 ++- pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py | 2 +- pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index 54ba8ab6d6b4..c7033808394b 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -246,7 +246,8 @@ def get_nixpkgs_rev(nixpkgs_path: Path | None) -> str | None: r = run_wrapper( ["git", "-C", nixpkgs_path, "rev-parse", "--short", "HEAD"], check=False, - stdout=PIPE, + # https://github.com/NixOS/nixpkgs/issues/365222 + capture_output=True, ) except FileNotFoundError: # Git is not included in the closure so we need to check diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index dff9c24fb1d2..39a50ecc405a 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -109,7 +109,7 @@ def test_execute_nix_boot(mock_run: Any, tmp_path: Path) -> None: call( ["git", "-C", nixpkgs_path, "rev-parse", "--short", "HEAD"], check=False, - stdout=PIPE, + capture_output=True, **DEFAULT_RUN_KWARGS, ), call( diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index 0e1a0ecdcc68..3cee46045863 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -289,14 +289,14 @@ def test_get_nixpkgs_rev() -> None: mock_run.assert_called_with( ["git", "-C", path, "rev-parse", "--short", "HEAD"], check=False, - stdout=PIPE, + capture_output=True, ) expected_calls = [ call( ["git", "-C", path, "rev-parse", "--short", "HEAD"], check=False, - stdout=PIPE, + capture_output=True, ), call( ["git", "-C", path, "diff", "--quiet"], From c6776ca354202c08fafd4eb075f27049522eeb01 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 14 Dec 2024 21:35:52 -0600 Subject: [PATCH 134/151] grimblast: add passthru.updateScript --- pkgs/by-name/gr/grimblast/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/gr/grimblast/package.nix b/pkgs/by-name/gr/grimblast/package.nix index 9c2250042009..09e88f1bbcac 100644 --- a/pkgs/by-name/gr/grimblast/package.nix +++ b/pkgs/by-name/gr/grimblast/package.nix @@ -13,6 +13,7 @@ slurp, wl-clipboard, bash, + nix-update-script, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -57,6 +58,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { }" ''; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + meta = with lib; { description = "Helper for screenshots within Hyprland, based on grimshot"; license = licenses.mit; From f75eb9192021c78c1d0f25356ad76d1bc8e566d5 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 14 Dec 2024 21:36:16 -0600 Subject: [PATCH 135/151] grimblast: unstable-2024-01-11 -> 0.1-unstable-2024-12-01 --- pkgs/by-name/gr/grimblast/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/grimblast/package.nix b/pkgs/by-name/gr/grimblast/package.nix index 09e88f1bbcac..c2f8dd49be22 100644 --- a/pkgs/by-name/gr/grimblast/package.nix +++ b/pkgs/by-name/gr/grimblast/package.nix @@ -18,13 +18,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "grimblast"; - version = "unstable-2024-01-11"; + version = "0.1-unstable-2024-12-01"; src = fetchFromGitHub { owner = "hyprwm"; repo = "contrib"; - rev = "89c56351e48785070b60e224ea1717ac50c3befb"; - hash = "sha256-EjdQsk5VIQs7INBugbgX1I9Q3kPAOZSwkXXqEjZL0E0="; + rev = "d7c55140f1785b8d9fef351f1cd2a4c9e1eaa466"; + hash = "sha256-sp14z0mrqrtmouz1+bU4Jh8/0xi+xwQHF2l7mhGSSVU="; }; strictDeps = true; From e0360b4881389e7727bdb360f860cdbdee488f4e Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 14 Dec 2024 21:36:35 -0600 Subject: [PATCH 136/151] grimblast: add khaneliman maintainer --- pkgs/by-name/gr/grimblast/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gr/grimblast/package.nix b/pkgs/by-name/gr/grimblast/package.nix index c2f8dd49be22..fa7bab1cde8b 100644 --- a/pkgs/by-name/gr/grimblast/package.nix +++ b/pkgs/by-name/gr/grimblast/package.nix @@ -64,7 +64,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Helper for screenshots within Hyprland, based on grimshot"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ donovanglover ]; + maintainers = with maintainers; [ + donovanglover + khaneliman + ]; mainProgram = "grimblast"; }; }) From eff9efed9b8382167c8e7d2ef8d1657c66376dc2 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 15 Dec 2024 04:59:45 +0000 Subject: [PATCH 137/151] juicefs: move to by-name --- .../juicefs/default.nix => by-name/ju/juicefs/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 4 deletions(-) rename pkgs/{tools/filesystems/juicefs/default.nix => by-name/ju/juicefs/package.nix} (100%) diff --git a/pkgs/tools/filesystems/juicefs/default.nix b/pkgs/by-name/ju/juicefs/package.nix similarity index 100% rename from pkgs/tools/filesystems/juicefs/default.nix rename to pkgs/by-name/ju/juicefs/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2ba978dc202..6743c8d357fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3904,10 +3904,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit; }; - juicefs = callPackage ../tools/filesystems/juicefs { - buildGoModule = buildGo122Module; - }; - jogl = callPackage ../by-name/jo/jogl/package.nix { stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then overrideSDK stdenv "11.0" else stdenv; }; From 101966f098aa0a34ac61749f8054c3ffc3867a6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Dec 2024 05:46:09 +0000 Subject: [PATCH 138/151] linuxPackages.facetimehd: 0.6.8.1 -> 0.6.8.2 --- pkgs/os-specific/linux/facetimehd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix index f90ace87caeb..078ef3833957 100644 --- a/pkgs/os-specific/linux/facetimehd/default.nix +++ b/pkgs/os-specific/linux/facetimehd/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "facetimehd-${version}-${kernel.version}"; - version = "0.6.8.1"; + version = "0.6.8.2"; # Note: When updating this revision: # 1. Also update pkgs/os-specific/linux/firmware/facetimehd-firmware/ @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "patjak"; repo = "facetimehd"; rev = version; - sha256 = "sha256-h5Erga2hlDIWdDKQbkmkLY1aNCibFM7SVSnxVcoToaM="; + sha256 = "sha256-dw4wEdYTtYyZI52CpoygI7KM6vsShDIYnKgIAAL/adY="; }; preConfigure = '' From fb69f66d0c961c5791967b571a5f3eba34d25480 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 15 Dec 2024 05:47:33 +0000 Subject: [PATCH 139/151] nixos-rebuild-ng: WITH_NIX_2_18 should default to true --- .../ni/nixos-rebuild-ng/src/nixos_rebuild/constants.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/constants.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/constants.py index 883c8b41b360..b02d918ab3b4 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/constants.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/constants.py @@ -1,6 +1,9 @@ # Build-time flags -# Strings to avoid breaking standalone (e.g.: `python -m nixos_rebuild`) usage +# Use strings to avoid breaking standalone (e.g.: `python -m nixos_rebuild`) +# usage EXECUTABLE = "@executable@" -WITH_NIX_2_18 = "@withNix218@" == "true" # type: ignore +# Use either `== "true"` if the default (e.g.: `python -m nixos_rebuld`) is +# `False` or `!= "false"` if the default is `True` +WITH_NIX_2_18 = "@withNix218@" != "false" # type: ignore WITH_REEXEC = "@withReexec@" == "true" # type: ignore WITH_SHELL_FILES = "@withShellFiles@" == "true" # type: ignore From 333a6d3d8804ba80e2ba11534560c1853379ddaa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Dec 2024 12:33:28 +0000 Subject: [PATCH 140/151] bzip3: 1.4.0 -> 1.5.0 --- pkgs/tools/compression/bzip3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/bzip3/default.nix b/pkgs/tools/compression/bzip3/default.nix index 463c4c670594..1cb0f104a41e 100644 --- a/pkgs/tools/compression/bzip3/default.nix +++ b/pkgs/tools/compression/bzip3/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "bzip3"; - version = "1.4.0"; + version = "1.5.0"; outputs = [ "bin" @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "kspalaiologos"; repo = "bzip3"; rev = finalAttrs.version; - hash = "sha256-UVCZWcjlueKSGYqdm7oiJ5i7/irkWv7IOyeCWT2r4sk="; + hash = "sha256-KEx21v1cGANCbTjFmI62QAxFoEhzM3KkxBriVXnxvEk="; }; postPatch = '' From 0212452e27161b583dfee83b5bf2f52141a379bb Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 15 Dec 2024 12:38:55 +0000 Subject: [PATCH 141/151] nixos-rebuild-ng: split get_generations in 2 functions --- .../nixos-rebuild-ng/src/nixos_rebuild/nix.py | 117 +++++++++--------- .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 58 ++++++--- 2 files changed, 98 insertions(+), 77 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index c7033808394b..c1f2e5d5c711 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -266,68 +266,72 @@ def get_nixpkgs_rev(nixpkgs_path: Path | None) -> str | None: return None -def _parse_generation_from_nix_store(path: Path, profile: Profile) -> Generation: - entry_id = path.name.split("-")[1] - current = path.name == profile.path.readlink().name - timestamp = datetime.fromtimestamp(path.stat().st_ctime).strftime( - "%Y-%m-%d %H:%M:%S" - ) - - return Generation( - id=int(entry_id), - timestamp=timestamp, - current=current, - ) - - -def _parse_generation_from_nix_env(line: str) -> Generation: - parts = line.split() - - entry_id = parts[0] - timestamp = f"{parts[1]} {parts[2]}" - current = "(current)" in parts - - return Generation( - id=int(entry_id), - timestamp=timestamp, - current=current, - ) - - -def get_generations( - profile: Profile, - target_host: Remote | None = None, - using_nix_env: bool = False, - sudo: bool = False, -) -> list[Generation]: +def get_generations(profile: Profile) -> list[Generation]: """Get all NixOS generations from profile. Includes generation ID (e.g.: 1, 2), timestamp (e.g.: when it was created) and if this is the current active profile or not. - - If `lock_profile = True` this command will need root to run successfully. """ if not profile.path.exists(): raise NRError(f"no profile '{profile.name}' found") - result = [] - if using_nix_env: - # Using `nix-env --list-generations` needs root to lock the profile - # TODO: do we actually need to lock profile for e.g.: rollback? - # https://github.com/NixOS/nix/issues/5144 - r = run_wrapper( - ["nix-env", "-p", profile.path, "--list-generations"], - stdout=PIPE, - remote=target_host, - sudo=sudo, + def parse_path(path: Path, profile: Profile) -> Generation: + entry_id = path.name.split("-")[1] + current = path.name == profile.path.readlink().name + timestamp = datetime.fromtimestamp(path.stat().st_ctime).strftime( + "%Y-%m-%d %H:%M:%S" ) - for line in r.stdout.splitlines(): - result.append(_parse_generation_from_nix_env(line)) - else: - assert not target_host, "target_host is not supported when using_nix_env=False" - for p in profile.path.parent.glob("system-*-link"): - result.append(_parse_generation_from_nix_store(p, profile)) - return sorted(result, key=lambda d: d.id) + + return Generation( + id=int(entry_id), + timestamp=timestamp, + current=current, + ) + + return sorted( + [parse_path(p, profile) for p in profile.path.parent.glob("system-*-link")], + key=lambda d: d.id, + ) + + +def get_generations_from_nix_env( + profile: Profile, + target_host: Remote | None = None, + sudo: bool = False, +) -> list[Generation]: + """Get all NixOS generations from profile with nix-env. Needs root. + + Includes generation ID (e.g.: 1, 2), timestamp (e.g.: when it was created) + and if this is the current active profile or not. + """ + if not profile.path.exists(): + raise NRError(f"no profile '{profile.name}' found") + + # Using `nix-env --list-generations` needs root to lock the profile + r = run_wrapper( + ["nix-env", "-p", profile.path, "--list-generations"], + stdout=PIPE, + remote=target_host, + sudo=sudo, + ) + + def parse_line(line: str) -> Generation: + parts = line.split() + + entry_id = parts[0] + timestamp = f"{parts[1]} {parts[2]}" + current = "(current)" in parts + + return Generation( + id=int(entry_id), + timestamp=timestamp, + current=current, + ) + + return sorted( + [parse_line(line) for line in r.stdout.splitlines()], + key=lambda d: d.id, + ) def list_generations(profile: Profile) -> list[GenerationJson]: @@ -437,11 +441,8 @@ def rollback_temporary_profile( sudo: bool, ) -> Path | None: "Rollback a temporary Nix profile, like one created by `nixos-rebuild test`." - generations = get_generations( - profile, - target_host=target_host, - using_nix_env=True, - sudo=sudo, + generations = get_generations_from_nix_env( + profile, target_host=target_host, sudo=sudo ) previous_gen_id = None for generation in generations: diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index 3cee46045863..34f47029c103 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -327,7 +327,7 @@ def test_get_nixpkgs_rev() -> None: mock_run.assert_has_calls(expected_calls) -def test_get_generations_from_nix_store(tmp_path: Path) -> None: +def test_get_generations(tmp_path: Path) -> None: nixos_path = tmp_path / "nixos-system" nixos_path.mkdir() @@ -337,20 +337,17 @@ def test_get_generations_from_nix_store(tmp_path: Path) -> None: (tmp_path / "system-3-link").symlink_to(nixos_path) (tmp_path / "system-2-link").symlink_to(nixos_path) - assert n.get_generations( - m.Profile("system", tmp_path / "system"), - using_nix_env=False, - ) == [ + assert n.get_generations(m.Profile("system", tmp_path / "system")) == [ m.Generation(id=1, current=False, timestamp=ANY), m.Generation(id=2, current=True, timestamp=ANY), m.Generation(id=3, current=False, timestamp=ANY), ] -@patch( - get_qualified_name(n.run_wrapper, n), - autospec=True, - return_value=CompletedProcess( +def test_get_generations_from_nix_env(tmp_path: Path) -> None: + path = tmp_path / "test" + path.touch() + return_value = CompletedProcess( [], 0, stdout=textwrap.dedent("""\ @@ -358,17 +355,40 @@ def test_get_generations_from_nix_store(tmp_path: Path) -> None: 2083 2024-11-07 22:59:41 2084 2024-11-07 23:54:17 (current) """), - ), -) -def test_get_generations_from_nix_env(mock_run: Any, tmp_path: Path) -> None: - path = tmp_path / "test" - path.touch() + ) - assert n.get_generations(m.Profile("system", path), using_nix_env=True) == [ - m.Generation(id=2082, current=False, timestamp="2024-11-07 22:58:56"), - m.Generation(id=2083, current=False, timestamp="2024-11-07 22:59:41"), - m.Generation(id=2084, current=True, timestamp="2024-11-07 23:54:17"), - ] + with patch( + get_qualified_name(n.run_wrapper, n), autospec=True, return_value=return_value + ) as mock_run: + assert n.get_generations_from_nix_env(m.Profile("system", path)) == [ + m.Generation(id=2082, current=False, timestamp="2024-11-07 22:58:56"), + m.Generation(id=2083, current=False, timestamp="2024-11-07 22:59:41"), + m.Generation(id=2084, current=True, timestamp="2024-11-07 23:54:17"), + ] + mock_run.assert_called_with( + ["nix-env", "-p", path, "--list-generations"], + stdout=PIPE, + remote=None, + sudo=False, + ) + + remote = m.Remote("user@host", [], "password") + with patch( + get_qualified_name(n.run_wrapper, n), autospec=True, return_value=return_value + ) as mock_run: + assert n.get_generations_from_nix_env( + m.Profile("system", path), remote, True + ) == [ + m.Generation(id=2082, current=False, timestamp="2024-11-07 22:58:56"), + m.Generation(id=2083, current=False, timestamp="2024-11-07 22:59:41"), + m.Generation(id=2084, current=True, timestamp="2024-11-07 23:54:17"), + ] + mock_run.assert_called_with( + ["nix-env", "-p", path, "--list-generations"], + stdout=PIPE, + remote=remote, + sudo=True, + ) @patch( From f14c946931a67970dc711b169a0a22cabe7174c1 Mon Sep 17 00:00:00 2001 From: genga Date: Thu, 21 Nov 2024 22:59:26 +0300 Subject: [PATCH 142/151] pied: init at 0.3.0 pied: update pied: update description pied: add piper-tts path patch pied: update pied: update src and meta attributes pied: update --- pkgs/by-name/pi/pied/package.nix | 47 + .../pi/pied/patches/add_piper_tts-path.patch | 29 + pkgs/by-name/pi/pied/pubspec.lock.json | 922 ++++++++++++++++++ 3 files changed, 998 insertions(+) create mode 100644 pkgs/by-name/pi/pied/package.nix create mode 100644 pkgs/by-name/pi/pied/patches/add_piper_tts-path.patch create mode 100644 pkgs/by-name/pi/pied/pubspec.lock.json diff --git a/pkgs/by-name/pi/pied/package.nix b/pkgs/by-name/pi/pied/package.nix new file mode 100644 index 000000000000..7c61cc369b26 --- /dev/null +++ b/pkgs/by-name/pi/pied/package.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + flutter327, + gst_all_1, +}: + +flutter327.buildFlutterApplication rec { + pname = "pied"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "Elleo"; + repo = "pied"; + tag = "v${version}"; + hash = "sha256-I2p3GIb54r9r/phbKJsz/cFw1ECdwZ2RnCYVxjsHzg0="; + }; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + patches = [ ./patches/add_piper_tts-path.patch ]; + + strictDeps = true; + + buildInputs = [ + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + ]; + + postInstall = '' + install -D flatpak/com.mikeasoft.pied.desktop -t $out/share/applications + install -D flatpak/com.mikeasoft.pied.png -t $out/share/pixmaps + ''; + + meta = { + description = "Piper text-to-speech voice manager for use with Speech Dispatcher"; + homepage = "https://github.com/Elleo/pied"; + changelog = "https://github.com/Elleo/pied/releases/tag/${src.tag}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ genga898 ]; + mainProgram = "pied"; + badPlatforms = [ + # Silently fails in dartConfigHook + lib.systems.inspect.patterns.isDarwin + ]; + }; +} diff --git a/pkgs/by-name/pi/pied/patches/add_piper_tts-path.patch b/pkgs/by-name/pi/pied/patches/add_piper_tts-path.patch new file mode 100644 index 000000000000..0744f4eafd33 --- /dev/null +++ b/pkgs/by-name/pi/pied/patches/add_piper_tts-path.patch @@ -0,0 +1,29 @@ +diff --git a/lib/main.dart b/lib/main.dart +index d677fc3..14c6fd9 100644 +--- a/lib/main.dart ++++ b/lib/main.dart +@@ -52,9 +52,8 @@ class _MainPageState extends State { + + void checkForPiper() async { + final Directory appDir = await getDataDir(); +- Directory piperDir = Directory(path.join(appDir.path, "piper")); + setState(() { +- piperPresent = piperDir.existsSync(); ++ piperPresent = true; + if (piperPresent) { + title = "Voice Selection"; + } +diff --git a/lib/voice_selector.dart b/lib/voice_selector.dart +index 33944ed..66949e3 100644 +--- a/lib/voice_selector.dart ++++ b/lib/voice_selector.dart +@@ -363,8 +363,7 @@ class _VoiceSelectorState extends State { + configString = + configString.replaceAll( + "PIPER_PATH", +- path.join(appDir.path, +- "piper", "piper")); ++ "piper"); + configString = + configString.replaceAll( + "MODEL_PATH", diff --git a/pkgs/by-name/pi/pied/pubspec.lock.json b/pkgs/by-name/pi/pied/pubspec.lock.json new file mode 100644 index 000000000000..e9a12f8d7121 --- /dev/null +++ b/pkgs/by-name/pi/pied/pubspec.lock.json @@ -0,0 +1,922 @@ +{ + "packages": { + "archive": { + "dependency": "direct main", + "description": { + "name": "archive", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.1" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.0" + }, + "audioplayers": { + "dependency": "direct main", + "description": { + "name": "audioplayers", + "sha256": "c05c6147124cd63e725e861335a8b4d57300b80e6e92cea7c145c739223bbaef", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.2.1" + }, + "audioplayers_android": { + "dependency": "transitive", + "description": { + "name": "audioplayers_android", + "sha256": "b00e1a0e11365d88576320ec2d8c192bc21f1afb6c0e5995d1c57ae63156acb5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.3" + }, + "audioplayers_darwin": { + "dependency": "transitive", + "description": { + "name": "audioplayers_darwin", + "sha256": "3034e99a6df8d101da0f5082dcca0a2a99db62ab1d4ddb3277bed3f6f81afe08", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.2" + }, + "audioplayers_linux": { + "dependency": "transitive", + "description": { + "name": "audioplayers_linux", + "sha256": "60787e73fefc4d2e0b9c02c69885402177e818e4e27ef087074cf27c02246c9e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "audioplayers_platform_interface": { + "dependency": "transitive", + "description": { + "name": "audioplayers_platform_interface", + "sha256": "365c547f1bb9e77d94dd1687903a668d8f7ac3409e48e6e6a3668a1ac2982adb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.0" + }, + "audioplayers_web": { + "dependency": "transitive", + "description": { + "name": "audioplayers_web", + "sha256": "22cd0173e54d92bd9b2c80b1204eb1eb159ece87475ab58c9788a70ec43c2a62", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "audioplayers_windows": { + "dependency": "transitive", + "description": { + "name": "audioplayers_windows", + "sha256": "9536812c9103563644ada2ef45ae523806b0745f7a78e89d1b5fb1951de90e1a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "collection": { + "dependency": "transitive", + "description": { + "name": "collection", + "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.18.0" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "cupertino_icons": { + "dependency": "direct main", + "description": { + "name": "cupertino_icons", + "sha256": "d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.6" + }, + "dbus": { + "dependency": "transitive", + "description": { + "name": "dbus", + "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.10" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_highlight": { + "dependency": "transitive", + "description": { + "name": "flutter_highlight", + "sha256": "7b96333867aa07e122e245c033b8ad622e4e3a42a1a2372cbb098a2541d8782c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "flutter_lints": { + "dependency": "direct dev", + "description": { + "name": "flutter_lints", + "sha256": "a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "flutter_local_notifications": { + "dependency": "direct main", + "description": { + "name": "flutter_local_notifications", + "sha256": "6d11ea777496061e583623aaf31923f93a9409ef8fcaeeefdd6cd78bf4fe5bb3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "16.1.0" + }, + "flutter_local_notifications_linux": { + "dependency": "transitive", + "description": { + "name": "flutter_local_notifications_linux", + "sha256": "33f741ef47b5f63cc7f78fe75eeeac7e19f171ff3c3df054d84c1e38bedb6a03", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0+1" + }, + "flutter_local_notifications_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_local_notifications_platform_interface", + "sha256": "7cf643d6d5022f3baed0be777b0662cce5919c0a7b86e700299f22dc4ae660ef", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0+1" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "globbing": { + "dependency": "transitive", + "description": { + "name": "globbing", + "sha256": "4f89cfaf6fa74c9c1740a96259da06bd45411ede56744e28017cc534a12b6e2d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "gtk": { + "dependency": "transitive", + "description": { + "name": "gtk", + "sha256": "e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "highlight": { + "dependency": "transitive", + "description": { + "name": "highlight", + "sha256": "5353a83ffe3e3eca7df0abfb72dcf3fa66cc56b953728e7113ad4ad88497cf21", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "http": { + "dependency": "direct main", + "description": { + "name": "http", + "sha256": "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.7" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.5" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.5" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "markdown": { + "dependency": "transitive", + "description": { + "name": "markdown", + "sha256": "acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.1.1" + }, + "markdown_widget": { + "dependency": "direct main", + "description": { + "name": "markdown_widget", + "sha256": "b69334a1dd633c32d688735d771ebaf5490f713cd00917cb52b53c14c2c09d81", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.1" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.1" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" + }, + "path_provider": { + "dependency": "direct main", + "description": { + "name": "path_provider", + "sha256": "a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "path_provider_android": { + "dependency": "transitive", + "description": { + "name": "path_provider_android", + "sha256": "e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_foundation": { + "dependency": "transitive", + "description": { + "name": "path_provider_foundation", + "sha256": "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.1" + }, + "path_provider_linux": { + "dependency": "transitive", + "description": { + "name": "path_provider_linux", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_platform_interface": { + "dependency": "transitive", + "description": { + "name": "path_provider_platform_interface", + "sha256": "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "path_provider_windows": { + "dependency": "transitive", + "description": { + "name": "path_provider_windows", + "sha256": "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.4.0" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "f4f88d4a900933e7267e2b353594774fc0d07fb072b47eedcd5b54e1ea3269f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.7" + }, + "posix": { + "dependency": "direct main", + "description": { + "name": "posix", + "sha256": "3ad26924254fd2354b0e2b95fc8b45ac392ad87434f8e64807b3a1ac077f2256", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.0" + }, + "quiver": { + "dependency": "transitive", + "description": { + "name": "quiver", + "sha256": "b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "scroll_to_index": { + "dependency": "transitive", + "description": { + "name": "scroll_to_index", + "sha256": "b707546e7500d9f070d63e5acf74fd437ec7eeeb68d3412ef7b0afada0b4f176", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "shared_preferences": { + "dependency": "direct main", + "description": { + "name": "shared_preferences", + "sha256": "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "shared_preferences_android": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_android", + "sha256": "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3" + }, + "shared_preferences_foundation": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_foundation", + "sha256": "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.3" + }, + "shared_preferences_linux": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_linux", + "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_platform_interface": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_platform_interface", + "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_web": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_web", + "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "shared_preferences_windows": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_windows", + "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.99" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "sprintf": { + "dependency": "transitive", + "description": { + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "synchronized": { + "dependency": "transitive", + "description": { + "name": "synchronized", + "sha256": "5fcbd27688af6082f5abd611af56ee575342c30e87541d0245f7ff99faa02c60", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "system_info2": { + "dependency": "direct main", + "description": { + "name": "system_info2", + "sha256": "65206bbef475217008b5827374767550a5420ce70a04d2d7e94d1d2253f3efc9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.2" + }, + "timezone": { + "dependency": "transitive", + "description": { + "name": "timezone", + "sha256": "1cfd8ddc2d1cfd836bc93e67b9be88c3adaeca6f40a00ca999104c30693cdca0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.2" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, + "url_launcher": { + "dependency": "direct main", + "description": { + "name": "url_launcher", + "sha256": "47e208a6711459d813ba18af120d9663c20bdf6985d6ad39fe165d2538378d27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.14" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "31222ffb0063171b526d3e569079cf1f8b294075ba323443fdc690842bfd4def", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.2.0" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "bba3373219b7abb6b5e0d071b0fe66dfbe005d07517a68e38d4fc3638f35c6d3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.2.1" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "9f2d390e096fdbe1e6e6256f97851e51afc2d9c423d3432f1d6a02a8a9a8b9fd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "980e8d9af422f477be6948bdfb68df8433be71f5743a188968b0c1b887807e50", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "ba140138558fcc3eead51a1c42e92a9fb074a1b1149ed3c73e66035b2ccd94f2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.19" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "7754a1ad30ee896b265f8d14078b0513a4dba28d358eabb9d5f339886f4a1adc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "uuid": { + "dependency": "transitive", + "description": { + "name": "uuid", + "sha256": "df5a4d8f22ee4ccd77f8839ac7cb274ebc11ef9adcce8b92be14b797fe889921", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.1" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "visibility_detector": { + "dependency": "transitive", + "description": { + "name": "visibility_detector", + "sha256": "dd5cc11e13494f432d15939c3aa8ae76844c42b723398643ce9addb88a5ed420", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.0+2" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.2.5" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "win32": { + "dependency": "direct overridden", + "description": { + "name": "win32", + "sha256": "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.5.4" + }, + "xdg_desktop_portal": { + "dependency": "direct main", + "description": { + "name": "xdg_desktop_portal", + "sha256": "8a630ea1ebb7d1a9733d0cf6d159839f427d10322776de0c93e7951f62975c8d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.12" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.3" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.0" + }, + "yaru": { + "dependency": "direct main", + "description": { + "name": "yaru", + "sha256": "037219db9ffe757eae0d929cb9dc1a8b27af9850dc6c0d89ecf597dc4f78a5b6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + } + }, + "sdks": { + "dart": ">=3.5.0 <4.0.0", + "flutter": ">=3.24.0" + } +} From 58d62863d8b6e91f416f847f0166fa32325fd7f6 Mon Sep 17 00:00:00 2001 From: Ilya Grigoriev Date: Sat, 14 Dec 2024 15:12:42 -0800 Subject: [PATCH 143/151] rclone: use tag in version output to match upstream pre build binaries Before it was missing a `v`, which caused minor problems with fish shell https://github.com/fish-shell/fish-shell/commit/cc8fa0f7808130ece03f1c2ac0c95f9ede2aaa1d. --- pkgs/applications/networking/sync/rclone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 5bf4ac7eac68..e821d7d3b1ff 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -25,7 +25,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "rclone"; repo = "rclone"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-3Al58jg+pYP46VbpIRbYBhMOG6m7OQaC0pxKawX12E8="; }; @@ -47,7 +47,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/rclone/rclone/fs.Version=${version}" + "-X github.com/rclone/rclone/fs.Version=${src.tag}" ]; postConfigure = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' From 45c7a57f8cf2b3ccd5f02251e709ce87351a5834 Mon Sep 17 00:00:00 2001 From: Soussi Mohamed Nour <88513682+ByteSudoer@users.noreply.github.com> Date: Sun, 15 Dec 2024 19:33:20 +0100 Subject: [PATCH 144/151] sleek-todo: init at 2.0.14 (#347525) sleek: init at 2.0.14 Co-authored-by: ByteSudoer --- pkgs/by-name/sl/sleek-todo/package.nix | 79 ++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 pkgs/by-name/sl/sleek-todo/package.nix diff --git a/pkgs/by-name/sl/sleek-todo/package.nix b/pkgs/by-name/sl/sleek-todo/package.nix new file mode 100644 index 000000000000..84436b9a732a --- /dev/null +++ b/pkgs/by-name/sl/sleek-todo/package.nix @@ -0,0 +1,79 @@ +{ + lib, + stdenv, + fetchurl, + undmg, + appimageTools, + +}: + +let + + pname = "sleek-todo"; + version = "2.0.14"; + + src = + fetchurl + { + x86_64-darwin = { + url = "https://github.com/ransome1/sleek/releases/download/v${version}/sleek-2.0.14-mac-x64.dmg"; + hash = "sha256-f5mMSRa+gAoakOy9TSZeALqCylGLd0nUJIh8o+LWAro="; + }; + x86_64-linux = { + url = "https://github.com/ransome1/sleek/releases/download/v${version}/sleek-2.0.14.AppImage"; + hash = "sha256-d2fLsCI7peuNBtjgHs1qumgPAF9eJeBYiIIffoSv9Jk="; + }; + } + .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.system}"); + + meta = { + description = "Todo manager based on todo.txt syntax"; + homepage = "https://github.com/ransome1/sleek"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ByteSudoer ]; + mainProgram = "sleek-todo"; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + ]; + }; + appimageContents = appimageTools.extract { inherit pname version src; }; +in +if stdenv.hostPlatform.isDarwin then + stdenv.mkDerivation { + inherit + pname + version + src + meta + ; + + sourceRoot = "."; + nativeBuildInputs = [ undmg ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/Applications + cp -r *.app $out/Applications/ + runHook postInstall + ''; + } +else + appimageTools.wrapType2 { + inherit + pname + version + src + meta + ; + + extraInstallCommands = '' + mkdir -p $out/share/{applications,sleek} + cp -a ${appimageContents}/{locales,resources} $out/share/sleek + cp -a ${appimageContents}/usr/share/icons $out/share + install -Dm 444 ${appimageContents}/sleek.desktop $out/share/applications + substituteInPlace $out/share/applications/sleek.desktop \ + --replace-warn 'Exec=AppRun' 'Exec=${pname}' + ''; + + } From a1a493d0b7e56d31e2e15dd940ac8d0ca46b344e Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Mon, 9 Dec 2024 17:31:27 +0000 Subject: [PATCH 145/151] python3Packages.jaeger-client: drop Unmaintained: https://github.com/jaegertracing/jaeger-client-python?tab=readme-ov-file#-this-library-is-deprecated Replaced by OpenTelemetry: https://opentelemetry.io/ --- .../manual/release-notes/rl-2505.section.md | 2 + .../python-modules/jaeger-client/default.nix | 42 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 4 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 pkgs/development/python-modules/jaeger-client/default.nix diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index f173d0d93b1d..e78a8af227f4 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -64,6 +64,8 @@ - The behavior of the `networking.nat.externalIP` and `networking.nat.externalIPv6` options has been changed. `networking.nat.forwardPorts` now only forwards packets destined for the specified IP addresses. +- `python3Packages.jaeger-client` was removed because it was deprecated upstream. [OpenTelemetry](https://opentelemetry.io) is the recommended replacement. + - `nodePackages.meshcommander` has been removed, as the package was deprecated by Intel. - `kanata` was updated to v1.7.0, which introduces several breaking changes. diff --git a/pkgs/development/python-modules/jaeger-client/default.nix b/pkgs/development/python-modules/jaeger-client/default.nix deleted file mode 100644 index c976fca5d634..000000000000 --- a/pkgs/development/python-modules/jaeger-client/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - buildPythonPackage, - fetchPypi, - lib, - opentracing, - threadloop, - thrift, - tornado, -}: - -buildPythonPackage rec { - pname = "jaeger-client"; - version = "4.8.0"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "3157836edab8e2c209bd2d6ae61113db36f7ee399e66b1dcbb715d87ab49bfe0"; - }; - - propagatedBuildInputs = [ - threadloop - thrift - tornado - opentracing - ]; - - # FIXME: Missing dependencies: tchannel, opentracing_instrumentation - # opentracing_instrumentation: Requires "tornado" lower than 6. Current is 6.1. - # https://github.com/uber-common/opentracing-python-instrumentation/pull/115 - doCheck = false; - - pythonImportsCheck = [ "jaeger_client" ]; - - meta = with lib; { - description = "Jaeger bindings for Python OpenTracing API"; - downloadPage = "https://pypi.org/project/jaeger-client/"; - homepage = "https://github.com/jaegertracing/jaeger-client-python"; - license = licenses.asl20; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 7c18c3d69dd2..cd5fb65d14ce 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -284,6 +284,7 @@ mapAliases ({ ipython_genutils = ipython-genutils; # added 2023-10-12 influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10 itanium_demangler = itanium-demangler; # added 2022-10-17 + jaeger-client = throw "jaeger-client was removed because it is deprecated upstream. OpenTelemetry is recommended instead."; # Added 2024-12-09 jaraco_classes = jaraco-classes; # added 2023-07-14 jaraco_collections = jaraco-collections; # added 2023-07-14 jaraco_functools = jaraco-functools; # added 2023-07-14 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fecbbeecaa84..41b6a09ecfbe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6491,8 +6491,6 @@ self: super: with self; { jaconv = callPackage ../development/python-modules/jaconv { }; - jaeger-client = callPackage ../development/python-modules/jaeger-client { }; - jalali-core = callPackage ../development/python-modules/jalali-core { }; jamo = callPackage ../development/python-modules/jamo { }; From 045a51c1d25f1255cc6137749152e8c200221a04 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Mon, 9 Dec 2024 17:31:27 +0000 Subject: [PATCH 146/151] python3Packages.opentracing: drop Unmaintained since 2023: https://github.com/opentracing/opentracing-python OpenTracing is deprecated in favor of OpenTelemetry: https://github.com/NixOS/nixpkgs/issues/261927 --- .../manual/release-notes/rl-2505.section.md | 2 + .../python-modules/opentracing/default.nix | 45 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 4 files changed, 3 insertions(+), 47 deletions(-) delete mode 100644 pkgs/development/python-modules/opentracing/default.nix diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index e78a8af227f4..9698e89ced1e 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -95,6 +95,8 @@ - `nodePackages.stackdriver-statsd-backend` has been removed, as the StackDriver service has been discontinued by Google, and therefore the package no longer works. +- `python3Packages.opentracing` has been removed due to being unmaintained upstream. [OpenTelemetry](https://opentelemetry.io/) is the recommended replacement. + - the notmuch vim plugin now lives in a separate output of the `notmuch` package. Installing `notmuch` will not bring the notmuch vim package anymore, add `vimPlugins.notmuch-vim` to your (Neo)vim configuration if you want the diff --git a/pkgs/development/python-modules/opentracing/default.nix b/pkgs/development/python-modules/opentracing/default.nix deleted file mode 100644 index c0f61bb10743..000000000000 --- a/pkgs/development/python-modules/opentracing/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - pythonAtLeast, - isPy27, - futures ? null, - gevent, - mock, - pytestCheckHook, - tornado, - six, -}: - -buildPythonPackage rec { - pname = "opentracing"; - version = "2.4.0"; - format = "setuptools"; - - # incompatible with asyncio changes in 3.11 and deprecated - # https://github.com/opentracing/specification/issues/163 - disabled = pythonAtLeast "3.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "a173117e6ef580d55874734d1fa7ecb6f3655160b8b8974a2a1e98e5ec9c840d"; - }; - - propagatedBuildInputs = lib.optional isPy27 futures; - - nativeCheckInputs = [ - gevent - mock - pytestCheckHook - six - tornado - ]; - - meta = with lib; { - homepage = "https://github.com/opentracing/opentracing-python"; - description = "Platform API for OpenTracing"; - license = licenses.asl20; - maintainers = with maintainers; [ rakesh4g ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index cd5fb65d14ce..41f4ded9cf2e 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -399,6 +399,7 @@ mapAliases ({ openllm-client = throw "openllm-client has been removed, since it is abandoned due to a change in philosophy"; # added 2024-08-24 openllm-core = throw "openllm-core has been removed, since it is abandoned due to a change in philosophy"; # added 2024-08-24 opsdroid_get_image_size = opsdroid-get-image-size; # added 2023-10-16 + opentracing = throw "The opentracing Python module was removed due to being unmaintained upstream. Use OpenTelemetry instead."; # Added 2024-12-09 ordereddict = throw "ordereddict has been removed because it is only useful on unsupported python versions."; # added 2022-05-28 pafy = throw "pafy has been removed because it is unmaintained and only a dependency of mps-youtube, itself superseded by yewtube"; # Added 2023-01-19 pam = python-pam; # added 2020-09-07. diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 41b6a09ecfbe..ed97110c4330 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9673,8 +9673,6 @@ self: super: with self; { enablePython = true; }); - opentracing = callPackage ../development/python-modules/opentracing { }; - opentsne = callPackage ../development/python-modules/opentsne { }; opentypespec = callPackage ../development/python-modules/opentypespec { }; From 8893464d45794958e4832647040f130e517f76f4 Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Sun, 15 Dec 2024 22:33:25 +0100 Subject: [PATCH 147/151] cratedb: init at 5.9.5 (#359693) --- pkgs/by-name/cr/cratedb/fix-poms.patch | 112 +++++++++++++++++++++++++ pkgs/by-name/cr/cratedb/package.nix | 81 ++++++++++++++++++ 2 files changed, 193 insertions(+) create mode 100644 pkgs/by-name/cr/cratedb/fix-poms.patch create mode 100644 pkgs/by-name/cr/cratedb/package.nix diff --git a/pkgs/by-name/cr/cratedb/fix-poms.patch b/pkgs/by-name/cr/cratedb/fix-poms.patch new file mode 100644 index 000000000000..bff18dd8f2e6 --- /dev/null +++ b/pkgs/by-name/cr/cratedb/fix-poms.patch @@ -0,0 +1,112 @@ +From c8570f7811dda8eb4c6314c54976afa8ebe5ffbf Mon Sep 17 00:00:00 2001 +From: Leah Amelia Chen +Date: Sun, 15 Dec 2024 20:58:33 +0200 +Subject: [PATCH] various POM fixes + +This patch does a number of things: +1. Remove the `git-commit-id-maven-plugin` and avoid needing to have a working Git repository and + Git in order to compile; +2. Remove `toolchains-maven-plugin` and avoid downloading Temurin; +3. Patch the module path of the JLink plugin to avoid a build failure; +4. Disable failing tests that can't be disabled via `-Dtest`, as they are within the `server` subproject. + +diff --git a/app/pom.xml b/app/pom.xml +index 5a0de98..5e511d9 100644 +--- a/app/pom.xml ++++ b/app/pom.xml +@@ -14,7 +14,7 @@ + + ${maven.build.timestamp} + yyyy-MM-dd-HH-mm +- ${project.version}-${timestamp}-${git.commit.id.abbrev} ++ ${project.version} + + + +@@ -72,29 +72,6 @@ + 9bf415bef68c39b3fb0a845ade2c86cb707d0457eba7badc6b9dd29ba7e773f0 + + +- +- io.github.git-commit-id +- git-commit-id-maven-plugin +- ${versions.plugin.git-commit} +- +- +- get-the-git-infos +- +- revision +- +- initialize +- +- +- +- true +- ${project.build.outputDirectory}/crate-build.properties +- +- ^git.build.(time|version)$ +- ^git.commit.id.(abbrev|full)$ +- +- full +- +- + + + +diff --git a/pom.xml b/pom.xml +index 3c9910c..304aa90 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -175,26 +175,6 @@ + + + +- +- org.mvnsearch +- toolchains-maven-plugin +- ${versions.plugin.toolchains} +- +- +- +- toolchain +- +- +- +- +- +- +- ${versions.jdk} +- temurin +- +- +- +- + + org.jacoco + jacoco-maven-plugin +@@ -242,6 +222,9 @@ + ${versions.plugin.jlink} + true + ++ ++ @jdk@/lib/openjdk/jmods ++ + + java.base + java.logging +diff --git a/server/pom.xml b/server/pom.xml +index acc86cb..5297e01 100644 +--- a/server/pom.xml ++++ b/server/pom.xml +@@ -25,6 +25,11 @@ + + + false ++ ++ ++ NodeStatsITest ++ CopyIntegrationTest ++ + + + diff --git a/pkgs/by-name/cr/cratedb/package.nix b/pkgs/by-name/cr/cratedb/package.nix new file mode 100644 index 000000000000..35a928ba283b --- /dev/null +++ b/pkgs/by-name/cr/cratedb/package.nix @@ -0,0 +1,81 @@ +{ + lib, + stdenvNoCC, + maven, + fetchFromGitHub, + replaceVars, + openjdk23, + libarchive, + makeWrapper, +}: +let + # Wants at least Java 22 + jdk = openjdk23; + version = "5.9.5"; +in +maven.buildMavenPackage { + pname = "cratedb"; + inherit version; + + src = fetchFromGitHub { + owner = "crate"; + repo = "crate"; + tag = version; + hash = "sha256-T72Cy/jU8l68Res85bcZysRB81IqUF4eqgRxW7TJ+6Q="; + }; + + nativeBuildInputs = [ + libarchive + makeWrapper + ]; + + patches = [ + (replaceVars ./fix-poms.patch { inherit jdk; }) + ]; + + mvnHash = "sha256-D5cVCx++99DJWX5UHgJydDDYCYmH1cKQ3EAKktFz+gE="; + mvnJdk = jdk; + + installPhase = '' + runHook preInstall + + mkdir -p $out + + # Don't install the bundled JDK; symlink instead. + # Fixing all the paths in the script is frankly way too much work. + bsdtar -xf app/target/crate-${version}.tar.gz -C $out --exclude="*/jdk/*" --strip-components=1 + ln -s ${jdk} $out/jdk + + runHook postInstall + ''; + + postFixup = '' + # By default it wants to write to $out/data and $out/logs. Bad program. + wrapProgram $out/bin/crate \ + --set CRATE_DISABLE_GC_LOGGING 1 \ + --add-flags '-Cpath.data="''${XDG_DATA_HOME:-$HOME/.local/share}/crate"' \ + --add-flags '-Cpath.logs="''${XDG_STATE_HOME:-$HOME/.local/state}/crate"' + ''; + + meta = { + description = "Distributed and scalable SQL database"; + longDescription = '' + CrateDB is a distributed SQL database that makes it simple to store and analyze massive + amounts of data in real-time. + + CrateDB offers the benefits of an SQL database and the scalability and flexibility typically + associated with NoSQL databases. Modest CrateDB clusters can ingest tens of thousands of records + per second without breaking a sweat. You can run ad-hoc queries using standard SQL. + CrateDB's blazing-fast distributed query execution engine parallelizes query workloads across + the whole cluster. + ''; + homepage = "https://cratedb.com/database"; + changelog = "https://cratedb.com/docs/crate/reference/en/latest/appendices/release-notes/${version}.html"; + license = with lib.licenses; [ asl20 ]; + platforms = with lib.platforms; unix ++ windows; + # FIXME: Somehow dependencies are platform-dependent. Somehow. + broken = stdenvNoCC.hostPlatform.system != "x86_64-linux"; + maintainers = with lib.maintainers; [ pluiedev ]; + mainProgram = "crate"; + }; +} From 391a61633b2444359ed0b688887e7a468ac65537 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 15 Dec 2024 13:54:41 -0800 Subject: [PATCH 148/151] Revert "home-assistant-custom-components.homematicip_local: 1.73.0 -> 1.74.0" This reverts commit c7ea95dbe45dd7c5da31e089b538258ee74e37e0. --- .../custom-components/homematicip_local/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix index 857867e349ad..b460d1748824 100644 --- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix +++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "danielperna84"; domain = "homematicip_local"; - version = "1.74.0"; + version = "1.73.0"; src = fetchFromGitHub { owner = "danielperna84"; repo = "custom_homematic"; rev = "refs/tags/${version}"; - hash = "sha256-UdM/T68VK3Dh585rm3qnZ9LtRgpumfzk4TaGGIfYdoM="; + hash = "sha256-1ssmaX6G03i9KYgjCRMZqOG2apEZ0069fQnmVy2BVhA="; }; dependencies = [ From 7211564ef728517a95f1067adde6aac0a2bd7d95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 15 Dec 2024 13:54:49 -0800 Subject: [PATCH 149/151] Revert "python312Packages.hahomematic: 2024.12.0 -> 2024.12.2" This reverts commit 3527ace86e76c4413d758fb438596da958c0beee. --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 3b068917c652..63a93a7ed5b7 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2024.12.2"; + version = "2024.12.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = "hahomematic"; rev = "refs/tags/${version}"; - hash = "sha256-pQiOi6uJcfeBOPmL9MksHLqnemHD9Qk6e7QTI9J3NCc="; + hash = "sha256-RLgJiapsRM8dMA4+T2S6DkSFjo+YBmVVpo1mOVKJ7EI="; }; __darwinAllowLocalNetworking = true; From d70e297ef7ad32038045617210dfe576fe3bfd43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 15 Dec 2024 13:51:27 -0800 Subject: [PATCH 150/151] home-assistant-custom-components.homematicip_local: fail if Home Assistant is too old --- .../custom-components/homematicip_local/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix index b460d1748824..6c99b07f4c3a 100644 --- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix +++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix @@ -3,6 +3,7 @@ buildHomeAssistantComponent, fetchFromGitHub, hahomematic, + home-assistant, }: buildHomeAssistantComponent rec { @@ -17,6 +18,13 @@ buildHomeAssistantComponent rec { hash = "sha256-1ssmaX6G03i9KYgjCRMZqOG2apEZ0069fQnmVy2BVhA="; }; + postPatch = '' + min_ha_version="$(sed -nr 's/^HMIP_LOCAL_MIN_HA_VERSION.*= "([0-9.]+)"$/\1/p' custom_components/homematicip_local/const.py)" + test \ + "$(printf '%s\n' "$min_ha_version" "${home-assistant.version}" | sort -V | head -n1)" = "$min_ha_version" \ + || (echo "error: only Home Assistant >= $min_ha_version is supported" && exit 1) + ''; + dependencies = [ hahomematic ]; From 4115132dfe71e5604d5218526cba2d94c34cac1b Mon Sep 17 00:00:00 2001 From: useranon350 <155507401+useranon350@users.noreply.github.com> Date: Sun, 15 Dec 2024 17:07:20 -0500 Subject: [PATCH 151/151] nvidia-settings: add libraries to runpath (#318131) * Add runtime dependencies to nvidia-settings runpath. * Move libXv to runtimeDependencies nvidia-x11 settings. --- pkgs/os-specific/linux/nvidia-x11/settings.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index df05a859b4c9..f1b363f5a696 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -17,6 +17,7 @@ nvidia_x11: sha256: , libXxf86vm , libvdpau , librsvg +, libglvnd , wrapGAppsHook3 , addDriverRunpath , withGtk2 ? false @@ -77,6 +78,12 @@ let }; }; + runtimeDependencies = [ + libglvnd libXrandr libXv + ]; + + runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies; + in stdenv.mkDerivation { @@ -143,7 +150,7 @@ stdenv.mkDerivation { binaryName = if withGtk3 then ".nvidia-settings-wrapped" else "nvidia-settings"; postFixup = '' - patchelf --set-rpath "$(patchelf --print-rpath $out/bin/$binaryName):$out/lib:${libXv}/lib" \ + patchelf --set-rpath "$(patchelf --print-rpath $out/bin/$binaryName):$out/lib:${runtimeLibraryPath}" \ $out/bin/$binaryName addDriverRunpath $out/bin/$binaryName