From e3f6735bca09d12f601c1945eb75339512669142 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 10:37:42 +0000 Subject: [PATCH 001/201] prometheus-xmpp-alerts: 0.5.1 -> 0.5.3 --- pkgs/servers/monitoring/prometheus/xmpp-alerts.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix index 97593cecca8..e38466df6e6 100644 --- a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix +++ b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "prometheus-xmpp-alerts"; - version = "0.5.1"; + version = "0.5.3"; src = fetchFromGitHub { owner = "jelmer"; repo = pname; rev = "v${version}"; - sha256 = "0qmmmlcanbrhyyxi32gy3gibgvj7jdjwpa8cf5ci9czvbyxg4rld"; + sha256 = "sha256-gb7lFRqqw4w/B+Sw0iteDkuGsPfw/ZZ+sRMTu5vxIUo="; }; propagatedBuildInputs = [ From 87c955386cd129d0b810d1864c4043db8408e4b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 12:10:43 +0000 Subject: [PATCH 002/201] s3fs: 1.90 -> 1.91 --- pkgs/tools/filesystems/s3fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index e0755a1eead..58ef6442d8d 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "s3fs-fuse"; - version = "1.90"; + version = "1.91"; src = fetchFromGitHub { owner = "s3fs-fuse"; repo = "s3fs-fuse"; rev = "v${version}"; - sha256 = "sha256-tcoINdkPfIdO0VMQ5tdpKcslpvvgVhaJiDFnS/ix0sc="; + sha256 = "sha256-41IgUgpVZiIzi3N5kgX7PAhgnd+i/FH1o8t5y3Uw14g="; }; buildInputs = [ curl openssl libxml2 fuse ]; From 31fda20387647ea9d90e4c621b5f101d800205c2 Mon Sep 17 00:00:00 2001 From: ppenguin Date: Fri, 18 Mar 2022 18:34:47 +0100 Subject: [PATCH 003/201] add self to maintainers --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e26d693c39c..914c75902b6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9904,6 +9904,12 @@ fingerprint = "48AD DE10 F27B AFB4 7BB0 CCAF 2D25 95A0 0D08 ACE0"; }]; }; + ppenguin = { + name = "Jeroen Versteeg"; + email = "hieronymusv@gmail.com"; + github = "ppenguin"; + githubId = 17690377; + }; ppom = { name = "Paco Pompeani"; email = "paco@ecomail.io"; From 93681a52a5bff48ecf434d3225588c1c99c1e853 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 28 Jan 2022 08:16:57 +0100 Subject: [PATCH 004/201] stdenv: check that all inputs are of an appropriate type Fixes #24462 --- pkgs/stdenv/generic/make-derivation.nix | 30 ++++++++++++++----------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 2465449867c..6bd31de83df 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -128,6 +128,10 @@ let else lib.subtractLists hardeningDisable (defaultHardeningFlags ++ hardeningEnable); # hardeningDisable additionally supports "all". erroneousHardeningFlags = lib.subtractLists supportedHardeningFlags (hardeningEnable ++ lib.remove "all" hardeningDisable); + + checkDependencyList = name: deps: lib.flip lib.imap1 deps (index: dep: + if lib.isDerivation dep || isNull dep || builtins.typeOf dep == "path" then dep + else throw "Dependency is not of a valid type: element ${toString index} of ${name} for ${attrs.name or attrs.pname}"); in if builtins.length erroneousHardeningFlags != 0 then abort ("mkDerivation was called with unsupported hardening flags: " + lib.generators.toPretty {} { inherit erroneousHardeningFlags hardeningDisable hardeningEnable supportedHardeningFlags; @@ -143,34 +147,34 @@ else let dependencies = map (map lib.chooseDevOutputs) [ [ - (map (drv: drv.__spliced.buildBuild or drv) depsBuildBuild) - (map (drv: drv.nativeDrv or drv) nativeBuildInputs + (map (drv: drv.__spliced.buildBuild or drv) (checkDependencyList "depsBuildBuild" depsBuildBuild)) + (map (drv: drv.nativeDrv or drv) (checkDependencyList "nativeBuildInputs" nativeBuildInputs ++ lib.optional separateDebugInfo' ../../build-support/setup-hooks/separate-debug-info.sh ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh ++ lib.optionals doCheck checkInputs - ++ lib.optionals doInstallCheck' installCheckInputs) - (map (drv: drv.__spliced.buildTarget or drv) depsBuildTarget) + ++ lib.optionals doInstallCheck' installCheckInputs)) + (map (drv: drv.__spliced.buildTarget or drv) (checkDependencyList "depsBuildTarget" depsBuildTarget)) ] [ - (map (drv: drv.__spliced.hostHost or drv) depsHostHost) - (map (drv: drv.crossDrv or drv) buildInputs) + (map (drv: drv.__spliced.hostHost or drv) (checkDependencyList "depsHostHost" depsHostHost)) + (map (drv: drv.crossDrv or drv) (checkDependencyList "buildInputs" buildInputs)) ] [ - (map (drv: drv.__spliced.targetTarget or drv) depsTargetTarget) + (map (drv: drv.__spliced.targetTarget or drv) (checkDependencyList "depsTargetTarget" depsTargetTarget)) ] ]; propagatedDependencies = map (map lib.chooseDevOutputs) [ [ - (map (drv: drv.__spliced.buildBuild or drv) depsBuildBuildPropagated) - (map (drv: drv.nativeDrv or drv) propagatedNativeBuildInputs) - (map (drv: drv.__spliced.buildTarget or drv) depsBuildTargetPropagated) + (map (drv: drv.__spliced.buildBuild or drv) (checkDependencyList "depsBuildBuildPropagated" depsBuildBuildPropagated)) + (map (drv: drv.nativeDrv or drv) (checkDependencyList "propagatedNativeBuildInputs" propagatedNativeBuildInputs)) + (map (drv: drv.__spliced.buildTarget or drv) (checkDependencyList "depsBuildTargetPropagated" depsBuildTargetPropagated)) ] [ - (map (drv: drv.__spliced.hostHost or drv) depsHostHostPropagated) - (map (drv: drv.crossDrv or drv) propagatedBuildInputs) + (map (drv: drv.__spliced.hostHost or drv) (checkDependencyList "depsHostHostPropagated" depsHostHostPropagated)) + (map (drv: drv.crossDrv or drv) (checkDependencyList "propagatedBuildInputs" propagatedBuildInputs)) ] [ - (map (drv: drv.__spliced.targetTarget or drv) depsTargetTargetPropagated) + (map (drv: drv.__spliced.targetTarget or drv) (checkDependencyList "depsTargetTargetPropagated" depsTargetTargetPropagated)) ] ]; From 235fe92e4268dfeb681dcb07273b152579592ea4 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 5 Apr 2022 12:18:04 +0200 Subject: [PATCH 005/201] make-derivation: allow nested lists in buildInputs This isn't really desirable in general, but given that Nix itself currently relies on this behaviour and that we don't want to break backwards compatibility we should support it for now, maybe deprecating it in the future. --- pkgs/stdenv/generic/make-derivation.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 6bd31de83df..eb4f7e59490 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -129,9 +129,11 @@ let # hardeningDisable additionally supports "all". erroneousHardeningFlags = lib.subtractLists supportedHardeningFlags (hardeningEnable ++ lib.remove "all" hardeningDisable); - checkDependencyList = name: deps: lib.flip lib.imap1 deps (index: dep: + checkDependencyList = checkDependencyList' []; + checkDependencyList' = positions: name: deps: lib.flip lib.imap1 deps (index: dep: if lib.isDerivation dep || isNull dep || builtins.typeOf dep == "path" then dep - else throw "Dependency is not of a valid type: element ${toString index} of ${name} for ${attrs.name or attrs.pname}"); + else if lib.isList dep then checkDependencyList' ([index] ++ positions) name dep + else throw "Dependency is not of a valid type: ${lib.concatMapStrings (ix: "element ${toString ix} of ") ([index] ++ positions)}${name} for ${attrs.name or attrs.pname}"); in if builtins.length erroneousHardeningFlags != 0 then abort ("mkDerivation was called with unsupported hardening flags: " + lib.generators.toPretty {} { inherit erroneousHardeningFlags hardeningDisable hardeningEnable supportedHardeningFlags; From e628bde7c1546144e32a1a1486388c798f18e69b Mon Sep 17 00:00:00 2001 From: Googlebot Date: Fri, 8 Apr 2022 15:26:52 -0400 Subject: [PATCH 006/201] prowlarr: Update dependencies, zlib and dotnet runtime --- pkgs/servers/prowlarr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index d05056b604e..fec77cfcc36 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, icu, dotnetCorePackages, openssl, nixosTests }: +{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, icu, dotnet-runtime, openssl, nixosTests, zlib }: let os = @@ -38,10 +38,10 @@ in stdenv.mkDerivation rec { mkdir -p $out/{bin,share/${pname}-${version}} cp -r * $out/share/${pname}-${version}/. - makeWrapper "${dotnetCorePackages.runtime_3_1}/bin/dotnet" $out/bin/Prowlarr \ + makeWrapper "${dotnet-runtime}/bin/dotnet" $out/bin/Prowlarr \ --add-flags "$out/share/${pname}-${version}/Prowlarr.dll" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ - curl sqlite libmediainfo mono openssl icu ]} + curl sqlite libmediainfo mono openssl icu zlib ]} runHook postInstall ''; From 4cc6fa7005d421865840a315d649951c4206d725 Mon Sep 17 00:00:00 2001 From: Googlebot Date: Fri, 8 Apr 2022 15:26:06 -0400 Subject: [PATCH 007/201] radarr: Update dependencies, zlib and dotnet runtime --- pkgs/servers/radarr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 75e20ecef05..e6211b7a147 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, icu, dotnetCorePackages, openssl, nixosTests }: +{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, icu, dotnet-runtime, openssl, nixosTests, zlib }: let os = if stdenv.isDarwin then "osx" else "linux"; @@ -31,10 +31,10 @@ in stdenv.mkDerivation rec { mkdir -p $out/{bin,share/${pname}-${version}} cp -r * $out/share/${pname}-${version}/. - makeWrapper "${dotnetCorePackages.runtime_3_1}/bin/dotnet" $out/bin/Radarr \ + makeWrapper "${dotnet-runtime}/bin/dotnet" $out/bin/Radarr \ --add-flags "$out/share/${pname}-${version}/Radarr.dll" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ - curl sqlite libmediainfo mono openssl icu ]} + curl sqlite libmediainfo mono openssl icu zlib ]} runHook postInstall ''; From 1155186a2b72dd8df1d701f40fedf8c84766061a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 12 Apr 2022 01:03:39 +0000 Subject: [PATCH 008/201] python3Packages.graphviz: 0.19.1 -> 0.19.2 https://github.com/xflr6/graphviz/blob/0.19.2/CHANGES.rst --- pkgs/development/python-modules/graphviz/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index 46a541fe504..b90ba9a6c73 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -16,16 +16,16 @@ buildPythonPackage rec { pname = "graphviz"; - version = "0.19.1"; + version = "0.19.2"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; # patch does not apply to PyPI tarball due to different line endings src = fetchFromGitHub { owner = "xflr6"; repo = "graphviz"; rev = version; - sha256 = "sha256-pE1lsx/r/BjvW5W2niDx/UeRXxx4kvCyHzAUAG3bdGc="; + hash = "sha256-LxXi0Es6ZJT/nSS6SjGg/3stmR25T4R7TZC34mbT+EA="; }; patches = [ @@ -65,6 +65,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple Python interface for Graphviz"; homepage = "https://github.com/xflr6/graphviz"; + changelog = "https://github.com/xflr6/graphviz/blob/${src.rev}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; From 773162442af358717b5885b29ea0c0b6f7be1fad Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Sun, 24 Apr 2022 15:58:50 -0500 Subject: [PATCH 009/201] xtreemfs: switch to python3 --- pkgs/tools/filesystems/xtreemfs/default.nix | 23 +++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index 5f942c92507..e8f283b096c 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -1,5 +1,20 @@ -{ stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python2 -, lib, valgrind, makeWrapper, fetchFromGitHub, fetchpatch }: +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, makeWrapper +, ant +, attr +, boost +, cmake +, file +, fuse +, jdk +, openssl +, python3 +, valgrind +, which +}: stdenv.mkDerivation { src = fetchFromGitHub { @@ -13,8 +28,8 @@ stdenv.mkDerivation { pname = "XtreemFS"; version = "1.5.1.81"; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ which attr python2 ]; + nativeBuildInputs = [ makeWrapper python3 ]; + buildInputs = [ which attr ]; patches = [ (fetchpatch { From 0af63d20a7435712a785d039ebabafe1a532cd4a Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Thu, 28 Apr 2022 11:56:15 +0200 Subject: [PATCH 010/201] flex-ndax: 0.2-20211111.0 -> 0.2-20220427 This update also reduces the PulseAudio dependency to the libraries. --- pkgs/applications/radio/flex-ndax/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/radio/flex-ndax/default.nix b/pkgs/applications/radio/flex-ndax/default.nix index 8be72ef3d6b..9e29249c065 100644 --- a/pkgs/applications/radio/flex-ndax/default.nix +++ b/pkgs/applications/radio/flex-ndax/default.nix @@ -1,19 +1,19 @@ -{ lib, buildGoModule, fetchFromGitHub, pulseaudio }: +{ lib, buildGoModule, fetchFromGitHub, libpulseaudio }: buildGoModule rec { pname = "flex-ndax"; - version = "0.2-20211111.0"; + version = "0.2-20220427"; src = fetchFromGitHub { owner = "kc2g-flex-tools"; repo = "nDAX"; rev = "v${version}"; - sha256 = "0m2hphj0qvgq25pfm3s76naf672ll43jv7gll8cfs7276ckg1904"; + hash = "sha256-KmvTLfGC6xzXcWYAzmBYiYSF65lqMdsdMQjUEk3siqc="; }; - buildInputs = [ pulseaudio ]; + buildInputs = [ libpulseaudio ]; - vendorSha256 = "1bf0iidb8ggzahy3fvxispf3g940mv6vj9wqd8i3rldc6ca2i3pf"; + vendorSha256 = "sha256-u/5LiVo/ZOefprEKr/L1+3+OfYb0a4wq+CWoUjYNvzg="; meta = with lib; { homepage = "https://github.com/kc2g-flex-tools/nDAX"; From eae04234f312738173768a880a7c7acc77fe34c9 Mon Sep 17 00:00:00 2001 From: Andrea Scarpino Date: Thu, 28 Apr 2022 14:01:18 +0200 Subject: [PATCH 011/201] 3llo: 0.3.0 -> 1.3.1 --- pkgs/tools/misc/3llo/Gemfile | 2 +- pkgs/tools/misc/3llo/Gemfile.lock | 32 ++++++++++---------- pkgs/tools/misc/3llo/default.nix | 20 ++----------- pkgs/tools/misc/3llo/gemset.nix | 49 ++++++++++++++++--------------- 4 files changed, 45 insertions(+), 58 deletions(-) diff --git a/pkgs/tools/misc/3llo/Gemfile b/pkgs/tools/misc/3llo/Gemfile index 17a1086d78f..7ad7c5aab15 100644 --- a/pkgs/tools/misc/3llo/Gemfile +++ b/pkgs/tools/misc/3llo/Gemfile @@ -1,2 +1,2 @@ source 'https://rubygems.org' -gem '3llo', '0.3.0' +gem '3llo', '1.3.1' diff --git a/pkgs/tools/misc/3llo/Gemfile.lock b/pkgs/tools/misc/3llo/Gemfile.lock index 45a37b5e1ca..76926d648af 100644 --- a/pkgs/tools/misc/3llo/Gemfile.lock +++ b/pkgs/tools/misc/3llo/Gemfile.lock @@ -1,27 +1,27 @@ GEM remote: https://rubygems.org/ specs: - 3llo (0.3.0) - tty-prompt (~> 0.12.0) - equatable (0.6.1) - necromancer (0.4.0) - pastel (0.7.3) - equatable (~> 0.6) + 3llo (1.3.1) + tty-prompt (~> 0.20) + pastel (0.8.0) tty-color (~> 0.5) - tty-color (0.5.0) - tty-cursor (0.4.0) - tty-prompt (0.12.0) - necromancer (~> 0.4.0) - pastel (~> 0.7.0) - tty-cursor (~> 0.4.0) - wisper (~> 1.6.1) - wisper (1.6.1) + tty-color (0.6.0) + tty-cursor (0.7.1) + tty-prompt (0.23.1) + pastel (~> 0.8) + tty-reader (~> 0.8) + tty-reader (0.9.0) + tty-cursor (~> 0.7) + tty-screen (~> 0.8) + wisper (~> 2.0) + tty-screen (0.8.1) + wisper (2.0.1) PLATFORMS ruby DEPENDENCIES - 3llo (= 0.3.0) + 3llo (= 1.3.1) BUNDLED WITH - 2.1.4 + 2.2.33 diff --git a/pkgs/tools/misc/3llo/default.nix b/pkgs/tools/misc/3llo/default.nix index 75dc8f772c1..3053af18cde 100644 --- a/pkgs/tools/misc/3llo/default.nix +++ b/pkgs/tools/misc/3llo/default.nix @@ -1,24 +1,10 @@ -{ lib, ruby, bundlerApp, fetchpatch }: +{ lib, ruby_3_0, bundlerApp, fetchpatch }: bundlerApp { pname = "3llo"; + ruby = ruby_3_0; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - - gemset = lib.recursiveUpdate (import ./gemset.nix) ({ - "3llo" = { - dontBuild = false; - patches = [ - (fetchpatch { - url = "https://github.com/qcam/3llo/commit/7667c67fdc975bac315da027a3c69f49e7c06a2e.patch"; - sha256 = "0ahp19igj77x23b2j9zk3znlmm7q7nija7mjgsmgqkgfbz2r1y7v"; - }) - ]; - }; - }); - - inherit ruby; + gemdir = ./.; exes = [ "3llo" ]; diff --git a/pkgs/tools/misc/3llo/gemset.nix b/pkgs/tools/misc/3llo/gemset.nix index c6e60d4b668..4de7651dbce 100644 --- a/pkgs/tools/misc/3llo/gemset.nix +++ b/pkgs/tools/misc/3llo/gemset.nix @@ -5,81 +5,82 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "082g42lkkynnb2piz37ih696zm2ms63mz2q9rnfzjsd149ig39yy"; + sha256 = "1w327skga2lpq9rbqqxy6w1r6k9k1l8prk5wmzrycvydn1wp7jk2"; type = "gem"; }; - version = "0.3.0"; + version = "1.3.1"; }; - equatable = { + pastel = { + dependencies = ["tty-color"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fzx2ishipnp6c124ka6fiw5wk42s7c7gxid2c4c1mb55b30dglf"; + sha256 = "0xash2gj08dfjvq4hy6l1z22s5v30fhizwgs10d6nviggpxsj7a8"; type = "gem"; }; - version = "0.6.1"; + version = "0.8.0"; }; - necromancer = { + tty-color = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v9nhdkv6zrp7cn48xv7n2vjhsbslpvs0ha36mfkcd56cp27pavz"; + sha256 = "0aik4kmhwwrmkysha7qibi2nyzb4c8kp42bd5vxnf8sf7b53g73g"; type = "gem"; }; - version = "0.4.0"; + version = "0.6.0"; }; - pastel = { - dependencies = ["equatable" "tty-color"]; + tty-cursor = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m43wk7gswwkl6lfxwlliqc9v1qp8arfygihyz91jc9icf270xzm"; + sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr"; type = "gem"; }; - version = "0.7.3"; + version = "0.7.1"; }; - tty-color = { + tty-prompt = { + dependencies = ["pastel" "tty-reader"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zpp6zixkkchrc2lqnabrsy24pxikz2px87ggz5ph6355fs803da"; + sha256 = "1j4y8ik82azjxshgd4i1v4wwhsv3g9cngpygxqkkz69qaa8cxnzw"; type = "gem"; }; - version = "0.5.0"; + version = "0.23.1"; }; - tty-cursor = { + tty-reader = { + dependencies = ["tty-cursor" "tty-screen" "wisper"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07whfm8mnp7l49s2cm2qy1snhsqq3a90sqwb71gvym4hm2kx822a"; + sha256 = "1cf2k7w7d84hshg4kzrjvk9pkyc2g1m3nx2n1rpmdcf0hp4p4af6"; type = "gem"; }; - version = "0.4.0"; + version = "0.9.0"; }; - tty-prompt = { - dependencies = ["necromancer" "pastel" "tty-cursor" "wisper"]; + tty-screen = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1026nyqhgmgxi2nmk8xk3hca07gy5rpisjs8y6w00wnw4f01kpv0"; + sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235"; type = "gem"; }; - version = "0.12.0"; + version = "0.8.1"; }; wisper = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19bw0z1qw1dhv7gn9lad25hgbgpb1bkw8d599744xdfam158ms2s"; + sha256 = "1rpsi0ziy78cj82sbyyywby4d0aw0a5q84v65qd28vqn79fbq5yf"; type = "gem"; }; - version = "1.6.1"; + version = "2.0.1"; }; } From bfecfa961300d374ce191fd2d1e51bdcb14262e1 Mon Sep 17 00:00:00 2001 From: Alex Wied Date: Tue, 26 Apr 2022 19:22:12 -0400 Subject: [PATCH 012/201] zcash: 4.6.0-2 -> 4.7.0 --- .../blockchains/zcash/default.nix | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index 5e9f4200141..a69393c2d2b 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -1,24 +1,37 @@ -{ rust, rustPlatform, stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper -, cargo, pkg-config, curl, coreutils, boost177, db62, hexdump, libsodium -, libevent, utf8cpp, util-linux, withDaemon ? true, withMining ? true +{ rust, rustPlatform, stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook +, makeWrapper, cargo, pkg-config, curl, coreutils, boost178, db62, hexdump +, libsodium, libevent, utf8cpp, util-linux, withDaemon ? true, withMining ? true , withUtils ? true, withWallet ? true, withZmq ? true, zeromq }: rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { pname = "zcash"; - version = "4.6.0-2"; + version = "4.7.0"; src = fetchFromGitHub { owner = "zcash"; repo = "zcash"; rev = "v${version}"; - sha256 = "sha256-RvUa8CKPBFfsqzrJkPHePZMqpCfyVafrUbftMdTviHA="; + sha256 = "sha256-yF+/QepSiZwsdZydWjvxDIFeFyJbJyqZmCdMyQHmrzI="; }; - cargoSha256 = "sha256-qWimataBZ/rLDOLgetNfFAzi/psXcJV54b3WGm9k+b4="; + prePatch = lib.optionalString stdenv.isAarch64 '' + substituteInPlace .cargo/config.offline \ + --replace "[target.aarch64-unknown-linux-gnu]" "" \ + --replace "linker = \"aarch64-linux-gnu-gcc\"" "" + ''; + + cargoPatches = [ + (fetchpatch { + url = "https://github.com/zcash/zcash/commit/61cd19a52d41d60c1987ecf269f7aa8e4d527310.diff"; + sha256 = "sha256-/7T2yCSVlRN7qfFjrZlfBNMlbVHb/KRjtUBY2xFr0mo="; + }) + ]; + + cargoSha256 = "sha256-+BLfO5OnCBqQTIqMXKJdoPCRgtENa+m0WOHKG9gkdMk="; nativeBuildInputs = [ autoreconfHook cargo hexdump makeWrapper pkg-config ]; - buildInputs = [ boost177 libevent libsodium utf8cpp ] + buildInputs = [ boost178 libevent libsodium utf8cpp ] ++ lib.optional withWallet db62 ++ lib.optional withZmq zeromq; @@ -37,7 +50,7 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { configureFlags = [ "--disable-tests" - "--with-boost-libdir=${lib.getLib boost177}/lib" + "--with-boost-libdir=${lib.getLib boost178}/lib" "CXXFLAGS=-I${lib.getDev utf8cpp}/include/utf8cpp" "RUST_TARGET=${rust.toRustTargetSpec stdenv.hostPlatform}" ] ++ lib.optional (!withWallet) "--disable-wallet" @@ -58,8 +71,8 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { meta = with lib; { description = "Peer-to-peer, anonymous electronic cash system"; homepage = "https://z.cash/"; - maintainers = with maintainers; [ rht tkerber ]; + maintainers = with maintainers; [ rht tkerber centromere ]; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } From 073ee0e4ab0b7d326a58d05fbe7dce8644ce4e6d Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Sat, 30 Apr 2022 17:30:57 +0200 Subject: [PATCH 013/201] umlet: 14.3.0 -> 15.0.0 --- pkgs/tools/misc/umlet/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix index d88e0bdea15..aca04546fd2 100644 --- a/pkgs/tools/misc/umlet/default.nix +++ b/pkgs/tools/misc/umlet/default.nix @@ -1,14 +1,16 @@ { lib, stdenv, fetchurl, jre, unzip, runtimeShell }: -stdenv.mkDerivation rec { - major = "14"; - minor = "3"; - version = "${major}.${minor}.0"; +let + major = "15"; + minor = "0"; + patch = "0"; +in stdenv.mkDerivation rec { pname = "umlet"; + version = "${major}.${minor}.${patch}"; src = fetchurl { - url = "http://www.umlet.com/umlet_${major}_${minor}/umlet-standalone-${version}.zip"; - sha256 = "0jfyxjxsjx29xhs3fl0f574nyncmk9j5jp8zlgd401mcaznn9c7l"; + url = "https://www.umlet.com/umlet_${major}_${minor}/umlet-standalone-${version}.zip"; + sha256 = "sha256-gdvhqYGyrFuQhhrkF26wXb3TQLRCLm59/uSxTPmHdAE="; }; nativeBuildInputs = [ unzip ]; @@ -43,7 +45,7 @@ stdenv.mkDerivation rec { UMLet runs stand-alone or as Eclipse plug-in on Windows, macOS and Linux. ''; - homepage = "http://www.umlet.com"; + homepage = "https://www.umlet.com"; license = licenses.gpl3; maintainers = with maintainers; [ oxzi ]; platforms = platforms.all; From b3613dd8d79940947f649b88e54cda420c7399e1 Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Sat, 30 Oct 2021 22:42:58 +0000 Subject: [PATCH 014/201] gtkd: add possibility to use different D compilers Specify the D compiler to use with argument `dcompiler` Move the specification to all-packages.nix Passthru the `dcompiler` attribute to make it discoverable by reverse deps --- pkgs/development/libraries/gtkd/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index ed432652700..18fedb2c17d 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, ldc, gdk-pixbuf, gnome, gst_all_1, librsvg +{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, dcompiler, gdk-pixbuf, gnome, gst_all_1, librsvg , glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { stripRoot = false; }; - nativeBuildInputs = [ ldc pkg-config which ]; + nativeBuildInputs = [ dcompiler pkg-config which ]; propagatedBuildInputs = [ atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview4 libgda libpeas librsvg pango vte @@ -134,6 +134,10 @@ in stdenv.mkDerivation rec { done ''; + passthru = { + inherit dcompiler; + }; + meta = with lib; { description = "D binding and OO wrapper for GTK"; homepage = "https://gtkd.org"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e665d0bdc23..85ae3447371 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6703,7 +6703,7 @@ with pkgs; gtdialog = callPackage ../development/libraries/gtdialog {}; - gtkd = callPackage ../development/libraries/gtkd { }; + gtkd = callPackage ../development/libraries/gtkd { dcompiler = ldc; }; gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { }; From e63b0f634e9f38fe3290660fb37fb6833ed5cf9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Tue, 3 May 2022 20:39:36 +1000 Subject: [PATCH 015/201] cvs2svn: add man pages --- pkgs/applications/version-management/cvs2svn/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix index 9f1df695a17..80225630c0a 100644 --- a/pkgs/applications/version-management/cvs2svn/default.nix +++ b/pkgs/applications/version-management/cvs2svn/default.nix @@ -1,6 +1,7 @@ { lib, fetchurl, makeWrapper , pypy2Packages , cvs, subversion, git, breezy +, installShellFiles }: pypy2Packages.buildPythonApplication rec { @@ -12,7 +13,7 @@ pypy2Packages.buildPythonApplication rec { sha256 = "1ska0z15sjhyfi860rjazz9ya1gxbf5c0h8dfqwz88h7fccd22b4"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; checkInputs = [ subversion git breezy ]; @@ -24,6 +25,8 @@ pypy2Packages.buildPythonApplication rec { for i in bzr svn git; do wrapProgram $out/bin/cvs2$i \ --prefix PATH : "${lib.makeBinPath [ cvs ]}" + $out/bin/cvs2$i --man > csv2$i.1 + installManPage csv2$i.1 done ''; From 578441d11bb6edd4299ff3a723e31e17250fa477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Tue, 3 May 2022 20:41:46 +1000 Subject: [PATCH 016/201] cvs2svn: add self to maintainers --- pkgs/applications/version-management/cvs2svn/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix index 80225630c0a..a5903b7266e 100644 --- a/pkgs/applications/version-management/cvs2svn/default.nix +++ b/pkgs/applications/version-management/cvs2svn/default.nix @@ -33,7 +33,7 @@ pypy2Packages.buildPythonApplication rec { meta = with lib; { description = "A tool to convert CVS repositories to Subversion repositories"; homepage = "https://github.com/mhagger/cvs2svn"; - maintainers = [ maintainers.makefu ]; + maintainers = with maintainers; [ makefu viraptor ]; platforms = platforms.unix; license = licenses.asl20; }; From 36c879d18cb3f4e2f6dcdd5e7d646c69138187c1 Mon Sep 17 00:00:00 2001 From: Jeroen Versteeg Date: Fri, 6 May 2022 18:23:47 +0200 Subject: [PATCH 017/201] python3Packages.pandoc-xnos: init at 2.5.0 --- .../python-modules/pandoc-xnos/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/pandoc-xnos/default.nix diff --git a/pkgs/development/python-modules/pandoc-xnos/default.nix b/pkgs/development/python-modules/pandoc-xnos/default.nix new file mode 100644 index 00000000000..28044d4bc24 --- /dev/null +++ b/pkgs/development/python-modules/pandoc-xnos/default.nix @@ -0,0 +1,32 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, pandocfilters +, psutil +}: + +buildPythonPackage rec { + pname = "pandoc-xnos"; + version = "2.5.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "tomduck"; + repo = pname; + rev = version; + sha256 = "sha256-beiGvN0DS6s8wFjcDKozDuwAM2OApX3lTRaUDRUqLeU="; + }; + + propagatedBuildInputs = [ pandocfilters psutil ]; + + doCheck = true; + + pythonImportsCheck = [ "pandocxnos" ]; + + meta = with lib; { + description = "Pandoc filter suite providing facilities for cross-referencing in markdown documents"; + homepage = "https://github.com/tomduck/pandoc-xnos"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ ppenguin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 720f463312f..8317673110f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5886,6 +5886,8 @@ in { pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { }; + pandoc-xnos = callPackage ../development/python-modules/pandoc-xnos { }; + pandocfilters = callPackage ../development/python-modules/pandocfilters { }; panel = callPackage ../development/python-modules/panel { }; From 5466f3931f5041b8cc91cf534c512a97fdaa9fb7 Mon Sep 17 00:00:00 2001 From: Jeroen Versteeg Date: Fri, 6 May 2022 18:24:51 +0200 Subject: [PATCH 018/201] pandoc-eqnos: init at 2.5.0 --- pkgs/tools/misc/pandoc-eqnos/default.nix | 30 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/misc/pandoc-eqnos/default.nix diff --git a/pkgs/tools/misc/pandoc-eqnos/default.nix b/pkgs/tools/misc/pandoc-eqnos/default.nix new file mode 100644 index 00000000000..310826c35b0 --- /dev/null +++ b/pkgs/tools/misc/pandoc-eqnos/default.nix @@ -0,0 +1,30 @@ +{ buildPythonApplication +, fetchFromGitHub +, lib +, pandoc-xnos +}: + +buildPythonApplication rec { + pname = "pandoc-eqnos"; + version = "2.5.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "tomduck"; + repo = pname; + rev = version; + sha256 = "sha256-7GQdfGHhtQs6LZK+ZyMmcPSkoFfBWmATTMejMiFcS7Y="; + }; + + propagatedBuildInputs = [ pandoc-xnos ]; + + # Different pandoc executables are not available + doCheck = false; + + meta = with lib; { + description = "Standalone pandoc filter from the pandoc-xnos suite for numbering equations and equation references"; + homepage = "https://github.com/tomduck/pandoc-eqnos"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ ppenguin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1584e5c0d9..9c86a2ffdb9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8332,7 +8332,8 @@ with pkgs; pandoc-plantuml-filter = python3Packages.callPackage ../tools/misc/pandoc-plantuml-filter { }; - panicparse = callPackage ../tools/misc/panicparse { }; + # pandoc-*nos is a filter suite, where pandoc-xnos has all functionality and the others are used for only specific functionality + pandoc-eqnos = python3Packages.callPackage ../tools/misc/pandoc-eqnos { }; patray = callPackage ../tools/audio/patray { }; From 2e563123bf6ed58fa85626686a27208a9c96348d Mon Sep 17 00:00:00 2001 From: Jeroen Versteeg Date: Fri, 6 May 2022 18:25:55 +0200 Subject: [PATCH 019/201] pandoc-fignos: init at 2.4.0 --- pkgs/tools/misc/pandoc-fignos/default.nix | 30 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/misc/pandoc-fignos/default.nix diff --git a/pkgs/tools/misc/pandoc-fignos/default.nix b/pkgs/tools/misc/pandoc-fignos/default.nix new file mode 100644 index 00000000000..846d1abe8d7 --- /dev/null +++ b/pkgs/tools/misc/pandoc-fignos/default.nix @@ -0,0 +1,30 @@ +{ buildPythonApplication +, fetchFromGitHub +, lib +, pandoc-xnos +}: + +buildPythonApplication rec { + pname = "pandoc-fignos"; + version = "2.4.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "tomduck"; + repo = pname; + rev = version; + sha256 = "sha256-eDwAW0nLB4YqrWT3Ajt9bmX1A43wl+tOPm2St5VpCLk="; + }; + + propagatedBuildInputs = [ pandoc-xnos ]; + + # Different pandoc executables are not available + doCheck = false; + + meta = with lib; { + description = "Standalone pandoc filter from the pandoc-xnos suite for numbering figures and figure references"; + homepage = "https://github.com/tomduck/pandoc-fignos"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ ppenguin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c86a2ffdb9..bb626f1de8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8334,6 +8334,7 @@ with pkgs; # pandoc-*nos is a filter suite, where pandoc-xnos has all functionality and the others are used for only specific functionality pandoc-eqnos = python3Packages.callPackage ../tools/misc/pandoc-eqnos { }; + pandoc-fignos = python3Packages.callPackage ../tools/misc/pandoc-fignos { }; patray = callPackage ../tools/audio/patray { }; From 62511c6de31dd81c2ea07a4cd37e38cb6dee5b29 Mon Sep 17 00:00:00 2001 From: Jeroen Versteeg Date: Fri, 6 May 2022 18:27:00 +0200 Subject: [PATCH 020/201] pandoc-secnos: init at 2.2.2 --- pkgs/tools/misc/pandoc-secnos/default.nix | 34 ++++++++++++++++ .../pandoc-secnos/patch/fix-manifest.patch | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 74 insertions(+) create mode 100644 pkgs/tools/misc/pandoc-secnos/default.nix create mode 100644 pkgs/tools/misc/pandoc-secnos/patch/fix-manifest.patch diff --git a/pkgs/tools/misc/pandoc-secnos/default.nix b/pkgs/tools/misc/pandoc-secnos/default.nix new file mode 100644 index 00000000000..95c67dde0ec --- /dev/null +++ b/pkgs/tools/misc/pandoc-secnos/default.nix @@ -0,0 +1,34 @@ +{ buildPythonApplication +, fetchFromGitHub +, lib +, pandoc-xnos +}: + +buildPythonApplication rec { + pname = "pandoc-secnos"; + version = "2.2.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "tomduck"; + repo = pname; + rev = version; + sha256 = "sha256-J9KLZvioYM3Pl2UXjrEgd4PuLTwCLYy9SsJIzgw5/jU="; + }; + + propagatedBuildInputs = [ pandoc-xnos ]; + + patches = [ + ./patch/fix-manifest.patch + ]; + + # Different pandoc executables are not available + doCheck = false; + + meta = with lib; { + description = "Standalone pandoc filter from the pandoc-xnos suite for numbering sections and section references"; + homepage = "https://github.com/tomduck/pandoc-secnos"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ ppenguin ]; + }; +} diff --git a/pkgs/tools/misc/pandoc-secnos/patch/fix-manifest.patch b/pkgs/tools/misc/pandoc-secnos/patch/fix-manifest.patch new file mode 100644 index 00000000000..782e5b5e07c --- /dev/null +++ b/pkgs/tools/misc/pandoc-secnos/patch/fix-manifest.patch @@ -0,0 +1,39 @@ +From 165ee1f4c1208636254392335d34934dc50d273e Mon Sep 17 00:00:00 2001 +From: ppenguin +Date: Tue, 15 Mar 2022 23:15:07 +0100 +Subject: [PATCH] fix setup.py to work in nixpkgs + +--- + setup.py | 13 ++----------- + 1 file changed, 2 insertions(+), 11 deletions(-) + +diff --git a/setup.py b/setup.py +index d705846..d7345a2 100644 +--- a/setup.py ++++ b/setup.py +@@ -42,10 +42,10 @@ + + author='Thomas J. Duck', + author_email='tomduck@tomduck.ca', +- description='Equation number filter for pandoc', ++ description='Section number filter for pandoc', + long_description=DESCRIPTION, + license='GPL', +- keywords='pandoc equation numbers filter', ++ keywords='pandoc section numbers filter', + url='https://github.com/tomduck/pandoc-secnos', + download_url='https://github.com/tomduck/pandoc-secnos/tarball/' + \ + __version__, +@@ -63,12 +63,3 @@ + 'Programming Language :: Python' + ] + ) +- +-# Check that the pandoc-secnos script is on the PATH +-if not shutil.which('pandoc-secnos'): +- msg = """ +- ERROR: `pandoc-secnos` script not found. This will need to +- be corrected. If you need help, please file an Issue at +- https://github.com/tomduck/pandoc-secnos/issues.\n""" +- print(textwrap.dedent(msg)) +- sys.exit(-1) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb626f1de8d..865c13b933b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8335,6 +8335,7 @@ with pkgs; # pandoc-*nos is a filter suite, where pandoc-xnos has all functionality and the others are used for only specific functionality pandoc-eqnos = python3Packages.callPackage ../tools/misc/pandoc-eqnos { }; pandoc-fignos = python3Packages.callPackage ../tools/misc/pandoc-fignos { }; + pandoc-secnos = python3Packages.callPackage ../tools/misc/pandoc-secnos { }; patray = callPackage ../tools/audio/patray { }; From 0a6a3c0b3375e4d3cdd58c20bc8650b361f81116 Mon Sep 17 00:00:00 2001 From: Jeroen Versteeg Date: Fri, 6 May 2022 18:27:40 +0200 Subject: [PATCH 021/201] pandoc-tablenos: init at 2.3.0 --- pkgs/tools/misc/pandoc-tablenos/default.nix | 30 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/misc/pandoc-tablenos/default.nix diff --git a/pkgs/tools/misc/pandoc-tablenos/default.nix b/pkgs/tools/misc/pandoc-tablenos/default.nix new file mode 100644 index 00000000000..f3d67826a45 --- /dev/null +++ b/pkgs/tools/misc/pandoc-tablenos/default.nix @@ -0,0 +1,30 @@ +{ buildPythonApplication +, fetchFromGitHub +, lib +, pandoc-xnos +}: + +buildPythonApplication rec { + pname = "pandoc-tablenos"; + version = "2.3.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "tomduck"; + repo = pname; + rev = version; + sha256 = "sha256-FwzsRziY3PoySo9hIFuLw6tOO9oQij6oQEyoY8HgnII="; + }; + + propagatedBuildInputs = [ pandoc-xnos ]; + + # Different pandoc executables are not available + doCheck = false; + + meta = with lib; { + description = "Standalone pandoc filter from the pandoc-xnos suite for numbering tables and table references"; + homepage = "https://github.com/tomduck/pandoc-tablenos"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ ppenguin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 865c13b933b..67acc8a0197 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8336,6 +8336,7 @@ with pkgs; pandoc-eqnos = python3Packages.callPackage ../tools/misc/pandoc-eqnos { }; pandoc-fignos = python3Packages.callPackage ../tools/misc/pandoc-fignos { }; pandoc-secnos = python3Packages.callPackage ../tools/misc/pandoc-secnos { }; + pandoc-tablenos = python3Packages.callPackage ../tools/misc/pandoc-tablenos { }; patray = callPackage ../tools/audio/patray { }; From b45b15cddd1fa636aaf61d58954f3b8981cd794c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 6 May 2022 13:38:43 -0500 Subject: [PATCH 022/201] =?UTF-8?q?metals:=200.11.4=20=E2=86=92=200.11.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/metals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index b7e8eca1b83..4281a1d9e39 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.11.4"; + version = "0.11.5"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-ZHl+uqYTSMEMR1CSo0btxEn/NQz7MNwh4JISm2L5B3Y="; + outputHash = "sha256-kw+8688E1b7XjEb7AqOExSVu88NqPprKaCuINWqL2wk="; }; nativeBuildInputs = [ makeWrapper setJavaClassPath ]; From 94c5433df267e68ab6c136f1fc742592b3f42714 Mon Sep 17 00:00:00 2001 From: Hexadecimal Date: Sat, 7 May 2022 10:11:09 +0800 Subject: [PATCH 023/201] wolfram-engine: fix wrappers --- pkgs/applications/science/math/wolfram-engine/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/wolfram-engine/default.nix b/pkgs/applications/science/math/wolfram-engine/default.nix index df9e2f88dfc..8b531b2c885 100644 --- a/pkgs/applications/science/math/wolfram-engine/default.nix +++ b/pkgs/applications/science/math/wolfram-engine/default.nix @@ -112,10 +112,14 @@ stdenv.mkDerivation rec { # Fix library paths cd $out/libexec/${dirName}/Executables - for path in MathKernel WolframKernel math mcc wolfram; do + for path in MathKernel math mcc wolfram; do makeWrapper $out/libexec/${dirName}/Executables/$path $out/bin/$path --set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" done + for path in WolframKernel wolframscript; do + makeWrapper $out/libexec/${dirName}/SystemFiles/Kernel/Binaries/Linux-x86-64/$path $out/bin/$path --set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" + done + # ... and xkeyboard config path for Qt for path in WolframPlayer wolframplayer; do makeWrapper $out/libexec/${dirName}/Executables/$path $out/bin/$path \ From 4206661e5d5273dbbd3f84448176e983fdc29f0f Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Fri, 6 May 2022 22:24:42 -0400 Subject: [PATCH 024/201] firefox: Enable crash reporter by default. This makes it easier to report bugs upstream and ensures that NixOS user crashes are fixed. Based on my testing these reports weren't automatically submitted anyways so the privacy concern is minimal. For my crashes it both asked my if a crash report should be produced after a crash, and required manual sending. Although possibly the report world eventually be sent automatically. Fixes https://github.com/NixOS/nixpkgs/issues/107889 --- pkgs/applications/networking/browsers/firefox/common.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index e1506239f45..402894f0154 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -94,6 +94,7 @@ # WARNING: NEVER set any of the options below to `true` by default. # Set to `!privacySupport` or `false`. +, crashreporterSupport ? !privacySupport , geolocationSupport ? !privacySupport , googleAPISupport ? geolocationSupport , webrtcSupport ? !privacySupport @@ -107,10 +108,6 @@ # `browser.eme.ui.enabled` and `media.gmp-widevinecdm.enabled` accordingly , drmSupport ? true -## other - -, crashreporterSupport ? false - # As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at # https://github.com/NixOS/nixpkgs/issues/31843#issuecomment-346372756 we # have permission to use the official firefox branding. From b3e88559999d7d0332d3415594be1c30edbc0722 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sat, 7 May 2022 10:42:50 +0200 Subject: [PATCH 025/201] make-derivation: allow strings in build input lists --- pkgs/stdenv/generic/make-derivation.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index eb4f7e59490..179926722be 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -131,7 +131,7 @@ let checkDependencyList = checkDependencyList' []; checkDependencyList' = positions: name: deps: lib.flip lib.imap1 deps (index: dep: - if lib.isDerivation dep || isNull dep || builtins.typeOf dep == "path" then dep + if lib.isDerivation dep || isNull dep || builtins.typeOf dep == "string" || builtins.typeOf dep == "path" then dep else if lib.isList dep then checkDependencyList' ([index] ++ positions) name dep else throw "Dependency is not of a valid type: ${lib.concatMapStrings (ix: "element ${toString ix} of ") ([index] ++ positions)}${name} for ${attrs.name or attrs.pname}"); in if builtins.length erroneousHardeningFlags != 0 From c88d3ed4bfd21f4ca4820d9815b1ec55f14dd414 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 8 May 2022 04:20:00 +0000 Subject: [PATCH 026/201] ledger: add patch to xdg support --- pkgs/applications/office/ledger/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 0ea9b908ada..e0865d7c4d1 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python3 -, texinfo, gnused, usePython ? true }: +, fetchpatch, texinfo, gnused, usePython ? true }: stdenv.mkDerivation rec { pname = "ledger"; @@ -34,6 +34,15 @@ stdenv.mkDerivation rec { --replace 'DESTINATION ''${Python_SITEARCH}' 'DESTINATION "${python3.sitePackages}"' ''; + patches = [ + # Add support for $XDG_CONFIG_HOME. Remove with the next release + (fetchpatch { + url = "https://github.com/ledger/ledger/commit/c79674649dee7577d6061e3d0776922257520fd0.patch"; + sha256 = "sha256-vwVQnY9EUCXPzhDJ4PSOmQStb9eF6H0yAOiEmL6sAlk="; + excludes = [ "doc/NEWS.md" ]; + }) + ]; + installTargets = [ "doc" "install" ]; meta = with lib; { From 1d5f520da8f01d147640e75b8c14ec3263bb7a42 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 8 May 2022 04:20:00 +0000 Subject: [PATCH 027/201] ledger: install bash completion --- pkgs/applications/office/ledger/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index e0865d7c4d1..17b0a69e04a 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python3 -, fetchpatch, texinfo, gnused, usePython ? true }: +, fetchpatch, installShellFiles, texinfo, gnused, usePython ? true }: stdenv.mkDerivation rec { pname = "ledger"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { gmp mpfr libedit gnused ] ++ lib.optional usePython python3; - nativeBuildInputs = [ cmake texinfo ]; + nativeBuildInputs = [ cmake texinfo installShellFiles ]; cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" @@ -45,6 +45,10 @@ stdenv.mkDerivation rec { installTargets = [ "doc" "install" ]; + postInstall = '' + installShellCompletion --cmd ledger --bash $src/contrib/ledger-completion.bash + ''; + meta = with lib; { homepage = "https://ledger-cli.org/"; description = "A double-entry accounting system with a command-line reporting interface"; From 9d22c5a51a07463869c48dba88013b4bca62e9b7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 8 May 2022 04:20:00 +0000 Subject: [PATCH 028/201] ledger: add marsam to maintainers --- pkgs/applications/office/ledger/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 17b0a69e04a..83c47848bc4 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.all; - maintainers = with maintainers; [ jwiegley ]; + maintainers = with maintainers; [ jwiegley marsam ]; }; } From 218a48c8491968735af9bb2cd87475206a6310e1 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Sun, 8 May 2022 17:34:45 +0200 Subject: [PATCH 029/201] qemu: stabilize USB EHCI This patch fixes a problem that caused the NixOS tests that tested booting from USB to fail periodically. Fixes #15690, fixes #104642, fixes #170803 Also submitted upstream at https://lists.nongnu.org/archive/html/qemu-devel/2022-05/msg01484.html --- pkgs/applications/virtualization/qemu/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index ac661ea330c..9f9b0389ced 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -103,6 +103,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-gTRf9XENAfbFB3asYCXnw4OV4Af6VE1W56K2xpYDhgM="; revert = true; }) + # make nixos tests that boot from USB more stable + # https://lists.nongnu.org/archive/html/qemu-devel/2022-05/msg01484.html + (fetchpatch { + url = "https://gitlab.com/raboof/qemu/-/commit/3fb5e8fe4434130b1167a995b2a01c077cca2cd5.patch"; + sha256 = "sha256-evzrN3i4ntc/AFG0C0rezQpQbWcnx74nXO+5DLErX8o="; + }) ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; From bb0210e327fb5e7023aefb886f8eb7aa153078fb Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Sun, 8 May 2022 16:42:13 -0700 Subject: [PATCH 030/201] ena: 2.5.0 -> 2.7.1 This update is supposed to give us support for the 5.17 kernel according to the 2.7.0 release notes here: https://github.com/amzn/amzn-drivers/releases/tag/ena_linux_2.7.0 Unfortunately, in practice, it does not build with `linuxPackages_5_17`, so I left that marked as broken. It does work for 5.15 though, so we can use that, woo! --- pkgs/os-specific/linux/ena/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index 9f2f8682078..b8128c83c0c 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { - version = "2.5.0"; + version = "2.7.1"; name = "ena-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; rev = "ena_linux_${version}"; - sha256 = "sha256-uOf/1624UtjaZtrk7XyQpeUGdTNVDnzZJZMgU86i+SM="; + sha256 = "sha256-JkGzmmsAmLvL9e+bg58H79GNHgsqydK/79VoWEq5/Mc="; }; hardeningDisable = [ "pic" ]; @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = [ maintainers.eelco ]; platforms = platforms.linux; - broken = kernel.kernelAtLeast "5.15"; + broken = kernel.kernelAtLeast "5.17"; }; } From 35cfe2c29c96d93b4430c59983361c61aaf002ae Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Sun, 8 May 2022 16:48:49 -0700 Subject: [PATCH 031/201] nixos/amazon-image: default to 5.15 kernel Previously, it was held back due to the ENA driver not building on the current default (5.15). The previous commit bumps the ENA driver, which allows 5.15 to work. --- nixos/modules/virtualisation/amazon-image.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 9a56b695015..12fe6fa4447 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -37,13 +37,11 @@ in { assertion = cfg.efi -> cfg.hvm; message = "EC2 instances using EFI must be HVM instances."; } - { assertion = versionOlder config.boot.kernelPackages.kernel.version "5.15"; - message = "ENA driver fails to build with kernel >= 5.15"; + { assertion = versionOlder config.boot.kernelPackages.kernel.version "5.17"; + message = "ENA driver fails to build with kernel >= 5.17"; } ]; - boot.kernelPackages = pkgs.linuxKernel.packages.linux_5_10; - boot.growPartition = cfg.hvm; fileSystems."/" = mkIf (!cfg.zfs.enable) { From f4fc992f1f8f104660d4204ddb181f0b845ee970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 9 May 2022 09:02:17 +0200 Subject: [PATCH 032/201] transmission-gtk: fixup build on darwin Hopefully the explicit linker flag isn't really needed (anymore?) --- pkgs/applications/networking/p2p/transmission/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 7f48ad2d3b4..f5a8188334c 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -86,8 +86,6 @@ in stdenv.mkDerivation { ++ lib.optionals stdenv.isLinux [ inotify-tools ] ; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation"; - postInstall = '' mkdir $apparmor cat >$apparmor/bin.transmission-daemon < Date: Mon, 9 May 2022 08:10:26 +0000 Subject: [PATCH 033/201] python310Packages.simplisafe-python: 2022.05.0 -> 2022.05.1 --- .../python-modules/simplisafe-python/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index cb3446156bf..720129a13fa 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "2022.05.0"; + version = "2022.05.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -28,8 +28,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bachya"; repo = pname; - rev = version; - sha256 = "sha256-NXEhjj8L7MPAdQwjqe6u+L9vi/mIIA8TxDpM5q4uUrU="; + rev = "refs/tags/${version}"; + sha256 = "sha256-tYExqOIJPJN8Lss6y0oelkrDuQCpNtFrsFRCxnbUNvU="; }; nativeBuildInputs = [ From cb8084f11415ef75d824c06b5477289ddfeaefe3 Mon Sep 17 00:00:00 2001 From: Victor Date: Mon, 9 May 2022 11:57:52 +0200 Subject: [PATCH 034/201] unpackerr: 0.9.9 -> 0.10.0 --- pkgs/servers/unpackerr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/unpackerr/default.nix b/pkgs/servers/unpackerr/default.nix index f0c55051fc8..83f745536ef 100644 --- a/pkgs/servers/unpackerr/default.nix +++ b/pkgs/servers/unpackerr/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "unpackerr"; - version = "0.9.9"; + version = "0.10.0"; src = fetchFromGitHub { owner = "davidnewhall"; repo = "unpackerr"; rev = "v${version}"; - sha256 = "sha256-lQqa1YtMLsCEfiC3Ld+lw4SvAD8wctSGi2YdXt9lrTA="; + sha256 = "sha256-o+dE3SX+Q+nhxUO4biEluLEeQhsZgzjXdWTdQcw/H2o="; }; - vendorSha256 = "sha256-W9lTIjntaNZSJVt6Jow8uSew+zCaGWU9qzseClNiVUI="; + vendorSha256 = "sha256-vo5Saq0QEEKi3/0ZXuQDtlMmEIPwshYHHr8h24cD0sI="; buildInputs = lib.optionals stdenv.isDarwin [ Cocoa WebKit ]; From 67d8bc339feb6ca29d8213f593f0ad2bac3b90a0 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 9 May 2022 11:33:27 +0300 Subject: [PATCH 035/201] python3.pkgs.moku: init at 2.3 --- .../python-modules/moku/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/moku/default.nix diff --git a/pkgs/development/python-modules/moku/default.nix b/pkgs/development/python-modules/moku/default.nix new file mode 100644 index 00000000000..3ed68ce8b47 --- /dev/null +++ b/pkgs/development/python-modules/moku/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchPypi +, zeroconf +, requests +, setuptools +}: + +buildPythonPackage rec { + pname = "moku"; + version = "2.3"; + + /* + + Pypi's webpage lists + https://github.com/liquidinstruments/moku/archive/${version}.tar.gz as the + download link, but that repository doesn't exist from some reason :/. When + packaging this, I didn't find any mention of a git repo of the sources. Note + that the pymoku repo holds the + sources of the legacy API package. + + */ + src = fetchPypi { + inherit pname version; + hash = "sha256-EzVcECjJyrr2NLQkG0Yp/jYBMnsEP1/FnS5O3UplszI="; + }; + /* + + Note: If you run `moku download` and encounter the error: + + [Errno 13] Permission denied: '/nix/store/.../lib/python 3.9/site-packages/moku/data' + + Then use the $MOKU_DATA_PATH environment variable to control where the + downloaded files will go to. It is undocumented upstream and there's no + repository to contribute such documentation unfortunately. Also there is no + suitable default value for this on Nix systems, so there's no patch we can + apply locally to make the situation better. + + */ + + propagatedBuildInputs = [ + zeroconf + requests + setuptools + ]; + + pythonImportsCheck = [ + "moku" + ]; + + meta = with lib; { + description = "Python scripting interface to the Liquid Instruments Moku"; + homepage = "https://apis.liquidinstruments.com/starting-python.html"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9e06e71c66b..41e92457222 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5337,6 +5337,8 @@ in { mohawk = callPackage ../development/python-modules/mohawk { }; + moku = callPackage ../development/python-modules/moku { }; + monero = callPackage ../development/python-modules/monero { }; mongomock = callPackage ../development/python-modules/mongomock { }; From 2381aa28fd1ff0641805b3b8fcc8031a42e2c4e5 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 9 May 2022 11:28:25 +0100 Subject: [PATCH 036/201] scorecard: 4.1.0 -> 4.2.0 --- pkgs/tools/security/scorecard/default.nix | 30 +++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/security/scorecard/default.nix b/pkgs/tools/security/scorecard/default.nix index 35ce8e900fb..af95a652491 100644 --- a/pkgs/tools/security/scorecard/default.nix +++ b/pkgs/tools/security/scorecard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "scorecard"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "ossf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QOWQhuEEnwtHmQwl5WCCHcKMjwhgxn9xerR0Bxi3660="; + sha256 = "sha256-MTqXQCPmm2NoueVd3bbQlRz4pi2dOZ9l2EUfb60LwsM="; # populate values otherwise taken care of by goreleaser, # unfortunately these require us to use git. By doing # this in postFetch we can delete .git afterwards and @@ -16,20 +16,14 @@ buildGoModule rec { leaveDotGit = true; postFetch = '' cd "$out" - - commit="$(git rev-parse HEAD)" - source_date_epoch=$(git log --date=iso8601-strict -1 --pretty=%ct) - - substituteInPlace "$out/pkg/scorecard_version.go" \ - --replace 'gitCommit = "unknown"' "gitCommit = \"$commit\"" \ - --replace 'buildDate = "unknown"' "buildDate = \"$source_date_epoch\"" - + git rev-parse HEAD > $out/COMMIT + # 0000-00-00T00:00:00Z + date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-AFadBzkRj0D1MXLHzexvomJ0cqirhW82tnNRGx/gChI="; + vendorSha256 = "sha256-JT1hoEm3eBjR5mlNJ+/tBpHIw6FSvFXC/nEVPkbIfq8="; - # Install completions post-install nativeBuildInputs = [ installShellFiles ]; subPackages = [ "." ]; @@ -37,10 +31,16 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/ossf/scorecard/v${lib.versions.major version}/pkg.gitVersion=v${version}" - "-X github.com/ossf/scorecard/v${lib.versions.major version}/pkg.gitTreeState=clean" + "-X sigs.k8s.io/release-utils/version.gitVersion=v${version}" + "-X sigs.k8s.io/release-utils/version.gitTreeState=clean" ]; + # ldflags based on metadata from git and source + preBuild = '' + ldflags+=" -X sigs.k8s.io/release-utils/version.gitCommit=$(cat COMMIT)" + ldflags+=" -X sigs.k8s.io/release-utils/version.buildDate=$(cat SOURCE_DATE_EPOCH)" + ''; + preCheck = '' # Feed in all but the e2e tests for testing # This is because subPackages above limits what is built to just what we @@ -63,7 +63,7 @@ buildGoModule rec { installCheckPhase = '' runHook preInstallCheck $out/bin/scorecard --help - $out/bin/scorecard version | grep "v${version}" + # $out/bin/scorecard version 2>&1 | grep "v${version}" runHook postInstallCheck ''; From 85e59afc49fc172b60d3320a4a2a9d4f6b5a2919 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 9 May 2022 12:42:01 +0100 Subject: [PATCH 037/201] snazy: 0.4.0 -> 0.9.0 --- pkgs/development/tools/snazy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/snazy/default.nix b/pkgs/development/tools/snazy/default.nix index c284c18d015..08328b1f900 100644 --- a/pkgs/development/tools/snazy/default.nix +++ b/pkgs/development/tools/snazy/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "snazy"; - version = "0.4.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "chmouel"; repo = pname; rev = version; - sha256 = "sha256-Pv+vLdbMTbDbdUVQhA07WY+o1PwtCiqdAXCj+UlP/ZQ="; + sha256 = "sha256-SoyGvy1F39kvMLuT9QFXiGEpN0DWS3X9ZDZhFocymCw="; }; - cargoSha256 = "sha256-96xgpkkWHsyb3kxEXM5f5jFSjbO+VEmX2uHltGJUPGk="; + cargoSha256 = "sha256-vz2bXmuRWFCx7dH0u2zVJLurtUAQ51ZqWVAcuUrm6d8="; doInstallCheck = true; installCheckPhase = '' From fb3d02563a31396dee1b3ada8e610ab3557cee81 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Sun, 8 May 2022 18:44:05 -0400 Subject: [PATCH 038/201] crossplane: init at 0.5.7 --- .../python-modules/crossplane/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/crossplane/default.nix diff --git a/pkgs/development/python-modules/crossplane/default.nix b/pkgs/development/python-modules/crossplane/default.nix new file mode 100644 index 00000000000..14e153cd8b2 --- /dev/null +++ b/pkgs/development/python-modules/crossplane/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, pytestCheckHook, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "crossplane"; + version = "0.5.7"; + + src = fetchFromGitHub { + owner = "nginxinc"; + repo = "crossplane"; + rev = "v${version}"; + sha256 = "0lv3frfvnvz5wjxwh3mwy8nbypv4i62v4bvy5fv7vd6kmbxy1q9l"; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "crossplane" ]; + + meta = with lib; { + homepage = "https://github.com/nginxinc/crossplane"; + description = "NGINX configuration file parser and builder"; + license = licenses.asl20; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb1c7cf3985..d0dfd8049d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3164,6 +3164,8 @@ with pkgs; crosvm = callPackage ../applications/virtualization/crosvm { }; + crossplane = with python3Packages; toPythonApplication crossplane; + crunch = callPackage ../tools/security/crunch { }; crudini = callPackage ../tools/misc/crudini { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ae681e3c946..dae2d0ee03b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1938,6 +1938,8 @@ in { croniter = callPackage ../development/python-modules/croniter { }; + crossplane = callPackage ../development/python-modules/crossplane { }; + crownstone-cloud = callPackage ../development/python-modules/crownstone-cloud { }; crownstone-core = callPackage ../development/python-modules/crownstone-core { }; From 3fd5f63834b67e27c9a16a3a7c8239f21bcd6055 Mon Sep 17 00:00:00 2001 From: Fernando Silva Date: Mon, 9 May 2022 13:08:53 -0300 Subject: [PATCH 039/201] font-awesome: 5.15.3 -> 6.1.1 --- .../{font-awesome-5 => font-awesome}/default.nix | 14 ++++++++++---- pkgs/top-level/all-packages.nix | 7 ++++--- 2 files changed, 14 insertions(+), 7 deletions(-) rename pkgs/data/fonts/{font-awesome-5 => font-awesome}/default.nix (76%) diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome/default.nix similarity index 76% rename from pkgs/data/fonts/font-awesome-5/default.nix rename to pkgs/data/fonts/font-awesome/default.nix index 7f251232ebc..3403660b1e8 100644 --- a/pkgs/data/fonts/font-awesome-5/default.nix +++ b/pkgs/data/fonts/font-awesome/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: let - font-awesome = { version, sha256, rev ? version}: fetchFromGitHub { + font-awesome = { version, sha256, rev ? version }: fetchFromGitHub { name = "font-awesome-${version}"; @@ -21,18 +21,20 @@ let Font Awesome gives you scalable vector icons that can instantly be customized. This package includes only the OTF font. For full CSS etc. see the project website. ''; - homepage = "http://fortawesome.github.io/Font-Awesome/"; + homepage = "https://fontawesome.com/"; license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ abaldeau johnazoidberg ]; }; }; -in { - # Keeping version 4 because version 5 is incompatible for some icons. That +in +{ + # Keeping version 4 and 5 because version 6 is incompatible for some icons. That # means that projects which depend on it need to actively convert the # symbols. See: # https://github.com/greshake/i3status-rust/issues/130 # https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4 + # https://fontawesome.com/v6/docs/web/setup/upgrade/ v4 = font-awesome { version = "4.7.0"; rev = "v4.7.0"; @@ -42,4 +44,8 @@ in { version = "5.15.3"; sha256 = "sha256-EDxk/yO3nMmtM/ytrAEgPYSBbep3rA3NrKkiqf3OsU0="; }; + v6 = font-awesome { + version = "6.1.1"; + sha256 = "sha256-BjK1PJQFWtKDvfQ2Vh7BoOPqYucyvOG+2Pu/Kh+JpAA"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7845dd0191..4b1705dd493 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24121,9 +24121,10 @@ with pkgs; flat-remix-gtk = callPackage ../data/themes/flat-remix-gtk { }; flat-remix-gnome = callPackage ../data/themes/flat-remix-gnome { }; - font-awesome_4 = (callPackage ../data/fonts/font-awesome-5 { }).v4; - font-awesome_5 = (callPackage ../data/fonts/font-awesome-5 { }).v5; - font-awesome = font-awesome_5; + font-awesome_4 = (callPackage ../data/fonts/font-awesome { }).v4; + font-awesome_5 = (callPackage ../data/fonts/font-awesome { }).v5; + font-awesome_6 = (callPackage ../data/fonts/font-awesome { }).v6; + font-awesome = font-awesome_6; fraunces = callPackage ../data/fonts/fraunces { }; From c36d585e14b84f3f046a45b5a36949aa33393f1f Mon Sep 17 00:00:00 2001 From: Madoura Date: Mon, 9 May 2022 12:05:23 -0500 Subject: [PATCH 040/201] ares: 126 -> 127 --- .../emulators/bsnes/ares/default.nix | 67 ++++++++----------- .../bsnes/ares/dont-rebuild-on-install.patch | 22 ++++++ 2 files changed, 50 insertions(+), 39 deletions(-) create mode 100644 pkgs/applications/emulators/bsnes/ares/dont-rebuild-on-install.patch diff --git a/pkgs/applications/emulators/bsnes/ares/default.nix b/pkgs/applications/emulators/bsnes/ares/default.nix index 33a7858455d..c1597fe2c6e 100644 --- a/pkgs/applications/emulators/bsnes/ares/default.nix +++ b/pkgs/applications/emulators/bsnes/ares/default.nix @@ -2,83 +2,72 @@ , stdenv , fetchFromGitHub , pkg-config +, SDL2 , alsa-lib +, gtk3 , gtksourceview3 +, libGL +, libGLU +, libX11 , libXv -, openal -, libpulseaudio , libao +, libpulseaudio +, openal , udev -, SDL2 }: stdenv.mkDerivation rec { pname = "ares"; - version = "126"; + version = "127"; src = fetchFromGitHub { owner = "ares-emulator"; repo = "ares"; rev = "v${version}"; - sha256 = "1rj4vmz8lvpmfc6wni7222kagnw9f6jda9rcb6qky2kpizlp2d24"; - }; - - parallel-rdp = fetchFromGitHub { - owner = "Themaister"; - repo = "parallel-rdp-standalone"; - rev = "0dcebe11ee79288441e40e145c8f340d81f52316"; - sha256 = "1avp4wyfkhk5yfjqx5w3jbqghn2mq5la7k9248kjmnp9n9lip6w9"; + sha256 = "0rhq39w41j9yr1fkyfmf4n6fjxnq1cglj98rp4wys12kwqv7smvx"; }; patches = [ + ./dont-rebuild-on-install.patch ./fix-ruby.patch ]; - enableParallelBuilding = true; - dontConfigure = true; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ + SDL2 alsa-lib + gtk3 gtksourceview3 + libGL + libGLU + libX11 libXv - openal - libpulseaudio libao + libpulseaudio + openal udev - SDL2 ]; - buildPhase = '' - runHook preBuild - - rm -rf ares/n64/vulkan/parallel-rdp - ln -sf ${parallel-rdp} ares/n64/vulkan/parallel-rdp - make -C desktop-ui -j $NIX_BUILD_CORES openmp=true vulkan=true local=false hiro=gtk3 - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,share/{applications,ares,pixmaps}} - cp desktop-ui/out/ares $out/bin - cp desktop-ui/resource/ares.desktop $out/share/applications - cp desktop-ui/resource/{ares{.ico,.png},font.png} $out/share/pixmaps - cp -r ares/{Shaders,System} $out/share/ares + enableParallelBuilding = true; - runHook postInstall - ''; + makeFlags = [ + "-C desktop-ui" + "local=false" + "openmp=true" + "hiro=gtk3" + "prefix=$(out)" + ]; meta = with lib; { homepage = "https://ares.dev"; description = "Open-source multi-system emulator with a focus on accuracy and preservation"; license = licenses.isc; maintainers = with maintainers; [ Madouura ]; - platforms = platforms.all; + platforms = platforms.linux; }; } +# TODO: select between Qt, GTK2 and GTK3 +# TODO: support Darwin diff --git a/pkgs/applications/emulators/bsnes/ares/dont-rebuild-on-install.patch b/pkgs/applications/emulators/bsnes/ares/dont-rebuild-on-install.patch new file mode 100644 index 00000000000..7b6bbfc21bd --- /dev/null +++ b/pkgs/applications/emulators/bsnes/ares/dont-rebuild-on-install.patch @@ -0,0 +1,22 @@ +From 65cc7647110edd768e7baa7991143014316e655a Mon Sep 17 00:00:00 2001 +From: Madoura <93990818+Madouura@users.noreply.github.com> +Date: Mon, 9 May 2022 10:17:06 -0500 +Subject: [PATCH] Update GNUmakefile + +--- + desktop-ui/GNUmakefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/desktop-ui/GNUmakefile b/desktop-ui/GNUmakefile +index 8e27b11d3..0bee561fb 100644 +--- a/desktop-ui/GNUmakefile ++++ b/desktop-ui/GNUmakefile +@@ -106,7 +106,7 @@ endif + $(call rdelete,$(object.path)) + $(call rdelete,$(output.path)) + +-install: all ++install: + ifeq ($(platform),windows) + $(call mkdir,$(prefix)/$(name)/) + else ifeq ($(shell id -un),root) From 470c724f83fa850a1588b89926df86d6f4a0b10f Mon Sep 17 00:00:00 2001 From: Karim Elatov Date: Sat, 7 May 2022 18:53:19 +0000 Subject: [PATCH 041/201] fwbuilder: add wayland support --- pkgs/tools/security/fwbuilder/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/fwbuilder/default.nix b/pkgs/tools/security/fwbuilder/default.nix index 398e552ffe4..15b67932c55 100644 --- a/pkgs/tools/security/fwbuilder/default.nix +++ b/pkgs/tools/security/fwbuilder/default.nix @@ -1,4 +1,13 @@ -{ stdenv, lib, fetchFromGitHub, cmake, qtbase, wrapQtAppsHook }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, qtbase +, wrapQtAppsHook +, wayland +, wayland-protocols +, qtwayland +}: stdenv.mkDerivation rec { pname = "fwbuilder"; @@ -16,6 +25,12 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; + buildInputs = [ + wayland + wayland-protocols + qtwayland + ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=misleading-indentation" ]; From 6b8d91253d3b921fbdba840af1835d7183f6d7d9 Mon Sep 17 00:00:00 2001 From: Nicolas Martin Date: Mon, 9 May 2022 21:36:28 +0200 Subject: [PATCH 042/201] melt: 0.3.0 -> 0.4.0 --- pkgs/tools/security/melt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/melt/default.nix b/pkgs/tools/security/melt/default.nix index 5690958848c..dcceb598a11 100644 --- a/pkgs/tools/security/melt/default.nix +++ b/pkgs/tools/security/melt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "melt"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "melt"; rev = "v${version}"; - sha256 = "sha256-I1LNCrJo3Ihh03aTUG0QhS6ySuMqNJJGyZ8XZzClDlU="; + sha256 = "sha256-R1ml/SQswsltBFLWOvI5GjI4VZUqEH3uwqgmdIrC/Q4="; }; - vendorSha256 = "sha256-eRFWDyXN2c5VSxYOE12sczYP3rGtzLjY9M2DQgHNFyA="; + vendorSha256 = "sha256-9LTR7CrTBGAh7TPMQenY4vZQ7KMYv02fDsY51pkJZSo="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; From 0fc6a60ecc20d72d218465831f2882544881d71c Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Mon, 9 May 2022 17:02:34 -0400 Subject: [PATCH 043/201] flyctl: fix ldflags date parsing --- pkgs/development/web/flyctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 8850f495027..0e569ad70df 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X github.com/superfly/flyctl/internal/buildinfo.commit=${src.rev}" - "-X github.com/superfly/flyctl/internal/buildinfo.buildDate=1970-01-01T00:00:00+0000" + "-X github.com/superfly/flyctl/internal/buildinfo.buildDate=1970-01-01T00:00:00Z" "-X github.com/superfly/flyctl/internal/buildinfo.environment=production" "-X github.com/superfly/flyctl/internal/buildinfo.version=${version}" ]; @@ -40,6 +40,6 @@ buildGoModule rec { downloadPage = "https://github.com/superfly/flyctl"; homepage = "https://fly.io/"; license = licenses.asl20; - maintainers = with maintainers; [ aaronjanse jsierles ]; + maintainers = with maintainers; [ aaronjanse jsierles techknowlogick ]; }; } From d4884bbc9ea8ac85b68a05d1c12e1ea1181db3b0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 2 May 2022 03:49:01 +0200 Subject: [PATCH 044/201] php.extensions: Remove fixes for abandoned PHP versions --- .../interpreters/php/zlib-darwin-tests.patch | 44 ------ pkgs/top-level/php-packages.nix | 130 ++++-------------- 2 files changed, 27 insertions(+), 147 deletions(-) delete mode 100644 pkgs/development/interpreters/php/zlib-darwin-tests.patch diff --git a/pkgs/development/interpreters/php/zlib-darwin-tests.patch b/pkgs/development/interpreters/php/zlib-darwin-tests.patch deleted file mode 100644 index ef61f0a8784..00000000000 --- a/pkgs/development/interpreters/php/zlib-darwin-tests.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/ext/zlib/tests/bug55544.phpt b/ext/zlib/tests/bug55544.phpt -index a0d22f4fcebf4846da6781f424f87821626de5ea..e650fe6909f555d04834f4c08f7fd0d354b783e2 100644 ---- a/ext/zlib/tests/bug55544.phpt -+++ b/ext/zlib/tests/bug55544.phpt -@@ -6,6 +6,9 @@ extension_loaded("zlib") or die("skip"); - if (substr(PHP_OS, 0, 3) == 'WIN') { - die("skip not for windows"); - } -+if (PHP_OS == "Darwin") { -+ die("skip not for darwin"); -+} - ?> - --INI-- - output_handler=ob_gzhandler -diff --git a/ext/zlib/tests/gzencode_variation1.phpt b/ext/zlib/tests/gzencode_variation1.phpt -index c966b2cbc5b7..2f953168fa22 100644 ---- a/ext/zlib/tests/gzencode_variation1.phpt -+++ b/ext/zlib/tests/gzencode_variation1.phpt -@@ -10,6 +10,10 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) { - if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; - } -+ -+if (PHP_OS == "Darwin") { -+ print "skip - OS is encoded in headers, tested header is non Darwin"; -+} - ?> - --FILE-- - - --FILE-- - Date: Tue, 10 May 2022 01:23:39 +0200 Subject: [PATCH 045/201] php: Remove fixes for abandoned PHP versions --- pkgs/development/interpreters/php/generic.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 7c0994d15b6..70052197d22 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -223,8 +223,7 @@ let [ "--disable-all" ] # PCRE - ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" ] - ++ [ "PCRE_LIBDIR=${pcre2}" ] + ++ [ "--with-external-pcre=${pcre2.dev}" ] # Enable sapis @@ -232,10 +231,6 @@ let ++ lib.optional (!cliSupport) "--disable-cli" ++ lib.optional fpmSupport "--enable-fpm" ++ lib.optional pearSupport [ "--with-pear" "--enable-xml" "--with-libxml" ] - ++ lib.optionals (pearSupport && (lib.versionOlder version "7.4")) [ - "--enable-libxml" - "--with-libxml-dir=${libxml2.dev}" - ] ++ lib.optional pharSupport "--enable-phar" ++ lib.optional (!phpdbgSupport) "--disable-phpdbg" @@ -270,14 +265,7 @@ let done export EXTENSION_DIR=$out/lib/php/extensions - '' - # PKG_CONFIG need not be a relative path - + lib.optionalString (lib.versionOlder version "7.4") '' - for i in $(find . -type f -name "*.m4"); do - substituteInPlace $i \ - --replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null' - done - '' + '' + ./buildconf --copy --force if test -f $src/genfiles; then From 66d86c7f3e8c479eea12a5963dbe609c39becf30 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 May 2022 01:24:42 +0000 Subject: [PATCH 046/201] cudatext: 1.163.0 -> 1.164.0 --- pkgs/applications/editors/cudatext/default.nix | 4 ++-- pkgs/applications/editors/cudatext/deps.json | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 3c16347a29e..9a872c91c95 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.163.0"; + version = "1.164.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "sha256-4jGLyAE202GAjaypubKGW1edyKqOti/yTwstC/R94iE="; + sha256 = "sha256-LKLWZiA3Ya8xI2QvNW2f+5akndBloj5pQ7QNaVMoYSI="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 9d3629645f8..0eac7839371 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -11,13 +11,13 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2022.04.18", - "sha256": "sha256-Bp/pkbTPLiVaDSstzTaNjKb+msPw8Tuny75n/aYBpUc=" + "rev": "2022.05.06", + "sha256": "sha256-mYZ3mgtUpQ8sry5WmdluHca/CR7RqR9GRrxIoeZFLes=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2022.04.26", - "sha256": "sha256-aItWkjnFqxeyEywELEBkuvMH1zfI4jJFL10CexSktxU=" + "rev": "2022.05.09", + "sha256": "sha256-bzBO9Uf8Zkt/kFouQuiPagL7e+86ezH/mOpDCuInJlE=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -26,13 +26,13 @@ }, "EControl": { "owner": "Alexey-T", - "rev": "2022.04.21", - "sha256": "sha256-le6ulGFUNjeipYQKzVFezFb9u/0IcQcu5BMxFaIZdyw=" + "rev": "2022.05.06", + "sha256": "sha256-ppm8Wuxhi5N3Er0f0h9d+v2spwEMr7ksf9tz4vI42+M=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2022.04.11", - "sha256": "sha256-wzE6lNhrXsBOP+Zx+qAcj6Hhf87qqDaqKf9up7I3ZUo=" + "rev": "2022.05.08", + "sha256": "sha256-mAxqJ3PO1BCOYNctKfw/4fKbJsI7Ckb5PVcKdALZu0Q=" }, "Python-for-Lazarus": { "owner": "Alexey-T", From 4d5ac2f67479fd6b61d08e93bf2f9ea54bc7bc7c Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 10 May 2022 05:34:34 +0300 Subject: [PATCH 047/201] portaudio2014: remove its some old version of portaudio2014 with no uses in nixpkgs --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6f08c13c357..a93e5cf0283 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1022,6 +1022,7 @@ mapAliases ({ polysh = throw "polysh has been removed from nixpkgs as the upstream has abandoned the project"; # Added 2022-01-01 poppler_qt5 = throw "'poppler_qt5' has been renamed to/replaced by 'libsForQt5.poppler'"; # Converted to throw 2022-02-22 powerdns = pdns; # Added 2022-03-28 + portaudio2014 = throw "'portaudio2014' has been removed"; # Added 2022-05-10 # postgresql postgresql96 = postgresql_9_6; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9c3f173478..67a3018a498 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20054,13 +20054,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit CoreAudio CoreServices Carbon; }; - portaudio2014 = portaudio.overrideAttrs (_: { - src = fetchurl { - url = "http://www.portaudio.com/archives/pa_stable_v19_20140130.tgz"; - sha256 = "0mwddk4qzybaf85wqfhxqlf0c5im9il8z03rd4n127k8y2jj9q4g"; - }; - }); - portmidi = callPackage ../development/libraries/portmidi { inherit (darwin.apple_sdk.frameworks) Carbon CoreAudio CoreFoundation CoreMIDI CoreServices; }; From ced69442bca98f4d61189d61d5be13aeedcdaccb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Tue, 10 May 2022 13:18:11 +0900 Subject: [PATCH 048/201] mepo: 0.4.1 -> 0.4.2 --- pkgs/applications/misc/mepo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mepo/default.nix b/pkgs/applications/misc/mepo/default.nix index 1b5178bb14a..1afcd3c3f1a 100644 --- a/pkgs/applications/misc/mepo/default.nix +++ b/pkgs/applications/misc/mepo/default.nix @@ -22,13 +22,13 @@ let menuInputs = if withX11 then [ dmenu xdotool ] else [ bemenu ]; in stdenv.mkDerivation rec { pname = "mepo"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromSourcehut { owner = "~mil"; repo = pname; rev = version; - hash = "sha256-soIAQgo8Cyii/zzJapgJmC5hN/ySnHKoSbOg/XgTnGg="; + hash = "sha256-k6YXaqB3EwbDPlTvijZf10q+IYwt4/MiqGXL495KIcY="; }; nativeBuildInputs = [ pkg-config zig makeWrapper ]; From 89120cda741c71ca626b383332f8d5e7c31f838a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 May 2022 05:32:30 +0000 Subject: [PATCH 049/201] jitsi-meet: 1.0.6091 -> 1.0.6155 --- pkgs/servers/web-apps/jitsi-meet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/jitsi-meet/default.nix b/pkgs/servers/web-apps/jitsi-meet/default.nix index e31327927fa..7be8ac57333 100644 --- a/pkgs/servers/web-apps/jitsi-meet/default.nix +++ b/pkgs/servers/web-apps/jitsi-meet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jitsi-meet"; - version = "1.0.6091"; + version = "1.0.6155"; src = fetchurl { url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2"; - sha256 = "lYQGrH7D2xsRdwDC0yXB+tt4nOawEkq9A5tDIwl6pRk="; + sha256 = "baCRVYe1z2uH3vSb5KbWs0y4KyQYO3JpTyoGFZIZQqo="; }; dontBuild = true; From c08232b717a221d2b208559a6884e791a5fc791d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 10 May 2022 08:02:03 +0100 Subject: [PATCH 050/201] directvnc: pull -fno-common fix pending upstream inclusion Without the change build fails on upstream gcc-10 as: ld: modmap.o:/build/source/src/directvnc.h:45: multiple definition of `buffer'; main.o:/build/source/src/directvnc.h:45: first defined here --- pkgs/os-specific/linux/directvnc/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix index d20b69775bf..78ccb677257 100644 --- a/pkgs/os-specific/linux/directvnc/default.nix +++ b/pkgs/os-specific/linux/directvnc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, directfb, zlib, libjpeg, xorgproto }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, directfb, zlib, libjpeg, xorgproto }: stdenv.mkDerivation { pname = "directvnc"; @@ -11,6 +11,17 @@ stdenv.mkDerivation { sha256 = "16x7mr7x728qw7nbi6rqhrwsy73zsbpiz8pbgfzfl2aqhfdiz88b"; }; + patches = [ + # Pull fix pending upstream inclusion for -fno-common toolchain + # support: + # https://github.com/drinkmilk/directvnc/pull/7 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/drinkmilk/directvnc/commit/e9c23d049bcf31d0097348d44391fe5fd9aad12b.patch"; + sha256 = "1dnzr0dnx20w80r73j4a9n6mhbazjzlr5ps9xjj898924cg140zx"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ directfb zlib libjpeg xorgproto ]; From b1571265b512febdcc862e8ecf2fb56598648d58 Mon Sep 17 00:00:00 2001 From: squalus Date: Tue, 10 May 2022 00:10:21 -0700 Subject: [PATCH 051/201] librewolf: move out of firefox directory Simplifies Firefox maintenance. See #160520 - make the firefox common.nix available from the top level as buildMozillaMach - use new buildMozillaMach function in librewolf expressions - minor changes to update script --- .../networking/browsers/firefox/packages.nix | 36 ++----------------- .../networking/browsers/librewolf/default.nix | 31 ++++++++++++++++ .../default.nix => librewolf/librewolf.nix} | 2 +- .../browsers/{firefox => }/librewolf/src.json | 0 .../browsers/{firefox => }/librewolf/src.nix | 0 .../{firefox => }/librewolf/update.nix | 2 +- pkgs/top-level/all-packages.nix | 10 +++--- 7 files changed, 42 insertions(+), 39 deletions(-) create mode 100644 pkgs/applications/networking/browsers/librewolf/default.nix rename pkgs/applications/networking/browsers/{firefox/librewolf/default.nix => librewolf/librewolf.nix} (98%) rename pkgs/applications/networking/browsers/{firefox => }/librewolf/src.json (100%) rename pkgs/applications/networking/browsers/{firefox => }/librewolf/src.nix (100%) rename pkgs/applications/networking/browsers/{firefox => }/librewolf/update.nix (96%) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index e34120de9c0..10249aea4ee 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,11 +1,7 @@ -{ stdenv, lib, callPackage, fetchurl, fetchpatch, nixosTests }: - -let - common = opts: callPackage (import ./common.nix opts) {}; -in +{ stdenv, lib, callPackage, fetchurl, fetchpatch, nixosTests, buildMozillaMach }: rec { - firefox = common rec { + firefox = buildMozillaMach rec { pname = "firefox"; version = "100.0"; src = fetchurl { @@ -30,7 +26,7 @@ rec { }; }; - firefox-esr-91 = common rec { + firefox-esr-91 = buildMozillaMach rec { pname = "firefox-esr"; version = "91.9.0esr"; src = fetchurl { @@ -54,30 +50,4 @@ rec { versionSuffix = "esr"; }; }; - - librewolf = - let - librewolf-src = callPackage ./librewolf { }; - in - (common rec { - pname = "librewolf"; - binaryName = "librewolf"; - version = librewolf-src.packageVersion; - src = librewolf-src.firefox; - inherit (librewolf-src) extraConfigureFlags extraPostPatch extraPassthru; - - meta = { - description = "A fork of Firefox, focused on privacy, security and freedom"; - homepage = "https://librewolf.net/"; - maintainers = with lib.maintainers; [ squalus ]; - inherit (firefox.meta) platforms badPlatforms broken maxSilent license; - }; - updateScript = callPackage ./librewolf/update.nix { - attrPath = "librewolf-unwrapped"; - }; - }).override { - crashreporterSupport = false; - enableOfficialBranding = false; - pgoSupport = false; # Profiling gets stuck and doesn't terminate. - }; } diff --git a/pkgs/applications/networking/browsers/librewolf/default.nix b/pkgs/applications/networking/browsers/librewolf/default.nix new file mode 100644 index 00000000000..8f3100de970 --- /dev/null +++ b/pkgs/applications/networking/browsers/librewolf/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, callPackage, buildMozillaMach }: + +let + librewolf-src = callPackage ./librewolf.nix { }; +in +(buildMozillaMach rec { + pname = "librewolf"; + binaryName = "librewolf"; + version = librewolf-src.packageVersion; + src = librewolf-src.firefox; + inherit (librewolf-src) extraConfigureFlags extraPostPatch extraPassthru; + + meta = { + description = "A fork of Firefox, focused on privacy, security and freedom"; + homepage = "https://librewolf.net/"; + maintainers = with lib.maintainers; [ squalus ]; + platforms = lib.platforms.unix; + badPlatforms = lib.platforms.darwin; + broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". + # not in `badPlatforms` because cross-compilation on 64-bit machine might work. + maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) + license = lib.licenses.mpl20; + }; + updateScript = callPackage ./update.nix { + attrPath = "librewolf-unwrapped"; + }; +}).override { + crashreporterSupport = false; + enableOfficialBranding = false; + pgoSupport = false; # Profiling gets stuck and doesn't terminate. +} diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/default.nix b/pkgs/applications/networking/browsers/librewolf/librewolf.nix similarity index 98% rename from pkgs/applications/networking/browsers/firefox/librewolf/default.nix rename to pkgs/applications/networking/browsers/librewolf/librewolf.nix index 10b65e8825c..68ed776e91c 100644 --- a/pkgs/applications/networking/browsers/firefox/librewolf/default.nix +++ b/pkgs/applications/networking/browsers/librewolf/librewolf.nix @@ -1,4 +1,4 @@ -{ callPackage, git }: +{ callPackage }: let src = callPackage ./src.nix { }; in diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json similarity index 100% rename from pkgs/applications/networking/browsers/firefox/librewolf/src.json rename to pkgs/applications/networking/browsers/librewolf/src.json diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/src.nix b/pkgs/applications/networking/browsers/librewolf/src.nix similarity index 100% rename from pkgs/applications/networking/browsers/firefox/librewolf/src.nix rename to pkgs/applications/networking/browsers/librewolf/src.nix diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/update.nix b/pkgs/applications/networking/browsers/librewolf/update.nix similarity index 96% rename from pkgs/applications/networking/browsers/firefox/librewolf/update.nix rename to pkgs/applications/networking/browsers/librewolf/update.nix index 5cb5c6168f7..b8bc64afafe 100644 --- a/pkgs/applications/networking/browsers/firefox/librewolf/update.nix +++ b/pkgs/applications/networking/browsers/librewolf/update.nix @@ -20,7 +20,7 @@ writeScript "update-librewolf" '' latestTag=$(curl https://gitlab.com/api/v4/projects/librewolf-community%2Fbrowser%2Fsource/repository/tags?per_page=1 | jq -r .[0].name) echo "latestTag=$latestTag" - srcJson=pkgs/applications/networking/browsers/firefox/librewolf/src.json + srcJson=pkgs/applications/networking/browsers/librewolf/src.json localRev=$(jq -r .source.rev < $srcJson) echo "localRev=$localRev" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c82544ce55b..6707930edd4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26404,11 +26404,13 @@ with pkgs; filezilla = callPackage ../applications/networking/ftp/filezilla { }; - firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix { - callPackage = newScope { + buildMozillaMach = + let callPackage = newScope { inherit (rustPackages) cargo rustc; }; - }); + in opts: callPackage (import ../applications/networking/browsers/firefox/common.nix opts) {}; + + firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix {}); firefox-unwrapped = firefoxPackages.firefox; firefox-esr-91-unwrapped = firefoxPackages.firefox-esr-91; @@ -26453,7 +26455,7 @@ with pkgs; desktopName = "Firefox DevEdition"; }; - librewolf-unwrapped = firefoxPackages.librewolf; + librewolf-unwrapped = callPackage ../applications/networking/browsers/librewolf {}; librewolf = wrapFirefox librewolf-unwrapped { inherit (librewolf-unwrapped) extraPrefsFiles extraPoliciesFiles; From 3e7a93449edda39ce34c09e95ecec2ab2ba6ca1e Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Tue, 10 May 2022 13:30:57 +0530 Subject: [PATCH 052/201] cinny: 1.8.2 -> 2.0.0 --- .../networking/instant-messengers/cinny/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index 940d0b6b92b..480bba6fde1 100644 --- a/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -4,11 +4,11 @@ let configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); in stdenv.mkDerivation rec { pname = "cinny"; - version = "1.8.2"; + version = "2.0.0"; src = fetchurl { url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; - sha256 = "sha256-0harFaO1MWzTmN/Q3e38MC2O7P9yVeQ5ZSy0yiGbtCs="; + sha256 = "sha256-tM3YA0GW8Z24gt8t9dOyr10GCINodAB0b4/gD7jfgOM="; }; installPhase = '' From b8985bb965737ce8d117b7a2c5242aabf0e6062c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 9 May 2022 00:51:22 -0300 Subject: [PATCH 053/201] teapot: use Museoa as backup The original site is now dead, so I took the liberty of getting the sources and backup it on my personal data hoarder project. --- pkgs/applications/office/teapot/default.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/office/teapot/default.nix b/pkgs/applications/office/teapot/default.nix index 62a48cebf19..d2d44511bc6 100644 --- a/pkgs/applications/office/teapot/default.nix +++ b/pkgs/applications/office/teapot/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchzip +, fetchFromGitHub , cmake , libtirpc , ncurses @@ -10,12 +10,18 @@ stdenv.mkDerivation rec { pname = "teapot"; version = "2.3.0"; - src = fetchzip { + src = fetchFromGitHub { name = "${pname}-${version}"; - url = "https://www.syntax-k.de/projekte/teapot/${pname}-${version}.tar.gz"; - sha256 = "sha256-wzAwZwOMeTsuR5LhfjspGdejT6X1V8YJ8B7v9pcbxaY="; + owner = "museoa"; + repo = pname; + rev = version; + hash = "sha256-38XFjRzOGasr030f+mRYT+ptlabpnVJfa+1s7ZAjS+k="; }; + prePatch = '' + cd src + ''; + patches = [ # include a local file in order to make cc happy ./001-fix-warning.patch @@ -41,8 +47,8 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://www.syntax-k.de/projekte/teapot/"; - description = "Table Editor And Planner, Or: Teapot!"; + inherit (src.meta) homepage; + description = "Table Editor And Planner, Or: Teapot"; longDescription = '' Teapot is a compact spreadsheet software originally written by Michael Haardt. It features a (n)curses-based text terminal interface, and @@ -70,4 +76,4 @@ stdenv.mkDerivation rec { }; } # TODO: patch/fix FLTK building -# TODO: add documentation from +# TODO: add documentation From 18d7643c9d19d89658cc820b474201cea9135af6 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 9 May 2022 00:57:33 -0300 Subject: [PATCH 054/201] dgen-sdl: fixup meta.homepage --- .../emulators/dgen-sdl/default.nix | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/emulators/dgen-sdl/default.nix b/pkgs/applications/emulators/dgen-sdl/default.nix index e56ca12a4e9..cbcdad4a3c2 100644 --- a/pkgs/applications/emulators/dgen-sdl/default.nix +++ b/pkgs/applications/emulators/dgen-sdl/default.nix @@ -1,39 +1,41 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , libarchive , SDL }: -let +stdenv.mkDerivation rec { pname = "dgen-sdl"; version = "1.33"; -in stdenv.mkDerivation { - inherit pname version; src = fetchurl { url = "https://sourceforge.net/projects/dgen/files/dgen/${version}/${pname}-${version}.tar.gz"; hash = "sha256-meLAYBfCKHPHf4gYbrzAmGckTrbgQsdjuwlLArje9h4="; }; - buildInputs = [ SDL libarchive ]; + buildInputs = [ + SDL + libarchive + ]; configureFlags = [ - "--enable-joystick" - "--enable-debugger" "--enable-debug-vdp" + "--enable-debugger" + "--enable-joystick" "--enable-pico" # experimental "--enable-vgmdump" - "--with-star=no" # Needs ASM support - "--with-musa" "--with-cyclone=no" # Needs ASM support - "--with-mz80" "--with-cz80" "--with-drz80=no" # Needs ASM support "--with-dz80" + "--with-musa" + "--with-mz80" + "--with-star=no" # Needs ASM support ]; meta = with lib; { - homepage = "https://dgen.sourceforge.net/"; + homepage = "http://dgen.sourceforge.net/"; description = "Sega Genesis/Mega Drive emulator"; longDescription = '' DGen/SDL is a free, open source emulator for Sega Genesis/Mega Drive From 3d195260adae3ed4436f456a80a563a8844d6aa9 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 10 May 2022 00:14:23 -0300 Subject: [PATCH 055/201] yex-lang: unstable-2021-12-25 -> 0.pre+date=2022-05-10 --- .../interpreters/yex-lang/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/yex-lang/default.nix b/pkgs/development/interpreters/yex-lang/default.nix index 7223b7aca78..cc4e7f31f31 100644 --- a/pkgs/development/interpreters/yex-lang/default.nix +++ b/pkgs/development/interpreters/yex-lang/default.nix @@ -1,21 +1,25 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +}: rustPlatform.buildRustPackage rec { pname = "yex-lang"; - version = "unstable-2021-12-25"; + version = "0.pre+date=2022-05-10"; src = fetchFromGitHub { owner = "nonamescm"; repo = "yex-lang"; - rev = "a97def1431b73b8693700f530ec023f1776eaf83"; - hash = "sha256-CEzJtlEVMvMnRyUKdko1UDTluv8Fc88tfOpKGIFMnRw="; + rev = "866c4decbb9340f5af687b145e2c4f47fcbee786"; + hash = "sha256-sxzkZ2Rhn3HvZIfjnJ6Z2au/l/jV5705ecs/X3Iah6k="; }; - cargoSha256 = "sha256-mHMenqcdt9Yjm/6H1Ywf637Sv8ddq6a4Eu2/A/jX9gQ="; + cargoSha256 = "sha256-nX5FoPAk50wt0CXskyg7jQeHvD5YtBNnCe0CVOGXTMI="; meta = with lib; { - homepage = "https://github.com/nonamesc/yex-lang"; - description = "A cool functional scripting language written in rust"; + homepage = "https://github.com/nonamescm/yex-lang"; + description = "A functional scripting language written in rust"; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; mainProgram = "yex"; From 8cc63bb7866788e582d05c6209abfb5006805b0c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 10 May 2022 07:40:24 -0300 Subject: [PATCH 056/201] libast: 0.7.1 -> 0.8 --- pkgs/development/libraries/libast/default.nix | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/development/libraries/libast/default.nix index b48971bc431..f4dae188f31 100644 --- a/pkgs/development/libraries/libast/default.nix +++ b/pkgs/development/libraries/libast/default.nix @@ -1,20 +1,29 @@ -{ lib, stdenv, fetchurl -, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +}: stdenv.mkDerivation rec { pname = "libast"; - version = "0.7.1"; + version = "0.8"; - src = fetchurl { - url = "http://www.eterm.org/download/${pname}-${version}.tar.gz"; - sha256 = "1w7bs46r4lykfd83kc3bg9i1rxzzlb4ydk23ikf8mx8avz05q1aj"; + src = fetchFromGitHub { + owner = "mej"; + repo = pname; + rev = version; + hash = "sha256-rnqToFi+d6D6O+JDHQxkVjTc/0RBag6Jqv4uDcE4PNc="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; meta = with lib; { + inherit (src.meta) homepage; description = "Library of Assorted Spiffy Things"; - homepage = "https://www.eterm.org"; license = licenses.bsd2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; From 6afb6d4032adb78d50bd52cbac9bd33ec6f23c01 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Tue, 10 May 2022 14:22:01 +0530 Subject: [PATCH 057/201] fnc: 0.10 -> 0.12 Install checks are removed, courtesy: https://fnc.bsdbox.org/info/9b191697d6 --- .../version-management/fnc/default.nix | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index 3d0c7a9cd30..564bcdc5897 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -2,22 +2,13 @@ stdenv.mkDerivation rec { pname = "fnc"; - version = "0.10"; + version = "0.12"; src = fetchurl { url = "https://fnc.bsdbox.org/tarball/${version}/fnc-${version}.tar.gz"; - sha256 = "1phqxh0afky7q2qmhgjlsq1awbv4254yd8wpzxlww4p7a57cp0lk"; + sha256 = "05cg8id4d1ia8y60y3x23167bl1rn2fdpkf1jfj3aklhlihvkbxd"; }; - patches = [ - (fetchpatch { - name = "sqlite3-upgrade.patch"; - url = "https://fnc.bsdbox.org/vpatch?from=12e8919d436f52ca&to=091ce838edf67f1d"; - sha256 = "sha256-uKSO+lCY6h7Wkv5T7zeagMbpDxj6oirA/bty6i6Py8s="; - }) - ]; - patchFlags = [ "-p0" ]; - buildInputs = [ libiconv ncurses zlib ]; makeFlags = [ "PREFIX=$(out)" ]; @@ -26,14 +17,6 @@ stdenv.mkDerivation rec { mkdir -p $out/bin ''; - doInstallCheck = true; - - installCheckPhase = '' - runHook preInstallCheck - test "$($out/bin/fnc --version)" = '${pname} ${version}' - runHook postInstallCheck - ''; - meta = with lib; { description = "Interactive ncurses browser for Fossil repositories"; longDescription = '' From 155e68e86ee25235609fa17aa815fec453b1b7cc Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 10 May 2022 14:55:42 +0300 Subject: [PATCH 058/201] libssh2_1_10: remove temp attr it was added in https://github.com/NixOS/nixpkgs/commit/28b6a910 --- pkgs/development/libraries/libssh2/1_10.nix | 10 ---------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 12 deletions(-) delete mode 100644 pkgs/development/libraries/libssh2/1_10.nix diff --git a/pkgs/development/libraries/libssh2/1_10.nix b/pkgs/development/libraries/libssh2/1_10.nix deleted file mode 100644 index edba7a84ef2..00000000000 --- a/pkgs/development/libraries/libssh2/1_10.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ libssh2, fetchurl }: - -libssh2.overrideAttrs (attrs: rec { - version = "1.10.0"; - src = fetchurl { - url = with attrs; "${meta.homepage}/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-LWTpDz3tOUuR06LndMogOkF59prr7gMAPlpvpiHkHVE="; - }; - patches = []; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67a3018a498..58f520d863e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19134,8 +19134,6 @@ with pkgs; libssh = callPackage ../development/libraries/libssh { }; libssh2 = callPackage ../development/libraries/libssh2 { }; - #FIXME: temporary attribute - libssh2_1_10 = callPackage ../development/libraries/libssh2/1_10.nix { }; libstartup_notification = callPackage ../development/libraries/startup-notification { }; From 6c3d8d72e907b20967c3f50153ac69fe9fd8b145 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 10 May 2022 14:58:38 +0300 Subject: [PATCH 059/201] all-packages.nix: remove old commented line about xracer it was commented in https://github.com/NixOS/nixpkgs/commit/bc913e25 in 2011 --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58f520d863e..a25bd08eca1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32355,8 +32355,6 @@ with pkgs; xcowsay = callPackage ../games/xcowsay { }; xjump = callPackage ../games/xjump { }; - # TODO: the corresponding nix file is missing - # xracer = callPackage ../games/xracer { }; xmoto = callPackage ../games/xmoto { }; From c9141b4bfc74498fcb09bc03047e34d32982ef30 Mon Sep 17 00:00:00 2001 From: Julius de Bruijn Date: Tue, 10 May 2022 16:12:21 +0200 Subject: [PATCH 060/201] prisma-engines: 3.13.0 -> 3.14.0 --- pkgs/development/tools/database/prisma-engines/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index b3c5c1b0dd0..26ec6597213 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -13,19 +13,19 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "3.13.0"; + version = "3.14.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-+Ug4tOaqUaqcEoMv20CKE8JrjIdW34VSn20gXZYX92k="; + sha256 = "sha256-UawQbVbafRpxkYFGW+y+HkkYME8qziG7tmsIjbqwHq0="; }; # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoSha256 = "sha256-V2G++BYLRGVM4leB2jkM+HcFiCIdf2wA3dfYdtlq7XI="; + cargoSha256 = "sha256-1kR70t7vWzvV3DOrkVP6ktzKK5tB9KjJyAMpKO6gtYA="; nativeBuildInputs = [ pkg-config ]; From af7b0652170c9b57f50c64a08531393a83f1f0ce Mon Sep 17 00:00:00 2001 From: Julius de Bruijn Date: Tue, 10 May 2022 16:12:33 +0200 Subject: [PATCH 061/201] nodePackages.prisma: 3.13.0 -> 3.14.0 --- pkgs/development/node-packages/default.nix | 2 +- pkgs/development/node-packages/node-packages.nix | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index e159a093af2..b2da0f16eb5 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -329,7 +329,7 @@ let src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - sha512 = "sha512-oO1auBnBtieGdiN+57IgsA9Vr7Sy4HkILi1KSaUG4mpKfEbnkTGnLOxAqjLed+K2nsG/GtE1tJBtB7JxN1a78Q=="; + sha512 = "sha512-l9MOgNCn/paDE+i1K2fp9NZ+Du4trzPTJsGkaQHVBufTGqzoYHuNk8JfzXuIn0Gte6/ZjyKj652Jq/Lc1tp2yw=="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 9d7f473ac4d..8f949d7d781 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -67102,15 +67102,6 @@ let sha512 = "hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg=="; }; }; - "ts-pattern-4.0.2" = { - name = "ts-pattern"; - packageName = "ts-pattern"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ts-pattern/-/ts-pattern-4.0.2.tgz"; - sha512 = "eHqR/7A6fcw05vCOfnL6RwgGJbVi9G/YHTdYdjYmElhDdJ1SMn7pWs+6+YuxygaFwQS/g+cIDlu+UD8IVpur1A=="; - }; - }; "ts-pnp-1.2.0" = { name = "ts-pnp"; packageName = "ts-pnp"; @@ -118740,7 +118731,6 @@ in }; dependencies = [ sources."@prisma/engines-3.13.0-17.efdf9b1183dddfd4258cd181a72125755215ab7b" - sources."ts-pattern-4.0.2" ]; buildInputs = globalBuildInputs; meta = { From cf5534a408c295d588d313d37420580340b22041 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 27 Apr 2022 01:40:37 +0000 Subject: [PATCH 062/201] mysql-shell: 8.0.28 -> 8.0.29 --- .../development/tools/mysql-shell/default.nix | 45 +++++-------------- .../tools/mysql-shell/fido2.cmake.patch | 25 ----------- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 13 insertions(+), 61 deletions(-) delete mode 100644 pkgs/development/tools/mysql-shell/fido2.cmake.patch diff --git a/pkgs/development/tools/mysql-shell/default.nix b/pkgs/development/tools/mysql-shell/default.nix index c54cda1ad27..915ed33c466 100644 --- a/pkgs/development/tools/mysql-shell/default.nix +++ b/pkgs/development/tools/mysql-shell/default.nix @@ -31,14 +31,10 @@ , CoreServices , developer_cmds , DarwinTools -, mysql-shell }: let - pythonDeps = [ - python3.pkgs.certifi - python3.pkgs.paramiko - ]; + pythonDeps = [ python3.pkgs.certifi python3.pkgs.paramiko ]; site = '' import sys; sys.path.extend([${lib.concatStringsSep ", " (map (x: ''"${x}/${python3.sitePackages}"'') pythonDeps)}]) @@ -46,24 +42,22 @@ let in stdenv.mkDerivation rec{ pname = "mysql-shell"; - version = "8.0.28"; + version = "8.0.29"; srcs = [ (fetchurl { url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${version}-src.tar.gz"; - sha256 = "sha256-xm2sepVgI0MPs25vu+BcRQeksaVhHcQlymreN1myu6c="; + sha256 = "sha256-ijwyamQgMoUEcMNpIJjJxH/dRuRFpdcXGmQqpD+WrmA="; }) (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor version}/mysql-${version}.tar.gz"; - sha256 = "sha256-2Gk2nrbeTyuy2407Mbe3OWjjVuX/xDVPS5ZlirHkiyI="; + sha256 = "sha256-USFw+m94ppTW8Y0ZfpmdJxbuaNxUHXZE3ZIqNmNAcmY="; }) ]; sourceRoot = "mysql-shell-${version}-src"; postPatch = '' - patch ../mysql-${version}/cmake/fido2.cmake ${./fido2.cmake.patch} - substituteInPlace ../mysql-${version}/cmake/libutils.cmake --replace /usr/bin/libtool libtool substituteInPlace ../mysql-${version}/cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool @@ -73,12 +67,7 @@ stdenv.mkDerivation rec{ echo '${site}' >> python/packages/mysqlsh/__init__.py ''; - nativeBuildInputs = [ - pkg-config - cmake - git - bison - ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]; + nativeBuildInputs = [ pkg-config cmake git bison ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]; buildInputs = [ boost @@ -99,30 +88,21 @@ stdenv.mkDerivation rec{ cyrus_sasl openldap v8 + python3 ] ++ pythonDeps ++ lib.optionals stdenv.isLinux [ numactl libtirpc - ] ++ lib.optionals stdenv.isDarwin [ - cctools - CoreServices - developer_cmds - DarwinTools - ]; + ] ++ lib.optionals stdenv.isDarwin [ cctools CoreServices developer_cmds DarwinTools ]; preConfigure = '' # Build MySQL - cmake -DWITH_BOOST=system \ - -DWITH_SYSTEM_LIBS=ON \ - -DWITH_ROUTER=OFF \ - -DWITH_UNIT_TESTS=OFF \ - -DFORCE_UNSUPPORTED_COMPILER=1 \ - -S ../mysql-${version} -B ../mysql-${version}/build + cmake -DWITH_BOOST=system -DWITH_SYSTEM_LIBS=ON -DWITH_ROUTER=OFF -DWITH_UNIT_TESTS=OFF \ + -DFORCE_UNSUPPORTED_COMPILER=1 -S ../mysql-${version} -B ../mysql-${version}/build cmake --build ../mysql-${version}/build --parallel ''${NIX_BUILD_CORES:-1} --target mysqlclient mysqlxclient # Get libv8_monolith - mkdir -p ../v8/lib - ln -s ${v8}/lib/libv8.a ../v8/lib/libv8_monolith.a + mkdir -p ../v8/lib && ln -s ${v8}/lib/libv8.a ../v8/lib/libv8_monolith.a ''; cmakeFlags = [ @@ -139,10 +119,7 @@ stdenv.mkDerivation rec{ "-DHAVE_PYTHON=1" ]; - CXXFLAGS = [ - "-DV8_COMPRESS_POINTERS=1" - "-DV8_31BIT_SMIS_ON_64BIT_ARCH=1" - ]; + CXXFLAGS = [ "-DV8_COMPRESS_POINTERS=1" "-DV8_31BIT_SMIS_ON_64BIT_ARCH=1" ]; meta = with lib; { homepage = "https://dev.mysql.com/doc/mysql-shell/${lib.versions.majorMinor version}/en/"; diff --git a/pkgs/development/tools/mysql-shell/fido2.cmake.patch b/pkgs/development/tools/mysql-shell/fido2.cmake.patch deleted file mode 100644 index df6005cca1a..00000000000 --- a/pkgs/development/tools/mysql-shell/fido2.cmake.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/cmake/fido2.cmake b/cmake/fido2.cmake -index c20e6e75c0d..f2d5cbd8430 100644 ---- a/cmake/fido2.cmake -+++ b/cmake/fido2.cmake -@@ -30,19 +30,8 @@ MACRO(FIND_FIDO_VERSION) - IF(WITH_FIDO STREQUAL "bundled") - SET(FIDO_VERSION "1.7.0") - ELSE() -- # This does not set any version information: -- # PKG_CHECK_MODULES(SYSTEM_FIDO fido2) -- - MYSQL_CHECK_PKGCONFIG() -- EXECUTE_PROCESS( -- COMMAND ${MY_PKG_CONFIG_EXECUTABLE} --modversion libfido2 -- OUTPUT_VARIABLE MY_FIDO_MODVERSION -- OUTPUT_STRIP_TRAILING_WHITESPACE -- RESULT_VARIABLE MY_MODVERSION_RESULT -- ) -- IF(MY_MODVERSION_RESULT EQUAL 0) -- SET(FIDO_VERSION ${MY_FIDO_MODVERSION}) -- ENDIF() -+ PKG_CHECK_MODULES(FIDO libfido2) - ENDIF() - MESSAGE(STATUS "FIDO_VERSION (${WITH_FIDO}) is ${FIDO_VERSION}") - ENDMACRO(FIND_FIDO_VERSION) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f76d7c679e..27ae382d315 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -625,8 +625,8 @@ with pkgs; mysql-shell = callPackage ../development/tools/mysql-shell { inherit (darwin) cctools developer_cmds DarwinTools; inherit (darwin.apple_sdk.frameworks) CoreServices; - boost = boost173; # Configure checks for specific version. - protobuf = protobuf3_11; + boost = boost177; # Configure checks for specific version. + protobuf = protobuf3_19; icu = icu67; v8 = v8_8_x; }; From d404697e7c89e9e0da4d420a157f53cbd6aea76e Mon Sep 17 00:00:00 2001 From: Francesco Zanini Date: Tue, 10 May 2022 13:49:22 +0200 Subject: [PATCH 063/201] nanovna-saver: 0.3.8 -> 0.4.0 --- .../electronics/nanovna-saver/default.nix | 31 ++++++------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/science/electronics/nanovna-saver/default.nix b/pkgs/applications/science/electronics/nanovna-saver/default.nix index af78fc71ebf..06b77294da7 100644 --- a/pkgs/applications/science/electronics/nanovna-saver/default.nix +++ b/pkgs/applications/science/electronics/nanovna-saver/default.nix @@ -1,36 +1,23 @@ -{ lib -, python3 -, fetchFromGitHub -, wrapQtAppsHook +{ + lib, + python3, + fetchFromGitHub, + wrapQtAppsHook, }: - -let - python = python3.override { - packageOverrides = self: super: { - scipy = super.scipy.overridePythonAttrs (oldAttrs: rec { - version = "1.4.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0ndw7zyxd2dj37775mc75zm4fcyiipnqxclc45mkpxy8lvrvpqfy"; - }; - doCheck = false; - }); - }; - }; -in python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "nanovna-saver"; - version = "0.3.8"; + version = "0.4.0"; src = fetchFromGitHub { owner = "NanoVNA-Saver"; repo = pname; rev = "v${version}"; - sha256 = "0z83rwpnbbs1n74mx8dgh1d1crp90mannj9vfy161dmy4wzc5kpv"; + sha256 = "1n1bh46spdyk7kgvv95hyfy9f904czhzlvk41vliqkak56hj2ss1"; }; nativeBuildInputs = [ wrapQtAppsHook ]; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ cython scipy pyqt5 From 6fc1fdc4be4950716e7c5bbb1a406cc3a5e43a2e Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 10 May 2022 17:29:24 +0000 Subject: [PATCH 064/201] =?UTF-8?q?n8n:=200.175.1=20=E2=86=92=200.176.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/n8n/node-packages.nix | 136 +++++++++++------- 1 file changed, 88 insertions(+), 48 deletions(-) diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index 0b6f39726a7..1c0eeeb8266 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -463,6 +463,15 @@ let sha512 = "L7wFlX3t9GsGgNS0oxLt6zbAZZGgsdptMmciL4cdxHmbL3Hz4Lysh8YqAR34eHsJ1uacJITcZBBDl5XpQlxPpQ=="; }; }; + "@types/generic-pool-3.1.10" = { + name = "_at_types_slash_generic-pool"; + packageName = "@types/generic-pool"; + version = "3.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/generic-pool/-/generic-pool-3.1.10.tgz"; + sha512 = "WRT/9taXh9XJRA9yvrbC02IqGZhK9GbFE/vuP2LeSLrqmDzz5wdXsH0Ige/F+3+rbbZfwH3LEazDsU0JiSV3vA=="; + }; + }; "@types/json-diff-0.5.2" = { name = "_at_types_slash_json-diff"; packageName = "@types/json-diff"; @@ -589,13 +598,13 @@ let sha512 = "nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ=="; }; }; - "@types/snowflake-sdk-1.6.3" = { + "@types/snowflake-sdk-1.6.4" = { name = "_at_types_slash_snowflake-sdk"; packageName = "@types/snowflake-sdk"; - version = "1.6.3"; + version = "1.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/snowflake-sdk/-/snowflake-sdk-1.6.3.tgz"; - sha512 = "YGlCPN88p6WYQCjBDIXwe2aWPkWNzKPW5/XJOGGnaXIacqULfKO6puq2a4OU02WCzfWr+XvOEj1MKWnxBhm+jw=="; + url = "https://registry.npmjs.org/@types/snowflake-sdk/-/snowflake-sdk-1.6.4.tgz"; + sha512 = "v3QjPbvd2dhyI5fPU5whxgUjhf9O19acIGiL65aUPCnkLIla5Z0ZqOiP3Jw5eyghunZHWohKfvtV+UdesCi29g=="; }; }; "@types/tough-cookie-2.3.8" = { @@ -976,13 +985,13 @@ let sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w=="; }; }; - "aws-sdk-2.1129.0" = { + "aws-sdk-2.1131.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1129.0"; + version = "2.1131.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1129.0.tgz"; - sha512 = "gQZaByfW7zKCg1n/kA+xDdLhI/SauaokRTq+lztK1cCCdFkR5CShcKeK/qUgVxjy43mwB7CkeTh1WUr2NMb0jg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1131.0.tgz"; + sha512 = "Ic3f2fSgVhYDQ0OBGxE6ODtSwaKyxBPGrI2RGrYt2Oj0Z8f227P7dB90o9X7y2MtnuJ4WoAzkf3Vc1c1UnnZlA=="; }; }; "aws-sign2-0.7.0" = { @@ -1804,13 +1813,13 @@ let sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; - "convict-6.2.2" = { + "convict-6.2.3" = { name = "convict"; packageName = "convict"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/convict/-/convict-6.2.2.tgz"; - sha512 = "3MsROJiEFN3BAzeFit1t87t7EUFzd44MNd13MLSikV2dsnDl7znwKgtYPPONtnDzxiDW0nBAsxVhSRNrjUrTTg=="; + url = "https://registry.npmjs.org/convict/-/convict-6.2.3.tgz"; + sha512 = "mTY04Qr7WrqiXifdeUYXr4/+Te4hPFWDvz6J2FVIKCLc2XBhq63VOSSYAKJ+unhZAYOAjmEdNswTOeHt7s++pQ=="; }; }; "cookie-0.4.1" = { @@ -1858,13 +1867,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.22.4" = { + "core-js-3.22.5" = { name = "core-js"; packageName = "core-js"; - version = "3.22.4"; + version = "3.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.22.4.tgz"; - sha512 = "1uLykR+iOfYja+6Jn/57743gc9n73EWiOnSJJ4ba3B4fOEYDBv25MagmEZBxTp5cWq4b/KPx/l77zgsp28ju4w=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.22.5.tgz"; + sha512 = "VP/xYuvJ0MJWRAobcmQ8F2H6Bsn+s7zqAAjFaHGBMc5AQm7zaelhD1LGduFn2EehEcQcU+br6t+fwbpQ5d1ZWA=="; }; }; "core-util-is-1.0.2" = { @@ -2344,13 +2353,13 @@ let sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="; }; }; - "es-abstract-1.19.5" = { + "es-abstract-1.20.0" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.19.5"; + version = "1.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.5.tgz"; - sha512 = "Aa2G2+Rd3b6kxEUKTF4TaW67czBLyAv3z7VOhYRU50YBx+bbsYZ9xQP4lMNazePuFlybXI0V4MruPos7qUo5fA=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz"; + sha512 = "URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA=="; }; }; "es-to-primitive-1.2.1" = { @@ -2776,6 +2785,24 @@ let sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; }; + "function.prototype.name-1.1.5" = { + name = "function.prototype.name"; + packageName = "function.prototype.name"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz"; + sha512 = "uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA=="; + }; + }; + "functions-have-names-1.2.3" = { + name = "functions-have-names"; + packageName = "functions-have-names"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz"; + sha512 = "xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="; + }; + }; "gauge-3.0.2" = { name = "gauge"; packageName = "gauge"; @@ -3847,13 +3874,13 @@ let sha512 = "xOqorG21Va+3CjpFOfFTU7SWohHH2uIX9ZY4Byz6J+lvpfvc486tOAT/G9GfbrKtJ9O7NCX9o0aC2lxqbnZ9EA=="; }; }; - "libphonenumber-js-1.9.52" = { + "libphonenumber-js-1.9.53" = { name = "libphonenumber-js"; packageName = "libphonenumber-js"; - version = "1.9.52"; + version = "1.9.53"; src = fetchurl { - url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.52.tgz"; - sha512 = "8k83chc+zMj+J/RkaBxi0PpSTAdzHmpqzCMqquSJVRfbZFr8DCp6vPC7ms2PIPGxeqajZLI6CBLW5nLCJCJrYg=="; + url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.53.tgz"; + sha512 = "3cuMrA2CY3TbKVC0wKye5dXYgxmVVi4g13gzotprQSguFHMqf0pIrMM2Z6ZtMsSWqvtIqi5TuQhGjMhxz0O9Mw=="; }; }; "libqp-1.1.0" = { @@ -4144,13 +4171,13 @@ let sha512 = "IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ=="; }; }; - "luxon-2.3.2" = { + "luxon-2.4.0" = { name = "luxon"; packageName = "luxon"; - version = "2.3.2"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-2.3.2.tgz"; - sha512 = "MlAQQVMFhGk4WUA6gpfsy0QycnKP0+NlCBJRVRNPxxSIbjrCbQ65nrpJD3FVyJNZLuJ0uoqL57ye6BmDYgHaSw=="; + url = "https://registry.npmjs.org/luxon/-/luxon-2.4.0.tgz"; + sha512 = "w+NAwWOUL5hO0SgwOHsMBAmZ15SoknmQXhSO0hIbJCAmPKSsGeK8MlmhYh2w6Iib38IxN2M+/ooXWLbeis7GuA=="; }; }; "mailparser-3.5.0" = { @@ -4531,13 +4558,13 @@ let sha512 = "Me8fk76HeWUmTPnksH4kzG0bKOp1yLFjAC4F+EcEllIIf+x75kjN+gSH4uwgvspzGCVO88ZnppWoGQwvHQpXQw=="; }; }; - "n8n-nodes-base-0.173.0" = { + "n8n-nodes-base-0.174.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.173.0"; + version = "0.174.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.173.0.tgz"; - sha512 = "9ya0cgRMk6iz01m2shZHahe4KurL89/T+iGLywrUZdPdIRni7LR4ywSG51B4jko73+zsKPNYjya650BGNz7TaQ=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.174.0.tgz"; + sha512 = "2yYWeSkfI08BtgGZvOksmQOpjNPYmhvkqO2SBTuTAqkryZ1AHiw6RtILsf2575prQDdep2clxIZxW7owxxFmLA=="; }; }; "n8n-workflow-0.98.0" = { @@ -5791,6 +5818,15 @@ let sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="; }; }; + "regexp.prototype.flags-1.4.3" = { + name = "regexp.prototype.flags"; + packageName = "regexp.prototype.flags"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz"; + sha512 = "fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA=="; + }; + }; "reinterval-1.1.0" = { name = "reinterval"; packageName = "reinterval"; @@ -6367,13 +6403,13 @@ let sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; }; }; - "sqlite3-5.0.7" = { + "sqlite3-5.0.8" = { name = "sqlite3"; packageName = "sqlite3"; - version = "5.0.7"; + version = "5.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.7.tgz"; - sha512 = "9PUfvpol1/5SI3WZawFINwpRz6qhUeJJtFNG6rr0CvDWMXN75PJPv+3b0aVEOOx5rAZIPcXW2zVasH8foqw7Gg=="; + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.8.tgz"; + sha512 = "f2ACsbSyb2D1qFFcqIXPfFscLtPVOWJr5GmUzYxf4W+0qelu5MWrR+FAQE1d5IUArEltBrzSDxDORG8P/IkqyQ=="; }; }; "sqlstring-2.3.3" = { @@ -7534,10 +7570,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.175.1"; + version = "0.176.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.175.1.tgz"; - sha512 = "rInwNB6wxOs79EvC2HFALyDhdDPJwLVT+z1LivxLRD9dZOrtlMD9wdDfESpHYS5ikND4T5JW32HaxGF9nnzlJA=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.176.0.tgz"; + sha512 = "eJTzCFcujAfJegWKQhGi+upAsfTEpW1/2HC5vwV2btdgm8XCMyhVBMJJR7ZJMozFNDz8ErLhwtlIfQCQSXRP0A=="; }; dependencies = [ (sources."@azure/abort-controller-1.1.0" // { @@ -7652,6 +7688,7 @@ in sources."@types/express-serve-static-core-4.17.28" sources."@types/express-unless-0.5.3" sources."@types/ftp-0.3.33" + sources."@types/generic-pool-3.1.10" sources."@types/json-diff-0.5.2" sources."@types/jsonwebtoken-8.5.8" sources."@types/lodash-4.14.182" @@ -7669,7 +7706,7 @@ in sources."@types/range-parser-1.2.4" sources."@types/readable-stream-2.3.13" sources."@types/serve-static-1.13.10" - sources."@types/snowflake-sdk-1.6.3" + sources."@types/snowflake-sdk-1.6.4" sources."@types/tough-cookie-2.3.8" sources."@types/tunnel-0.0.3" sources."@xmldom/xmldom-0.7.5" @@ -7725,7 +7762,7 @@ in ]; }) sources."avsc-5.7.4" - (sources."aws-sdk-2.1129.0" // { + (sources."aws-sdk-2.1131.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -7898,11 +7935,11 @@ in }) sources."content-disposition-0.5.4" sources."content-type-1.0.4" - sources."convict-6.2.2" + sources."convict-6.2.3" sources."cookie-0.4.1" sources."cookie-parser-1.4.6" sources."cookie-signature-1.0.6" - sources."core-js-3.22.4" + sources."core-js-3.22.5" sources."core-util-is-1.0.2" sources."crc-32-1.2.2" sources."cron-1.7.2" @@ -7966,7 +8003,7 @@ in sources."entities-2.2.0" sources."env-variable-0.0.6" sources."err-code-2.0.3" - sources."es-abstract-1.19.5" + sources."es-abstract-1.20.0" sources."es-to-primitive-1.2.1" sources."es5-ext-0.8.2" sources."escalade-3.1.1" @@ -8024,6 +8061,8 @@ in sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" + sources."function.prototype.name-1.1.5" + sources."functions-have-names-1.2.3" sources."gauge-3.0.2" sources."generate-function-2.3.1" sources."generic-pool-3.8.2" @@ -8168,7 +8207,7 @@ in sources."iconv-lite-0.6.3" ]; }) - sources."libphonenumber-js-1.9.52" + sources."libphonenumber-js-1.9.53" sources."libqp-1.1.0" sources."limiter-1.1.5" sources."linkify-it-4.0.0" @@ -8212,7 +8251,7 @@ in sources."yallist-2.1.2" ]; }) - sources."luxon-2.3.2" + sources."luxon-2.4.0" (sources."mailparser-3.5.0" // { dependencies = [ sources."iconv-lite-0.6.3" @@ -8283,7 +8322,7 @@ in sources."n8n-core-0.116.0" sources."n8n-design-system-0.19.0" sources."n8n-editor-ui-0.142.1" - (sources."n8n-nodes-base-0.173.0" // { + (sources."n8n-nodes-base-0.174.0" // { dependencies = [ sources."iconv-lite-0.6.3" ]; @@ -8469,6 +8508,7 @@ in sources."redis-parser-3.0.0" sources."reflect-metadata-0.1.13" sources."regenerator-runtime-0.13.9" + sources."regexp.prototype.flags-1.4.3" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" sources."remove-trailing-slash-0.1.1" @@ -8577,7 +8617,7 @@ in ]; }) sources."sprintf-js-1.1.2" - sources."sqlite3-5.0.7" + sources."sqlite3-5.0.8" sources."sqlstring-2.3.3" sources."sse-channel-3.1.1" sources."ssf-0.11.2" From c209577626a62f1e8ab6fcb48d903f736fa9c443 Mon Sep 17 00:00:00 2001 From: amesgen Date: Tue, 10 May 2022 19:52:34 +0200 Subject: [PATCH 065/201] svt-av1: 0.9.1 -> 1.0.0 --- pkgs/tools/video/svt-av1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix index 3c45f2608eb..7522bb042ed 100644 --- a/pkgs/tools/video/svt-av1/default.nix +++ b/pkgs/tools/video/svt-av1/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "svt-av1"; - version = "0.9.1"; + version = "1.0.0"; src = fetchFromGitLab { owner = "AOMediaCodec"; repo = "SVT-AV1"; rev = "v${version}"; - sha256 = "sha256-PIr2bCEKj1dXKiGWloZv2v+ed6JdHK3z+p11ugWGzAk="; + sha256 = "sha256-M5ErWB/klVijsF+GysR0b3m180h+O+10weKr1pTh8ow="; }; nativeBuildInputs = [ cmake nasm ]; From 63f82810d1518f0410684e116f8ccba8449a8729 Mon Sep 17 00:00:00 2001 From: amesgen Date: Tue, 10 May 2022 19:52:34 +0200 Subject: [PATCH 066/201] svt-av1: remove BSD-2 from licenses Quoting from the README: > Up to v0.8.7, SVT-AV1 is licensed under the BSD-2-clause license and > the Alliance for Open Media Patent License 1.0. See LICENSE and > PATENTS for details. Starting from v0.9, SVT-AV1 is licensed under > the BSD-3-clause clear license and the Alliance for Open Media > Patent License 1.0. See LICENSE and PATENTS for details. --- pkgs/tools/video/svt-av1/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix index 7522bb042ed..dc57cf11609 100644 --- a/pkgs/tools/video/svt-av1/default.nix +++ b/pkgs/tools/video/svt-av1/default.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.com/AOMediaCodec/SVT-AV1/-/blob/v${version}/CHANGELOG.md"; license = with licenses; [ aom - bsd2 bsd3 ]; platforms = platforms.unix; From 78ebec14483cecafa6ff8ceb095f92257890c5c7 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 10 May 2022 19:34:53 +0100 Subject: [PATCH 067/201] open-policy-agent: 0.38.1 -> 0.40.0 --- .../tools/open-policy-agent/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 66648faed1d..7fe4b10f2d2 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , installShellFiles @@ -6,15 +7,17 @@ , enableWasmEval ? false }: +assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm on darwin is failing in nixpkgs"; + buildGoModule rec { pname = "open-policy-agent"; - version = "0.38.1"; + version = "0.40.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "sha256-x8mSlZ2X0DdkhaW5QXs5axERJkwARu8tHueQHXfamXM="; + sha256 = "sha256-rLfo2SUlxL6QFc2v+nxFnbyYcfy7i3OFhGt6ZAUteHY="; }; vendorSha256 = null; @@ -35,12 +38,13 @@ buildGoModule rec { # Feed in all but the e2e tests for testing # This is because subPackages above limits what is built to just what we # want but also limits the tests + # Also avoid wasm tests on darwin due to wasmtime-go build issues getGoDirs() { - go list ./... | grep -v e2e + go list ./... | grep -v -e e2e ${lib.optionalString stdenv.isDarwin "-e wasm"} } - - # Remove test case that fails on < go1.17 - rm test/cases/testdata/cryptox509parsecertificates/test-cryptox509parsecertificates-0123.yaml + '' + lib.optionalString stdenv.isDarwin '' + # resolve "too many open files" errors during the tests on darwin + ulimit -n 1024 ''; postInstall = '' @@ -66,6 +70,7 @@ buildGoModule rec { ''; meta = with lib; { + mainProgram = "opa"; homepage = "https://www.openpolicyagent.org"; changelog = "https://github.com/open-policy-agent/opa/blob/v${version}/CHANGELOG.md"; description = "General-purpose policy engine"; From 44d5d31d98435036d445b224ee4d56055c6515b5 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 9 May 2022 18:20:22 -0700 Subject: [PATCH 068/201] Revert "pythonPackages: set mainProgram to pname by default" It's now the case that `nix run` checks `pname` as well as `name`, so this is no longer needed. See: https://github.com/NixOS/nix/commit/a2473823d748b0249804d393c739622146954d02 This reverts commit baf91ea7d9ffab6d1f95395b7c2f724a2e349698. --- pkgs/development/interpreters/python/mk-python-derivation.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 963073df620..4917b167046 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -176,8 +176,6 @@ let # default to python's platforms platforms = python.meta.platforms; isBuildPythonPackage = python.meta.platforms; - } // lib.optionalAttrs (attrs?pname) { - mainProgram = attrs.pname; } // meta; } // lib.optionalAttrs (attrs?checkPhase) { # If given use the specified checkPhase, otherwise use the setup hook. From f433d91bb3fae87f5232a8946965777802b16b59 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 10 May 2022 21:15:48 +0200 Subject: [PATCH 069/201] anbox: drop kernel modules package All builds are broken: - 4.14 - 4.19 - 5.4 https://hydra.nixos.org/eval/1761072?filter=anbox&compare=1760998&full=#tabs-still-fail Let's just drop it. This leaves the anbox module possibly in a broken-ish state, but I'm not sure what to do about it. --- nixos/modules/virtualisation/anbox.nix | 3 -- pkgs/os-specific/linux/anbox/kmod.nix | 42 -------------------------- pkgs/top-level/linux-kernels.nix | 2 -- 3 files changed, 47 deletions(-) delete mode 100644 pkgs/os-specific/linux/anbox/kmod.nix diff --git a/nixos/modules/virtualisation/anbox.nix b/nixos/modules/virtualisation/anbox.nix index a4da62eb5f7..c70da573533 100644 --- a/nixos/modules/virtualisation/anbox.nix +++ b/nixos/modules/virtualisation/anbox.nix @@ -73,9 +73,6 @@ in environment.systemPackages = with pkgs; [ anbox ]; - boot.kernelModules = [ "ashmem_linux" "binder_linux" ]; - boot.extraModulePackages = [ kernelPackages.anbox ]; - services.udev.extraRules = '' KERNEL=="ashmem", NAME="%k", MODE="0666" KERNEL=="binder*", NAME="%k", MODE="0666" diff --git a/pkgs/os-specific/linux/anbox/kmod.nix b/pkgs/os-specific/linux/anbox/kmod.nix deleted file mode 100644 index 553712d21a7..00000000000 --- a/pkgs/os-specific/linux/anbox/kmod.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, kernel, fetchFromGitHub }: - -stdenv.mkDerivation { - pname = "anbox-modules"; - version = "2020-06-14-${kernel.version}"; - - src = fetchFromGitHub { - owner = "anbox"; - repo = "anbox-modules"; - rev = "98f0f3b3b1eeb5a6954ca15ec43e150b76369086"; - sha256 = "sha256-6xDJQ4YItdbYqle/9VNfOc7D80yFGd9cFyF+CuABaF0="; - }; - - nativeBuildInputs = kernel.moduleBuildDependencies; - - KERNEL_SRC="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - - buildPhase = '' - for d in ashmem binder;do - cd $d - make - cd - - done - ''; - - installPhase = '' - modDir=$out/lib/modules/${kernel.modDirVersion}/kernel/updates/ - mkdir -p $modDir - for d in ashmem binder;do - mv $d/$d*.ko $modDir/. - done - ''; - - meta = with lib; { - description = "Anbox ashmem and binder drivers."; - homepage = "https://github.com/anbox/anbox-modules"; - license = licenses.gpl2Only; - platforms = platforms.linux; - broken = kernel.kernelAtLeast "5.5"; - maintainers = with maintainers; [ edwtjo ]; - }; -} diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 454e1cdca76..7c892035e7f 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -271,8 +271,6 @@ in { }); }; - anbox = callPackage ../os-specific/linux/anbox/kmod.nix { }; - apfs = callPackage ../os-specific/linux/apfs { }; batman_adv = callPackage ../os-specific/linux/batman-adv {}; From 33bf62b1ff7a3e1f9476689690db389743e19002 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 May 2022 19:24:29 +0000 Subject: [PATCH 070/201] python310Packages.pygtfs: 0.1.6 -> 0.1.7 --- pkgs/development/python-modules/pygtfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygtfs/default.nix b/pkgs/development/python-modules/pygtfs/default.nix index 735990c0944..831a7d22c4a 100644 --- a/pkgs/development/python-modules/pygtfs/default.nix +++ b/pkgs/development/python-modules/pygtfs/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pygtfs"; - version = "0.1.6"; + version = "0.1.7"; src = fetchPypi { inherit pname version; - sha256 = "0nx2idgza07kmvj7pcgpj3pqhw53v5rq63paw2ly51cjas2fv5pr"; + sha256 = "sha256-sGJwtf8DVIrE4hcU3IksnyAAt8yf67UBJIiVILDSsv8="; }; nativeBuildInputs = [ From 9ef1af9aa304364f4fc85fa21660aa6ebc230625 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 10 May 2022 22:21:09 +0200 Subject: [PATCH 071/201] rapcad: drop Broken since 2018 --- pkgs/applications/graphics/rapcad/default.nix | 34 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 36 deletions(-) delete mode 100644 pkgs/applications/graphics/rapcad/default.nix diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix deleted file mode 100644 index 904c9f8f402..00000000000 --- a/pkgs/applications/graphics/rapcad/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline -, qtbase, qmake, libGLU -}: - -stdenv.mkDerivation rec { - version = "0.9.8"; - pname = "rapcad"; - - src = fetchFromGitHub { - owner = "gilesbathgate"; - repo = "rapcad"; - rev = "v${version}"; - sha256 = "0a0sqf6h227zalh0jrz6jpm8iwji7q3i31plqk76i4qm9vsgrhir"; - }; - - patches = [ - (fetchurl { - url = "https://github.com/GilesBathgate/RapCAD/commit/278a8d6c7b8fe08f867002528bbab4a6319a7bb6.patch"; - sha256 = "1vvkyf0wg79zdzs5zlggfrr1lrp1x75dglzl0mspnycwldsdwznj"; - name = "disable-QVector-qHash.patch"; - }) - ]; - - nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline libGLU ]; - - meta = with lib; { - license = licenses.gpl3; - maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; - description = "Constructive solid geometry package"; - broken = true; # 2018-04-11 - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f432f8e438..01ac5896356 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29275,8 +29275,6 @@ with pkgs; raiseorlaunch = callPackage ../applications/misc/raiseorlaunch {}; - rapcad = libsForQt514.callPackage ../applications/graphics/rapcad { boost = boost159; }; - rapid-photo-downloader = libsForQt5.callPackage ../applications/graphics/rapid-photo-downloader { }; rapidsvn = callPackage ../applications/version-management/rapidsvn { }; From e0cd2c540a93715c388f4b8d7ebcb107be8a2477 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Fri, 18 Mar 2022 12:54:53 +0100 Subject: [PATCH 072/201] pcsx2: 1.7.2105 -> 1.7.2731, support Vulkan --- pkgs/applications/emulators/pcsx2/default.nix | 31 ++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/emulators/pcsx2/default.nix b/pkgs/applications/emulators/pcsx2/default.nix index 2e22e7d9053..a5ff1106fd6 100644 --- a/pkgs/applications/emulators/pcsx2/default.nix +++ b/pkgs/applications/emulators/pcsx2/default.nix @@ -12,7 +12,9 @@ , libpng , libpulseaudio , libsamplerate -, libxml2 +, libXdmcp +, openssl +, pcre , perl , pkg-config , portaudio @@ -20,6 +22,8 @@ , soundtouch , stdenv , udev +, vulkan-headers +, vulkan-loader , wrapGAppsHook , wxGTK , zlib @@ -28,14 +32,14 @@ stdenv.mkDerivation rec { pname = "pcsx2"; - version = "1.7.2105"; + version = "1.7.2731"; src = fetchFromGitHub { owner = "PCSX2"; repo = "pcsx2"; fetchSubmodules = true; rev = "v${version}"; - hash = "sha256-/A8u7oDIVs0Zmne0ebaXxOeIQbM9pr62KEH6FJR2umk="; + hash = "sha256-b3cK3ly9J44YMy/cNprlDCSsu8+DrlhRSLXv5xMouWo="; }; cmakeFlags = [ @@ -44,9 +48,10 @@ stdenv.mkDerivation rec { "-DPACKAGE_MODE=TRUE" "-DWAYLAND_API=TRUE" "-DXDG_STD=TRUE" + "-DUSE_VULKAN=TRUE" ]; - nativeBuildInputs = [ cmake perl pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ cmake perl pkg-config vulkan-headers wrapGAppsHook ]; buildInputs = [ alsa-lib @@ -60,16 +65,29 @@ stdenv.mkDerivation rec { libpng libpulseaudio libsamplerate - libxml2 + libXdmcp + openssl + pcre portaudio SDL2 soundtouch udev + vulkan-loader wayland wxGTK zlib ]; + # Wayland doesn't seem to work right now (crashes when booting a game). + # Try removing `--prefix GDK_BACKEND : x11` on the next update. + # (This may be solved when the project finshes migrating to Qt) + preFixup = '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]} + --prefix GDK_BACKEND : x11 + ) + ''; + meta = with lib; { description = "Playstation 2 emulator"; longDescription = '' @@ -81,13 +99,12 @@ stdenv.mkDerivation rec { ''; homepage = "https://pcsx2.net"; maintainers = with maintainers; [ hrdinka govanify ]; - mainProgram = "PCSX2"; # PCSX2's source code is released under LGPLv3+. It However ships # additional data files and code that are licensed differently. # This might be solved in future, for now we should stick with # license.free license = licenses.free; - platforms = platforms.x86; + platforms = platforms.x86_64; }; } From fc2255fffa9406cc67d95e555c207104423a9f1d Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 10 May 2022 22:24:13 +0200 Subject: [PATCH 073/201] multibootusb: drop Broken since 2021-02-06 --- .../misc/multibootusb/default.nix | 115 ------------------ pkgs/top-level/all-packages.nix | 2 - 2 files changed, 117 deletions(-) delete mode 100644 pkgs/applications/misc/multibootusb/default.nix diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix deleted file mode 100644 index 403df853343..00000000000 --- a/pkgs/applications/misc/multibootusb/default.nix +++ /dev/null @@ -1,115 +0,0 @@ -{ fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, qemu, unzip, zip, - coreutils, gnugrep, which, gnused, e2fsprogs, autoPatchelfHook, gptfdisk, - python3Packages, qt5, runtimeShell, lib, util-linux, wrapQtAppsHook }: - -# Note: Multibootusb is tricky to maintain. It relies on the -# $PYTHONPATH variable containing some of their code, so that -# something like: -# -# from scripts import config -# -# works. It also relies on the current directory to find some runtime -# resources thanks to a use of __file__. -# -# https://github.com/mbusb/multibootusb/blob/0d34d70c3868f1d7695cfd141141b17c075de967/scripts/osdriver.py#L59 - -python3Packages.buildPythonApplication rec { - pname = "multibootusb"; - name = "${pname}-${version}"; - version = "9.2.0"; - - nativeBuildInputs = [ - wrapQtAppsHook - autoPatchelfHook - unzip - zip - ]; - - runTimeDeps = [ - coreutils - gnugrep - which - parted - util-linux - qemu - p7zip - gnused - mtools - procps - e2fsprogs - gptfdisk - ]; - - buildInputs = [ - libxcb - python3Packages.python - qt5.full - ]; - - src = fetchFromGitHub { - owner = "mbusb"; - repo = pname; - rev = "v${version}"; - - sha256 = "0wlan0cp6c2i0nahixgpmkm0h4n518gj8rc515d579pqqp91p2h3"; - }; - - # Tests can't run inside the NixOS sandbox - # "Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory" - doCheck = false; - - pythonPath = with python3Packages; [ - dbus-python - pyqt5 - pytest-shutil - pyudev - six - ]; - - # multibootusb ships zips with various versions of syslinux, we need to patchelf them - postPatch = '' - for zip in $(find . -name "*.zip"); do - zip=$(readlink -f $zip) - target="$(mktemp -d)" - pushd $target - unzip $zip - rm $zip - autoPatchelf . - zip -r $zip * - popd - done - ''; - - postInstall = '' - # This script doesn't work and it doesn't add much anyway - rm $out/bin/multibootusb-pkexec - - # The installed data isn't sufficient for whatever reason, missing gdisk/gdisk.exe - mkdir -p "$out/share/${pname}" - cp -r data "$out/share/${pname}/data" - ''; - - preFixup = '' - makeWrapperArgs+=( - # Firstly, add all necessary QT variables - "''${qtWrapperArgs[@]}" - - # Then, add the installed scripts/ directory to the python path - --prefix "PYTHONPATH" ":" "$out/lib/${python3Packages.python.libPrefix}/site-packages" - - # Add some runtime dependencies - --prefix "PATH" ":" "${lib.makeBinPath runTimeDeps}" - - # Finally, move to directory that contains data - --chdir "$out/share/${pname}" - ) - ''; - - meta = with lib; { - description = "Multiboot USB creator for Linux live disks"; - homepage = "http://multibootusb.org/"; - license = licenses.gpl2; - maintainers = []; # Looking for a maintainer! - broken = true; # "name 'config' is not defined", added 2021-02-06 - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01ac5896356..2e92bb50379 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26753,8 +26753,6 @@ with pkgs; moe = callPackage ../applications/editors/moe { }; - multibootusb = libsForQt514.callPackage ../applications/misc/multibootusb { qt5 = qt514; }; - praat = callPackage ../applications/audio/praat { }; quvi = callPackage ../applications/video/quvi/tool.nix { From 0ae3ed37c19884850bd961b1576c1c150d9fb480 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Tue, 10 May 2022 22:36:04 +0200 Subject: [PATCH 074/201] palemoon: 29.4.6 -> 31.0.0 --- .../networking/browsers/palemoon/default.nix | 31 +++++++++---------- .../networking/browsers/palemoon/mozconfig | 2 -- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index eacc66271d5..a07ca4e581d 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -6,7 +6,7 @@ , dbus , dbus-glib , desktop-file-utils -, fetchzip +, fetchFromGitea , ffmpeg , fontconfig , freetype @@ -39,19 +39,21 @@ # https://developer.palemoon.org/build/linux/ assert stdenv.cc.isGNU; assert with lib.strings; ( - versionAtLeast stdenv.cc.version "4.9" - && !hasPrefix "6" stdenv.cc.version - && versionOlder stdenv.cc.version "11" + versionAtLeast stdenv.cc.version "7.1" + && versionOlder stdenv.cc.version "12" ); stdenv.mkDerivation rec { pname = "palemoon"; - version = "29.4.6"; - - src = fetchzip { - name = "${pname}-${version}"; - url = "http://archive.palemoon.org/source/${pname}-${version}.source.tar.xz"; - sha256 = "sha256-6bI3AnIhp0x3BCgTvmbOXDBGrJXg3cN+AmwI8XCKD8g="; + version = "31.0.0"; + + src = fetchFromGitea { + domain = "repo.palemoon.org"; + owner = "MoonchildProductions"; + repo = "Pale-Moon"; + rev = "${version}_Release"; + fetchSubmodules = true; + sha256 = "sha256-fIQAQCtjA/9Otft3e9Z4xWgE09sqsdArYQtZqmEgfTc="; }; nativeBuildInputs = [ @@ -139,14 +141,9 @@ stdenv.mkDerivation rec { ./mach install - # Fix missing icon due to wrong WMClass - # https://forum.palemoon.org/viewtopic.php?f=3&t=26746&p=214221#p214221 - substituteInPlace ./palemoon/branding/official/palemoon.desktop \ - --replace 'StartupWMClass="pale moon"' 'StartupWMClass=Pale moon' + # Install official branding stuff desktop-file-install --dir=$out/share/applications \ ./palemoon/branding/official/palemoon.desktop - - # Install official branding icons for iconname in default{16,22,24,32,48,256} mozicon128; do n=''${iconname//[^0-9]/} size=$n"x"$n @@ -155,7 +152,7 @@ stdenv.mkDerivation rec { # Remove unneeded SDK data from installation # https://forum.palemoon.org/viewtopic.php?f=37&t=26796&p=214676#p214729 - rm -rf $out/{include,share/idl,lib/palemoon-devel-${version}} + rm -r $out/{include,share/idl,lib/palemoon-devel-${version}} runHook postInstall ''; diff --git a/pkgs/applications/networking/browsers/palemoon/mozconfig b/pkgs/applications/networking/browsers/palemoon/mozconfig index 0eab96e5846..65143fdac18 100644 --- a/pkgs/applications/networking/browsers/palemoon/mozconfig +++ b/pkgs/applications/networking/browsers/palemoon/mozconfig @@ -20,8 +20,6 @@ ac_add_options --enable-strip ac_add_options --enable-devtools ac_add_options --enable-av1 -ac_add_options --disable-eme -ac_add_options --disable-webrtc ac_add_options --disable-gamepad ac_add_options --disable-tests ac_add_options --disable-debug From a797299a78f4befb7dbd6bdb04a9687bd449a07d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 10 May 2022 22:54:44 +0200 Subject: [PATCH 075/201] perlPackages.CryptOpenSSLRandom: mark broken for aarch64-darwin --- pkgs/top-level/perl-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index adf03ae7271..274e07c098a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4764,6 +4764,10 @@ let NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -lcrypto"; buildInputs = [ CryptOpenSSLGuess ]; + meta = { + # errors with: 74366 Abort trap: 6 + broken = stdenv.isDarwin && stdenv.isAarch64; + }; }; CryptOpenSSLRSA = buildPerlPackage { From 7c5607887fe7e0e4a79c986918053539a4ec9e96 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 May 2022 22:58:20 +0200 Subject: [PATCH 076/201] python310Packages.pcapy-ng: init at 1.0.9 --- .../python-modules/pcapy-ng/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/pcapy-ng/default.nix diff --git a/pkgs/development/python-modules/pcapy-ng/default.nix b/pkgs/development/python-modules/pcapy-ng/default.nix new file mode 100644 index 00000000000..7fec65bfb52 --- /dev/null +++ b/pkgs/development/python-modules/pcapy-ng/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, cython +, fetchFromGitHub +, libpcap +, pkgconfig +, pytestCheckHook +, python +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pcapy-ng"; + version = "1.0.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "stamparm"; + repo = pname; + rev = version; + hash = "sha256-6LA2n7Kv0MiZcqUJpi0lDN4Q+GcOttYw7hJwVqK/DU0="; + }; + + nativeBuildInputs = [ + cython + pkgconfig + ]; + + buildInputs = [ + libpcap + ]; + + checkInputs = [ + pytestCheckHook + ]; + + preCheck = '' + cd tests + ''; + + pythonImportsCheck = [ + "pcapy" + ]; + + doCheck = pythonOlder "3.10"; + + pytestFlagsArray = [ + "pcapytests.py" + ]; + + meta = with lib; { + description = "Module to interface with the libpcap packet capture library"; + homepage = "https://github.com/stamparm/pcapy-ng/"; + license = licenses.bsd2; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3fd57e228de..4650b6545a7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6179,6 +6179,8 @@ in { pc-ble-driver-py = toPythonModule (callPackage ../development/python-modules/pc-ble-driver-py { }); + pcapy-ng = callPackage ../development/python-modules/pcapy-ng { }; + pcodedmp = callPackage ../development/python-modules/pcodedmp { }; pcpp = callPackage ../development/python-modules/pcpp { }; From 752c95521ce29d4664fbecc7e22c93affe9e9890 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 May 2022 23:09:43 +0200 Subject: [PATCH 077/201] python310Packages.pure-pcapy3: add pythonImportsCheck --- .../python-modules/pure-pcapy3/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pure-pcapy3/default.nix b/pkgs/development/python-modules/pure-pcapy3/default.nix index 636cbaff71c..56b8da5db23 100644 --- a/pkgs/development/python-modules/pure-pcapy3/default.nix +++ b/pkgs/development/python-modules/pure-pcapy3/default.nix @@ -1,17 +1,28 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { pname = "pure-pcapy3"; version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "14panfklap6wwi9avw46gvd7wg9mkv9xbixvbvmi1m2adpqlb7mr"; + hash = "sha256-uZ5F8W1K1BDrXrvH1dOeNT1+2n6G8K1S5NxcRaez6pI="; }; + pythonImportsCheck = [ + "pure_pcapy" + ]; + meta = with lib; { - description = "Pure Python reimplementation of pcapy. This package is API compatible and a drop-in replacement."; - homepage = "https://bitbucket.org/viraptor/pure-pcapy"; + description = "Reimplementation of pcapy"; + homepage = "https://github.com/rcloran/pure-pcapy-3"; license = licenses.bsd2; maintainers = with maintainers; [ etu ]; }; From b140f3f0b4f668a9168a9428e0593433010580e4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 May 2022 23:18:29 +0200 Subject: [PATCH 078/201] checkov: 2.0.1118 -> 2.0.1132 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 52899ac238e..50f4c1c004b 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.1118"; + version = "2.0.1132"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-8zhCyIHI3Pl5fTqQGSe8l6+7DZQsI6YgyTSCs1BNe94="; + hash = "sha256-jy6a421lOfNGhxEuCOw+0JRD9RH7XJFP0dxhN0taKmk="; }; nativeBuildInputs = with py.pkgs; [ From 25494ec8ca223c4b27b090b178f0430f9de9364a Mon Sep 17 00:00:00 2001 From: Mrinal Purohit Date: Wed, 11 May 2022 02:49:33 +0530 Subject: [PATCH 079/201] google-cloud-sdk: 384.0.1 -> 385.0.0 --- pkgs/tools/admin/google-cloud-sdk/data.nix | 22 ++++++++++----------- pkgs/tools/admin/google-cloud-sdk/update.sh | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/data.nix b/pkgs/tools/admin/google-cloud-sdk/data.nix index 359427d32a0..87ae11bdc14 100644 --- a/pkgs/tools/admin/google-cloud-sdk/data.nix +++ b/pkgs/tools/admin/google-cloud-sdk/data.nix @@ -1,32 +1,32 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "384.0.1"; + version = "385.0.0"; googleCloudSdkPkgs = { x86_64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-384.0.1-linux-x86_64.tar.gz"; - sha256 = "1pa6dzizn7sjahghiwz98n906ssbq4aa9kg1f3akdsmmabh95pd7"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-385.0.0-linux-x86_64.tar.gz"; + sha256 = "17l70chxxnacljhck1bxqz85170a6ilw5lzj8m3gcciy6klkj66d"; }; x86_64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-384.0.1-darwin-x86_64.tar.gz"; - sha256 = "0pis92ldxxzvsamkck54d5d86ss13wipji29x082750c54gwm6w3"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-385.0.0-darwin-x86_64.tar.gz"; + sha256 = "185kj98vwg0fbkfxw0w8258dg45avn22p7afq98gcflr2ymxin2v"; }; aarch64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-384.0.1-linux-arm.tar.gz"; - sha256 = "1ssxb126hjyylgjbybl7ksiqnwf2hz6y0x1s5rjicaqpw5yv0sqy"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-385.0.0-linux-arm.tar.gz"; + sha256 = "044zk3px8wqlz4wcl2kqdv4nr5r2p1s0ahlxiaigdgfm8b3wm1gh"; }; aarch64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-384.0.1-darwin-arm.tar.gz"; - sha256 = "1qxhl7c1ii44drls2mpmm03n2j7274dxcsf5inrhyjgs94yl5h7b"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-385.0.0-darwin-arm.tar.gz"; + sha256 = "1rjjr5vn99cv9shr5yazqzh6m7yvbn7rmjg0f8wbbmlj7fqd7gzv"; }; i686-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-384.0.1-linux-x86.tar.gz"; - sha256 = "1gghl16bdc9vgd2p834vd2i6av81q15czi7arpnmgg9n5dl3i2c8"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-385.0.0-linux-x86.tar.gz"; + sha256 = "1ym5hh1dq5wbx3lr75im2ibsr5iqnsamqsvz1nw15l7ii2v7hsjy"; }; }; } diff --git a/pkgs/tools/admin/google-cloud-sdk/update.sh b/pkgs/tools/admin/google-cloud-sdk/update.sh index 6402e3f32df..368612b19c9 100755 --- a/pkgs/tools/admin/google-cloud-sdk/update.sh +++ b/pkgs/tools/admin/google-cloud-sdk/update.sh @@ -5,7 +5,7 @@ BASE_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-clou # Version of Google Cloud SDK from # https://cloud.google.com/sdk/docs/release-notes -VERSION="384.0.1" +VERSION="385.0.0" function genMainSrc() { local url="${BASE_URL}-${VERSION}-${1}-${2}.tar.gz" From a8b95e6f28d3440cd3bd6a5d9509e0b71cc4caa8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 May 2022 23:25:52 +0200 Subject: [PATCH 080/201] naabu: 2.0.6 -> 2.0.7 --- pkgs/tools/security/naabu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/naabu/default.nix b/pkgs/tools/security/naabu/default.nix index a9a6fe29e13..a93e8082a0c 100644 --- a/pkgs/tools/security/naabu/default.nix +++ b/pkgs/tools/security/naabu/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "naabu"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "naabu"; rev = "v${version}"; - sha256 = "sha256-soYtm8vEkMJq9MeoUqOGJPWxZUrh3mGnApxG154W1wI="; + sha256 = "sha256-pfaK2Hj6iHk8njEMEbeSHGIKTn5O3IF83At14iDNI34="; }; - vendorSha256 = "sha256-MR1JUbeGC4N0jDuYdwVFMHBdZEy5BkID2BFdCwjtTAg="; + vendorSha256 = "sha256-eco1e1A0cDk1Yc0KP9tc3Kf4E+z1av7EDHynVhoHhMk="; buildInputs = [ libpcap From 182ae70b3f4bdbbfd9058f9a1ea818b7001ad584 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 May 2022 23:34:03 +0200 Subject: [PATCH 081/201] python310Packages.pygtfs: disable on older Python releases --- pkgs/development/python-modules/pygtfs/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygtfs/default.nix b/pkgs/development/python-modules/pygtfs/default.nix index 831a7d22c4a..6bd6fedb64a 100644 --- a/pkgs/development/python-modules/pygtfs/default.nix +++ b/pkgs/development/python-modules/pygtfs/default.nix @@ -4,6 +4,7 @@ , fetchPypi , nose , pytz +, pythonOlder , setuptools-scm , six , sqlalchemy @@ -12,10 +13,13 @@ buildPythonPackage rec { pname = "pygtfs"; version = "0.1.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sGJwtf8DVIrE4hcU3IksnyAAt8yf67UBJIiVILDSsv8="; + hash = "sha256-sGJwtf8DVIrE4hcU3IksnyAAt8yf67UBJIiVILDSsv8="; }; nativeBuildInputs = [ @@ -33,7 +37,9 @@ buildPythonPackage rec { nose ]; - pythonImportsCheck = [ "pygtfs" ]; + pythonImportsCheck = [ + "pygtfs" + ]; meta = with lib; { description = "Python module for GTFS"; From d6638dc53fa41fe727234a19d498110dce41dae4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 May 2022 23:35:57 +0200 Subject: [PATCH 082/201] python310Packages.aioairzone: 0.4.3 -> 0.4.4 --- pkgs/development/python-modules/aioairzone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index 1b926074cba..5c12501723d 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.4.3"; + version = "0.4.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-QLHM7M3x0QjTTzKNngsNioEzpPh4qG1ntEtSkHQPlfQ="; + hash = "sha256-fYhYqBnwvnfu2GbWUlmMmW/Xon3OE3fh+gGlnQRsCyA="; }; propagatedBuildInputs = [ From a011ccde7d408ba55e677943673b24a2b229892f Mon Sep 17 00:00:00 2001 From: Mrinal Purohit Date: Wed, 11 May 2022 03:06:05 +0530 Subject: [PATCH 083/201] broot: 1.11.1 -> 1.12.0 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 9160790bce3..73b302809c8 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.11.1"; + version = "1.12.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-MbyfdzeBo12/7M1F/J7upBQGB/tv1M4sZ+90i/vcLjs="; + sha256 = "sha256-WCnTmb9EEFmA4nEBD3UzV3JfyHtJyJibMd85madoyto="; }; - cargoHash = "sha256-GDU7tL+NDKk46DYnZajcAoPMZxGCrg/IS4xhSZrB6Cs="; + cargoHash = "sha256-FH+swtzO65fKWFLG3rDOysmbsVSjGFGeMiYtNQU62ww="; nativeBuildInputs = [ installShellFiles From d04a981edbd902a5ff03bfb5a3178f8099142866 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 May 2022 23:48:07 +0200 Subject: [PATCH 084/201] python310Packages.yte: 1.4.0 -> 1.4.0 --- pkgs/development/python-modules/yte/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yte/default.nix b/pkgs/development/python-modules/yte/default.nix index 7457cc14f31..8783e890e76 100644 --- a/pkgs/development/python-modules/yte/default.nix +++ b/pkgs/development/python-modules/yte/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, dpath , fetchFromGitHub , plac , poetry-core @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "yte"; - version = "1.2.3"; + version = "1.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +20,7 @@ buildPythonPackage rec { owner = "koesterlab"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-xu88zupT0/kIzTd56IbKYKBM5+EDI1d+QIEq8zOBWWo="; + sha256 = "sha256-G3TjIs/EeCqpNuFdb/WZ7PaPtnUdTvbH41OtRypfptg="; }; nativeBuildInputs = [ @@ -27,6 +28,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + dpath plac pyyaml ]; From 6a503166b0ddffdcf391017dd9238c9a2738a6b2 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Sun, 24 Apr 2022 22:03:01 -0500 Subject: [PATCH 085/201] phwmon: remove --- pkgs/applications/misc/phwmon/default.nix | 40 ----------------------- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 pkgs/applications/misc/phwmon/default.nix diff --git a/pkgs/applications/misc/phwmon/default.nix b/pkgs/applications/misc/phwmon/default.nix deleted file mode 100644 index 719c3dc9998..00000000000 --- a/pkgs/applications/misc/phwmon/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, python2Packages }: - -stdenv.mkDerivation { - pname = "phwmon"; - version = "2017-04-10"; - - src = fetchFromGitLab { - owner = "o9000"; - repo = "phwmon"; - rev = "b162e53dccc4adf8f11f49408d05fd85d9c6c909"; - sha256 = "1hqmsq66y8bqkpvszw84jyk8haxq3cjnz105hlkmp7786vfmkisq"; - }; - - nativeBuildInputs = [ python2Packages.wrapPython ]; - - buildInputs = [ python2Packages.pygtk python2Packages.psutil ]; - - pythonPath = [ python2Packages.pygtk python2Packages.psutil ]; - - postPatch = '' - substituteInPlace install.sh --replace "/usr/local" "$out" - ''; - - installPhase = '' - mkdir -p $out/bin $out/share/applications - ./install.sh - ''; - - postFixup = '' - wrapPythonPrograms - ''; - - meta = { - homepage = "https://gitlab.com/o9000/phwmon"; - description = "Hardware monitor (CPU, memory, network and disk I/O) for the system tray"; - license = lib.licenses.gpl2; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.romildo ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f7c89161495..176f5ea6e44 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -950,6 +950,8 @@ mapAliases ({ phantomjs = throw "phantomjs 1.9.8 has been dropped due to lack of maintenance and security issues"; # Added 2022-02-20 phantomjs2 = throw "phantomjs2 has been dropped due to lack of maintenance"; # Added 2022-04-22 philter = throw "philter has been removed: abandoned by upstream"; # Added 2022-04-26 + phwmon = throw "phwmon has been removed: abandoned by upstream"; # Added 2022-04-24 + # Obsolete PHP version aliases php73 = throw "php73 has been dropped due to the lack of maintanence from upstream for future releases"; # Added 2021-06-03 php73Packages = php73; # Added 2021-06-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2ec4e7668d..fe4187ff58c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28898,8 +28898,6 @@ with pkgs; phraseapp-client = callPackage ../tools/misc/phraseapp-client { }; - phwmon = callPackage ../applications/misc/phwmon { }; - pianobar = callPackage ../applications/audio/pianobar { }; pianobooster = qt5.callPackage ../applications/audio/pianobooster { }; From 95e6d4f76359dce39c436753fc807bef78ca4ffb Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Tue, 10 May 2022 16:59:26 -0600 Subject: [PATCH 086/201] python3Packages.gidgethub: set format to flit --- .../python-modules/gidgethub/default.nix | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index 9d1fdc07d90..327672bad1b 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -2,21 +2,20 @@ , buildPythonPackage , fetchPypi , pythonOlder -, setuptools -, pytest-runner -, pytest -, pytest-asyncio -, twisted -, treq -, tornado -, aiohttp , uritemplate , pyjwt +, pytestCheckHook +, aiohttp +, httpx +, importlib-resources +, pytest-asyncio +, pytest-tornasync }: buildPythonPackage rec { pname = "gidgethub"; version = "5.1.0"; + format = "flit"; disabled = pythonOlder "3.6"; @@ -25,20 +24,25 @@ buildPythonPackage rec { sha256 = "sha256-kNGTb6mA2XBaljYvpOWaKFEks3NigsiPgmdIgSMKTiU="; }; - nativeBuildInputs = [ setuptools pytest-runner ]; - checkInputs = [ pytest pytest-asyncio twisted treq tornado aiohttp ]; propagatedBuildInputs = [ uritemplate pyjwt ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "extras_require=extras_require," "extras_require=None," - ''; + checkInputs = [ + pytestCheckHook + aiohttp + httpx + importlib-resources + pytest-asyncio + pytest-tornasync + ]; - # requires network (reqests github.com) - doCheck = false; + disabledTests = [ + # Require internet connection + "test__request" + "test_get" + ]; meta = with lib; { description = "An async GitHub API library"; From fdb0c163eceff0317ad666234d98493690ec89b0 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Tue, 10 May 2022 17:37:13 -0600 Subject: [PATCH 087/201] python3Packages.github3_py: update list of dependencies --- .../python-modules/github3_py/default.nix | 46 +++++++++++-------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/github3_py/default.nix b/pkgs/development/python-modules/github3_py/default.nix index 67e1868fb8b..08786916bd9 100644 --- a/pkgs/development/python-modules/github3_py/default.nix +++ b/pkgs/development/python-modules/github3_py/default.nix @@ -1,41 +1,50 @@ { lib -, pythonOlder , buildPythonPackage +, pythonOlder , fetchPypi -, betamax -, pytest -, betamax-matchers -, unittest2 -, mock , requests , uritemplate , python-dateutil -, jwcrypto -, pyopenssl -, ndg-httpsclient -, pyasn1 +, pyjwt +, pytestCheckHook +, betamax +, betamax-matchers }: buildPythonPackage rec { pname = "github3.py"; version = "3.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "sha256-Cbcr4Ul9NGsJaM3oNgoNavedwgbQFJpjzT7IbGXDd8w="; }; - checkInputs = [ betamax pytest betamax-matchers ] - ++ lib.optional (pythonOlder "3") unittest2 - ++ lib.optional (pythonOlder "3.3") mock; - propagatedBuildInputs = [ requests uritemplate python-dateutil jwcrypto pyopenssl ndg-httpsclient pyasn1 ]; + propagatedBuildInputs = [ + requests + uritemplate + python-dateutil + pyjwt + ]; - postPatch = '' - sed -i -e 's/unittest2 ==0.5.1/unittest2>=0.5.1/' setup.py + checkInputs = [ + pytestCheckHook + betamax + betamax-matchers + ]; + + # Solves "__main__.py: error: unrecognized arguments: -nauto" + preCheck = '' + rm tox.ini ''; - # TODO: only disable the tests that require network - doCheck = false; + disabledTests = [ + # FileNotFoundError: [Errno 2] No such file or directory: 'tests/id_rsa.pub' + "test_delete_key" + ]; meta = with lib; { homepage = "https://github3py.readthedocs.org/en/master/"; @@ -43,5 +52,4 @@ buildPythonPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; }; - } From 6ffa5ae0dd31b89bf78d7163dca1ce209abf05c3 Mon Sep 17 00:00:00 2001 From: devhell Date: Wed, 11 May 2022 00:47:33 +0100 Subject: [PATCH 088/201] libstrophe: 0.11.0 -> 0.12.0 --- pkgs/development/libraries/libstrophe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libstrophe/default.nix b/pkgs/development/libraries/libstrophe/default.nix index a98099cfaec..cddc563ccf0 100644 --- a/pkgs/development/libraries/libstrophe/default.nix +++ b/pkgs/development/libraries/libstrophe/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "libstrophe"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "strophe"; repo = pname; rev = version; - sha256 = "sha256-xAqBxCYNo2IntnHKXY6CSJ+Yiu01lxQ1Q3gb0ioypSs="; + sha256 = "sha256-YJ8A97ECc3VxdGfhUu0YYijAamnrHCO6kr7TAIan96o="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 119c335a4f156f8899751000f163c22385d3de34 Mon Sep 17 00:00:00 2001 From: William Kral Date: Tue, 10 May 2022 14:32:06 -0700 Subject: [PATCH 089/201] scite: 5.0.2 -> 5.2.2 --- pkgs/applications/editors/scite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix index ab0fef9be26..4118aee8a2d 100644 --- a/pkgs/applications/editors/scite/default.nix +++ b/pkgs/applications/editors/scite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "scite"; - version = "5.0.2"; + version = "5.2.2"; src = fetchurl { - url = "https://www.scintilla.org/scite502.tgz"; - sha256 = "00n2gr915f7kvp2250dzn6n0p6lhr6qdlm1m7y2xi6qrrky0bpan"; + url = "https://www.scintilla.org/scite522.tgz"; + sha256 = "1q46clclx8r0b8zbq2zi89sygszgqf9ra5l83r2fs0ghvjgh2cxd"; }; nativeBuildInputs = [ pkg-config ]; From 2758ee448d6c9cc55ecf4e6664f1b203944dbb34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 May 2022 00:16:43 +0000 Subject: [PATCH 090/201] pur: 6.1.0 -> 7.0.0 --- pkgs/development/tools/pur/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/pur/default.nix b/pkgs/development/tools/pur/default.nix index fc6a46cbc0a..d065b7b1351 100644 --- a/pkgs/development/tools/pur/default.nix +++ b/pkgs/development/tools/pur/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "pur"; - version = "6.1.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "alanhamlett"; repo = "pip-update-requirements"; - rev = version; - hash = "sha256-EcyDEXDgjicCRThXC+co/PwTjAxkRXVG1++JZtsSjZo="; + rev = "refs/tags/${version}"; + hash = "sha256-JAjz9A9r1H6MJX7MSq7UvQKfULhB9UuPP3tI6Cggx9I="; }; propagatedBuildInputs = [ From 27cae2d5a27d950e16de843c0719acc8d20052c3 Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Wed, 11 May 2022 00:23:22 +0000 Subject: [PATCH 091/201] vscode: 1.67.0 -> 1.67.1 --- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 3d663c39ec9..1604cc901e4 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0ss7c0dvlgnfqi0snhx73ndzjbw24xz6pcny4v52mrd1kfhcmpvd"; - x86_64-darwin = "0ds5jv5q6k1hzrwhcgkyvx0ls9p1q7zh0fqigpxandx6ysrd7cga"; - aarch64-linux = "12zz02hdhhw19rx9kbi3yd5x81w1vs8vxjrnqqvva8bj0jnwf4iq"; - aarch64-darwin = "07ws2dc2il7ky77j5pxaxqp5cyw0v04jnv98z1494pdmxyn8gf7q"; - armv7l-linux = "0khyzc69rbfz2pnbab9v3as1hdzkzxfg3mxvf6g7ax9npvsrqw92"; + x86_64-linux = "1db5vwcwi3w11zm2b72cvddn5k9yav65rg7ii9wq4a0dym39f8ql"; + x86_64-darwin = "1q5vjisdc0q5vigb1lwq8fkxbaar73jnk4ac0fqlhc4gqacz3cs3"; + aarch64-linux = "01lcvjw9nfgp93ydl16bp91gbkivd23jn8pan220fjvdsgvcbg48"; + aarch64-darwin = "06p6p2c9a3rav9c23pvfn8mmd77wc9z7pavpmkgm1f3wplx48q8q"; + armv7l-linux = "0pzim9r2zzwyim3g6f8ixgqllgz4cijaiw76czi0wmz4dxxdljrw"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.67.0"; + version = "1.67.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From 0859094cc9ce30b54ea9fb5f15f3bf42b369e328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 11 May 2022 00:23:05 +0000 Subject: [PATCH 092/201] python3Packages.ytmusicapi: 0.21.0 -> 0.22.0 https://github.com/sigma67/ytmusicapi/releases/tag/0.22.0 --- pkgs/development/python-modules/ytmusicapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index fdee7ace495..6331438a958 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "0.21.0"; + version = "0.22.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-JstIHc61TFQEgRHr54N4Doq6ML0EcIcDGTEJ/tbrC2A="; + hash = "sha256-CZ4uoW4UHn5C+MckQXysTdydaApn99b0UCnF5RPb7DI="; }; propagatedBuildInputs = [ From 48c4f5c2b8b23653d82097a78c7e5762957bbc05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 11 May 2022 00:29:04 +0000 Subject: [PATCH 093/201] python3Packages.azure-eventhub: 5.7.0 -> 5.9.0 https://github.com/Azure/azure-sdk-for-python/blob/azure-eventhub_5.9.0/sdk/eventhub/azure-eventhub/CHANGELOG.md --- pkgs/development/python-modules/azure-eventhub/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix index de3ddb803aa..c09ff87522a 100644 --- a/pkgs/development/python-modules/azure-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-eventhub/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "azure-eventhub"; - version = "5.7.0"; + version = "5.9.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "6ac364e5f1c5b376604c3b5a25ad0be5e3a5f96368f590e05b47e6745f1006ee"; + sha256 = "509c6b351db0c1674a7c33308e6ffebc5a9bd2b0a9d10bcb2fa3d0a3a47d42d0"; }; propagatedBuildInputs = [ @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure Event Hubs Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/eventhub/azure-eventhub"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-eventhub_${version}/sdk/eventhub/azure-eventhub/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; From cb7412c787a149d91e561f970a47d7a5e2821696 Mon Sep 17 00:00:00 2001 From: William Kral Date: Tue, 10 May 2022 17:03:03 -0700 Subject: [PATCH 094/201] rdfind: fix build --- pkgs/tools/filesystems/rdfind/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/pkgs/tools/filesystems/rdfind/default.nix index 91245615474..c363ee56137 100644 --- a/pkgs/tools/filesystems/rdfind/default.nix +++ b/pkgs/tools/filesystems/rdfind/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, nettle }: +{ lib, stdenv, fetchpatch, fetchurl, nettle }: stdenv.mkDerivation rec { pname = "rdfind"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "103hfqzgr6izmj57fcy4jsa2nmb1ax43q4b5ij92pcgpaq9fsl21"; }; + patches = [ + (fetchpatch { + name = "include-limits.patch"; + url = "https://github.com/pauldreik/rdfind/commit/61877de88d782b63b17458a61fcc078391499b29.patch"; + sha256 = "0igzm4833cn905pj84lgr88nd5gx35dnjl8kl8vrwk7bpyii6a8l"; + }) + ]; + buildInputs = [ nettle ]; meta = with lib; { From d09ee716bfbf7241298e7bf65a1c1b5edc14340f Mon Sep 17 00:00:00 2001 From: Serge Belov Date: Tue, 26 Apr 2022 11:34:23 +1000 Subject: [PATCH 095/201] sil-abyssinica: init at 1.500 --- pkgs/data/fonts/sil-abyssinica/default.nix | 23 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/data/fonts/sil-abyssinica/default.nix diff --git a/pkgs/data/fonts/sil-abyssinica/default.nix b/pkgs/data/fonts/sil-abyssinica/default.nix new file mode 100644 index 00000000000..c884b5567dd --- /dev/null +++ b/pkgs/data/fonts/sil-abyssinica/default.nix @@ -0,0 +1,23 @@ +{ fetchzip, lib }: + +let + version = "1.500"; +in +fetchzip { + name = "sil-abyssinica-${version}"; + url = "mirror://debian/pool/main/f/fonts-sil-abyssinica/fonts-sil-abyssinica_${version}.orig.tar.xz"; + sha256 = "sha256-fCa88wG2JfHTaHaBkuvoncbcbrh3XNzc8ewS3W+W/fM="; + + postFetch = '' + mkdir -p $out/share/fonts + tar xf $downloadedFile --strip-components=1 -C $out/share/fonts AbyssinicaSIL-${version}/AbyssinicaSIL-R.ttf + ''; + + meta = with lib; { + description = "Unicode font for Ethiopian and Erythrean scripts (Amharic et al.)"; + homepage = "https://software.sil.org/abyssinica/"; + license = licenses.ofl; + maintainers = with lib.maintainers; [ serge ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c020641079e..48a58bc2cd2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24759,6 +24759,8 @@ with pkgs; sierra-gtk-theme = callPackage ../data/themes/sierra { }; + sil-abyssinica = callPackage ../data/fonts/sil-abyssinica { }; + sil-padauk = callPackage ../data/fonts/sil-padauk { }; snap7 = callPackage ../development/libraries/snap7 {}; From 749d9e08620f3c3de7c167c222bc56d15fab4ff9 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Tue, 10 May 2022 18:49:14 -0600 Subject: [PATCH 096/201] python3Packages.jenkinsapi: disable python 3.6 onwards --- pkgs/development/python-modules/jenkinsapi/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/jenkinsapi/default.nix b/pkgs/development/python-modules/jenkinsapi/default.nix index 912c21cc8fb..39ad443f189 100644 --- a/pkgs/development/python-modules/jenkinsapi/default.nix +++ b/pkgs/development/python-modules/jenkinsapi/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , buildPythonPackage +, pythonAtLeast , fetchPypi , mock , pytest @@ -13,6 +14,9 @@ buildPythonPackage rec { pname = "jenkinsapi"; version = "0.3.11"; + format = "setuptools"; + + disabled = pythonAtLeast "3.6"; src = fetchPypi { inherit pname version; From 446ba0dc2230d4c5cc90023c85ce773f99dafc62 Mon Sep 17 00:00:00 2001 From: devhell Date: Wed, 11 May 2022 01:52:33 +0100 Subject: [PATCH 097/201] profanity: 0.12.0 -> 0.12.1 --- .../networking/instant-messengers/profanity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 0e4487768a8..8ffe6f05f5d 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "profanity"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; rev = version; - hash = "sha256-kmixWp9Q2tMVp+tk5kbTdBfgRNghKk3+48L582hqlm8="; + hash = "sha256-yUiiww8yhymdqR6CITRnItxZhfpZiEbu1WyD8bDW+vc="; }; patches = [ From 7c38f2d12ac62b0f078ce0141ace6298979ddca8 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 11 May 2022 08:09:04 +1000 Subject: [PATCH 098/201] gh: 2.9.0 -> 2.10.1 https://github.com/cli/cli/releases/tag/v2.10.0 https://github.com/cli/cli/releases/tag/v2.10.1 --- .../version-management/git-and-tools/gh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 43311216e65..78ec57b9059 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.9.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-k8td9YKtlkit3YzpAncocZE7+Cl8v9ZNyPD4ZysCFRI="; + sha256 = "sha256-2lIHEO4+oW9+C7VSulmVwZJ1l6RYBbV6wlKMvdOGqi8="; }; - vendorSha256 = "sha256-YLkNua0Pz0gVIYnWOzOlV5RuLBaoZ4l7l1Pf4QIfUVQ="; + vendorSha256 = "sha256-EFJfd6sUK5iquFW0kXaiH6tLiNqbZNe9awpIqmqhp7I="; nativeBuildInputs = [ installShellFiles ]; From 104a92fe7722ae5f7b908e89f880afcf35988262 Mon Sep 17 00:00:00 2001 From: libjared Date: Tue, 10 May 2022 21:19:11 -0400 Subject: [PATCH 099/201] dictd: remove deprecated `enable-dictorg` flag This flag was removed in 1.13.0 and is now unrecognized --- pkgs/servers/dict/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix index b35201ce1df..1b396290778 100644 --- a/pkgs/servers/dict/default.nix +++ b/pkgs/servers/dict/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { patchPhase = "patch -p0 < ${./buildfix.diff}"; configureFlags = [ - "--enable-dictorg" "--datadir=/run/current-system/sw/share/dictd" "--sysconfdir=/etc" ]; From 547f9bf973df9eaba3941cc19d0d149607cd6445 Mon Sep 17 00:00:00 2001 From: Luke Sandell Date: Tue, 3 May 2022 21:52:06 -0500 Subject: [PATCH 100/201] xca: 2.2.1 -> 2.4.0 --- pkgs/applications/misc/xca/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 9e05e09caef..2a6bab5ebda 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -1,25 +1,23 @@ -{ mkDerivation, lib, fetchFromGitHub, autoreconfHook, perl, pkg-config -, libtool, openssl, qtbase, qttools }: +{ mkDerivation, lib, fetchFromGitHub, autoreconfHook, pkg-config +, libtool, openssl, qtbase, qttools, sphinx }: mkDerivation rec { pname = "xca"; - version = "2.2.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "chris2511"; repo = "xca"; rev = "RELEASE.${version}"; - sha256 = "0na2816lkfkkvssh9kmf5vwy6x8kd4x7h138jzy61wrvs69vhnbi"; + sha256 = "04z0mmjsry72nvib4icmwh1717y4q9pf2gr68ljrzln4vv4ckpwk"; }; - postPatch = '' - substituteInPlace doc/code2html \ - --replace /usr/bin/perl ${perl}/bin/perl - ''; - buildInputs = [ libtool openssl qtbase ]; - nativeBuildInputs = [ autoreconfHook pkg-config qttools ]; + nativeBuildInputs = [ autoreconfHook pkg-config qttools sphinx ]; + + # Needed for qcollectiongenerator (see https://github.com/NixOS/nixpkgs/pull/92710) + QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; enableParallelBuilding = true; From 88d28c300cab26a237836eb5a165698a3ec5369a Mon Sep 17 00:00:00 2001 From: devhell Date: Wed, 11 May 2022 02:38:49 +0100 Subject: [PATCH 101/201] termusic: 0.6.10 -> 0.6.15 --- pkgs/applications/audio/termusic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/termusic/default.nix b/pkgs/applications/audio/termusic/default.nix index 4a0035aadf5..a8889cab697 100644 --- a/pkgs/applications/audio/termusic/default.nix +++ b/pkgs/applications/audio/termusic/default.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "termusic"; - version = "0.6.10"; + version = "0.6.15"; src = fetchCrate { inherit pname version; - sha256 = "sha256-i+XxEPkLZK+JKDl88P8Nd7XBhsGhEzvUGovJtSWvRtg="; + sha256 = "sha256-e4hCo5a54EPp6/sd1/ivwHePu+e6MqbA9tvPWf41EhQ="; }; - cargoHash = "sha256-7nQzU1VvRDrtltVAXTX268vl9AbQhMOilPG4nNAJ+Xk="; + cargoHash = "sha256-kQjLmASJpo7+LT73vVjbPWhNUGJ1HI6S/8W6gJskJXE="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib ]; From 2cd74fc15402259714eb39bf835772634eab34f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 May 2022 01:49:43 +0000 Subject: [PATCH 102/201] python310Packages.azure-mgmt-network: 19.3.0 -> 20.0.0 --- .../development/python-modules/azure-mgmt-network/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index 6da9e8e2e0b..fa05c6bcdf8 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { - version = "19.3.0"; + version = "20.0.0"; pname = "azure-mgmt-network"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0b6a1ccdffd76e057ab16a6c319740a0ca68d59fedf7e9c02f2437396e72aa11"; + sha256 = "sha256-mnjPyCAJ+rlNgZ4umSYjfVVVg83EobZYY/zupyDjdoY="; }; propagatedBuildInputs = [ From 3f898ed15a4bc20a14687b2384bd991ad7837d6c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 10 May 2022 07:40:51 -0300 Subject: [PATCH 103/201] eterm: reformat knownVulnerabilities message Also, with a link to CVE entry --- pkgs/applications/terminal-emulators/eterm/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/eterm/default.nix b/pkgs/applications/terminal-emulators/eterm/default.nix index 769104fea43..a0bccbfcb1e 100644 --- a/pkgs/applications/terminal-emulators/eterm/default.nix +++ b/pkgs/applications/terminal-emulators/eterm/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "eterm"; - version = "0.9.6-unstable=2020-03-03"; + version = "0.9.6+date=2020-03-03"; src = fetchFromGitHub { owner = "mej"; @@ -43,7 +43,10 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; knownVulnerabilities = [ - "Usage of ANSI escape sequences causes unexpected newline-termination, leading to unexpected command execution (https://www.openwall.com/lists/oss-security/2021/05/17/1)" + ''Usage of ANSI escape sequences causes unexpected newline-termination, + leading to unexpected command execution. More info at: + - https://www.cve.org/CVERecord?id=CVE-2021-33477 + - https://www.openwall.com/lists/oss-security/2021/05/17/1'' ]; }; } From 4942d03b9137a6b6e999d2e0ca3b8ee3caa6739a Mon Sep 17 00:00:00 2001 From: lom Date: Tue, 10 May 2022 20:22:46 -0600 Subject: [PATCH 104/201] tmpmail: 1.1.9 -> 1.2.3 --- pkgs/applications/networking/tmpmail/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/tmpmail/default.nix b/pkgs/applications/networking/tmpmail/default.nix index 535f5ce6d9d..d29d5816f44 100644 --- a/pkgs/applications/networking/tmpmail/default.nix +++ b/pkgs/applications/networking/tmpmail/default.nix @@ -1,14 +1,14 @@ -{ lib, fetchFromGitHub, stdenvNoCC, w3m, curl, jq, makeWrapper, installShellFiles }: +{ lib, fetchFromGitHub, stdenvNoCC, w3m, curl, jq, makeWrapper, installShellFiles, xclip }: stdenvNoCC.mkDerivation rec { pname = "tmpmail"; - version = "1.1.9"; + version = "1.2.3"; src = fetchFromGitHub { owner = "sdushantha"; repo = "tmpmail"; rev = "v${version}"; - sha256 = "sha256-sWcsmBUHSfo7sICXyhNhbfRFSHumObnWc7stWxcwVTg="; + sha256 = "sha256-s4c1M4YHK/CNpH7nPt7rRqlkLUZrpBXvAVS/qxCai9c="; }; dontConfigure = true; @@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec { mkdir -p $out/bin install -Dm755 -t $out/bin tmpmail installManPage tmpmail.1 - wrapProgram $out/bin/tmpmail --prefix PATH : ${lib.makeBinPath [ w3m curl jq ]} + wrapProgram $out/bin/tmpmail --prefix PATH : ${lib.makeBinPath [ w3m curl jq xclip ]} ''; meta = with lib; { From 960778ef79b9f00f14c4e4af0043cfe5f1134145 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 May 2022 02:48:09 +0000 Subject: [PATCH 105/201] python310Packages.azure-storage-file-share: 12.7.0 -> 12.8.0 --- .../python-modules/azure-storage-file-share/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index c7c59fd2b9f..a5bb566aa07 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.7.0"; + version = "12.8.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-kYNugiWNlXEgryKLwrzytca/W+2481RqqUCbdJWrqDI="; + sha256 = "sha256-46OEVjMYFUa8A6Qh+yicrqUuXmUaSzsWT4maBFG6Yqg="; }; propagatedBuildInputs = [ From 913460372c58ae7e202ddbf490b2b26db7c1ff63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 11 May 2022 03:19:27 +0000 Subject: [PATCH 106/201] python3Packages.graphviz: 0.19.2 -> 0.20 https://github.com/xflr6/graphviz/blob/0.20/CHANGES.rst --- pkgs/development/python-modules/graphviz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index b90ba9a6c73..2fa10120c18 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "graphviz"; - version = "0.19.2"; + version = "0.20"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "xflr6"; repo = "graphviz"; rev = version; - hash = "sha256-LxXi0Es6ZJT/nSS6SjGg/3stmR25T4R7TZC34mbT+EA="; + hash = "sha256-QyZwXxRbcMushxh/Ypy+v4FOTM4H1u5b7IZMSVgLyEs="; }; patches = [ From de559a30b786051d41d8eaa20c0d34b1bef48042 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 10 May 2022 20:23:06 -0700 Subject: [PATCH 107/201] wdomirror: fix build failure by applying patch from GH #5 A recent change to xdg-shell-client-protocol causes a build failure. This was reported upstream as GH #5. User @AlexBMJ posted a two-line fix in that issue, but the developer has not yet responded: https://github.com/progandy/wdomirror/issues/5#issuecomment-1103265438 --- .../wayland/wdomirror/configure-bounds.patch | 15 +++++++++++++++ pkgs/tools/wayland/wdomirror/default.nix | 9 +++++++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/wayland/wdomirror/configure-bounds.patch diff --git a/pkgs/tools/wayland/wdomirror/configure-bounds.patch b/pkgs/tools/wayland/wdomirror/configure-bounds.patch new file mode 100644 index 00000000000..c42563741df --- /dev/null +++ b/pkgs/tools/wayland/wdomirror/configure-bounds.patch @@ -0,0 +1,15 @@ +From https://github.com/progandy/wdomirror/issues/5#issuecomment-1103265438 + +--- a/main.c ++++ b/main.c +@@ -409,9 +409,12 @@ xdg_toplevel_handle_close(void *data, struct xdg_toplevel *xdg_toplevel) + ctx->quit = true; + } + ++static void xdg_toplevel_handle_configure_bounds(void *data, struct xdg_toplevel *toplevel, int32_t width, int32_t height) {} ++ + static const struct xdg_toplevel_listener xdg_toplevel_listener = { + xdg_toplevel_handle_configure, + xdg_toplevel_handle_close, ++ xdg_toplevel_handle_configure_bounds, + }; diff --git a/pkgs/tools/wayland/wdomirror/default.nix b/pkgs/tools/wayland/wdomirror/default.nix index 8fddf51f539..67d8a7cf299 100644 --- a/pkgs/tools/wayland/wdomirror/default.nix +++ b/pkgs/tools/wayland/wdomirror/default.nix @@ -23,6 +23,15 @@ stdenv.mkDerivation { buildInputs = [ wayland ]; + patches = [ + # A recent change to xdg-shell-client-protocol causes a build + # failure. This was reported upstream as GH #5. User @AlexBMJ + # posted the following two-line fix in that issue, but the + # developer has not yet responded: + # https://github.com/progandy/wdomirror/issues/5#issuecomment-1103265438 + ./configure-bounds.patch + ]; + installPhase = '' runHook preInstall install -m755 -D wdomirror $out/bin/wdomirror From d547f4682d1f8a01523aaad9e0ccc8488e490d63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 May 2022 03:37:24 +0000 Subject: [PATCH 108/201] python310Packages.bellows: 0.29.0 -> 0.30.0 --- pkgs/development/python-modules/bellows/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 33539e371c2..531f05844f5 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.29.0"; + version = "0.30.0"; format = "setuptools"; src = fetchFromGitHub { owner = "zigpy"; repo = "bellows"; - rev = version; - sha256 = "sha256-coIrI3C6Wnn8Of/IHAlvZgkcBBf9OBQt5Ir6YOXCf0c="; + rev = "refs/tags/${version}"; + sha256 = "sha256-epsE/VKK6LwMVbkx5PWgAxZ62PO4udCFr3jYi0MrUpI="; }; propagatedBuildInputs = [ From ccf95d84b1924b31ad6f65674bc8c1b44541a33c Mon Sep 17 00:00:00 2001 From: Lin Yinfeng Date: Wed, 11 May 2022 12:24:27 +0800 Subject: [PATCH 109/201] godns: add updateScript --- pkgs/tools/networking/godns/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix index 27ff7a25977..0f962f38363 100644 --- a/pkgs/tools/networking/godns/default.nix +++ b/pkgs/tools/networking/godns/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib, nix-update-script }: buildGoModule rec { pname = "godns"; @@ -18,6 +18,8 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; + passthru.updateScript = nix-update-script { attrPath = pname; }; + meta = with lib; { description = "A dynamic DNS client tool supports AliDNS, Cloudflare, Google Domains, DNSPod, HE.net & DuckDNS & DreamHost, etc"; homepage = "https://github.com/TimothyYe/godns"; From 8d4edd0c4ef0a9bd535dd2a2ed4af2c53ba7df3f Mon Sep 17 00:00:00 2001 From: Lin Yinfeng Date: Wed, 11 May 2022 12:26:43 +0800 Subject: [PATCH 110/201] godns: 2.7.6 -> 2.7.7 --- pkgs/tools/networking/godns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix index 0f962f38363..1e86d1c2ed0 100644 --- a/pkgs/tools/networking/godns/default.nix +++ b/pkgs/tools/networking/godns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "godns"; - version = "2.7.6"; + version = "2.7.7"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "v${version}"; - sha256 = "sha256-w0hHl7QOpIOINRbCrocZM68b44h+IwkHmXTDnVfT0o0="; + sha256 = "sha256-55A1dxVRIngfS43V+iM1RX2U6eQyPsIAHgyxKGO4yrY="; }; vendorSha256 = "sha256-vhByl9oJjFIvOskAgLubZ5RCcitKd2jjxi8D9nU6850="; From f4f93c770a1148a3ae1de95e8f6f3910941e0152 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 May 2022 04:58:35 +0000 Subject: [PATCH 111/201] python310Packages.azure-mgmt-redhatopenshift: 1.0.0 -> 1.1.0 --- .../python-modules/azure-mgmt-redhatopenshift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix b/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix index f2f4587cc67..b2a763441a3 100644 --- a/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { - version = "1.0.0"; + version = "1.1.0"; pname = "azure-mgmt-redhatopenshift"; disabled = isPy27; # don't feel like fixing namespace issues on python2 src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "94cd41f1ebd82e40620fd3e6d88f666b5c19ac7cf8b4e8edadb9721bd7c80980"; + sha256 = "sha256-Tq8h3fvajxIG2QjtCyHCQDE2deBDioxLLaQQek/O24U="; }; propagatedBuildInputs = [ From 8869941b2716c2d45d1fb13acd0ca2b49209d118 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 11 May 2022 08:30:35 +0200 Subject: [PATCH 112/201] linux: 5.10.113 -> 5.10.114 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 1ac78adf7c7..ba61e44fc75 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.113"; + version = "5.10.114"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1z3dd5hrdbn2axsi2n70n41q1dq2dvg7s8aph1p6yiajpc16llc2"; + sha256 = "09h5ngcl8clsvsv11q6ksvgcs01whlwbbrlpj1jz8mg3gjsrzl07"; }; } // (args.argsOverride or {})) From 38496aa1496b54d0be6cc949ef5e4ce016f7904a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 11 May 2022 08:30:47 +0200 Subject: [PATCH 113/201] linux: 5.15.37 -> 5.15.38 --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 007258e7336..fb0311a523f 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.37"; + version = "5.15.38"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -15,6 +15,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "09n0l9ly111r6jbpgz1kw2q4n4mmcv5jxfhs5bcsiyjp44d0kgqq"; + sha256 = "0lhhl766mrl2mbbvn7gkajfzja4v1f96xm9qq3z8pf4h1515shby"; }; } // (args.argsOverride or { })) From d6bd76af6ec5d802a3b7389079243ce27eaeb163 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 11 May 2022 08:30:59 +0200 Subject: [PATCH 114/201] linux: 5.17.5 -> 5.17.6 --- pkgs/os-specific/linux/kernel/linux-5.17.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.17.nix b/pkgs/os-specific/linux/kernel/linux-5.17.nix index 4c67169b706..6af5cb06546 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.17.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.17.5"; + version = "5.17.6"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "11z95wsgmj97pg77yck26l0383gncbla0zwpzv4gjdj4p62x3g4v"; + sha256 = "035i9i0gg3fxi5ighjrya97592sk0i4xagra6a8m8nxyh21z3k34"; }; } // (args.argsOverride or { })) From ee2608d3aba065d66af8ace94d1483e8c92246c8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 11 May 2022 08:31:10 +0200 Subject: [PATCH 115/201] linux: 5.4.191 -> 5.4.192 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 073d0ef7705..2ce46309465 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.191"; + version = "5.4.192"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0fharjqasvq76pciwci6qamdadpfjh2n8gdyri8fj65drmgsi318"; + sha256 = "14wyvacajnj6fnxqrash7b8inq0lgmglydqa30kb21zva88jwj1j"; }; } // (args.argsOverride or {})) From 59fe74cca345e07f3c016039b8d5e73fd972c9d1 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 11 May 2022 08:31:25 +0200 Subject: [PATCH 116/201] linux_latest-libre: 18688 -> 18713 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 7bb6e5f7972..78646dddf96 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18688"; - sha256 = "15f83zcwxk28b3a4am8avi0xwd7zr79n00150k6xdf3g8haz7yaj"; + rev = "18713"; + sha256 = "10744jp1i7z3jwpc42vrmdfpq1yblf3vy17yb04xdfhimkflw77p"; } , ... }: From 0faa00ddbe669dadd5a455acd5bb8bfe4b2bd730 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 11 May 2022 08:32:17 +0200 Subject: [PATCH 117/201] linux/hardened/patches/4.19: 4.19.240-hardened1 -> 4.19.241-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 16b0ac27fc6..1f17b996be8 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,12 +12,12 @@ "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.240-hardened1.patch", - "sha256": "1qhrwpjfy5c75zcpvp1b0xb460vyjv04iml2inqrhnj9zcz1kgp8", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.240-hardened1/linux-hardened-4.19.240-hardened1.patch" + "name": "linux-hardened-4.19.241-hardened1.patch", + "sha256": "1ynhclfiswgbm0kdg7nvx4lizixhfskbj91imklsy0mp5brgfpbz", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.241-hardened1/linux-hardened-4.19.241-hardened1.patch" }, - "sha256": "1hj6vngynx6kjaczjl77jjwqq0kh0lm6jdqjvakd1cgrppaizb3j", - "version": "4.19.240" + "sha256": "04zyi22c2d91k7v2w0s8v112cqqf24km599mn18k2nafq79njqjc", + "version": "4.19.241" }, "5.10": { "patch": { From 1fd97805d899157f533b05a80919e7d345e78375 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 11 May 2022 08:32:29 +0200 Subject: [PATCH 118/201] linux/hardened/patches/5.10: 5.10.113-hardened1 -> 5.10.114-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 1f17b996be8..4416c58a5a2 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,12 +22,12 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.113-hardened1.patch", - "sha256": "0v6blapny74fkhsm5rksxg632hv3chh81wgc96l6ql4sy7p19riv", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.113-hardened1/linux-hardened-5.10.113-hardened1.patch" + "name": "linux-hardened-5.10.114-hardened1.patch", + "sha256": "0ml5ghywz550d5vj1qfw0528ax7pilnf5rvwn4780gqnkn44nbcd", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.114-hardened1/linux-hardened-5.10.114-hardened1.patch" }, - "sha256": "1z3dd5hrdbn2axsi2n70n41q1dq2dvg7s8aph1p6yiajpc16llc2", - "version": "5.10.113" + "sha256": "09h5ngcl8clsvsv11q6ksvgcs01whlwbbrlpj1jz8mg3gjsrzl07", + "version": "5.10.114" }, "5.15": { "patch": { From e6d741c9dd1670b6a8a974c482243c795d1154ce Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 11 May 2022 08:32:42 +0200 Subject: [PATCH 119/201] linux/hardened/patches/5.15: 5.15.36-hardened1 -> 5.15.38-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 4416c58a5a2..e8ac93b0625 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.36-hardened1.patch", - "sha256": "1y52bayw2n1lc1vp9jz8a39fz32x81ivaw24kc6hdr23yg0a8q5g", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.36-hardened1/linux-hardened-5.15.36-hardened1.patch" + "name": "linux-hardened-5.15.38-hardened1.patch", + "sha256": "0nrwxi48v8ij1sfh15qkiil2i28vqy24gr9ciklbdl5kgy3glvf4", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.38-hardened1/linux-hardened-5.15.38-hardened1.patch" }, - "sha256": "1466557034q1fzvpy8vwj8ps3cv2q8s7z76af9y1jz4kgaqmsd1n", - "version": "5.15.36" + "sha256": "0lhhl766mrl2mbbvn7gkajfzja4v1f96xm9qq3z8pf4h1515shby", + "version": "5.15.38" }, "5.17": { "patch": { From c0a5d86c98ca344b5fabb0bb622de49a8812aec1 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 11 May 2022 08:32:54 +0200 Subject: [PATCH 120/201] linux/hardened/patches/5.17: 5.17.5-hardened1 -> 5.17.6-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index e8ac93b0625..f7e16ddb141 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -42,12 +42,12 @@ "5.17": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.17.5-hardened1.patch", - "sha256": "1cv43sp2amai7r75dw07bd2ys6fz1ri9pfra3kaajap55sbalsw0", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.17.5-hardened1/linux-hardened-5.17.5-hardened1.patch" + "name": "linux-hardened-5.17.6-hardened1.patch", + "sha256": "100lvwzrjq6v69faaydyn3cm03l0kq36hjiyid3iwi035a2vljy8", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.17.6-hardened1/linux-hardened-5.17.6-hardened1.patch" }, - "sha256": "11z95wsgmj97pg77yck26l0383gncbla0zwpzv4gjdj4p62x3g4v", - "version": "5.17.5" + "sha256": "035i9i0gg3fxi5ighjrya97592sk0i4xagra6a8m8nxyh21z3k34", + "version": "5.17.6" }, "5.4": { "patch": { From e3d598b7e878ee173f3cd00a5f357396e2bd8f96 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 11 May 2022 08:33:06 +0200 Subject: [PATCH 121/201] linux/hardened/patches/5.4: 5.4.191-hardened1 -> 5.4.192-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index f7e16ddb141..99008cfcf28 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,11 +52,11 @@ "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.191-hardened1.patch", - "sha256": "117v9xb9y3bmppxmrbya5a4d869fh6l7map25g5n03sca56g7c32", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.191-hardened1/linux-hardened-5.4.191-hardened1.patch" + "name": "linux-hardened-5.4.192-hardened1.patch", + "sha256": "1i0x4f51qlq3bi7zfk8xvjgrl758y8nidb6wp3f507w6ic1757hg", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.192-hardened1/linux-hardened-5.4.192-hardened1.patch" }, - "sha256": "0fharjqasvq76pciwci6qamdadpfjh2n8gdyri8fj65drmgsi318", - "version": "5.4.191" + "sha256": "14wyvacajnj6fnxqrash7b8inq0lgmglydqa30kb21zva88jwj1j", + "version": "5.4.192" } } From 5be5a8310957371c90a9eb9cd50e721460f2f9f7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 08:33:46 +0200 Subject: [PATCH 122/201] python310Packages.azure-storage-file-share: disable on older Python releases --- .../azure-storage-file-share/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index a5bb566aa07..754fbae5522 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -1,7 +1,7 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi -, isPy3k -, lib +, pythonOlder # pythonPackages , azure-core @@ -12,12 +12,14 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; version = "12.8.0"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-46OEVjMYFUa8A6Qh+yicrqUuXmUaSzsWT4maBFG6Yqg="; + hash = "sha256-46OEVjMYFUa8A6Qh+yicrqUuXmUaSzsWT4maBFG6Yqg="; }; propagatedBuildInputs = [ @@ -28,6 +30,7 @@ buildPythonPackage rec { # requires checkout from monorepo doCheck = false; + pythonImportsCheck = [ "azure.core" "azure.storage" @@ -37,8 +40,6 @@ buildPythonPackage rec { description = "Microsoft Azure File Share Storage Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ - kamadorueda - ]; + maintainers = with maintainers; [ kamadorueda ]; }; } From 7d045a76dd810bb0328ed46ba7d770760a44f52e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 08:36:03 +0200 Subject: [PATCH 123/201] python310Packages.azure-mgmt-network: disable on older Python releases --- .../azure-mgmt-network/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index fa05c6bcdf8..93cd52c63d1 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -5,18 +5,20 @@ , azure-mgmt-core , msrest , msrestazure -, isPy3k +, pythonOlder }: buildPythonPackage rec { version = "20.0.0"; pname = "azure-mgmt-network"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-mnjPyCAJ+rlNgZ4umSYjfVVVg83EobZYY/zupyDjdoY="; + hash = "sha256-mnjPyCAJ+rlNgZ4umSYjfVVVg83EobZYY/zupyDjdoY="; }; propagatedBuildInputs = [ @@ -26,12 +28,16 @@ buildPythonPackage rec { msrestazure ]; - # has no tests + # Module has no tests doCheck = false; - pythonNamespaces = [ "azure.mgmt" ]; + pythonNamespaces = [ + "azure.mgmt" + ]; - pythonImportsCheck = [ "azure.mgmt.network" ]; + pythonImportsCheck = [ + "azure.mgmt.network" + ]; meta = with lib; { description = "Microsoft Azure SDK for Python"; From 0fd6a3a981ffeb74db42b3fdf35f0f70d819b4cf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 08:39:15 +0200 Subject: [PATCH 124/201] python3Packages.azure-eventhub: disable on older Python releases --- pkgs/development/python-modules/azure-eventhub/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix index c09ff87522a..175b48dfcb1 100644 --- a/pkgs/development/python-modules/azure-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-eventhub/default.nix @@ -3,11 +3,15 @@ , fetchPypi , azure-core , uamqp +, pythonOlder }: buildPythonPackage rec { pname = "azure-eventhub"; version = "5.9.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; From 71fb057021baa6c2bdb85e2276e511aad434f649 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 08:41:53 +0200 Subject: [PATCH 125/201] python3Packages.azure-eventhub: add missing imput --- pkgs/development/python-modules/azure-eventhub/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix index 175b48dfcb1..feafb56323c 100644 --- a/pkgs/development/python-modules/azure-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-eventhub/default.nix @@ -4,6 +4,7 @@ , azure-core , uamqp , pythonOlder +, typing-extensions }: buildPythonPackage rec { @@ -22,6 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ azure-core uamqp + typing-extensions ]; # too complicated to set up From dd6e29f6cbadee6dc8385ef13cd0c71323ca3eb8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 May 2022 06:46:11 +0000 Subject: [PATCH 126/201] python310Packages.fontmath: 0.9.1 -> 0.9.2 --- pkgs/development/python-modules/fontmath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fontmath/default.nix b/pkgs/development/python-modules/fontmath/default.nix index c0e4bc85773..2d5f90ebb68 100644 --- a/pkgs/development/python-modules/fontmath/default.nix +++ b/pkgs/development/python-modules/fontmath/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "fontMath"; - version = "0.9.1"; + version = "0.9.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1c5e76e135409f49b15809d0ce94dfd00850f893f86d4d6a336808dbbf292700"; + sha256 = "sha256-TIsccR4cv0upPD0IQ5NbBmGXMTEmGvCGCL3hfeEBhAQ="; extension = "zip"; }; From b1de4bf60f955ed59adb2d8878eb0b5d55fb1b4e Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 9 May 2022 10:30:27 -0700 Subject: [PATCH 127/201] ocamlPackages: add meta.mainProgram to many packages --- pkgs/development/ocaml-modules/biniou/default.nix | 5 +++-- pkgs/development/ocaml-modules/jsonm/default.nix | 1 + pkgs/development/ocaml-modules/omd/default.nix | 1 + pkgs/development/ocaml-modules/piqi-ocaml/default.nix | 3 ++- pkgs/development/ocaml-modules/ppx_bap/default.nix | 3 ++- pkgs/development/ocaml-modules/uuidm/default.nix | 3 ++- pkgs/development/ocaml-modules/uunf/default.nix | 3 ++- pkgs/development/ocaml-modules/uuseg/default.nix | 3 ++- pkgs/development/ocaml-modules/uutf/default.nix | 3 ++- pkgs/development/ocaml-modules/xmlm/default.nix | 5 +++-- pkgs/development/ocaml-modules/yojson/default.nix | 1 + pkgs/development/tools/ocaml/findlib/default.nix | 8 +++----- pkgs/development/tools/ocaml/oasis/default.nix | 7 +++---- 13 files changed, 27 insertions(+), 19 deletions(-) diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix index 75725f13551..ff3b8769935 100644 --- a/pkgs/development/ocaml-modules/biniou/default.nix +++ b/pkgs/development/ocaml-modules/biniou/default.nix @@ -22,9 +22,10 @@ buildDunePackage rec { ''; meta = { - inherit (src.meta) homepage; description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; - maintainers = [ lib.maintainers.vbgl ]; + inherit (src.meta) homepage; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.vbgl ]; + mainProgram = "bdump"; }; } diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/pkgs/development/ocaml-modules/jsonm/default.nix index 2b9c9918382..d29b19b3b40 100644 --- a/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/pkgs/development/ocaml-modules/jsonm/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { homepage = "https://erratique.ch/software/jsonm"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ vbgl ]; + mainProgram = "jsontrip"; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/omd/default.nix b/pkgs/development/ocaml-modules/omd/default.nix index b9797e257ab..cfb743cc982 100644 --- a/pkgs/development/ocaml-modules/omd/default.nix +++ b/pkgs/development/ocaml-modules/omd/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ocaml/omd"; license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; + mainProgram = "omd"; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index 8c0276bc9a7..39869765349 100644 --- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -28,9 +28,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://piqi.org"; description = "Universal schema language and a collection of tools built around it. These are the ocaml bindings"; + homepage = "https://piqi.org"; license = licenses.asl20; maintainers = [ maintainers.maurer ]; + mainProgram = "piqic-ocaml"; }; } diff --git a/pkgs/development/ocaml-modules/ppx_bap/default.nix b/pkgs/development/ocaml-modules/ppx_bap/default.nix index f0a223c3db7..b1229643ae6 100644 --- a/pkgs/development/ocaml-modules/ppx_bap/default.nix +++ b/pkgs/development/ocaml-modules/ppx_bap/default.nix @@ -44,8 +44,9 @@ buildDunePackage rec { meta = { description = "The set of ppx rewriters for BAP"; - license = lib.licenses.mit; inherit (src.meta) homepage; + license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; + mainProgram = "ppx-bap"; }; } diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index 336d66cb0a6..7df1c588dd3 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { description = "An OCaml module implementing 128 bits universally unique identifiers version 3, 5 (name based with MD5, SHA-1 hashing) and 4 (random based) according to RFC 4122"; homepage = "https://erratique.ch/software/uuidm"; license = licenses.bsd3; - platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.maurer ]; + mainProgram = "uuidtrip"; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index b61a60c2a37..d69c22db802 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -32,8 +32,9 @@ stdenv.mkDerivation { meta = with lib; { description = "An OCaml module for normalizing Unicode text"; homepage = webpage; - inherit (ocaml.meta) platforms; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; + mainProgram = "unftrip"; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix index 42642d2dc24..9d19de1c3ce 100644 --- a/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/pkgs/development/ocaml-modules/uuseg/default.nix @@ -26,8 +26,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An OCaml library for segmenting Unicode text"; homepage = webpage; - inherit (ocaml.meta) platforms; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; + mainProgram = "usegtrip"; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix index c76eac45b35..62ac1fc7c1c 100644 --- a/pkgs/development/ocaml-modules/uutf/default.nix +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -26,8 +26,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Non-blocking streaming Unicode codec for OCaml"; homepage = "https://erratique.ch/software/uutf"; - inherit (ocaml.meta) platforms; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; + mainProgram = "utftrip"; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix index d989b281cad..34878cb30bb 100644 --- a/pkgs/development/ocaml-modules/xmlm/default.nix +++ b/pkgs/development/ocaml-modules/xmlm/default.nix @@ -27,8 +27,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An OCaml streaming codec to decode and encode the XML data format"; homepage = webpage; - platforms = ocaml.meta.platforms or []; - maintainers = [ maintainers.vbgl ]; license = licenses.bsd3; + maintainers = [ maintainers.vbgl ]; + mainProgram = "xmltrip"; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index 2be9ce1b021..03b01c43776 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -18,5 +18,6 @@ buildDunePackage rec { homepage = "https://github.com/ocaml-community/${pname}"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; + mainProgram = "ydump"; }; } diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 44d9782f3ce..5a9b08e20d0 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -54,14 +54,12 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://projects.camlcity.org/projects/findlib.html"; description = "O'Caml library manager"; + homepage = "http://projects.camlcity.org/projects/findlib.html"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ maggesi vbmithr ]; + mainProgram = "ocamlfind"; platforms = ocaml.meta.platforms or []; - maintainers = [ - lib.maintainers.maggesi - lib.maintainers.vbmithr - ]; }; } diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index d35ddbe210b..c550bef7dda 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -39,12 +39,11 @@ stdenv.mkDerivation { ''; meta = with lib; { - homepage = "http://oasis.forge.ocamlcore.org/"; description = "Configure, build and install system for OCaml projects"; + homepage = "http://oasis.forge.ocamlcore.org/"; license = licenses.lgpl21; + maintainers = with maintainers; [ vbgl maggesi ]; + mainProgram = "oasis"; platforms = ocaml.meta.platforms or []; - maintainers = with maintainers; [ - vbgl maggesi - ]; }; } From bca4ad048701d2b0a472c0e0f0e3e24d62ccc9b0 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 10 May 2022 10:36:58 -0700 Subject: [PATCH 128/201] ocamlPackages: inherit ocaml.meta.platforms --- pkgs/development/ocaml-modules/benchmark/default.nix | 2 +- pkgs/development/ocaml-modules/camlzip/default.nix | 2 +- pkgs/development/ocaml-modules/camomile/0.8.2.nix | 2 +- pkgs/development/ocaml-modules/camomile/0.8.5.nix | 2 +- pkgs/development/ocaml-modules/cmdliner/default.nix | 2 +- pkgs/development/ocaml-modules/cpdf/default.nix | 2 +- pkgs/development/ocaml-modules/cryptgps/default.nix | 2 +- pkgs/development/ocaml-modules/curses/default.nix | 2 +- pkgs/development/ocaml-modules/dypgen/default.nix | 2 +- pkgs/development/ocaml-modules/extlib/default.nix | 2 +- pkgs/development/ocaml-modules/functory/default.nix | 2 +- pkgs/development/ocaml-modules/jsonm/default.nix | 2 +- pkgs/development/ocaml-modules/lablgtk/2.14.0.nix | 2 +- pkgs/development/ocaml-modules/lablgtk/default.nix | 2 +- pkgs/development/ocaml-modules/llvm/default.nix | 2 +- pkgs/development/ocaml-modules/ocaml-cairo/default.nix | 2 +- pkgs/development/ocaml-modules/ocaml-libvirt/default.nix | 2 +- pkgs/development/ocaml-modules/ocamlnat/default.nix | 2 +- pkgs/development/ocaml-modules/ocamlnet/default.nix | 2 +- pkgs/development/ocaml-modules/ocsigen-server/default.nix | 2 +- pkgs/development/ocaml-modules/otfm/default.nix | 2 +- pkgs/development/ocaml-modules/rope/default.nix | 2 +- pkgs/development/ocaml-modules/sawja/default.nix | 2 +- pkgs/development/ocaml-modules/sodium/default.nix | 2 +- pkgs/development/ocaml-modules/syslog/default.nix | 2 +- pkgs/development/ocaml-modules/tsdl/default.nix | 2 +- pkgs/development/ocaml-modules/ulex/default.nix | 2 +- pkgs/development/ocaml-modules/uuidm/default.nix | 2 +- pkgs/development/ocaml-modules/xmlm/default.nix | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/pkgs/development/ocaml-modules/benchmark/default.nix b/pkgs/development/ocaml-modules/benchmark/default.nix index c8016230724..f2a98516c75 100644 --- a/pkgs/development/ocaml-modules/benchmark/default.nix +++ b/pkgs/development/ocaml-modules/benchmark/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ocaml-benchmark.forge.ocamlcore.org/"; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; description = "Benchmark running times of code"; license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ volth ]; diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix index 8124b8d8e43..caf3e7a63f0 100644 --- a/pkgs/development/ocaml-modules/camlzip/default.nix +++ b/pkgs/development/ocaml-modules/camlzip/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { for reading from and writing to compressed files in these formats. ''; license = "LGPL+linking exceptions"; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = with maintainers; [ maggesi ]; }; } diff --git a/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/pkgs/development/ocaml-modules/camomile/0.8.2.nix index 43bbfe7b6a6..502e517b2a9 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.2.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.2.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "A comprehensive Unicode library for OCaml"; license = lib.licenses.lgpl21; branch = "0.8.2"; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = [ lib.maintainers.maggesi ]; diff --git a/pkgs/development/ocaml-modules/camomile/0.8.5.nix b/pkgs/development/ocaml-modules/camomile/0.8.5.nix index e6395383698..7726a95cece 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.5.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.5.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { homepage = "https://github.com/yoriyuki/Camomile/tree/master/Camomile"; description = "A comprehensive Unicode library for OCaml"; license = lib.licenses.lgpl21; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = [ lib.maintainers.maggesi ]; diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index 77970556100..ed96b1b6155 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = "https://erratique.ch/software/cmdliner"; description = "An OCaml module for the declarative definition of command line interfaces"; license = licenses.bsd3; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = [ maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index b1694885258..360848881a9 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.coherentpdf.com/"; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; description = "PDF Command Line Tools"; license = licenses.unfree; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix index aeaa87aaf75..60f64c34054 100644 --- a/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { itself. ''; license = lib.licenses.mit; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = [ lib.maintainers.maggesi ]; diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix index 824f24ab955..b9006012ae5 100644 --- a/pkgs/development/ocaml-modules/curses/default.nix +++ b/pkgs/development/ocaml-modules/curses/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; changelog = "https://github.com/mbacarella/curses/raw/${version}/CHANGES"; maintainers = [ maintainers.volth ]; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/dypgen/default.nix b/pkgs/development/ocaml-modules/dypgen/default.nix index 64017bd65fe..f504e3d7ca4 100644 --- a/pkgs/development/ocaml-modules/dypgen/default.nix +++ b/pkgs/development/ocaml-modules/dypgen/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { homepage = "http://dypgen.free.fr"; description = "Dypgen GLR self extensible parser generator"; license = lib.licenses.cecill-b; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index 7f50548f4b8..7baee7a6032 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ygrek/ocaml-extlib"; description = "Enhancements to the OCaml Standard Library modules"; license = lib.licenses.lgpl21Only; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = [ lib.maintainers.sternenseemann ]; }; } diff --git a/pkgs/development/ocaml-modules/functory/default.nix b/pkgs/development/ocaml-modules/functory/default.nix index a05472366a2..3c56aaf0a0a 100644 --- a/pkgs/development/ocaml-modules/functory/default.nix +++ b/pkgs/development/ocaml-modules/functory/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation { description = "A distributed computing library for Objective Caml which facilitates distributed execution of parallelizable computations in a seamless fashion"; license = licenses.lgpl21; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/pkgs/development/ocaml-modules/jsonm/default.nix index d29b19b3b40..f90a252264f 100644 --- a/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/pkgs/development/ocaml-modules/jsonm/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ vbgl ]; mainProgram = "jsontrip"; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index f37c3b5c6f9..47f48c89be7 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (rec { meta = { branch = "2.14"; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = [ lib.maintainers.maggesi lib.maintainers.roconnor diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 36ade6979c3..7eb94bc188a 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { dontStrip = true; meta = with lib; { - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = with maintainers; [ maggesi roconnor vbgl ]; diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix index c0600df64f2..93824894455 100644 --- a/pkgs/development/ocaml-modules/llvm/default.nix +++ b/pkgs/development/ocaml-modules/llvm/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = { inherit (libllvm.meta) license homepage; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; description = "OCaml bindings distributed with LLVM"; maintainers = with lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index 6748619d492..f0e70699ad8 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { homepage = "http://cairographics.org/cairo-ocaml"; description = "ocaml bindings for cairo library"; license = lib.licenses.gpl2; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index f2336cf88bb..f4a9e55cc12 100644 --- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://libvirt.org/ocaml/"; license = licenses.gpl2; maintainers = [ maintainers.volth ]; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/ocamlnat/default.nix b/pkgs/development/ocaml-modules/ocamlnat/default.nix index 66bd00707ad..0be4e780663 100644 --- a/pkgs/development/ocaml-modules/ocamlnat/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnat/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { x86 or x86-64 processors. Support for additional architectures and operating systems is planned, but not yet available. ''; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = [ lib.maintainers.maggesi ]; diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index d435d7a0484..22cd84da1f8 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { homepage = "http://projects.camlcity.org/projects/ocamlnet.html"; description = "A library implementing Internet protocols (http, cgi, email, etc.) for OCaml"; license = "Most Ocamlnet modules are released under the zlib/png license. The HTTP server module Nethttpd is, however, under the GPL."; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = [ lib.maintainers.maggesi ]; diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index daa64b7e301..704354202d1 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -67,7 +67,7 @@ buildDunePackage rec { A full featured Web server. It implements most features of the HTTP protocol, and has a very powerful extension mechanism that make very easy to plug your own OCaml modules for generating pages. ''; license = lib.licenses.lgpl21Only; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = [ lib.maintainers.gal_bolle ]; }; diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix index 91d91bdc46f..f6717458791 100644 --- a/pkgs/development/ocaml-modules/otfm/default.nix +++ b/pkgs/development/ocaml-modules/otfm/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { of them. ''; homepage = webpage; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; license = licenses.bsd3; maintainers = [ maintainers.jirkamarsik ]; }; diff --git a/pkgs/development/ocaml-modules/rope/default.nix b/pkgs/development/ocaml-modules/rope/default.nix index 9ac090a780e..483aefef12d 100644 --- a/pkgs/development/ocaml-modules/rope/default.nix +++ b/pkgs/development/ocaml-modules/rope/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation ({ meta = { homepage = "http://rope.forge.ocamlcore.org/"; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; description = ''Ropes ("heavyweight strings") in OCaml''; license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ volth ]; diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix index eaad7e7f1bb..78d28270035 100644 --- a/pkgs/development/ocaml-modules/sawja/default.nix +++ b/pkgs/development/ocaml-modules/sawja/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation { homepage = "http://sawja.inria.fr/"; license = licenses.gpl3Plus; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/sodium/default.nix b/pkgs/development/ocaml-modules/sodium/default.nix index 040a34ef6f1..74983fef3e7 100644 --- a/pkgs/development/ocaml-modules/sodium/default.nix +++ b/pkgs/development/ocaml-modules/sodium/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/dsheets/ocaml-sodium"; description = "Binding to libsodium 1.0.9+"; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = [ maintainers.rixed ]; }; } diff --git a/pkgs/development/ocaml-modules/syslog/default.nix b/pkgs/development/ocaml-modules/syslog/default.nix index 9614c404c5b..ccec0329638 100644 --- a/pkgs/development/ocaml-modules/syslog/default.nix +++ b/pkgs/development/ocaml-modules/syslog/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/rixed/ocaml-syslog"; description = "Simple wrapper to access the system logger from OCaml"; license = licenses.lgpl21Plus; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = [ maintainers.rixed ]; }; } diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 3a1990326df..44cc2076fbb 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation { homepage = webpage; description = "Thin bindings to the cross-platform SDL library"; license = licenses.isc; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index d08f2c4c0ae..b871bc403ed 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "A lexer generator for Unicode and OCaml"; license = lib.licenses.mit; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = [ lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index 7df1c588dd3..5e6d71c19ef 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = [ maintainers.maurer ]; mainProgram = "uuidtrip"; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix index 34878cb30bb..9396dd7b914 100644 --- a/pkgs/development/ocaml-modules/xmlm/default.nix +++ b/pkgs/development/ocaml-modules/xmlm/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; mainProgram = "xmltrip"; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; }; } From a4caa41357dd2904516c099e966a859626afc7de Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 09:20:20 +0200 Subject: [PATCH 129/201] python310Packages.archinfo: 9.2.2 -> 9.2.3 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index e6cd183d413..59a2f9ad9c9 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.2"; + version = "9.2.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-wJEipAlqBsP2tgsRDVDe1ZtiEg1uhpP+1P1VGU7tBBw="; + hash = "sha256-r0cZXyj47HmgFVyQ3POGexeQxBiQ1xx/ptsPMwCRjHY="; }; checkInputs = [ From 165dc4ec042b27c65e9b132d092ea6f2dec0e19d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 09:20:24 +0200 Subject: [PATCH 130/201] python310Packages.ailment: 9.2.2 -> 9.2.3 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index bc977348a71..498caa2045d 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.2"; + version = "9.2.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-JJ5wrjXazq0+6f4nccLRYaAgTg0d39REXmPHVchDzaE="; + hash = "sha256-R8AaQj/Rdz8SSN2L8v8ZzIxnPQqdg/SKUB6FV9uYFLs="; }; propagatedBuildInputs = [ From 5db0ce5a2b00dee63a2fcfbaeea9d8e34d26e070 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 09:20:32 +0200 Subject: [PATCH 131/201] python310Packages.pyvex: 9.2.2 -> 9.2.3 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 509da93663d..682bc0d80ac 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.2"; + version = "9.2.3"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-jfquDFZylrrtYb3PbDmLDy7wHcvM8H2nIv4dRqRvY2U="; + hash = "sha256-uGZlWDTDczBiNCd4D4y6Umz44G8Zn3Zr8/R7Kn+4aS8="; }; propagatedBuildInputs = [ From c124beb25dd9320bc7d1d365b22b83e8baec8e7b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 09:20:36 +0200 Subject: [PATCH 132/201] python310Packages.claripy: 9.2.2 -> 9.2.3 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index eafc0c3f427..e37f1ee8dbd 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.2"; + version = "9.2.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-b07WygCR3IhRgyt7u1ipyyK4MM3TNeLW04WoZJ2eQZk="; + hash = "sha256-O2nkGIQfjGmhrqBPoMI97DsCvOUZix0VcUHwmDyF40Q="; }; propagatedBuildInputs = [ From 0e86c35701c1f61b1b5bdcf48f3478ace062c7f4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 09:20:40 +0200 Subject: [PATCH 133/201] python310Packages.cle: 9.2.2 -> 9.2.3 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index cbbb130a6aa..f626e62db0d 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.2"; + version = "9.2.3"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-vEnhoVxn/p4CNzfHFM1cKaQ3ESsJx5U4+Lz4/LDCtao="; + hash = "sha256-gyWeE4sF9Bmk2CNmXh90xMtXlaz/Agm7wX6sWr0Fyco="; }; propagatedBuildInputs = [ From 8e819d9b789490772298d5ee06ddfac5779c68c6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 09:20:44 +0200 Subject: [PATCH 134/201] python310Packages.angr: 9.2.2 -> 9.2.3 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index a65d681a17b..f8e3ac530f1 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.2.2"; + version = "9.2.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-aniLMNKfEqlVkniS2mSCaeXIOc0EC4zOR59kiGTNUWk="; + hash = "sha256-RcAiPzz2JUlNIGU7+6WCd5JskRYmlMee8wOcOclfb0Q="; }; propagatedBuildInputs = [ From e1fa7d7b2d03b47c83c94dd8d187156f69389127 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 09:20:48 +0200 Subject: [PATCH 135/201] python310Packages.angrop: 9.2.2 -> 9.2.3 --- pkgs/development/python-modules/angrop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 47ecddb0447..d46c18f6d17 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.2.2"; + version = "9.2.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-LCgY/eOtRulnMeYt96ZYI8vPyyM+jxjlkxTd8Cmnfe0="; + hash = "sha256-bhdn3uomvegpvynR0ts4KdwFapX2xGfuwp4e57Xtcoo="; }; propagatedBuildInputs = [ From 8a7a08e149a83fb930eb2a47badf187ec4fdd0eb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 09:26:22 +0200 Subject: [PATCH 136/201] python310Packages.slack-sdk: 3.16.0 -> 3.16.1 --- pkgs/development/python-modules/slack-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index baba69922eb..7e80ad35c5c 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.16.0"; + version = "3.16.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - sha256 = "sha256-odu8/xT2TuOLT2jRztPDUHcGMfmHvWrsnDRkp4yGaY0="; + sha256 = "sha256-XTt2R0JypbDGJtiWqFzmui7UVLK4/U46co7LcHkSbWo="; }; propagatedBuildInputs = [ From 40803e47d152fbfeb0c9943aa1a73764f8ec7fde Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 09:34:00 +0200 Subject: [PATCH 137/201] python310Packages.plugwise: 0.18.0 -> 0.18.1 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 396583b9ee4..6bbcd9d78cc 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.18.0"; + version = "0.18.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - sha256 = "sha256-kpEs5LvUz61Wm2IUI6sNXx2R+vtuHq1Y6aaj+zLrr+Q="; + sha256 = "sha256-jdRwaw5hPP8VCmCp3l5idjzrHJ2vLhYpC6yPCmOF56Y="; }; propagatedBuildInputs = [ From e4459d1400038edbb21b44a0ba4efebf7f71e741 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 09:34:24 +0200 Subject: [PATCH 138/201] tfsec: 1.20.0 -> 1.20.2 --- pkgs/development/tools/analysis/tfsec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index cedf2535df3..ee84ca66b24 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "tfsec"; - version = "1.20.0"; + version = "1.20.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ikMmd+avT8Fl+oZti2aegX4knYmPgEE/FOMAMZriV0g="; + sha256 = "sha256-1zMFetWPfSJn0QSomLf9yHjbjNyKzUKOfKIBEKUWxIs="; }; ldflags = [ @@ -21,7 +21,7 @@ buildGoModule rec { # "-extldflags '-fno-PIC -static'" ]; - vendorSha256 = "sha256-LRXnBSG+xpQ3QqF2SiC2s3luTaBxFHOF3XXxhFZV5D0="; + vendorSha256 = "sha256-klgETD1hw9XPJfgiI3sRlYqfhVoh/fhComkCs4BhSI4="; subPackages = [ "cmd/tfsec" From 409d3e7f9af4e223f618ca189ee59fffe67323a4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 09:36:36 +0200 Subject: [PATCH 139/201] python310Packages.aioqsw: 0.0.7 -> 0.0.8 --- pkgs/development/python-modules/aioqsw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioqsw/default.nix b/pkgs/development/python-modules/aioqsw/default.nix index ae311fe4bc7..d788b1e8c7c 100644 --- a/pkgs/development/python-modules/aioqsw/default.nix +++ b/pkgs/development/python-modules/aioqsw/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioqsw"; - version = "0.0.7"; + version = "0.0.8"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-EEgEpil6/pa3gihiLZ5RrtTxP63H24VmMc8Nf1Vsrw8="; + hash = "sha256-FSH7MWtxYdJjCLpit2IhxXUFkGWml6P0SroUJ3iorRw="; }; propagatedBuildInputs = [ From 802a8416b6f0b34afd2eec9d6249aa9763b9924d Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 11 May 2022 02:33:57 -0500 Subject: [PATCH 140/201] bowtie: add arm64 patch to build on M1 Macs This does not fix the build on Macs, but it brings the build on M1 Macs to parity with non-M1 Macs. --- pkgs/applications/science/biology/bowtie/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/biology/bowtie/default.nix b/pkgs/applications/science/biology/bowtie/default.nix index 81cdaecf2c1..85c7756dbce 100644 --- a/pkgs/applications/science/biology/bowtie/default.nix +++ b/pkgs/applications/science/biology/bowtie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib }: stdenv.mkDerivation rec { pname = "bowtie"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-mWItmrTMPst/NnzSpxxTHcBztDqHPCza9yOsZPwp7G4="; }; + patches = [ + # Without this patch, compiling with clang on an M1 Mac fails because + # 'cpuid.h' is included. It only works on x86 and throws an error. + (fetchpatch { + name = "fix_compilation_on_arm64"; + url = "https://github.com/BenLangmead/bowtie/commit/091d72f4cb69ca0713704d38bd7f9b37e6c4ff2d.patch"; + sha256 = "sha256-XBvgICUBnE5HKpJ36IHTDiKjJgLFKETsIaJC46uN+2I="; + }) + ]; + buildInputs = [ zlib ]; installFlags = [ "prefix=$(out)" ]; From dca0c4a803e1b3840236e72278575c0e2f27b92d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 09:38:21 +0200 Subject: [PATCH 141/201] python310Packages.praw: 7.5.0 -> 7.6.0 --- pkgs/development/python-modules/praw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index ddef2dcc1c1..3138f4497d5 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "praw"; - version = "7.5.0"; + version = "7.6.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "praw-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xcITJ349ek9Y0HvJwzKJ7xDUV74w2v3yTBaj5n8YJ58="; + sha256 = "sha256-y2eynMsjF4wZd31YoLdtk8F+ga7Z3R+IQkQK0x0RAGA="; }; propagatedBuildInputs = [ From aa1f2083a1bf5266ea41a0e22291323e82baf6ee Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Wed, 11 May 2022 00:49:59 -0700 Subject: [PATCH 142/201] python3Packages.weasyprint: disable failing tests Fixes #172421 ZHF #172160 --- pkgs/development/python-modules/weasyprint/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index a1a7470b8b5..548c3ace35a 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -48,6 +48,12 @@ buildPythonPackage rec { pangocairo = "${pango.out}/lib/libpangocairo-1.0${stdenv.hostPlatform.extensions.sharedLibrary}"; harfbuzz = "${harfbuzz.out}/lib/libharfbuzz${stdenv.hostPlatform.extensions.sharedLibrary}"; }) + # Disable tests for new Ghostscript + # Remove when next version is released + (fetchpatch { + url = "https://github.com/Kozea/WeasyPrint/commit/e544398b00d76bc0317ea7e2abe40dc46b380910.patch"; + sha256 = "sha256-oQO3j9Mo1x98WaLPROxsOn0qkeYRJrCx5QWWKoHvabE="; + }) ]; nativeBuildInputs = [ From db93a10d817edc9cba5d08352411ba911f945f05 Mon Sep 17 00:00:00 2001 From: Ram Kromberg Date: Mon, 2 May 2022 21:55:31 +0300 Subject: [PATCH 143/201] rc: update 1.7.4 -> unstable-2021-08-03 --- pkgs/shells/rc/default.nix | 40 ++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/pkgs/shells/rc/default.nix b/pkgs/shells/rc/default.nix index af43c42dd4b..804919665ec 100644 --- a/pkgs/shells/rc/default.nix +++ b/pkgs/shells/rc/default.nix @@ -1,42 +1,44 @@ -{ lib, stdenv, fetchurl, autoreconfHook -, ncurses #acinclude.m4 wants headers for tgetent(). -, historySupport ? false -, readline ? null -}: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, byacc +, ncurses, readline +, historySupport ? false, readlineSupport ? true }: stdenv.mkDerivation rec { pname = "rc"; - version = "1.7.4"; + version = "unstable-2021-08-03"; - src = fetchurl { - url = "http://static.tobold.org/rc/rc-${version}.tar.gz"; - sha256 = "1n5zz6d6z4z6s3fwa0pscqqawy561k4xfnmi91i626hcvls67ljy"; + src = fetchFromGitHub { + owner = "rakitzis"; + repo = "rc"; + rev = "8ca9ab1305c3e30cd064290081d6e5a1fa841d26"; + sha256 = "0744ars6y9zzsjr9xazms91qy6bi7msg2gg87526waziahfh4s4z"; }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ncurses ] - ++ lib.optionals (readline != null) [ readline ]; + + # acinclude.m4 wants headers for tgetent(). + buildInputs = [ byacc ncurses ] + ++ lib.optionals readlineSupport [ readline ]; configureFlags = [ "--enable-def-interp=${stdenv.shell}" #183 ] ++ lib.optionals historySupport [ "--with-history" ] - ++ lib.optionals (readline != null) [ "--with-edit=readline" ]; + ++ lib.optionals readlineSupport [ "--with-edit=readline" ]; - prePatch = '' + #reproducible-build + postPatch = '' substituteInPlace configure.ac \ - --replace "date -I" "echo 2015-05-13" #reproducible-build + --replace "$(git describe || echo '(git description unavailable)')" "${builtins.substring 0 7 src.rev}" ''; - passthru = { - shellPath = "/bin/rc"; - }; + passthru.shellPath = "/bin/rc"; meta = with lib; { description = "The Plan 9 shell"; - longDescription = "Byron Rakitzis' UNIX reimplementation of Tom Duff's Plan 9 shell."; - homepage = "http://tobold.org/article/rc"; + longDescription = "Byron Rakitzis' UNIX reimplementation of Tom Duff's Plan 9 shell"; + homepage = "https://web.archive.org/web/20180820053030/tobold.org/article/rc"; license = with licenses; zlib; maintainers = with maintainers; [ ramkromberg ]; + mainProgram = "rc"; platforms = with platforms; all; }; } From 81046b393b404714d56d7bef275cdd28f7cfb044 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 11 May 2022 03:17:52 -0500 Subject: [PATCH 144/201] bowtie: fix build on case insensitive file systems Add a patch that removes the current source directory from the include search path during compilation so that #include does not end up picking the VERSION source code file. --- pkgs/applications/science/biology/bowtie/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/science/biology/bowtie/default.nix b/pkgs/applications/science/biology/bowtie/default.nix index 85c7756dbce..ccb797d8a22 100644 --- a/pkgs/applications/science/biology/bowtie/default.nix +++ b/pkgs/applications/science/biology/bowtie/default.nix @@ -19,6 +19,16 @@ stdenv.mkDerivation rec { url = "https://github.com/BenLangmead/bowtie/commit/091d72f4cb69ca0713704d38bd7f9b37e6c4ff2d.patch"; sha256 = "sha256-XBvgICUBnE5HKpJ36IHTDiKjJgLFKETsIaJC46uN+2I="; }) + + # Without this patch, compilation adds the current source directory to the + # include search path, and #include in standard library code can + # end up picking the unrelated VERSION source code file on case-insensitive + # file systems. + (fetchpatch { + name = "fix_include_search_path"; + url = "https://github.com/BenLangmead/bowtie/commit/c208b9db936eab0bc3ffdf0182b4f59a9017a1c4.patch"; + sha256 = "sha256-772EE+oWFWXssSMabPryb0AfIS1tC10mPTRCBm7RrUs="; + }) ]; buildInputs = [ zlib ]; From f35d9453f7a0eee735418c2fabcf0f73130a98a4 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 11 May 2022 01:30:53 -0700 Subject: [PATCH 145/201] wdomirror: avoid adding a patch A few hours after my previous PR #172441 was merged, one of the upstream contributors responded to my comment that their PR did not adequately address this issue: https://github.com/progandy/wdomirror/pull/7 The PR has not yet merged, but at least now we can reference this commit instead of having a patch in nixpkgs. --- .../wayland/wdomirror/configure-bounds.patch | 15 --------------- pkgs/tools/wayland/wdomirror/default.nix | 12 ++++++------ 2 files changed, 6 insertions(+), 21 deletions(-) delete mode 100644 pkgs/tools/wayland/wdomirror/configure-bounds.patch diff --git a/pkgs/tools/wayland/wdomirror/configure-bounds.patch b/pkgs/tools/wayland/wdomirror/configure-bounds.patch deleted file mode 100644 index c42563741df..00000000000 --- a/pkgs/tools/wayland/wdomirror/configure-bounds.patch +++ /dev/null @@ -1,15 +0,0 @@ -From https://github.com/progandy/wdomirror/issues/5#issuecomment-1103265438 - ---- a/main.c -+++ b/main.c -@@ -409,9 +409,12 @@ xdg_toplevel_handle_close(void *data, struct xdg_toplevel *xdg_toplevel) - ctx->quit = true; - } - -+static void xdg_toplevel_handle_configure_bounds(void *data, struct xdg_toplevel *toplevel, int32_t width, int32_t height) {} -+ - static const struct xdg_toplevel_listener xdg_toplevel_listener = { - xdg_toplevel_handle_configure, - xdg_toplevel_handle_close, -+ xdg_toplevel_handle_configure_bounds, - }; diff --git a/pkgs/tools/wayland/wdomirror/default.nix b/pkgs/tools/wayland/wdomirror/default.nix index 67d8a7cf299..5c3b7ddbb72 100644 --- a/pkgs/tools/wayland/wdomirror/default.nix +++ b/pkgs/tools/wayland/wdomirror/default.nix @@ -6,6 +6,7 @@ , pkg-config , wayland , wayland-protocols +, fetchurl }: stdenv.mkDerivation { @@ -24,12 +25,11 @@ stdenv.mkDerivation { buildInputs = [ wayland ]; patches = [ - # A recent change to xdg-shell-client-protocol causes a build - # failure. This was reported upstream as GH #5. User @AlexBMJ - # posted the following two-line fix in that issue, but the - # developer has not yet responded: - # https://github.com/progandy/wdomirror/issues/5#issuecomment-1103265438 - ./configure-bounds.patch + # https://github.com/progandy/wdomirror/pull/7 + (fetchurl { + url = "https://github.com/progandy/wdomirror/commit/142632208e9ea2b4a4ebd784532efdb8cad7b87c.patch"; + hash = "sha256-z6/8q2vOtmlGFbDVG5BVWWbLQT8kBvJXT9/oZkWS9gw="; + }) ]; installPhase = '' From 3f19e35965f92f6635fe49ba18beaf3932049d17 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 11 May 2022 11:42:16 +0300 Subject: [PATCH 146/201] =?UTF-8?q?gnss-sdr:=200.0.16=20=E2=86=92=200.0.17?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/radio/gnss-sdr/default.nix | 9 ++---- .../fix_libcpu_features_install_path.patch | 30 +++++++++---------- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index f6e834d53fb..6aac0112f96 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -21,13 +21,13 @@ gnuradio.pkgs.mkDerivation rec { pname = "gnss-sdr"; - version = "0.0.16"; + version = "0.0.17"; src = fetchFromGitHub { owner = "gnss-sdr"; repo = "gnss-sdr"; rev = "v${version}"; - sha256 = "sha256-ODe4k6PDGtDX11FrbggEbN3tc4UtATaItUIpCKl4JjM="; + sha256 = "sha256-0aAjkrVAswoRL/KANBSZ5Jq4Y9VwOHZKUKLpXDdKtk8="; }; patches = [ @@ -35,11 +35,6 @@ gnuradio.pkgs.mkDerivation rec { # cpu_features which is bundled in the source. NOTE: Perhaps this patch # should be sent upstream. ./fix_libcpu_features_install_path.patch - # Fixes a compilation issue, should be removed on next release. - (fetchpatch { - url = "https://github.com/gnss-sdr/gnss-sdr/commit/8a42967c854e575f2dd9ee7ca81a2522eebb864b.patch"; - sha256 = "sha256-W8BwC08QVtW0LUj5Q+j28aYG+713s+vQIzsWyrNUs1Q="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch b/pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch index cfeb0bd416b..46925e741a1 100644 --- a/pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch +++ b/pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch @@ -1,6 +1,6 @@ ---- a/CMakeLists.txt 1970-01-01 08:00:01.000000000 +0800 -+++ b/CMakeLists.txt 2022-02-16 20:41:53.725290020 +0800 -@@ -1214,7 +1214,7 @@ +--- i/CMakeLists.txt ++++ w/CMakeLists.txt +@@ -1210,7 +1210,7 @@ if(NOT VOLKGNSSSDR_FOUND) BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=$<$:None>$<$:Debug>$<$:Release>$<$:RelWithDebInfo>$<$:MinSizeRel>$<$:NoOptWithASM>$<$:Coverage>$<$:O2WithASM>$<$:O3WithASM>$<$:ASAN> @@ -9,16 +9,16 @@ DOWNLOAD_COMMAND "" UPDATE_COMMAND "" PATCH_COMMAND "" -@@ -1247,7 +1247,7 @@ - ) - set(VOLK_GNSSSDR_BUILD_BYPRODUCTS - ${VOLK_GNSSSDR_BUILD_BYPRODUCTS} -- ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} -+ ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} - ) +@@ -1248,7 +1248,7 @@ if(NOT VOLKGNSSSDR_FOUND) + ) + set(VOLK_GNSSSDR_BUILD_BYPRODUCTS + ${VOLK_GNSSSDR_BUILD_BYPRODUCTS} +- ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} ++ ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} + ) + endif() endif() - ExternalProject_Add(volk_gnsssdr_module -@@ -1256,7 +1256,7 @@ +@@ -1261,7 +1261,7 @@ if(NOT VOLKGNSSSDR_FOUND) BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=$<$:None>$<$:Debug>$<$:Release>$<$:RelWithDebInfo>$<$:MinSizeRel>$<$:NoOptWithASM>$<$:Coverage>$<$:O2WithASM>$<$:O3WithASM>$<$:ASAN> @@ -27,7 +27,7 @@ DOWNLOAD_COMMAND "" UPDATE_COMMAND "" PATCH_COMMAND "" -@@ -1271,7 +1271,7 @@ +@@ -1280,7 +1280,7 @@ if(NOT VOLKGNSSSDR_FOUND) BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=$<$:None>$<$:Debug>$<$:Release>$<$:RelWithDebInfo>$<$:MinSizeRel>$<$:NoOptWithASM>$<$:Coverage>$<$:O2WithASM>$<$:O3WithASM>$<$:ASAN> @@ -36,9 +36,9 @@ DOWNLOAD_COMMAND "" UPDATE_COMMAND "" PATCH_COMMAND "" -@@ -1310,7 +1310,7 @@ +@@ -1319,7 +1319,7 @@ if(NOT VOLKGNSSSDR_FOUND) if(CMAKE_VERSION VERSION_GREATER 3.0 AND SUPPORTED_CPU_FEATURES_ARCH) - if(NOT CpuFeatures_FOUND) + if(NOT CPUFEATURES_FOUND AND ENABLE_CPUFEATURES) set_target_properties(Volkgnsssdr::volkgnsssdr PROPERTIES - INTERFACE_LINK_LIBRARIES ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} + INTERFACE_LINK_LIBRARIES ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} From 03cecc226724dda5672ef8591499f21c9c87df04 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Mon, 9 May 2022 14:02:44 +0200 Subject: [PATCH 147/201] python3Packages.sentry-sdk: fix build, python3Packages.weasyprint: exclude tests Signed-off-by: Florian Brandes --- pkgs/development/python-modules/sentry-sdk/default.nix | 2 ++ pkgs/development/python-modules/weasyprint/default.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index e764cd912a0..b368db45bf7 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -37,6 +37,7 @@ , trytond , urllib3 , werkzeug +, multidict }: buildPythonPackage rec { @@ -88,6 +89,7 @@ buildPythonPackage rec { tornado trytond werkzeug + multidict ]; doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index a1a7470b8b5..e35ef36011f 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -80,6 +80,8 @@ buildPythonPackage rec { # sensitive to sandbox environments "test_tab_size" "test_tabulation_character" + "test_linear_gradients_5" + "test_linear_gradients_12" ]; FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; From 196deeb961b1a1900a152a04a320cdf0667614d8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 10:48:45 +0200 Subject: [PATCH 148/201] python310Packages.flux-led: 0.28.28 -> 0.28.29 --- pkgs/development/python-modules/flux-led/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index 9e1c881805e..590f1d9f824 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.28.28"; + version = "0.28.29"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = version; - sha256 = "sha256-FtZHZ48XGo+0aP4ARSfzI9xzFVptYhG6CDVGTT4oDBQ="; + sha256 = "sha256-Hwe8eshY5j+10fARCp7fMnZf2Sxal7+7Vj5DYVPNXks="; }; propagatedBuildInputs = [ From 433f7fd23378bb5e40f945f2efc18bb489085b5e Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 11 May 2022 11:29:21 +0200 Subject: [PATCH 149/201] pe-parse: fix the build ZHF: #172160 --- pkgs/development/libraries/pe-parse/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/pe-parse/default.nix b/pkgs/development/libraries/pe-parse/default.nix index b2a555bd263..c8689d15e24 100644 --- a/pkgs/development/libraries/pe-parse/default.nix +++ b/pkgs/development/libraries/pe-parse/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # See https://github.com/trailofbits/pe-parse/issues/169 + NIX_CFLAGS_COMPILE = "-Wno-sign-conversion"; + doInstallCheck = true; installCheckPhase = '' $out/bin/dump-pe ../tests/assets/example.exe From d77b0fc315bc11fda969a88706ed2da304948b2d Mon Sep 17 00:00:00 2001 From: marius david Date: Wed, 11 May 2022 11:33:18 +0200 Subject: [PATCH 150/201] azimuth: fix compilation --- pkgs/games/azimuth/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/azimuth/default.nix b/pkgs/games/azimuth/default.nix index dcc67533fac..301fa231122 100644 --- a/pkgs/games/azimuth/default.nix +++ b/pkgs/games/azimuth/default.nix @@ -14,8 +14,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which ]; buildInputs = [ SDL ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=maybe-uninitialized" ]; + preConfigure = '' - cat Makefile substituteInPlace data/azimuth.desktop \ --replace Exec=azimuth "Exec=$out/bin/azimuth" \ --replace "Version=%AZ_VERSION_NUMBER" "Version=${version}" From dc2c00a9af91d8886e9b950836e93025a5e14c41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 11 May 2022 11:44:10 +0200 Subject: [PATCH 151/201] libxslt: update homepage --- pkgs/development/libraries/libxslt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index ac4dd749233..a8ed68b088b 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://xmlsoft.org/XSLT/"; + homepage = "https://gitlab.gnome.org/GNOME/libxslt"; description = "A C library and tools to do XSL transformations"; license = licenses.mit; platforms = platforms.all; From a722d04617fc670306cbe931240ee04afea11205 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 11 May 2022 11:46:21 +0200 Subject: [PATCH 152/201] mini-httpd: fix the build Moved back to C++14 where dynamic exception specifications are deprecated but still present. ZHF: #172160 --- pkgs/servers/http/mini-httpd/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix index 81a8228b027..258eacf768c 100644 --- a/pkgs/servers/http/mini-httpd/default.nix +++ b/pkgs/servers/http/mini-httpd/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + meta = { homepage = "http://mini-httpd.nongnu.org/"; description = "minimalistic high-performance web server"; From b4e8a4bbda45f0576017281d25e817bc19383bbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 11 May 2022 11:46:58 +0200 Subject: [PATCH 153/201] libxml2: update homepage --- pkgs/development/libraries/libxml2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 06c073c718a..f0b4d0baf4f 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -124,7 +124,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://xmlsoft.org/"; + homepage = "https://gitlab.gnome.org/GNOME/libxml2"; description = "XML parsing library for C"; license = licenses.mit; platforms = platforms.all; From 69f7c987501cad5311a615f6fa0bf3d3b975a967 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 11:35:59 +0200 Subject: [PATCH 154/201] python310Packages.pkginfo2: init at 30.0.0 --- .../python-modules/pkginfo2/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/pkginfo2/default.nix diff --git a/pkgs/development/python-modules/pkginfo2/default.nix b/pkgs/development/python-modules/pkginfo2/default.nix new file mode 100644 index 00000000000..25b9b053748 --- /dev/null +++ b/pkgs/development/python-modules/pkginfo2/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pkginfo2"; + version = "30.0.0"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "nexB"; + repo = "pkginfo2"; + rev = "v${version}"; + hash = "sha256-E9EyaN3ncf/34vvvhRe0rwV28VrjqJo79YFgXq2lKWU="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pkginfo2" + ]; + + meta = with lib; { + description = "Query metadatdata from sdists, bdists or installed packages"; + homepage = "https://github.com/nexB/pkginfo2"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8ebd87e812a..a734ab2b360 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6355,6 +6355,8 @@ in { pkginfo = callPackage ../development/python-modules/pkginfo { }; + pkginfo2 = callPackage ../development/python-modules/pkginfo2 { }; + pkuseg = callPackage ../development/python-modules/pkuseg { }; pmsensor = callPackage ../development/python-modules/pmsensor { }; From 8fc305d584e42e567c5f8550d17773ac734edf84 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 11 Feb 2022 15:01:41 +0100 Subject: [PATCH 155/201] vimPlugins.stylish-nvim: init at 2022-02-11 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 10 ++++++++++ 2 files changed, 22 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index dcbadc30a25..d01b240e347 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6326,6 +6326,18 @@ final: prev: meta.homepage = "https://github.com/darfink/starsearch.vim/"; }; + stylish-nvim = buildVimPluginFrom2Nix { + pname = "stylish.nvim"; + version = "2022-02-11"; + src = fetchFromGitHub { + owner = "teto"; + repo = "stylish.nvim"; + rev = "ea745ebf446410ef3d75f9890b2e7fd59be42e19"; + sha256 = "1kl2g32ls4s7kpr6395rdmsa7gdzkpfiypphmnxg8n75n0b0mwb3"; + }; + meta.homepage = "https://github.com/teto/stylish.nvim/"; + }; + suda-vim = buildVimPluginFrom2Nix { pname = "suda.vim"; version = "2022-02-10"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index e294ea0b5a2..bbdd19f22f1 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -41,6 +41,8 @@ , ycmd , zoxide , nodejs +, xdotool +, xorg # test dependencies , neovim-unwrapped @@ -606,6 +608,14 @@ self: super: { ''; }; + stylish-nvim = super.stylish-nvim.overrideAttrs (old: { + postPatch = '' + substituteInPlace lua/stylish/common/mouse_hover_handler.lua --replace xdotool ${xdotool}/bin/xdotool + substituteInPlace lua/stylish/components/menu.lua --replace xdotool ${xdotool}/bin/xdotool + substituteInPlace lua/stylish/components/menu.lua --replace xwininfo ${xorg.xwininfo}/bin/xwininfo + ''; + }); + sved = let # we put the script in its own derivation to benefit the magic of wrapGAppsHook From 82f0b53588967aa392e8a60fd30022ce8981329b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 1 May 2022 15:45:12 +0800 Subject: [PATCH 156/201] dendrite: 0.8.1 -> 0.8.4 --- nixos/modules/services/misc/dendrite.nix | 9 +++++++++ nixos/tests/dendrite.nix | 1 + pkgs/servers/dendrite/default.nix | 21 +++++++++++++++++---- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/misc/dendrite.nix b/nixos/modules/services/misc/dendrite.nix index 35bec40926e..ac5df9951b3 100644 --- a/nixos/modules/services/misc/dendrite.nix +++ b/nixos/modules/services/misc/dendrite.nix @@ -222,6 +222,13 @@ in for available options with which to populate settings. ''; }; + openRegistration = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Allow open registration without secondary verification (reCAPTCHA). + ''; + }; }; config = lib.mkIf cfg.enable { @@ -263,6 +270,8 @@ in "--https-bind-address :${builtins.toString cfg.httpsPort}" "--tls-cert ${cfg.tlsCert}" "--tls-key ${cfg.tlsKey}" + ] ++ lib.optionals cfg.openRegistration [ + "--really-enable-open-registration" ]); ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Restart = "on-failure"; diff --git a/nixos/tests/dendrite.nix b/nixos/tests/dendrite.nix index a444c9b2001..d4a5bb13226 100644 --- a/nixos/tests/dendrite.nix +++ b/nixos/tests/dendrite.nix @@ -17,6 +17,7 @@ import ./make-test-python.nix ( homeserver = { pkgs, ... }: { services.dendrite = { enable = true; + openRegistration = true; settings = { global.server_name = "test-dendrite-server.com"; global.private_key = private_key; diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index 82c6d4ba3e6..2b12a47edc8 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -1,17 +1,30 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, fetchurl, nixosTests, postgresql, postgresqlTestHook }: buildGoModule rec { pname = "matrix-dendrite"; - version = "0.8.1"; + version = "0.8.4"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - sha256 = "sha256-cEqedl6iVt/HZEh1zeEcqby8gfJEcqIDEQnPewyErMI="; + sha256 = "sha256-w4un+TdFTzfVZltvo6ZAPQ3B9HJvnGlJW+LmZHuYk1M="; }; - vendorSha256 = "sha256-nQx+PyjRvECeIerZ9jq7YMTSS8LfohY7NgK8DklREQQ="; + vendorSha256 = "sha256-AJ7Hn23aji/cXioDaOSyF8XD3Mr135DZf7KbUW1SoJ4="; + + checkInputs = [ + postgresqlTestHook + postgresql + ]; + + postgresqlTestUserOptions = "LOGIN SUPERUSER"; + preCheck = '' + export PGUSER=$(whoami) + # temporarily disable this failing test + # it passes in upstream CI and requires further investigation + rm roomserver/internal/input/input_test.go + ''; passthru.tests = { inherit (nixosTests) dendrite; From a76ef494589dcf8cdaa9f1d42ab45ea427203332 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 11 May 2022 11:53:36 +0100 Subject: [PATCH 157/201] open-policy-agent: fix darwin build issues --- pkgs/development/tools/open-policy-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 7fe4b10f2d2..bd13a697c0c 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -43,8 +43,8 @@ buildGoModule rec { go list ./... | grep -v -e e2e ${lib.optionalString stdenv.isDarwin "-e wasm"} } '' + lib.optionalString stdenv.isDarwin '' - # resolve "too many open files" errors during the tests on darwin - ulimit -n 1024 + # remove tests that have "too many open files"/"no space left on device" issues on darwin in hydra + rm server/server_test.go ''; postInstall = '' From 9a0ff61993e02bb9db5860d383866dc7537de148 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 11 May 2022 12:54:13 +0200 Subject: [PATCH 158/201] chromium: 101.0.4951.54 -> 101.0.4951.64 https://chromereleases.googleblog.com/2022/05/stable-channel-update-for-desktop_10.html This update includes 13 security fixes. CVEs: CVE-2022-1633 CVE-2022-1634 CVE-2022-1635 CVE-2022-1636 CVE-2022-1637 CVE-2022-1638 CVE-2022-1639 CVE-2022-1640 CVE-2022-1641 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 02292a8c61e..f73f171b750 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "101.0.4951.54", - "sha256": "1d808a7mvg0nd0mm20c1ny5kdvb2xvrs8vz4nnk456ix8pywcv62", - "sha256bin64": "1m6s6xf2wvz535w6jskk3pnibvsjpzmbxvd9rlxmqr08y219gp5y", + "version": "101.0.4951.64", + "sha256": "1xyqm32y9v1hn8ji6qfw6maynqgg3266j58dq4x4aqsm2gj9cn4w", + "sha256bin64": "14ijrj7h2y72ppyysz6jv40c01lbnan7z69cl24asch2zjlgwv8v", "deps": { "gn": { "version": "2022-03-14", From b573c0d93b01edcbd12784f8484bf06523d79ab3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 13:03:40 +0200 Subject: [PATCH 159/201] python310Packages.container-inspector: init at 31.0.0 --- .../container-inspector/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/container-inspector/default.nix diff --git a/pkgs/development/python-modules/container-inspector/default.nix b/pkgs/development/python-modules/container-inspector/default.nix new file mode 100644 index 00000000000..d8acd1160a8 --- /dev/null +++ b/pkgs/development/python-modules/container-inspector/default.nix @@ -0,0 +1,54 @@ +{ lib +, attrs +, buildPythonPackage +, click +, commoncode +, dockerfile-parse +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "container-inspector"; + version = "31.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "nexB"; + repo = pname; + rev = "v${version}"; + hash = "sha256-YwtyNZsTMb8iFXo/rojvjkKUbMNRCXVamzFykpwYCOk="; + }; + + dontConfigure = true; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + attrs + click + dockerfile-parse + commoncode + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "container_inspector" + ]; + + meta = with lib; { + description = "Suite of analysis utilities and command line tools for container images"; + homepage = "https://github.com/nexB/container-inspector"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3fd57e228de..f3fb2524974 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1871,6 +1871,8 @@ in { consul = callPackage ../development/python-modules/consul { }; + container-inspector = callPackage ../development/python-modules/container-inspector { }; + contexter = callPackage ../development/python-modules/contexter { }; contextlib2 = callPackage ../development/python-modules/contextlib2 { }; From c2e73ebc70f9318f45fe5063eed0969773af35a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 13:22:40 +0200 Subject: [PATCH 160/201] python310Packages.pip-requirements-parser: init at 31.2.0 --- .../pip-requirements-parser/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/pip-requirements-parser/default.nix diff --git a/pkgs/development/python-modules/pip-requirements-parser/default.nix b/pkgs/development/python-modules/pip-requirements-parser/default.nix new file mode 100644 index 00000000000..d4246d302a2 --- /dev/null +++ b/pkgs/development/python-modules/pip-requirements-parser/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, packaging +, pytestCheckHook +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "pip-requirements-parser"; + version = "31.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "nexB"; + repo = pname; + rev = "v${version}"; + hash = "sha256-i4hw3tS4i2ek2JzcDiGo5aFFJ9J2JJ9MB5vxDhOilb0="; + }; + + dontConfigure = true; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + packaging + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pip_requirements_parser" + ]; + + meta = with lib; { + description = "Module to parse pip requirements"; + homepage = "https://github.com/nexB/pip-requirements-parser"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8ebd87e812a..e1bd721657b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6340,6 +6340,8 @@ in { pip-tools = callPackage ../development/python-modules/pip-tools { }; + pip-requirements-parser = callPackage ../development/python-modules/pip-requirements-parser { }; + pipx = callPackage ../development/python-modules/pipx { }; pivy = callPackage ../development/python-modules/pivy { From 0ecfb204ae24a27c8aa94082675b60ed2ac7818d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 13:36:48 +0200 Subject: [PATCH 161/201] python310Packages.praw: update disable --- pkgs/development/python-modules/praw/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index 3138f4497d5..967ff88be92 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { version = "7.6.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "praw-dev"; From c5dbc6d16165577428f03a50fad798088c5a7c58 Mon Sep 17 00:00:00 2001 From: Sandro Date: Wed, 11 May 2022 13:39:59 +0200 Subject: [PATCH 162/201] =?UTF-8?q?pypiserver:=201.4.2=20->=201.5.0,=20add?= =?UTF-8?q?=20SuperSandro2000=20as=20maintainer,=20add=20to=E2=80=A6=20(#1?= =?UTF-8?q?72417)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: austinbutler --- .../python-modules/pypiserver/default.nix | 36 ++++++++++++++----- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pypiserver/default.nix b/pkgs/development/python-modules/pypiserver/default.nix index d1c6fee942c..ae7a98cfbe8 100644 --- a/pkgs/development/python-modules/pypiserver/default.nix +++ b/pkgs/development/python-modules/pypiserver/default.nix @@ -1,15 +1,23 @@ -{ buildPythonPackage, fetchFromGitHub, lib, passlib, pytestCheckHook, setuptools -, setuptools-git, twine, webtest }: +{ buildPythonPackage +, fetchFromGitHub +, lib +, passlib +, pytestCheckHook +, setuptools +, setuptools-git +, twine +, webtest +}: buildPythonPackage rec { pname = "pypiserver"; - version = "1.4.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1z5rsmqgin98m6ihy1ww42fxxr6jb4hzldn8vlc9ssv7sawdz8vz"; + sha256 = "sha256-BK5vQsaWIMOnUqyeofAWJC1nQJPsTvmzl9i2893JCDI="; }; nativeBuildInputs = [ setuptools-git ]; @@ -20,13 +28,23 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - checkInputs = [ passlib pytestCheckHook twine webtest ]; + checkInputs = [ + passlib + pytestCheckHook + twine + webtest + ]; - # These tests try to use the network disabledTests = [ - "test_pipInstall_openOk" - "test_pipInstall_authedOk" + # fails to install the package "test_hash_algos" + "test_pip_install_authed_succeeds" + "test_pip_install_open_succeeds" + ]; + + disabledTestPaths = [ + # requires docker service running + "docker/test_docker.py" ]; pythonImportsCheck = [ "pypiserver" ]; @@ -35,6 +53,6 @@ buildPythonPackage rec { homepage = "https://github.com/pypiserver/pypiserver"; description = "Minimal PyPI server for use with pip/easy_install"; license = with licenses; [ mit zlib ]; - maintainers = [ maintainers.austinbutler ]; + maintainers = with maintainers; [ austinbutler SuperSandro2000 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4cc1acb82de..369f864df22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22450,6 +22450,8 @@ with pkgs; pypolicyd-spf = python3.pkgs.callPackage ../servers/mail/pypolicyd-spf { }; + pypiserver = with python3Packages; toPythonApplication pypiserver; + qpid-cpp = callPackage ../servers/amqp/qpid-cpp { }; qremotecontrol-server = callPackage ../servers/misc/qremotecontrol-server { }; From 897fdff73b7471c97ddfba5fd6916b5ce8a55438 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 11 May 2022 13:49:56 +0200 Subject: [PATCH 163/201] snapper: 0.10.0 -> 0.10.2 --- pkgs/tools/misc/snapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index e14d3732d76..1df8492a8e2 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "snapper"; - version = "0.10.0"; + version = "0.10.2"; src = fetchFromGitHub { owner = "openSUSE"; repo = "snapper"; rev = "v${version}"; - sha256 = "sha256-02ufjPuXK3a+gQ8kp968KXd3Jgvx4O6TO2Q5wL5n2cw="; + sha256 = "0x9anracaa19yqkc0x8wangrkdrx01kdy07c55lvlqrjyimfm4ih"; }; nativeBuildInputs = [ From 1e2065983e248aaf65a7f7c7de673b798fc6f9b9 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 11 May 2022 14:01:02 +0200 Subject: [PATCH 164/201] octopus: 11.3 -> 11.4 --- pkgs/applications/science/chemistry/octopus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index 86addd5bd69..25749b8947c 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -11,13 +11,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "octopus"; - version = "11.3"; + version = "11.4"; src = fetchFromGitLab { owner = "octopus-code"; repo = "octopus"; rev = version; - sha256 = "0n04yvnc0rg3lvnkkdpbwkfl6zg544260p3s65vwkc5dflrhk34r"; + sha256 = "1z423sjpc4ajjy3s7623z3rfwmp2hgis7iiiy8gb5apw73k33dyv"; }; nativeBuildInputs = [ From ef38006a31d5cbf616e91942c1fcd7ce76d525d0 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 11 May 2022 22:50:50 +1000 Subject: [PATCH 165/201] shfmt: 3.4.3 -> 3.5.0 https://github.com/mvdan/sh/releases/tag/v3.5.0 --- pkgs/tools/text/shfmt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index 061e1f709eb..e23e79473b1 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "shfmt"; - version = "3.4.3"; + version = "3.5.0"; src = fetchFromGitHub { owner = "mvdan"; repo = "sh"; rev = "v${version}"; - sha256 = "sha256-tE7U/hE1Z/9VZTYt2jU0IE11cS01l6wTPVFuXH36sM4="; + sha256 = "sha256-ZhuOOZ+Lttan7R5YgpiM5okGNkSH0NRUj4hHd1ELbLI="; }; - vendorSha256 = "sha256-ZYsQ+wE+G7xNrBN29npSxxPCz9+Wb/RsBzM5uwJkhO8="; + vendorSha256 = "sha256-3eao9bORPTsyCFpafp89mcL2Y7HNBlDfUsTull7qnYs="; subPackages = [ "cmd/shfmt" ]; From 0a2adbd84772c6856ada04a964a51ed0c4ed500f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 11 May 2022 09:18:31 -0400 Subject: [PATCH 166/201] python3Packages.validict: init at 0.5.1 (#171558) Co-authored-by: Sandro --- .../python-modules/validobj/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/validobj/default.nix diff --git a/pkgs/development/python-modules/validobj/default.nix b/pkgs/development/python-modules/validobj/default.nix new file mode 100644 index 00000000000..2cf21522d4b --- /dev/null +++ b/pkgs/development/python-modules/validobj/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, flit +, hypothesis +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "validobj"; + version = "0.5.1"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "430b0b56931a2cebdb857a9fe9da2467c06a3b4db37b728e7f1a8706e8887705"; + }; + + nativeBuildInputs = [ flit ]; + + checkInputs = [ hypothesis pytestCheckHook ]; + + pythonImportsCheck = [ "validobj" ]; + + meta = with lib; { + description = "Validobj is library that takes semistructured data (for example JSON and YAML configuration files) and converts it to more structured Python objects"; + homepage = "https://github.com/Zaharid/validobj"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3fd57e228de..ddfc13fc4af 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10722,6 +10722,8 @@ in { validictory = callPackage ../development/python-modules/validictory { }; + validobj = callPackage ../development/python-modules/validobj { }; + variants = callPackage ../development/python-modules/variants { }; varint = callPackage ../development/python-modules/varint { }; From b085aefbd40eb0d7b99572658beaad1428f42226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20He=C3=9Felmann?= Date: Wed, 11 May 2022 11:59:19 +0200 Subject: [PATCH 167/201] python3Packages.openshift: fix disabled tests --- pkgs/development/python-modules/openshift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openshift/default.nix b/pkgs/development/python-modules/openshift/default.nix index c233f88c73f..497af2e735d 100644 --- a/pkgs/development/python-modules/openshift/default.nix +++ b/pkgs/development/python-modules/openshift/default.nix @@ -44,8 +44,8 @@ buildPythonPackage rec { ]; disabledTestPaths = [ - # requires docker - "test/functional" + # requires kubeconfig + "test/integration" ]; meta = with lib; { From b116e88556d80ae6ba0d44ca3de384ba2520e8bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Mon, 17 Jan 2022 15:40:48 +0100 Subject: [PATCH 168/201] split2flac: removed --- .../applications/audio/split2flac/default.nix | 62 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 1 insertion(+), 66 deletions(-) delete mode 100644 pkgs/applications/audio/split2flac/default.nix diff --git a/pkgs/applications/audio/split2flac/default.nix b/pkgs/applications/audio/split2flac/default.nix deleted file mode 100644 index 5de48d1b296..00000000000 --- a/pkgs/applications/audio/split2flac/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper -, shntool, cuetools -, flac, faac, mp4v2, wavpack, mac -, imagemagick, libiconv, enca, lame, mutagen, vorbis-tools -, aacgain, mp3gain, vorbisgain -}: - -let - wrapSplit2flac = format: '' - makeWrapper $out/bin/.split2flac-wrapped $out/bin/split2${format} \ - --set SPLIT2FLAC_FORMAT ${format} \ - --prefix PATH : ${lib.makeBinPath [ - shntool cuetools - flac faac mp4v2 wavpack mac - imagemagick libiconv enca lame mutagen vorbis-tools - aacgain mp3gain vorbisgain - ]} - ''; - -in stdenv.mkDerivation rec { - pname = "split2flac"; - version = "122"; - - src = fetchFromGitHub { - owner = "ftrvxmtrx"; - repo = "split2flac"; - rev = version; - sha256 = "1a71amamip25hhqx7wwzfcl3d5snry9xsiha0kw73iq2m83r2k63"; - }; - - dontBuild = true; - - nativeBuildInputs = [ makeWrapper ]; - - patchPhase = '' - substituteInPlace split2flac \ - --replace 'FORMAT="''${0##*split2}"' 'FORMAT=''${SPLIT2FLAC_FORMAT:-flac}' - ''; - - installPhase = '' - mkdir -p $out/share/bash-completion/completions - cp split2flac-bash-completion.sh \ - $out/share/bash-completion/completions/split2flac-bash-completion.sh - - mkdir -p $out/bin - cp split2flac $out/bin/.split2flac-wrapped - - ${wrapSplit2flac "flac"} - ${wrapSplit2flac "mp3"} - ${wrapSplit2flac "ogg"} - ${wrapSplit2flac "m4a"} - ${wrapSplit2flac "wav"} - ''; - - meta = with lib; { - description = "Split flac/ape/wv/wav + cue sheet into separate tracks"; - homepage = "https://github.com/ftrvxmtrx/split2flac"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ jfrankenau ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d44822c31c9..c0980a97dab 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1240,6 +1240,7 @@ mapAliases ({ spidermonkey_68 = throw "spidermonkey_68 has been removed. Please use spidermonkey_91 instead"; # added 2022-01-04 # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell spidermonkey = spidermonkey_78; # Added 2020-10-09 + split2flac = throw "split2flac has been removed. Consider using the shnsplit command from shntool package or help packaging unflac."; # added 2022-01-13 spring-boot = spring-boot-cli; # added 2020-04-24 sqlite3_analyzer = throw "'sqlite3_analyzer' has been renamed to/replaced by 'sqlite-analyzer'"; # Converted to throw 2022-02-22 sqliteInteractive = throw "'sqliteInteractive' has been renamed to/replaced by 'sqlite-interactive'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 369f864df22..64f9b277566 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29502,10 +29502,6 @@ with pkgs; spideroak = callPackage ../applications/networking/spideroak { }; - split2flac = callPackage ../applications/audio/split2flac { - inherit (python3.pkgs) mutagen; - }; - spotify-qt = libsForQt5.callPackage ../applications/audio/spotify-qt { }; spotify-tray = callPackage ../applications/misc/spotify-tray { }; From a4022cf3de27d356df8d40c1b9f5b9d00cce543e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Wed, 11 May 2022 15:57:52 +0200 Subject: [PATCH 169/201] sptlrx: add version test --- pkgs/applications/audio/sptlrx/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/sptlrx/default.nix b/pkgs/applications/audio/sptlrx/default.nix index 2ec9562c620..ffe4741d179 100644 --- a/pkgs/applications/audio/sptlrx/default.nix +++ b/pkgs/applications/audio/sptlrx/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, sptlrx }: buildGoModule rec { pname = "sptlrx"; @@ -15,6 +15,12 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; + passthru.tests.version = testers.testVersion { + package = sptlrx; + # TODO Wrong version in `0.2.0`. Has been fixed upstream. + version = "v0.1.0"; + }; + meta = with lib; { description = "Spotify lyrics in your terminal"; homepage = "https://github.com/raitonoberu/sptlrx"; From 0825d9ad8842ed5d5507109f470bebf946c6827d Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 11 May 2022 14:58:10 +0100 Subject: [PATCH 170/201] terragrunt: 0.36.11 -> 0.37.0 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 502b2bf41ef..57cd5e11df8 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.36.11"; + version = "0.37.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kXa3iG94WTH6KpQksl2r0yXyr4KuLY2AZdZtZ6zWYUA="; + sha256 = "sha256-7nil/T6q1crZh9ARTP615UzfjKcgsclpIt2N1ifABBk="; }; vendorSha256 = "sha256-7SUf4r+6r6dkBoBZFg2AUK114QEl0+1lwRA4ymYArFs="; From 26d686cc860bf438ee818caaaa01180ada7f8493 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Wed, 11 May 2022 10:17:37 -0400 Subject: [PATCH 171/201] cloudflared: 2022.5.0 -> 2022.5.1 --- pkgs/applications/networking/cloudflared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index c75c5824283..96cddf0f42a 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2022.5.0"; + version = "2022.5.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - hash = "sha256-vz0fxSzx0vOpZy6/MVfZ467c9qdHUWZIL5wklTnnBBA="; + hash = "sha256-yv4ulVkc7WX6T287kXecyE6lFlxh4YKAi2UCGkOf/lk="; }; vendorSha256 = null; From 96a514a232c866ffc044c88214390ee30bd6804b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 11 May 2022 14:51:37 +0200 Subject: [PATCH 172/201] python3.pkgs.ldaptor: disable checks, remove broken --- pkgs/development/python-modules/ldaptor/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ldaptor/default.nix b/pkgs/development/python-modules/ldaptor/default.nix index 1f6975ff255..55725fb49c9 100644 --- a/pkgs/development/python-modules/ldaptor/default.nix +++ b/pkgs/development/python-modules/ldaptor/default.nix @@ -33,6 +33,11 @@ buildPythonPackage rec { twisted ]; + # Test creates an excessive amount of temporary files (order of millions). + # Cleaning up those files already took over 15 hours already on my zfs + # filesystem and is not finished yet. + doCheck = false; + checkPhase = '' trial -j$NIX_BUILD_CORES ldaptor ''; @@ -42,7 +47,5 @@ buildPythonPackage rec { homepage = "https://github.com/twisted/ldaptor"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; - # tests hang or fail with "no space left on device" - broken = true; }; } From 89c7a24cef2057bbf2996ad1a1924120a5d2d04c Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 10 May 2022 21:05:27 -0400 Subject: [PATCH 173/201] flyctl: add testVersion as simple smoke test --- pkgs/development/web/flyctl/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 0e569ad70df..714cab494f7 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib, testers, flyctl }: buildGoModule rec { pname = "flyctl"; @@ -32,9 +32,15 @@ buildGoModule rec { ''; postCheck = '' - go test ./... -ldflags="-X 'github.com/superfly/flyctl/internal/buildinfo.buildDate=1970-01-01T00:00:00+0000'" + go test ./... -ldflags="-X 'github.com/superfly/flyctl/internal/buildinfo.buildDate=1970-01-01T00:00:00Z'" ''; + passthru.tests.version = testers.testVersion { + package = flyctl; + command = "HOME=$(mktemp -d) flyctl version"; + version = "v${flyctl.version}"; + }; + meta = with lib; { description = "Command line tools for fly.io services"; downloadPage = "https://github.com/superfly/flyctl"; From 464db0cb7839c6c699eb8e903d9d7b86df3e02bc Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Sun, 1 May 2022 00:17:46 +0800 Subject: [PATCH 174/201] gtkd: 3.9.0 -> 3.10.0 --- pkgs/development/libraries/gtkd/default.nix | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index 18fedb2c17d..8666a531f16 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, dcompiler, gdk-pixbuf, gnome, gst_all_1, librsvg +{ lib, stdenv, fetchzip, atk, cairo, dcompiler, gdk-pixbuf, gnome, gst_all_1, librsvg , glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }: let inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad; in stdenv.mkDerivation rec { pname = "gtkd"; - version = "3.9.0"; + version = "3.10.0"; outputs = [ "out" "dev" ]; src = fetchzip { url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip"; - sha256 = "12kc4s5gp6gn456d8pzhww1ggi9qbxldmcpp6855297g2x8xxy5p"; + sha256 = "DEKVDexGyg/T3SdnnvRjaHq1LbDo8ekNslxKROpMCCE="; stripRoot = false; }; @@ -21,20 +21,7 @@ in stdenv.mkDerivation rec { libgda libpeas librsvg pango vte ]; - patches = [ - # Fix makefile not installing .pc's - (fetchpatch { - url = "https://github.com/gtkd-developers/GtkD/commit/a9db09117ab27127ca4c3b8d2f308fae483a9199.patch"; - sha256 = "0ngyqifw1kandc1vk01kms3z65pcisfd75q7z09rml96glhfzjd6"; - }) - # Fix breakage with dmd ldc 1.26 and newer - (fetchpatch { - url = "https://github.com/gtkd-developers/GtkD/commit/323ff96c648882eaca2faee170bd9e90c6e1e9c3.patch"; - sha256 = "1rhyi0isl6fl5i6fgsinvgq6v72xq7c6sajrxcsnmrzpvw91il3d"; - }) - ]; - - prePatch = '' + postPatch = '' substituteAll ${./paths.d} generated/gtkd/gtkd/paths.d substituteInPlace generated/gstreamer/gst/app/c/functions.d \ From 945365017ae592a63c23685e5257893b6963d138 Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Sun, 1 May 2022 01:19:17 +0800 Subject: [PATCH 175/201] gtkd: remove the dev output to resolve cycle dependency --- pkgs/development/libraries/gtkd/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index 8666a531f16..d773434b832 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -7,8 +7,6 @@ in stdenv.mkDerivation rec { pname = "gtkd"; version = "3.10.0"; - outputs = [ "out" "dev" ]; - src = fetchzip { url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip"; sha256 = "DEKVDexGyg/T3SdnnvRjaHq1LbDo8ekNslxKROpMCCE="; From 9d39485d5863644100c622ae0ad55b6fb0429051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 11 May 2022 16:00:59 +0000 Subject: [PATCH 176/201] python3Packages.diagrams: relax version constraints --- pkgs/development/python-modules/diagrams/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/diagrams/default.nix b/pkgs/development/python-modules/diagrams/default.nix index 84d98d09135..5708a17d6f0 100644 --- a/pkgs/development/python-modules/diagrams/default.nix +++ b/pkgs/development/python-modules/diagrams/default.nix @@ -27,8 +27,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'jinja2 = "^2.10"' 'jinja2 = "*"' \ - --replace 'graphviz = ">=0.13.2,<0.17.0"' 'graphviz = "*"' + --replace 'graphviz = ">=0.13.2,<0.20.0"' 'graphviz = "*"' ''; preConfigure = '' From 15cf12c0ac44c1884027cc6e304bf0b00a894d53 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Wed, 11 May 2022 12:08:20 -0400 Subject: [PATCH 177/201] singular: fix darwin build --- pkgs/applications/science/math/singular/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 23712061160..aad3eaf529a 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -4,6 +4,7 @@ , buildPackages , sharutils , file +, getconf , flint , ntl , cddlib @@ -87,7 +88,7 @@ stdenv.mkDerivation rec { latex2html texinfo4 texlive.combined.scheme-small - ]; + ] ++ lib.optionals stdenv.isDarwin [ getconf ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; preAutoreconf = '' From 542eff225dcacac9d105b835333a70bcb5b75500 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 11 May 2022 18:18:56 +0200 Subject: [PATCH 178/201] =?UTF-8?q?cloudsmith-cli:=200.31.1=20=E2=86=92=20?= =?UTF-8?q?0.32.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix compatibility with latest cloudsmith-api. --- pkgs/development/tools/cloudsmith-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/cloudsmith-cli/default.nix b/pkgs/development/tools/cloudsmith-cli/default.nix index c58455ac24b..46e2a7801f6 100644 --- a/pkgs/development/tools/cloudsmith-cli/default.nix +++ b/pkgs/development/tools/cloudsmith-cli/default.nix @@ -4,14 +4,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cloudsmith-cli"; - version = "0.31.1"; + version = "0.32.0"; format = "wheel"; src = python3.pkgs.fetchPypi { pname = "cloudsmith_cli"; inherit format version; - sha256 = "sha256-r8h0fHePZoqy/oFOedkwAke0b+Huasuv+sWcL92EZ+k="; + sha256 = "ZETVtRlzd9KUOeDyAH0MnnIy1WtGLVBm+bActUM4zBw="; }; propagatedBuildInputs = with python3.pkgs; [ From 77e956ef7685ed489bcb1e775065af7610e4354d Mon Sep 17 00:00:00 2001 From: ppenguin Date: Wed, 11 May 2022 18:55:12 +0200 Subject: [PATCH 179/201] Update pkgs/development/python-modules/pandoc-xnos/default.nix Co-authored-by: Sandro --- pkgs/development/python-modules/pandoc-xnos/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/pandoc-xnos/default.nix b/pkgs/development/python-modules/pandoc-xnos/default.nix index 28044d4bc24..ce365708b35 100644 --- a/pkgs/development/python-modules/pandoc-xnos/default.nix +++ b/pkgs/development/python-modules/pandoc-xnos/default.nix @@ -19,8 +19,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ pandocfilters psutil ]; - doCheck = true; - pythonImportsCheck = [ "pandocxnos" ]; meta = with lib; { From e8e6743b280a33e1538bfa719d39fd93e42ab701 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 10 May 2022 22:27:39 +0200 Subject: [PATCH 180/201] neopg: drop Broken since 2020-11-30 --- pkgs/tools/security/neopg/default.nix | 49 --------------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 51 deletions(-) delete mode 100644 pkgs/tools/security/neopg/default.nix diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix deleted file mode 100644 index e39be14475e..00000000000 --- a/pkgs/tools/security/neopg/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -, sqlite -, botan2 -, boost -, curl -, gettext -, pkg-config -, libusb1 -, gnutls }: - -stdenv.mkDerivation rec { - pname = "neopg"; - version = "0.0.6"; - - src = fetchFromGitHub { - owner = "das-labor"; - repo = "neopg"; - rev = "v${version}"; - sha256 = "15xp5w046ix59cfrhh8ka4camr0d8qqw643g184sqrcqwpk7nbrx"; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ cmake gettext pkg-config ]; - - buildInputs = [ sqlite botan2 boost curl libusb1 gnutls ]; - - doCheck = true; - checkTarget = "test"; - dontUseCmakeBuildDir = true; - - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$(pwd)/3rdparty/googletest/googletest:$(pwd)/neopg - ''; - - meta = with lib; { - homepage = "https://neopg.io/"; - description = "Modern replacement for GnuPG 2"; - license = licenses.gpl3; - longDescription = '' - NeoPG starts as an opiniated fork of GnuPG 2 to clean up the code and make it easier to develop. - It is written in C++11. - ''; - maintainers = with maintainers; [ erictapen ]; - platforms = platforms.linux; - broken = true; # fails to build with recent versions of botan. https://github.com/das-labor/neopg/issues/98 - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e92bb50379..616a18d67cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8533,8 +8533,6 @@ with pkgs; ndisc6 = callPackage ../tools/networking/ndisc6 { }; - neopg = callPackage ../tools/security/neopg { }; - netboot = callPackage ../tools/networking/netboot {}; netbootxyz-efi = callPackage ../tools/misc/netbootxyz-efi { }; From 2b6ad306109d108711219e9c5e9fa5e58ffdad40 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 10 May 2022 22:29:52 +0200 Subject: [PATCH 181/201] libdap: drop Broken since 2020-08-15 --- pkgs/development/libraries/libdap/default.nix | 23 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 25 deletions(-) delete mode 100644 pkgs/development/libraries/libdap/default.nix diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix deleted file mode 100644 index 8eacd9706a8..00000000000 --- a/pkgs/development/libraries/libdap/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }: - -stdenv.mkDerivation rec { - version = "3.20.6"; - pname = "libdap"; - - nativeBuildInputs = [ bison flex ]; - buildInputs = [ libuuid curl libxml2 ]; - - src = fetchurl { - url = "https://www.opendap.org/pub/source/${pname}-${version}.tar.gz"; - sha256 = "0jn5bi8k2lq6mmrsw7r1r5aviyf8gb39b2iy20v4kpkj5napzk1m"; - }; - - meta = with lib; { - description = "A C++ SDK which contains an implementation of DAP"; - homepage = "https://www.opendap.org/software/libdap"; - license = licenses.lgpl2; - maintainers = [ maintainers.bzizou ]; - platforms = platforms.linux; - broken = true; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 616a18d67cc..5d5945f9ab8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18333,8 +18333,6 @@ with pkgs; libdaemon = callPackage ../development/libraries/libdaemon { }; - libdap = callPackage ../development/libraries/libdap { }; - libdatrie = callPackage ../development/libraries/libdatrie { }; libdazzle = callPackage ../development/libraries/libdazzle { }; From d14b6e65fffc88872063d6e0c6f4635bfd6c887e Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 10 May 2022 22:31:58 +0200 Subject: [PATCH 182/201] samsung-unified-linux-driver_4_00_39: drop Broken since 2018-10-03 --- .../cups/drivers/samsung/4.00.39/default.nix | 44 ------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 45 deletions(-) delete mode 100644 pkgs/misc/cups/drivers/samsung/4.00.39/default.nix diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix deleted file mode 100644 index 92f5fdc409c..00000000000 --- a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -# Tested on linux-x86_64. Might work on linux-i386. Probably won't work on anything else. - -# To use this driver in NixOS, add it to printing.drivers in configuration.nix. -# configuration.nix might look like this when you're done: -# { pkgs, ... }: { -# printing = { -# enable = true; -# drivers = [ pkgs.samsungUnifiedLinuxDriver ]; -# }; -# (more stuff) -# } -# (This advice was tested on 2010 August 2.) - -{ lib, stdenv, fetchurl, cups, gcc, ghostscript, glibc, patchelf }: - -# Do not bump lightly! Visit -# to see what will break when upgrading. Consider a new versioned attribute. -let - cups' = lib.getLib cups; -in stdenv.mkDerivation rec { - pname = "samsung-UnifiedLinuxDriver"; - version = "4.00.39"; - - src = fetchurl { - url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz"; - sha256 = "144b4xggbzjfq7ga5nza7nra2cf6qn63z5ls7ba1jybkx1vm369k"; - }; - - nativeBuildInputs = [ patchelf ]; - buildInputs = [ cups' gcc ghostscript glibc ]; - - inherit gcc ghostscript glibc; - cups = cups'; - - builder = ./builder.sh; - - meta = with lib; { - description = "Samsung's Linux printing drivers; includes binaries without source code"; - homepage = "http://www.samsung.com/"; - license = licenses.unfree; - platforms = platforms.linux; - broken = true; # libscmssc.so and libmfp.so can't find their library dependencies at run-time - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d5945f9ab8..d51b392fb00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34520,7 +34520,6 @@ with pkgs; samsung-unified-linux-driver_1_00_36 = callPackage ../misc/cups/drivers/samsung/1.00.36 { }; samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung/1.00.37.nix { }; - samsung-unified-linux-driver_4_00_39 = callPackage ../misc/cups/drivers/samsung/4.00.39 { }; samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { }; samsung-unified-linux-driver = res.samsung-unified-linux-driver_4_01_17; From bb38235dc6835d83534d5265271ae35b5b36c1e4 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 10 May 2022 22:33:14 +0200 Subject: [PATCH 183/201] infobar: drop Broken since 2019-06-12 --- .../audio/deadbeef/plugins/infobar.nix | 34 ------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 35 deletions(-) delete mode 100644 pkgs/applications/audio/deadbeef/plugins/infobar.nix diff --git a/pkgs/applications/audio/deadbeef/plugins/infobar.nix b/pkgs/applications/audio/deadbeef/plugins/infobar.nix deleted file mode 100644 index 3f62e73e7e4..00000000000 --- a/pkgs/applications/audio/deadbeef/plugins/infobar.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, deadbeef, gtk3, libxml2 }: - -stdenv.mkDerivation rec { - pname = "deadbeef-infobar-plugin"; - version = "1.4"; - - src = fetchurl { - url = "https://bitbucket.org/dsimbiriatin/deadbeef-infobar/downloads/deadbeef-infobar-${version}.tar.gz"; - sha256 = "0c9wh3wh1hdww7v96i8cy797la06mylhfi0880k8vwh88079aapf"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ deadbeef gtk3 libxml2 ]; - - buildFlags = [ "gtk3" ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib/deadbeef - cp gtk3/ddb_infobar_gtk3.so $out/lib/deadbeef - - runHook postInstall - ''; - - meta = with lib; { - broken = true; # crashes DeaDBeeF and is abandoned (https://bitbucket.org/dsimbiriatin/deadbeef-infobar/issues/38/infobar-causes-deadbeef-180-to-crash) - description = "DeaDBeeF Infobar Plugin"; - homepage = "https://bitbucket.org/dsimbiriatin/deadbeef-infobar"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.jtojnar ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d51b392fb00..1062cf167f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25727,7 +25727,6 @@ with pkgs; deadbeefPlugins = { headerbar-gtk3 = callPackage ../applications/audio/deadbeef/plugins/headerbar-gtk3.nix { }; - infobar = callPackage ../applications/audio/deadbeef/plugins/infobar.nix { }; lyricbar = callPackage ../applications/audio/deadbeef/plugins/lyricbar.nix { }; mpris2 = callPackage ../applications/audio/deadbeef/plugins/mpris2.nix { }; statusnotifier = callPackage ../applications/audio/deadbeef/plugins/statusnotifier.nix { }; From 70aad78d1931a1496bc5ead8a444422c69d2a7e8 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 10 May 2022 22:34:19 +0200 Subject: [PATCH 184/201] vogl: drop Broken since 2019-10-07 --- pkgs/development/tools/vogl/default.nix | 57 ------------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 59 deletions(-) delete mode 100644 pkgs/development/tools/vogl/default.nix diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix deleted file mode 100644 index 2e9e8936ddb..00000000000 --- a/pkgs/development/tools/vogl/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ mkDerivation, lib, fetchFromGitHub -, cmake, git, pkg-config, wget, zip -, qtbase, qtx11extras -, libdwarf, libjpeg_turbo, libunwind, xz, tinyxml, libX11 -, SDL2, SDL2_gfx, SDL2_image, SDL2_ttf -, freeglut, libGLU -, fetchpatch -}: - -mkDerivation { - pname = "vogl"; - version = "2016-05-13"; - - src = fetchFromGitHub { - owner = "deepfire"; - repo = "vogl"; - rev = "cbc5f1853e294b363f16c4e00b3e0c49dbf74559"; - sha256 = "17gwd73x3lnqv6ccqs48pzqwbzjhbn41c0x0l5zzirhiirb3yh0n"; - }; - - patches = [ - (fetchpatch { - name = "fix-qt59.patch"; - url = "https://github.com/ValveSoftware/vogl/commit/be3d85f.patch"; - sha256 = "1yh4jd35mds337waqxdw3w22w7ghn05b5jm7fb4iihl39mhq6qyv"; - }) - ]; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ - git wget zip - qtbase qtx11extras - libdwarf libjpeg_turbo libunwind xz tinyxml libX11 - SDL2 SDL2_gfx SDL2_image SDL2_ttf - freeglut libGLU - ]; - - dontUseCmakeBuildDir = true; - preConfigure = '' - cmakeDir=$PWD - mkdir -p vogl/vogl_build/release64 && cd $_ - ''; - cmakeFlags = [ - "-DCMAKE_VERBOSE=On" - "-DBUILD_X64=On" - ]; - - meta = with lib; { - description = "OpenGL capture / playback debugger"; - homepage = "https://github.com/ValveSoftware/vogl"; - license = licenses.mit; - maintainers = [ maintainers.deepfire ]; - platforms = [ "x86_64-linux" "i686-linux" ]; - broken = true; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1062cf167f7..f48b2195a81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30377,8 +30377,6 @@ with pkgs; vocal = callPackage ../applications/audio/vocal { }; - vogl = libsForQt5.callPackage ../development/tools/vogl { }; - volnoti = callPackage ../applications/misc/volnoti { }; vorbis-tools = callPackage ../applications/audio/vorbis-tools { From 0bd5909ea7ae25fb5cd2667128d3c161abcbdb76 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 10 May 2022 22:35:26 +0200 Subject: [PATCH 185/201] openbr: drop Broken since 2016-05-08 --- pkgs/development/libraries/openbr/default.nix | 27 ------------------- pkgs/top-level/qt5-packages.nix | 2 -- 2 files changed, 29 deletions(-) delete mode 100644 pkgs/development/libraries/openbr/default.nix diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix deleted file mode 100644 index 8e56e250ac4..00000000000 --- a/pkgs/development/libraries/openbr/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, opencv, qtbase, qtsvg }: - -stdenv.mkDerivation { - - version = "0.5"; - pname = "openbr"; - - src = fetchFromGitHub { - owner = "biometrics"; - repo = "openbr"; - rev = "cc364a89a86698cd8d3052f42a3cb520c929b325"; - sha256 = "12y00cf5dlzp9ciiwbihf6xhlkdxpydhscv5hwp83qjdllid9rrz"; - }; - - buildInputs = [ opencv qtbase qtsvg ]; - - nativeBuildInputs = [ cmake ]; - - meta = { - description = "Open Source Biometric Recognition"; - homepage = "http://openbiometrics.org/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [flosse]; - platforms = with lib.platforms; linux; - broken = true; - }; -} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 7629790d50d..8551c5f9bff 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -154,8 +154,6 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea mlt = callPackage ../development/libraries/mlt/qt-5.nix { }; - openbr = callPackage ../development/libraries/openbr { }; - phonon = callPackage ../development/libraries/phonon { }; phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix { }; From 63453563237eb2868de6be359eb49a3090a836ac Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 10 May 2022 22:37:06 +0200 Subject: [PATCH 186/201] pdftk-legacy: drop Broken since 2020-08-24 --- pkgs/tools/typesetting/pdftk/legacy.nix | 44 ------------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 45 deletions(-) delete mode 100644 pkgs/tools/typesetting/pdftk/legacy.nix diff --git a/pkgs/tools/typesetting/pdftk/legacy.nix b/pkgs/tools/typesetting/pdftk/legacy.nix deleted file mode 100644 index 18997887037..00000000000 --- a/pkgs/tools/typesetting/pdftk/legacy.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ fetchurl, lib, stdenv, gcj, unzip }: - -stdenv.mkDerivation rec { - pname = "pdftk"; - version = "2.02"; - - src = fetchurl { - url = "https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-${version}-src.zip"; - sha256 = "1hdq6zm2dx2f9h7bjrp6a1hfa1ywgkwydp14i2sszjiszljnm3qi"; - }; - - nativeBuildInputs = [ gcj unzip ]; - - hardeningDisable = [ "fortify" "format" ]; - - preBuild = '' - cd pdftk - sed -e 's@/usr/bin/@@g' -i Makefile.* - NIX_ENFORCE_PURITY= \ - make \ - LIBGCJ="${gcj.cc}/share/java/libgcj-${gcj.cc.version}.jar" \ - GCJ=gcj GCJH=gcjh GJAR=gjar \ - -iC ../java all - ''; - - # Makefile.Debian has almost fitting defaults - makeFlags = [ "-f" "Makefile.Debian" "VERSUFF=" ]; - - installPhase = '' - mkdir -p $out/bin $out/share/man/man1 - cp pdftk $out/bin - cp ../pdftk.1 $out/share/man/man1 - ''; - - - meta = { - description = "Simple tool for doing everyday things with PDF documents"; - homepage = "https://www.pdflabs.com/tools/pdftk-server/"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ raskin ]; - platforms = with lib.platforms; linux; - broken = true; # Broken on Hydra since 2020-08-24 - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f48b2195a81..f8d2ce064a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28856,7 +28856,6 @@ with pkgs; pdftk = callPackage ../tools/typesetting/pdftk { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - pdftk-legacy = lowPrio (callPackage ../tools/typesetting/pdftk/legacy.nix { }); pdfgrep = callPackage ../tools/typesetting/pdfgrep { }; pdfpc = callPackage ../applications/misc/pdfpc { From d86c6050269100d5384ad4db293f08e7d6bdc4d9 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Tue, 10 May 2022 08:26:59 -0400 Subject: [PATCH 187/201] libnvidia-container: 1.5.0 -> 1.9.0 --- .../libnvidia-container/default.nix | 81 +++++++++++++------ .../libnvidia-container/inline-c-struct.patch | 14 ++++ .../libnvidia-container/modprobe.patch | 12 +-- 3 files changed, 76 insertions(+), 31 deletions(-) create mode 100644 pkgs/applications/virtualization/libnvidia-container/inline-c-struct.patch diff --git a/pkgs/applications/virtualization/libnvidia-container/default.nix b/pkgs/applications/virtualization/libnvidia-container/default.nix index c7743bf44fc..c74416ac33b 100644 --- a/pkgs/applications/virtualization/libnvidia-container/default.nix +++ b/pkgs/applications/virtualization/libnvidia-container/default.nix @@ -1,5 +1,6 @@ { stdenv , lib +, addOpenGLRunpath , fetchFromGitHub , pkg-config , libelf @@ -8,25 +9,31 @@ , rpcsvc-proto , libtirpc , makeWrapper +, substituteAll +, go }: let - modp-ver = "450.57"; + modprobeVersion = "495.44"; nvidia-modprobe = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-modprobe"; - rev = modp-ver; - sha256 = "0r4f6lpbbqqs9932xd2mr7bxn6a3xdalcwq332fc1amrrkgzfyv7"; + rev = modprobeVersion; + sha256 = "sha256-Y3ZOfge/EcmhqI19yWO7UfPqkvY1CHHvFC5l9vYyGuU="; + }; + modprobePatch = substituteAll { + src = ./modprobe.patch; + inherit modprobeVersion; }; in stdenv.mkDerivation rec { pname = "libnvidia-container"; - version = "1.5.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b9yQ1mEo1EkjXMguV0t98OvFEQO4h76EVu154MsB2II="; + sha256 = "sha256-7OTawWwjeKU8wIa8I/+aSvAJli4kEua94nJSNyCajpE="; }; patches = [ @@ -36,18 +43,8 @@ stdenv.mkDerivation rec { # path. ./libnvc-ldconfig-and-path-fixes.patch - # the libnvidia-container Makefile wants to build and install static - # libtirpc libraries; this patch prevents that from happening - ./avoid-static-libtirpc-build.patch - ]; - - makeFlags = [ - "WITH_LIBELF=yes" - "prefix=$(out)" - # we can't use the WITH_TIRPC=yes flag that exists in the Makefile for the - # same reason we patch out the static library use of libtirpc so we set the - # define in CFLAGS - "CFLAGS=-DWITH_TIRPC" + # fix bogus struct declaration + ./inline-c-struct.patch ]; postPatch = '' @@ -56,27 +53,61 @@ stdenv.mkDerivation rec { -e 's/^COMPILER :=.*/COMPILER = $(CC)/' \ mk/common.mk - mkdir -p deps/src/nvidia-modprobe-${modp-ver} - cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modp-ver} + mkdir -p deps/src/nvidia-modprobe-${modprobeVersion} + cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modprobeVersion} chmod -R u+w deps/src pushd deps/src - patch -p0 < ${./modprobe.patch} - touch nvidia-modprobe-${modp-ver}/.download_stamp + + patch -p0 < ${modprobePatch} + touch nvidia-modprobe-${modprobeVersion}/.download_stamp popd + + # 1. replace DESTDIR=$(DEPS_DIR) with empty strings to prevent copying + # things into deps/src/nix/store + # 2. similarly, remove any paths prefixed with DEPS_DIR + # 3. prevent building static libraries because we don't build static + # libtirpc (for now) + # 4. prevent installation of static libraries because of step 3 + # 5. prevent installation of libnvidia-container-go.so twice + sed -i Makefile \ + -e 's#DESTDIR=\$(DEPS_DIR)#DESTDIR=""#g' \ + -e 's#\$(DEPS_DIR)\$#\$#g' \ + -e 's#all: shared static tools#all: shared tools#g' \ + -e '/$(INSTALL) -m 644 $(LIB_STATIC) $(DESTDIR)$(libdir)/d' \ + -e '/$(INSTALL) -m 755 $(libdir)\/$(LIBGO_SHARED) $(DESTDIR)$(libdir)/d' ''; - postInstall = '' - wrapProgram $out/bin/nvidia-container-cli \ - --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:/run/opengl-driver-32/lib + enableParallelBuilding = true; + + preBuild = '' + HOME="$(mktemp -d)" ''; NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; NIX_LDFLAGS = [ "-L${libtirpc.dev}/lib" "-ltirpc" ]; - nativeBuildInputs = [ pkg-config rpcsvc-proto makeWrapper ]; + nativeBuildInputs = [ pkg-config go rpcsvc-proto makeWrapper ]; buildInputs = [ libelf libcap libseccomp libtirpc ]; + makeFlags = [ + "WITH_LIBELF=yes" + "prefix=$(out)" + # we can't use the WITH_TIRPC=yes flag that exists in the Makefile for the + # same reason we patch out the static library use of libtirpc so we set the + # define in CFLAGS + "CFLAGS=-DWITH_TIRPC" + ]; + + postInstall = + let + inherit (addOpenGLRunpath) driverLink; + libraryPath = lib.makeLibraryPath [ "$out" driverLink "${driverLink}-32" ]; + in + '' + wrapProgram $out/bin/nvidia-container-cli --prefix LD_LIBRARY_PATH : ${libraryPath} + ''; + meta = with lib; { homepage = "https://github.com/NVIDIA/libnvidia-container"; description = "NVIDIA container runtime library"; diff --git a/pkgs/applications/virtualization/libnvidia-container/inline-c-struct.patch b/pkgs/applications/virtualization/libnvidia-container/inline-c-struct.patch new file mode 100644 index 00000000000..dab574e5839 --- /dev/null +++ b/pkgs/applications/virtualization/libnvidia-container/inline-c-struct.patch @@ -0,0 +1,14 @@ +diff --git a/src/nvcgo.c b/src/nvcgo.c +index 98789a3..47ad02b 100644 +--- a/src/nvcgo.c ++++ b/src/nvcgo.c +@@ -33,7 +33,8 @@ + void nvcgo_program_1(struct svc_req *, register SVCXPRT *); + + static struct nvcgo_ext { +- struct nvcgo; ++ struct rpc rpc; ++ struct libnvcgo api; + bool initialized; + void *dl_handle; + } global_nvcgo_context; diff --git a/pkgs/applications/virtualization/libnvidia-container/modprobe.patch b/pkgs/applications/virtualization/libnvidia-container/modprobe.patch index 8e7b0a723ec..c28b6bad291 100644 --- a/pkgs/applications/virtualization/libnvidia-container/modprobe.patch +++ b/pkgs/applications/virtualization/libnvidia-container/modprobe.patch @@ -1,6 +1,6 @@ -diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c ---- nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c 2020-07-09 17:06:05.000000000 +0000 -+++ nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c 2020-08-18 12:43:03.223871514 +0000 +diff -ruN nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c +--- nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c 2020-07-09 17:06:05.000000000 +0000 ++++ nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c 2020-08-18 12:43:03.223871514 +0000 @@ -840,10 +840,10 @@ return mknod_helper(major, minor_num, vgpu_dev_name, NV_PROC_REGISTRY_PATH); } @@ -16,9 +16,9 @@ diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c nvidia-m { char field[32]; FILE *fp; -diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h ---- nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h 2020-07-09 17:06:05.000000000 +0000 -+++ nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h 2020-08-18 12:43:44.227745050 +0000 +diff -ruN nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h +--- nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h 2020-07-09 17:06:05.000000000 +0000 ++++ nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h 2020-08-18 12:43:44.227745050 +0000 @@ -81,6 +81,7 @@ int nvidia_nvswitch_get_file_state(int minor); int nvidia_cap_mknod(const char* cap_file_path, int *minor); From 0165df5b456a8951ea0dbf3702f24f02dde4588f Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Wed, 11 May 2022 19:27:35 +0200 Subject: [PATCH 188/201] ue4: link to fixing issue, remove maintainer puffnfresh is not maintaining this anymore --- pkgs/games/ue4/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/ue4/default.nix b/pkgs/games/ue4/default.nix index 95f0d64f197..0260e4f2e20 100644 --- a/pkgs/games/ue4/default.nix +++ b/pkgs/games/ue4/default.nix @@ -76,7 +76,8 @@ stdenv.mkDerivation rec { homepage = "https://www.unrealengine.com/what-is-unreal-engine-4"; license = lib.licenses.unfree; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.puffnfresh ]; + maintainers = [ ]; + # See issue https://github.com/NixOS/nixpkgs/issues/17162 broken = true; }; } From a7677322d36fc9de29beaf74756624fbe502309a Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Wed, 11 May 2022 20:43:02 +0300 Subject: [PATCH 189/201] werf: 1.2.91 -> 1.2.99 --- pkgs/applications/networking/cluster/werf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 6ff362bb0e0..65e057b69fd 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -12,15 +12,15 @@ buildGoModule rec { pname = "werf"; - version = "1.2.91"; + version = "1.2.99"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-ZafIG4D5TvAbXbo07gFajt8orTsju1GfF9a1OR0t1Oo="; + sha256 = "sha256-D9NwVZGB0UV0tRe927GpxHzdvAeqcRJOYfocbbj6BRM="; }; - vendorSha256 = "sha256-U4eVQR/ExAENOg2XEYM+mFXANk+basdMLEcqSHuTsh4="; + vendorSha256 = "sha256-ZMSTl9WFTF5x+tiQZ37ihVrOuLS0W5PjyXbbzyHJNsI="; proxyVendor = true; nativeBuildInputs = [ installShellFiles pkg-config ]; From 5b447f98e18e87f346b2ac6bcae7af7ec9cf7e3e Mon Sep 17 00:00:00 2001 From: mdarocha Date: Wed, 11 May 2022 19:55:45 +0200 Subject: [PATCH 190/201] ArchiSteamFarm: fix aarch64 build --- pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix b/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix index 7b0148457fa..51ed1def41d 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix @@ -76,7 +76,7 @@ (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.4"; sha256 = "1zm9q9yvglsn5w786c9cjdfj1a8z4sipmvn9rhg3ps23rllxwmcc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.4"; sha256 = "0g1vw0wr88zlfpdg2gz8c0mriasci1kzvjia4nj19j7b0zaga7f0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.4"; sha256 = "1x1g3jhd57z1w3js7f6qa72vwvvjayvxzc2xxcqyscm9xy1fb3d4"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.4"; sha256 = "08mrvb71kldzla2j7v10ifxrc6bwsrd4bms2rqfb7rmx00qs6yj0"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.4"; sha256 = "0vgjwpy55mf6x22a634cdidckyq5hi941i9p10jqyrbnc637frv2"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.4"; sha256 = "1qasm6j25lmcc4xn7f7s3jli1pypz1kfnj7j9dkjlx9mc8r356zp"; }) From 08594d7a7e1e2ad4ab65dd0adcf26598cb2461bd Mon Sep 17 00:00:00 2001 From: be7a Date: Wed, 11 May 2022 19:26:38 +0200 Subject: [PATCH 191/201] factorio: 1.1.57 -> 1.1.59 --- pkgs/games/factorio/versions.json | 48 +++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 8dc902ea099..e3673edd4ac 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,56 +2,56 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.57.tar.xz", + "name": "factorio_alpha_x64-1.1.59.tar.xz", "needsAuth": true, - "sha256": "0sazpljdkknv74dqhrv5gxi7s50bfccynqk7xhsr4awl2gdkys0v", + "sha256": "0qwq3mjsmhb119pvbfznpncw898z4zs2if4fd7p6rqfz0wip93qk", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.57/alpha/linux64", - "version": "1.1.57" + "url": "https://factorio.com/get-download/1.1.59/alpha/linux64", + "version": "1.1.59" }, "stable": { - "name": "factorio_alpha_x64-1.1.57.tar.xz", + "name": "factorio_alpha_x64-1.1.59.tar.xz", "needsAuth": true, - "sha256": "0sazpljdkknv74dqhrv5gxi7s50bfccynqk7xhsr4awl2gdkys0v", + "sha256": "0qwq3mjsmhb119pvbfznpncw898z4zs2if4fd7p6rqfz0wip93qk", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.57/alpha/linux64", - "version": "1.1.57" + "url": "https://factorio.com/get-download/1.1.59/alpha/linux64", + "version": "1.1.59" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.57.tar.xz", + "name": "factorio_demo_x64-1.1.59.tar.xz", "needsAuth": false, - "sha256": "1lwrz0ix7iycampjh87ki8vg3pkk753873vmrfiyrmh3hchvbj34", + "sha256": "1nddk8184kgq4ni0y9j2l8sa3szvcbsq9l90b35l9jb6sqflgki0", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.57/demo/linux64", - "version": "1.1.57" + "url": "https://factorio.com/get-download/1.1.59/demo/linux64", + "version": "1.1.59" }, "stable": { - "name": "factorio_demo_x64-1.1.57.tar.xz", + "name": "factorio_demo_x64-1.1.59.tar.xz", "needsAuth": false, - "sha256": "1lwrz0ix7iycampjh87ki8vg3pkk753873vmrfiyrmh3hchvbj34", + "sha256": "1nddk8184kgq4ni0y9j2l8sa3szvcbsq9l90b35l9jb6sqflgki0", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.57/demo/linux64", - "version": "1.1.57" + "url": "https://factorio.com/get-download/1.1.59/demo/linux64", + "version": "1.1.59" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.57.tar.xz", + "name": "factorio_headless_x64-1.1.59.tar.xz", "needsAuth": false, - "sha256": "1y65wppfzfpad6g6kvdd8srd9sq71dh1dpqia5b3x6pnwk5xsqdm", + "sha256": "1p5wyki6wxnvnp7zqjjw9yggiy0p78rx49wmq3q7kq0mxfz054dg", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.57/headless/linux64", - "version": "1.1.57" + "url": "https://factorio.com/get-download/1.1.59/headless/linux64", + "version": "1.1.59" }, "stable": { - "name": "factorio_headless_x64-1.1.57.tar.xz", + "name": "factorio_headless_x64-1.1.59.tar.xz", "needsAuth": false, - "sha256": "1y65wppfzfpad6g6kvdd8srd9sq71dh1dpqia5b3x6pnwk5xsqdm", + "sha256": "1p5wyki6wxnvnp7zqjjw9yggiy0p78rx49wmq3q7kq0mxfz054dg", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.57/headless/linux64", - "version": "1.1.57" + "url": "https://factorio.com/get-download/1.1.59/headless/linux64", + "version": "1.1.59" } } } From fd33656e3d31f83bb40cb7e2ad4238a5dda74d55 Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Thu, 5 May 2022 12:48:32 +0200 Subject: [PATCH 192/201] pls: init at 4.0.3 --- pkgs/tools/misc/pls/default.nix | 38 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/misc/pls/default.nix diff --git a/pkgs/tools/misc/pls/default.nix b/pkgs/tools/misc/pls/default.nix new file mode 100644 index 00000000000..c9cb7e98bc0 --- /dev/null +++ b/pkgs/tools/misc/pls/default.nix @@ -0,0 +1,38 @@ +{ lib, python3, fetchFromGitHub }: + +python3.pkgs.buildPythonApplication rec { + pname = "pls"; + version = "4.0.3"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "dhruvkb"; + repo = "pls"; + rev = version; + sha256 = "sha256-cVTIWSOx3FwF3QPak3eIIIgQ1O9JF5e5ILpcHQ4qI6k="; + }; + + nativeBuildInputs = [ python3.pkgs.poetry-core ]; + + propagatedBuildInputs = with python3.pkgs; [ + pyyaml + rich + ]; + + checkInputs = with python3.pkgs; [ + freezegun + jsonschema + pytestCheckHook + ]; + + pytestFlagsArray = [ "tests/" "--ignore=tests/e2e" ]; + + pythonImportsCheck = [ "pls" ]; + + meta = with lib; { + homepage = "https://dhruvkb.github.io/pls/"; + description = "Prettier and powerful ls"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ arjan-s ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 377656e0d2f..e1c2d0cab37 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9401,6 +9401,8 @@ with pkgs; plowshare = callPackage ../tools/misc/plowshare { }; + pls = callPackage ../tools/misc/pls { }; + pm2 = nodePackages.pm2; pngcheck = callPackage ../tools/graphics/pngcheck { }; From d7af2fb8571e983b501601f9af0cb1f06cdbaf3b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 May 2022 15:12:22 +0000 Subject: [PATCH 193/201] python310Packages.zimports: 0.5.0 -> 0.6.0 --- pkgs/development/python-modules/zimports/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zimports/default.nix b/pkgs/development/python-modules/zimports/default.nix index dc9a6189240..6df2b47be9d 100644 --- a/pkgs/development/python-modules/zimports/default.nix +++ b/pkgs/development/python-modules/zimports/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "zimports"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "sqlalchemyorg"; repo = "zimports"; - rev = "v${version}"; - sha256 = "sha256-O8MHUt9yswL9fK9pEddkvnNS2E4vWA/S1BTs1OD1VbU="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-qm5mA8pCSLbkupGBo+ppHSW6uy1j/FfV3idvGQGhjqU="; }; disabled = !isPy3k; From c6cf01e66fe90e3684376f281da1b3334650e227 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 19:20:40 +0200 Subject: [PATCH 194/201] python310Packages.zimports: enable tests --- .../python-modules/zimports/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/zimports/default.nix b/pkgs/development/python-modules/zimports/default.nix index 6df2b47be9d..20e23afcfc0 100644 --- a/pkgs/development/python-modules/zimports/default.nix +++ b/pkgs/development/python-modules/zimports/default.nix @@ -6,22 +6,24 @@ , pyflakes , tomli , setuptools -, mock +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "zimports"; version = "0.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "sqlalchemyorg"; repo = "zimports"; rev = "refs/tags/v${version}"; - sha256 = "sha256-qm5mA8pCSLbkupGBo+ppHSW6uy1j/FfV3idvGQGhjqU="; + hash = "sha256-qm5mA8pCSLbkupGBo+ppHSW6uy1j/FfV3idvGQGhjqU="; }; - disabled = !isPy3k; - propagatedBuildInputs = [ flake8-import-order pyflakes @@ -30,14 +32,12 @@ buildPythonPackage rec { ]; checkInputs = [ - mock + pytestCheckHook ]; - checkPhase = '' - runHook preInstallCheck - PYTHONPATH= $out/bin/zimports --help >/dev/null - runHook postInstallCheck - ''; + pythonImportsCheck = [ + "zimports" + ]; meta = with lib; { description = "Python import rewriter"; From 9e7978f75f126c2bce9b6f289657d539ba2ec272 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 19:37:42 +0200 Subject: [PATCH 195/201] python310Packages.yalexs: 1.1.24 -> 1.1.25 --- pkgs/development/python-modules/yalexs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index 948ca6c6b88..3e93a01b57b 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.1.24"; + version = "1.1.25"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6wuTY1nH7btGEktH5UmTV2rMbsap5M55tJx3fljsnlY="; + sha256 = "sha256-O7M9Shh8jp2fTaVQPM8mgh1pkv75wn22PFpxJVenbAo="; }; propagatedBuildInputs = [ From caf95ff50940e3e120e0879312870cdcff8d8fa7 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Wed, 11 May 2022 21:04:28 +0200 Subject: [PATCH 196/201] CODEOWNERS: rename Gabriel439 to Gabriella439 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/Gabriel439: Hi, there! 👋🏼 I renamed my GitHub account from @Gabriel439 to @Gabriella439, so if you got here from an old profile link you can visit my new profile here: @Gabriella439 I created this placeholder account so that: … people who visit old links to my profile can find my new profile … other people cannot impersonate my old handle … GitHub continues to redirect old links to my repositories indefinitely --- .github/CODEOWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 28bfe7c1fd5..00c8dabe918 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -192,8 +192,8 @@ /nixos/tests/knot.nix @mweinelt # Dhall -/pkgs/development/dhall-modules @Gabriel439 @Profpatsch @ehmry -/pkgs/development/interpreters/dhall @Gabriel439 @Profpatsch @ehmry +/pkgs/development/dhall-modules @Gabriella439 @Profpatsch @ehmry +/pkgs/development/interpreters/dhall @Gabriella439 @Profpatsch @ehmry # Idris /pkgs/development/idris-modules @Infinisil From 7bf12fe3b5a88016834e3693184e6375cbf4a645 Mon Sep 17 00:00:00 2001 From: Daniel Poelzleithner Date: Wed, 11 May 2022 22:48:28 +0200 Subject: [PATCH 197/201] kgpg: update description to reflect gnupg --- pkgs/applications/kde/kgpg.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/kde/kgpg.nix b/pkgs/applications/kde/kgpg.nix index 1590887575b..3db757b497d 100644 --- a/pkgs/applications/kde/kgpg.nix +++ b/pkgs/applications/kde/kgpg.nix @@ -19,7 +19,7 @@ mkDerivation { ''; meta = { homepage = "https://apps.kde.org/kgpg/"; - description = "Encryption tool"; + description = "A KDE based interface for GnuPG, a powerful encryption utility"; license = [ lib.licenses.gpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; }; From ced8e41eefd174f4b8f2f8d4e9b82365dd404191 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 11 May 2022 02:10:13 +0300 Subject: [PATCH 198/201] =?UTF-8?q?crow-translate:=202.9.2=20=E2=86=92=202?= =?UTF-8?q?.9.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../misc/crow-translate/default.nix | 60 +++-------------- .../dont-fetch-external-libs.patch | 65 ------------------- 2 files changed, 8 insertions(+), 117 deletions(-) delete mode 100644 pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix index 8505c97e1bc..09a7595765d 100644 --- a/pkgs/applications/misc/crow-translate/default.nix +++ b/pkgs/applications/misc/crow-translate/default.nix @@ -1,5 +1,5 @@ { lib -, mkDerivation +, stdenv , nix-update-script , fetchFromGitHub , substituteAll @@ -11,61 +11,22 @@ , qtmultimedia , qtx11extras , qttranslations +, wrapQtAppsHook }: -let - singleapplication = fetchFromGitHub { - owner = "itay-grudev"; - repo = "SingleApplication"; - rev = "v3.2.0"; - sha256 = "0w3z97dcqcz3bf7w6fja4smkafmx9kvhzb9px4k2nfmmyxh4yfma"; - }; - qtaskbarcontrol = fetchFromGitHub { - owner = "Skycoder42"; - repo = "QTaskbarControl"; - rev = "2.0.2"; - sha256 = "0iymcvq3pv07fs9l4kh6hi1igqr7957iqndhsmg9fqkalf8nqyad"; - }; - qhotkey = fetchFromGitHub { - owner = "Skycoder42"; - repo = "QHotkey"; - rev = "1.4.2"; - sha256 = "0391fkqrxqmzpvms4rk06aq05l308k6sadp6y3czq0gx2kng8mn9"; - }; - qonlinetranslator = fetchFromGitHub { - owner = "crow-translate"; - repo = "QOnlineTranslator"; - rev = "1.5.3"; - sha256 = "sha256-L8y4vazbWD5SC7itxQOjEcX10w0laewxTOGz+Yd+kVM="; - }; - circleflags = fetchFromGitHub { - owner = "HatScripts"; - repo = "circle-flags"; - rev = "v2.3.0"; - sha256 = "sha256-KabmewF1Xf/1JQuzolrlRyLJR8O5j+/iT+29/QtOQVE="; - }; - fluent = fetchFromGitHub { - owner = "vinceliuice"; - repo = "Fluent-icon-theme"; - rev = "2021-08-15"; - sha256 = "sha256-uBu0vbKfhhnPKGwrnSBjPwS9ncH1iAlmeefAcpckOm4="; - }; -in -mkDerivation rec { + +stdenv.mkDerivation rec { pname = "crow-translate"; - version = "2.9.2"; + version = "2.9.5"; src = fetchFromGitHub { owner = "crow-translate"; repo = pname; rev = version; - sha256 = "sha256-cxfBdoqGVmtCaXyw6QzXj2V44wKyVal/uqsddwIdvjw="; + sha256 = "sha256-AzwJJ85vxXsc0+W3QM8citN5f0AD6APQVd9628cfLgI="; + fetchSubmodules = true; }; patches = [ - (substituteAll { - src = ./dont-fetch-external-libs.patch; - inherit singleapplication qtaskbarcontrol qhotkey qonlinetranslator circleflags fluent; - }) (substituteAll { # See https://github.com/NixOS/nixpkgs/issues/86054 src = ./fix-qttranslations-path.patch; @@ -73,12 +34,7 @@ mkDerivation rec { }) ]; - postPatch = '' - cp -r ${circleflags}/flags/* data/icons - cp -r ${fluent}/src/* data/icons - ''; - - nativeBuildInputs = [ cmake extra-cmake-modules qttools ]; + nativeBuildInputs = [ cmake extra-cmake-modules qttools wrapQtAppsHook ]; buildInputs = [ leptonica tesseract4 qtmultimedia qtx11extras ]; diff --git a/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch b/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch deleted file mode 100644 index 0bfdc9ef2f7..00000000000 --- a/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git i/CMakeLists.txt w/CMakeLists.txt -index 375b17c..106efa9 100644 ---- i/CMakeLists.txt -+++ w/CMakeLists.txt -@@ -114,13 +114,11 @@ qt5_add_translation(QM_FILES - ) - - configure_file(src/cmake.h.in cmake.h) --configure_file(data/icons/flags.qrc ${CircleFlags_SOURCE_DIR}/flags/flags.qrc COPYONLY) --configure_file(data/icons/fluent-icon-theme.qrc ${FluentIconTheme_SOURCE_DIR}/src/fluent-icon-theme.qrc COPYONLY) - - add_executable(${PROJECT_NAME} -- ${CircleFlags_SOURCE_DIR}/flags/flags.qrc -+ data/icons/flags.qrc - ${QM_FILES} -- ${FluentIconTheme_SOURCE_DIR}/src/fluent-icon-theme.qrc -+ data/icons/fluent-icon-theme.qrc - data/icons/engines/engines.qrc - src/addlanguagedialog.cpp - src/addlanguagedialog.ui -diff --git i/cmake/ExternalLibraries.cmake w/cmake/ExternalLibraries.cmake -index c92e745..f265f03 100644 ---- i/cmake/ExternalLibraries.cmake -+++ w/cmake/ExternalLibraries.cmake -@@ -2,34 +2,28 @@ include(FetchContent) - - set(QAPPLICATION_CLASS QApplication) - FetchContent_Declare(SingleApplication -- GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication -- GIT_TAG v3.2.0 -+ SOURCE_DIR @singleapplication@ - ) - - FetchContent_Declare(QTaskbarControl -- GIT_REPOSITORY https://github.com/Skycoder42/QTaskbarControl -- GIT_TAG 2.0.2 -+ SOURCE_DIR @qtaskbarcontrol@ - ) - - option(QHOTKEY_INSTALL OFF) - FetchContent_Declare(QHotkey -- GIT_REPOSITORY https://github.com/Skycoder42/QHotkey -- GIT_TAG 1.4.2 -+ SOURCE_DIR @qhotkey@ - ) - - FetchContent_Declare(QOnlineTranslator -- GIT_REPOSITORY https://github.com/crow-translate/QOnlineTranslator -- GIT_TAG 1.5.3 -+ SOURCE_DIR @qonlinetranslator@ - ) - - FetchContent_Declare(CircleFlags -- GIT_REPOSITORY https://github.com/HatScripts/circle-flags -- GIT_TAG v2.3.0 -+ SOURCE_DIR @circleflags@ - ) - - FetchContent_Declare(FluentIconTheme -- GIT_REPOSITORY https://github.com/vinceliuice/Fluent-icon-theme -- GIT_TAG 2021-08-15 -+ SOURCE_DIR @fluent@ - ) - - FetchContent_MakeAvailable(SingleApplication QTaskbarControl QHotkey QOnlineTranslator CircleFlags FluentIconTheme) From e3d8a347fee00b675222ad11a68fd12737e9357f Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 11 May 2022 16:32:35 -0500 Subject: [PATCH 199/201] garage: fix build on Darwin Security needs to be added as a buildInput. --- pkgs/tools/filesystems/garage/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index 8799ec5a3d2..2818c335176 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -1,4 +1,5 @@ -{ lib, rustPlatform, fetchFromGitea, protobuf, testers, garage }: +{ lib, stdenv, rustPlatform, fetchFromGitea, protobuf, testers, Security, garage }: + rustPlatform.buildRustPackage rec { pname = "garage"; version = "0.7.0"; @@ -15,6 +16,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ protobuf ]; + buildInputs = lib.optional stdenv.isDarwin Security; + passthru = { tests.version = testers.testVersion { package = garage; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24322febb49..0041e57d646 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6079,7 +6079,9 @@ with pkgs; gaphor = python3Packages.callPackage ../tools/misc/gaphor { }; - garage = callPackage ../tools/filesystems/garage { }; + garage = callPackage ../tools/filesystems/garage { + inherit (darwin.apple_sdk.frameworks) Security; + }; garmin-plugin = callPackage ../applications/misc/garmin-plugin {}; From b1e6ccc862a71e3f57e98ec1631a67b2b18fe98c Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 11 May 2022 16:51:17 -0500 Subject: [PATCH 200/201] cliscord: fix build on Darwin Security needs to be added as a buildInput. --- pkgs/misc/cliscord/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/cliscord/default.nix b/pkgs/misc/cliscord/default.nix index 485a6c05041..8ce0da14ce4 100644 --- a/pkgs/misc/cliscord/default.nix +++ b/pkgs/misc/cliscord/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, openssl, pkg-config, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, openssl, pkg-config, fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { pname = "cliscord"; @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-hzZozgOkw8kFppuHiX9TQxHhxKRv8utWWbhEOIzKDLo="; }; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24322febb49..ca9d50bbacd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14142,7 +14142,9 @@ with pkgs; clips = callPackage ../development/interpreters/clips { }; - cliscord = callPackage ../misc/cliscord { }; + cliscord = callPackage ../misc/cliscord { + inherit (darwin.apple_sdk.frameworks) Security; + }; clisp = callPackage ../development/interpreters/clisp { }; clisp-tip = callPackage ../development/interpreters/clisp/hg.nix { }; From bad52402a5387df45dc98968d95a6506bbc09c5d Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Wed, 11 May 2022 19:00:52 -0400 Subject: [PATCH 201/201] python3.pkgs.sphinx-better-theme: init at 0.1.5 (#171595) * python3.pkgs.sphinx-better-theme: init at 0.1.5 * Update pkgs/development/python-modules/sphinx-better-theme/default.nix Co-authored-by: Sandro * Update pkgs/development/python-modules/sphinx-better-theme/default.nix Co-authored-by: Sandro Co-authored-by: Dmitry Bogatov Co-authored-by: Sandro --- .../sphinx-better-theme/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/sphinx-better-theme/default.nix diff --git a/pkgs/development/python-modules/sphinx-better-theme/default.nix b/pkgs/development/python-modules/sphinx-better-theme/default.nix new file mode 100644 index 00000000000..8227eca47d8 --- /dev/null +++ b/pkgs/development/python-modules/sphinx-better-theme/default.nix @@ -0,0 +1,45 @@ +{ lib, buildPythonPackage, fetchFromGitHub, sphinxHook }: + +buildPythonPackage rec { + pname = "sphinx-better-theme"; + version = "0.1.5"; + outputs = [ "out" "doc" ]; + + src = fetchFromGitHub { + owner = "irskep"; + repo = "sphinx-better-theme"; + rev = "v${version}"; + sha256 = "07lhfmsjcfzcchsjzh6kxdq5s47j2a6lb5wv3m1kmv2hcm3gvddh"; + }; + + nativeBuildInputs = [ sphinxHook ]; + + pythonImportsCheck = [ "better" ]; + + meta = with lib; { + homepage = "https://github.com/irskep/sphinx-better-theme"; + description = "Better Sphinx Theme"; + longDescription = '' + This is a modified version of the default Sphinx theme with the following + goals: + + 1. Remove frivolous colors, especially hard-coded ones + 2. Improve readability by limiting width and using more whitespace + 3. Encourage visual customization through CSS, not themeconf + 4. Use semantic markup + + v0.1 meets goals one and two. Goal three is partially complete; it's simple to + add your own CSS file without creating a whole new theme. + you'd like something changed. + + To use the theme, set ``html_theme_path`` to contain + ``better.better_theme_path``, and set ``html_theme`` to ``'better'``:: + + from better import better_theme_path + html_theme_path = [better_theme_path] + html_theme = 'better' + ''; + license = licenses.bsd2; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 807ad190323..44f7328c6f9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9721,6 +9721,8 @@ in { spinners = callPackage ../development/python-modules/spinners { }; + sphinx-better-theme = callPackage ../development/python-modules/sphinx-better-theme { }; + sphinxcontrib-actdiag = callPackage ../development/python-modules/sphinxcontrib-actdiag { }; sphinxcontrib-apidoc = callPackage ../development/python-modules/sphinxcontrib-apidoc { };