From 30f1776d29a0beb52e0c8e78e30f3d72a644fe24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Tue, 19 Apr 2022 17:46:25 +0100 Subject: [PATCH 01/67] ledger-live-desktop: 2.40.2 -> 2.40.4 --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index d72da2c060f1..59166149e6a6 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.40.2"; + version = "2.40.4"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-2L1iVPLCCIQ6qBqkg+GmiqMmknHmdDLUrysN8vcW2YQ="; + hash = "sha256-ktmGXEWoCrhx9hGau2VkQi0GMa53EqHV1wGtUk6kicc="; }; appimageContents = appimageTools.extractType2 { From be73d666287ccf7ab7e6c1fed477ef47f078cd05 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 18 Apr 2022 23:58:14 -0300 Subject: [PATCH 02/67] Create a GAMES/LGAMES tag --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0faf57c85641..ab37a0d43934 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31101,6 +31101,8 @@ with pkgs; keeperrl = callPackage ../games/keeperrl { }; + ### GAMES/LGAMES + lbreakout2 = callPackage ../games/lgames/lbreakout2 { }; ltris = callPackage ../games/lgames/ltris { }; From 133c56305ddfa02f45b2e96e2f9873c826f65d91 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 20 Apr 2022 23:25:47 +0200 Subject: [PATCH 03/67] esphome: 2022.3.2 -> 2022.4.0 https://github.com/esphome/esphome/releases/tag/2022.4.0 --- pkgs/tools/misc/esphome/dashboard.nix | 4 ++-- pkgs/tools/misc/esphome/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index dfb61ca29ad9..1f101735e981 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20220209.0"; + version = "20220309.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FkFu3SvsowcsOFXvqWmpY3KEypXSb6KcpC/nJbQpDBA="; + sha256 = "sha256-J/T3Av0jwT0CJSwc0j+YjaiKFqs9soLf7ctpiz5rmm4="; }; # no tests diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index de39a6e7f380..3ce65eb20380 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -15,14 +15,14 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2022.3.2"; + version = "2022.4.0"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-s5NisPUoppROM/p7qm1da4lStpAWZvk18zkUEsOn0Pg="; + sha256 = "sha256-/IMiUMtWFouAjOlyq+BXvqQ1IddBXvua7y0i4J1cktM="; }; postPatch = '' From 7e242b510ee2a6f7b542bb09e2f9816a3e720d0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Apr 2022 02:00:54 +0000 Subject: [PATCH 04/67] dsq: 0.14.0 -> 0.15.1 --- pkgs/tools/misc/dsq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dsq/default.nix b/pkgs/tools/misc/dsq/default.nix index bb884c5a2933..8df3c2183ec7 100644 --- a/pkgs/tools/misc/dsq/default.nix +++ b/pkgs/tools/misc/dsq/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "dsq"; - version = "0.14.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "multiprocessio"; repo = "dsq"; rev = version; - hash = "sha256-BhWcl0yMpTi/6+dFk6wX/rMkH1k9m9eVm40iNwZGrJM="; + hash = "sha256-AT5M3o1cvRIZyyA28uX+AI4p9I3SzX3OCdBcIFGKspw="; }; - vendorSha256 = "sha256-mSF2oNdTKAg3iRejKkn24hSCJDM6iOkRMruic73ceX4="; + vendorSha256 = "sha256-yfhLQBmWkG0ZLjI/ArLZkEGvClmZXkl0o7fEu5JqHM8="; nativeBuildInputs = [ diffutils ]; From 9acfaa8c6115944561d5513c4731e4d07dbd9764 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 21 Apr 2022 07:58:51 +0100 Subject: [PATCH 05/67] rili: fix build on gcc-11 Without the change the build fails on `master` as: ``` tableau.cc:90:9: error: ordered comparison of pointer with integer zero ('unsigned char*' and 'int') 90 | if(Buf<=0) return false; | ~~~^~~ ``` --- pkgs/games/rili/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix index a0082d28d506..3a87fc0523c7 100644 --- a/pkgs/games/rili/default.nix +++ b/pkgs/games/rili/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, SDL_mixer, SDL, autoreconfHook }: +{ lib, stdenv, fetchurl, fetchpatch, SDL_mixer, SDL, autoreconfHook }: stdenv.mkDerivation rec { pname = "ri_li"; @@ -9,7 +9,17 @@ stdenv.mkDerivation rec { sha256 = "f71ccc20c37c601358d963e087ac0d524de8c68e96df09c3aac1ae65edd38dbd"; }; - patches = [ ./moderinze_cpp.patch ]; + patches = [ + ./moderinze_cpp.patch + + # Build fix for gcc-11 pending upstream inclusion: + # https://sourceforge.net/p/ri-li/bugs/2/ + (fetchpatch { + name = "gcc-11.patch"; + url = "https://sourceforge.net/p/ri-li/bugs/2/attachment/0001-Fix-build-on-gcc-11.patch"; + sha256 = "01il9lm3amwp3b435ka9q63p0jwlzajwnbshyazx6n9vcnrr17yw"; + }) + ]; CPPFLAGS = "-I${SDL.dev}/include -I${SDL.dev}/include/SDL -I${SDL_mixer}/include"; From 5885de0b495d5e25948fac089a234695e804a51f Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Thu, 21 Apr 2022 13:24:59 +0300 Subject: [PATCH 06/67] python3Packages.tensorflow*: unpin cuda --- pkgs/top-level/python-packages.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4cbede6e070e..0b67d121c9a6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9956,15 +9956,8 @@ in { tensorboardx = callPackage ../development/python-modules/tensorboardx { }; - tensorflow-bin = let - # CUDA-related packages that are compatible with the currently packaged version - # of TensorFlow, used to keep these versions in sync in related packages like `jaxlib`. - cudaPackages = pkgs.cudaPackages_11_2.overrideScope' (final: prev: { - cudnn = prev.cudnn_8_1_1; - }); - in callPackage ../development/python-modules/tensorflow/bin.nix { + tensorflow-bin = callPackage ../development/python-modules/tensorflow/bin.nix { cudaSupport = pkgs.config.cudaSupport or false; - inherit cudaPackages; }; tensorflow-build = callPackage ../development/python-modules/tensorflow { From 5bbb538e7261294c694fce1534efcf2d9b02672b Mon Sep 17 00:00:00 2001 From: Corbin Date: Tue, 17 Aug 2021 09:56:42 -0700 Subject: [PATCH 07/67] doc: Explain how to use and maintain CHICKEN. Also add information about egg2nix. Includes suggestions from code review. Co-authored-by: sterni --- doc/languages-frameworks/chicken.section.md | 49 +++++++++++++++++++++ doc/languages-frameworks/index.xml | 1 + 2 files changed, 50 insertions(+) create mode 100644 doc/languages-frameworks/chicken.section.md diff --git a/doc/languages-frameworks/chicken.section.md b/doc/languages-frameworks/chicken.section.md new file mode 100644 index 000000000000..d8c35bd20c50 --- /dev/null +++ b/doc/languages-frameworks/chicken.section.md @@ -0,0 +1,49 @@ +# CHICKEN {#sec-chicken} + +[CHICKEN](https://call-cc.org/) is a +[R⁵RS](https://schemers.org/Documents/Standards/R5RS/HTML/)-compliant Scheme +compiler. It includes an interactive mode and a custom package format, "eggs". + +## Using Eggs + +Eggs described in nixpkgs are available inside the +`chickenPackages.chickenEggs` attrset. Including an egg as a build input is +done in the typical Nix fashion. For example, to include support for [SRFI +189](https://srfi.schemers.org/srfi-189/srfi-189.html) in a derivation, one +might write: + +```nix + buildInputs = [ + chicken + chickenPackages.chickenEggs.srfi-189 + ]; +``` + +Both `chicken` and its eggs have a setup hook which configures the environment +variables `CHICKEN_INCLUDE_PATH` and `CHICKEN_REPOSITORY_PATH`. + +## Updating Eggs + +nixpkgs only knows about a subset of all published eggs. It uses +[egg2nix](https://github.com/the-kenny/egg2nix) to generate a +package set from a list of eggs to include. + +The package set is regenerated by running the following shell commands: + +``` +$ nix-shell -p chickenPackages.egg2nix +$ cd pkgs/development/compilers/chicken/5/ +$ egg2nix eggs.scm > eggs.nix +``` + +## Adding Eggs + +When we run `egg2nix`, we obtain one collection of eggs with +mutually-compatible versions. This means that when we add new eggs, we may +need to update existing eggs. To keep those separate, follow the procedure for +updating eggs before including more eggs. + +To include more eggs, edit `pkgs/development/compilers/chicken/5/eggs.scm`. +The first section of this file lists eggs which are required by `egg2nix` +itself; all other eggs go into the second section. After editing, follow the +procedure for updating eggs. diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index f221693e764c..2c34a29d4863 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -9,6 +9,7 @@ + From 212fecb7343e4ff35794df584d23e54283178737 Mon Sep 17 00:00:00 2001 From: Corbin Date: Tue, 17 Aug 2021 09:57:49 -0700 Subject: [PATCH 08/67] chickenPackages.chickenEggs.srfi-13: 0.3 -> 0.3.1 Performed semi-automatically with egg2nix, as a test of freshly-written documentation. --- pkgs/development/compilers/chicken/5/eggs.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/chicken/5/eggs.nix b/pkgs/development/compilers/chicken/5/eggs.nix index 1c1377350d21..ceddea7a71b5 100644 --- a/pkgs/development/compilers/chicken/5/eggs.nix +++ b/pkgs/development/compilers/chicken/5/eggs.nix @@ -1,4 +1,4 @@ -{ pkgs }: +{ pkgs, stdenv }: rec { inherit (pkgs) eggDerivation fetchegg; @@ -47,12 +47,12 @@ rec { }; srfi-13 = eggDerivation { - name = "srfi-13-0.3"; + name = "srfi-13-0.3.1"; src = fetchegg { name = "srfi-13"; - version = "0.3"; - sha256 = "0yaw9i6zhpxl1794pirh168clprjgmsb0xlr96drirjzsslgm3zp"; + version = "0.3.1"; + sha256 = "12ryxs3w3las0wjdh0yp52g1xmyq1fb48xi3i26l5a9sfx7gbilp"; }; buildInputs = [ From ec35f59fd10ce8cd3965eab830a00087fa636b0c Mon Sep 17 00:00:00 2001 From: Corbin Date: Tue, 17 Aug 2021 10:03:56 -0700 Subject: [PATCH 09/67] chickenPackages.chickenEggs.srfi-189: init at 0.1 Semi-automatically done by egg2nix. --- pkgs/development/compilers/chicken/5/eggs.nix | 46 +++++++++++++++++++ pkgs/development/compilers/chicken/5/eggs.scm | 3 ++ 2 files changed, 49 insertions(+) diff --git a/pkgs/development/compilers/chicken/5/eggs.nix b/pkgs/development/compilers/chicken/5/eggs.nix index ceddea7a71b5..c74afe187371 100644 --- a/pkgs/development/compilers/chicken/5/eggs.nix +++ b/pkgs/development/compilers/chicken/5/eggs.nix @@ -32,6 +32,22 @@ rec { ]; }; + r7rs = eggDerivation { + name = "r7rs-1.0.5"; + + src = fetchegg { + name = "r7rs"; + version = "1.0.5"; + sha256 = "0zyi1z4m1995hm2wfc5wpi8jjgxcwk03qknq5v2ygff3akxazsf6"; + }; + + buildInputs = [ + matchable + srfi-1 + srfi-13 + ]; + }; + srfi-1 = eggDerivation { name = "srfi-1-0.5.1"; @@ -74,6 +90,36 @@ rec { ]; }; + srfi-145 = eggDerivation { + name = "srfi-145-0.1"; + + src = fetchegg { + name = "srfi-145"; + version = "0.1"; + sha256 = "1r4278xhpmm8gww64j6akpyv3qjnn14b6nsisyb9qm7yx3pkpim9"; + }; + + buildInputs = [ + + ]; + }; + + srfi-189 = eggDerivation { + name = "srfi-189-0.1"; + + src = fetchegg { + name = "srfi-189"; + version = "0.1"; + sha256 = "1nmrywpi9adi5mm1vcbxxsgw0j3v6m7s4j1mii7icj83xn81cgvx"; + }; + + buildInputs = [ + r7rs + srfi-1 + srfi-145 + ]; + }; + srfi-37 = eggDerivation { name = "srfi-37-1.4"; diff --git a/pkgs/development/compilers/chicken/5/eggs.scm b/pkgs/development/compilers/chicken/5/eggs.scm index b743d6e3229d..499109470849 100644 --- a/pkgs/development/compilers/chicken/5/eggs.scm +++ b/pkgs/development/compilers/chicken/5/eggs.scm @@ -1,3 +1,6 @@ ;; Eggs used by egg2nix args matchable + +;; other eggs to include in nixpkgs +srfi-189 From b66cbbd74ee72d4c904f9386c159405106f4fab0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 22 Apr 2022 04:20:00 +0000 Subject: [PATCH 10/67] jdk8: fix manpage symlink on darwin --- pkgs/development/compilers/openjdk/darwin/8.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix index 009802b29234..aeb60d8bc460 100644 --- a/pkgs/development/compilers/openjdk/darwin/8.nix +++ b/pkgs/development/compilers/openjdk/darwin/8.nix @@ -79,6 +79,12 @@ let EOF ''; + # fixupPhase is moving the man to share/man which breaks it because it's a + # relative symlink. + postFixup = '' + ln -nsf ../zulu-${lib.versions.major version}.jdk/Contents/Home/man $out/share/man + ''; + passthru = { jre = jdk; home = jdk; From f67df1807f44ad62cf932bf4f3469b3105962f43 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 22 Apr 2022 04:20:00 +0000 Subject: [PATCH 11/67] ugrep: 3.7.7 -> 3.7.9 https://github.com/Genivia/ugrep/releases/tag/v3.7.8 https://github.com/Genivia/ugrep/releases/tag/v3.7.9 --- pkgs/tools/text/ugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 2511e0c88b21..f3e3d00aeee4 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "3.7.7"; + version = "3.7.9"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FucHivUd9WVQlTsBJbnSd2Q6WQpoFjm6dS0eb6z8SSs="; + sha256 = "sha256-ZY3pihHU5FLu41vKrM/U06iZZ6D/LSuoyy2gHJJqRFY="; }; buildInputs = [ From f73ff5c2298a14ea1dc1722cb15cf94b3b879281 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 22 Apr 2022 04:20:00 +0000 Subject: [PATCH 12/67] emacsWrapper: add missing variable substitutions to Darwin app --- pkgs/build-support/emacs/wrapper.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index 2bf8eaf2d7ad..d61f6967c4b8 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -227,6 +227,8 @@ runCommand substitute ${./wrapper.sh} $out/Applications/Emacs.app/Contents/MacOS/Emacs \ --subst-var-by bash ${emacs.stdenv.shell} \ --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \ + --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp:" \ + --subst-var-by autoloadExpression "-l cl-loaddefs -l nix-generated-autoload" \ --subst-var-by prog "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs" chmod +x $out/Applications/Emacs.app/Contents/MacOS/Emacs fi From 03e4688c7f27b04f251769a711b5e1483f22f16a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 05:26:18 +0000 Subject: [PATCH 13/67] argocd-autopilot: 0.3.2 -> 0.3.5 --- .../networking/cluster/argocd-autopilot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix index 4bc1d2d1c20c..c56f937223c9 100644 --- a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix +++ b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "argocd-autopilot"; - version = "0.3.2"; + version = "0.3.5"; src = fetchFromGitHub { owner = "argoproj-labs"; repo = "argocd-autopilot"; rev = "v${version}"; - sha256 = "sha256-9si2zqYhmAqzhdUWMkfQ/yLeyNcZSAWypvZTbDDrPvA="; + sha256 = "sha256-YqnmtDVtprQQFbL++X9rUJFGj+fMD+fvDRWsQ+uOxxo="; }; - vendorSha256 = "sha256-UfZCGG24JjPoc5nbX9vPeFCP8YGMNF5oUrdwTC6RpKI="; + vendorSha256 = "sha256-r8RTwMzFS/BkxW08+wfAovuFLpIOReDsuHi/Hx9cVPc="; proxyVendor = true; From 7b185dd49170296f71d1654aea171151c711513b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 06:44:11 +0000 Subject: [PATCH 14/67] atlassian-jira: 8.22.0 -> 8.22.1 --- pkgs/servers/atlassian/jira.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index 7880c529c733..e1b37cf8a06d 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "atlassian-jira"; - version = "8.22.0"; + version = "8.22.1"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "sha256-swEq8g/A1Ok1P7JtceUDId7kG0GRtBPGblY09xt81Ys="; + sha256 = "sha256-9cFSlvqbyLqgmNN0LbfdV2vfyIrHPBR8vLJAXe5cqV0="; }; buildPhase = '' From f7f3725fc61b5c1166a0fd748f2fee47c977b353 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Apr 2022 08:56:51 +0200 Subject: [PATCH 15/67] gau: 2.0.9 -> 2.1.1 --- pkgs/tools/security/gau/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gau/default.nix b/pkgs/tools/security/gau/default.nix index 8113289a9c4f..29a0aadd1561 100644 --- a/pkgs/tools/security/gau/default.nix +++ b/pkgs/tools/security/gau/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gau"; - version = "2.0.9"; + version = "2.1.1"; src = fetchFromGitHub { owner = "lc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8op515+0wDxxU1e08gJ6lg/8NhQScFb4b3mCzBV/VNw="; + sha256 = "sha256-jIMBvRnY1Z/cLwBnWGp1fsx6oLri1qiknLj+r9B4GHc="; }; vendorSha256 = "sha256-HQATUCzYvhhlqe4HhNu9H4CqmY2IGLNJ9ydt3/igSmQ="; From e31f7ee3e8eed11e9971e1c371bd1edc6e25ba27 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Apr 2022 08:59:34 +0200 Subject: [PATCH 16/67] gitleaks: 8.7.2 -> 8.8.1 --- pkgs/tools/security/gitleaks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index a26e0569c5c5..4f9d8dd26b0a 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.7.2"; + version = "8.8.1"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-V2wBzoU3oL/wT/pIvMxEPTuNaRLTI72OTDRgWXyzZoY="; + sha256 = "sha256-yXyebPZN5WbSP4x2cbdlWqbwhVW24x6VmmodK6GCMH8="; }; vendorSha256 = "sha256-X8z9iKRR3PptNHwy1clZG8QsClsjbW45nZb2fHGfSYk="; From 04efa9b7bb9c204705a80bc07a6f5645a682ac87 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 07:14:25 +0000 Subject: [PATCH 17/67] python310Packages.lightwave2: 0.8.4 -> 0.8.8 --- pkgs/development/python-modules/lightwave2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lightwave2/default.nix b/pkgs/development/python-modules/lightwave2/default.nix index 4501eb664e90..dd85d3b1f67f 100644 --- a/pkgs/development/python-modules/lightwave2/default.nix +++ b/pkgs/development/python-modules/lightwave2/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "lightwave2"; - version = "0.8.4"; + version = "0.8.8"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-WB5U8VjUKx2hCcJX2JeFgEiwzweGzROEK3pox3l/wrE="; + sha256 = "sha256-6z4w6GMwShhdF8JUwySOR2RNvCXJ22IzQvoahmSS6Zk="; }; propagatedBuildInputs = [ From 35fb3cc6fc274e57f3522f1f8caf407de6df2ffe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Apr 2022 09:28:00 +0200 Subject: [PATCH 18/67] feroxbuster: 2.6.4 -> 2.7.0 --- pkgs/tools/security/feroxbuster/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/feroxbuster/default.nix b/pkgs/tools/security/feroxbuster/default.nix index bc1df5eb5692..d73ba4306337 100644 --- a/pkgs/tools/security/feroxbuster/default.nix +++ b/pkgs/tools/security/feroxbuster/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "feroxbuster"; - version = "2.6.4"; + version = "2.7.0"; src = fetchFromGitHub { owner = "epi052"; repo = pname; - rev = "v${version}"; - hash = "sha256-aTyjZc+bsA4rvbcFTLArK+zbfF6thHEYyPbMx9vLcMo="; + rev = version; + hash = "sha256-Ub4HOi38fYNJkpXfms1/aDl97h2UI1Fru8+NAiAztoc="; }; - cargoSha256 = "sha256-PLrIMgn0o+fFB6Zv9sf7X4gZyHwVSd6BOM1/KUo3TAg="; + cargoSha256 = "sha256-ODLL++wn8IQloEFZXF8TasercTKJ0nhPtny4fsi03Ks="; OPENSSL_NO_VENDOR = true; From b9789fb75c72feac74d0cf84baffdc3b3f27a11f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 07:33:18 +0000 Subject: [PATCH 19/67] python310Packages.stripe: 2.73.0 -> 2.74.0 --- pkgs/development/python-modules/stripe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index c0bd1751bf12..27c3f84331ad 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.73.0"; + version = "2.74.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Z5JG1mPaX7OElL48OoIljUdqu4TKrmfwrh85Z81i0zo="; + hash = "sha256-+o7StcJBv9peiYTWBnIfnDUqodiG3sVQJBbKBOALktA="; }; propagatedBuildInputs = [ From 21d8d6efa583613e471acb979dad44fe8bb4f638 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 07:40:14 +0000 Subject: [PATCH 20/67] alfaview: 8.41.0 -> 8.42.0 --- .../networking/instant-messengers/alfaview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index a810dbdc3a1f..eae63701d4d9 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "8.41.0"; + version = "8.42.0"; src = fetchurl { url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb"; - sha256 = "sha256-qW+MB71sylKJQycSX6hiBgxAO4MuhnBaPGFjm+6y4vk="; + sha256 = "sha256-O440sk6OJUsO+5TuzLxkUELnCfxKd5byoxSD+Rs4h1c="; }; nativeBuildInputs = [ From 75d69638864ebe820f96d6b98b4a7f2e83e6d026 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 07:47:38 +0000 Subject: [PATCH 21/67] python310Packages.bitstruct: 8.14.0 -> 8.14.1 --- pkgs/development/python-modules/bitstruct/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitstruct/default.nix b/pkgs/development/python-modules/bitstruct/default.nix index 8279f0ac9769..5867e695b816 100644 --- a/pkgs/development/python-modules/bitstruct/default.nix +++ b/pkgs/development/python-modules/bitstruct/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "bitstruct"; - version = "8.14.0"; + version = "8.14.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IwwZHHXxUm9pIs2wjqtvUsBVRS4iOb9WOPAunP04LJE="; + hash = "sha256-04ExvUR7avW49GTEh4eXyHpdnaHJW5NX4HHEJP3l8FU="; }; pythonImportsCheck = [ From f86e2a0932cd839eaf2568b999b9e1e958d1a315 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 08:43:34 +0000 Subject: [PATCH 22/67] python310Packages.databricks-connect: 9.1.13 -> 9.1.14 --- .../development/python-modules/databricks-connect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index b86dbb798109..3475001a58b7 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "9.1.13"; + version = "9.1.14"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TpE15UOwbuAvp+ffC9JUnR8yQb0DWvBMkSieMhQGjao="; + sha256 = "sha256-l+mTqiQPuPJfGbEVSILpCTlxAka0GeCgIXjMG4Vs82o="; }; sourceRoot = "."; From ebbffb62eeb09bbfa98b13ed22cc9d24dd3e1b78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 08:47:09 +0000 Subject: [PATCH 23/67] checkip: 0.24.5 -> 0.35.2 --- pkgs/tools/networking/checkip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/checkip/default.nix b/pkgs/tools/networking/checkip/default.nix index 7959bdaa83ea..1ae0f0036026 100644 --- a/pkgs/tools/networking/checkip/default.nix +++ b/pkgs/tools/networking/checkip/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "checkip"; - version = "0.24.5"; + version = "0.35.2"; src = fetchFromGitHub { owner = "jreisinger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/sTagdlWU6hU3TTeJcZ8WK4TqmvxgUbC5eLBz2FH6Jo="; + sha256 = "sha256-O6jVedVwzC575s7LS0gx1t6mUizQGv4Gcqra57vXX+w="; }; vendorSha256 = "sha256-NHu1hZFPT2k8izrvvz7w0vlVe/nKH0nS4oXUGS8CWcc="; From 0fda27c4958836824addc0e3e513f5fb72da5676 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 08:52:18 +0000 Subject: [PATCH 24/67] checkmate: 0.5.8 -> 0.5.9 --- pkgs/development/tools/checkmate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/checkmate/default.nix b/pkgs/development/tools/checkmate/default.nix index bcb115e409b7..6ca90b28f4e7 100644 --- a/pkgs/development/tools/checkmate/default.nix +++ b/pkgs/development/tools/checkmate/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "checkmate"; - version = "0.5.8"; + version = "0.5.9"; src = fetchFromGitHub { owner = "adedayo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nzhzeXy70UQ1HP3/PCBnUPhrjg7CnKURMCH0iJ099E0="; + sha256 = "sha256-V7b8NEKzS4wDIhFJkAve94Tl3tzYtnbG01GzyRj8yfA="; }; vendorSha256 = "sha256-uQRAVbLnzY+E3glMJ3AvmbtmwD2LkuqCh2mUpqZbmaA="; From 46e828aa13993865a5064d782d1dde0d88781fe6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 08:59:18 +0000 Subject: [PATCH 25/67] cilium-cli: 0.10.4 -> 0.11.1 --- pkgs/applications/networking/cluster/cilium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index cf1ada47189f..bde7a21b33ef 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.10.4"; + version = "0.11.1"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1/WXpXZ6f4p4IZ/yropCjH3hHt+t5HGw0aq0HFk04mo="; + sha256 = "sha256-8twqA8aUuk5+LzjxMRbRA3m6qiEbk60A0q3nw9uzCvU="; }; vendorSha256 = null; From 37f523286881e4aef8bec21cb97088f724262b05 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 09:04:04 +0000 Subject: [PATCH 26/67] circleci-cli: 0.1.17110 -> 0.1.17142 --- pkgs/development/tools/misc/circleci-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 4aa1b8c0b91a..19984886207c 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.17110"; + version = "0.1.17142"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zCX6LWIPiHDOnSBE+BeePjeQ1evTWhLY0Pqk7NmMMlc="; + sha256 = "sha256-69GGJfnOHry+N3hKZapKz6eFSerqIHt4wRAhm/q/SOQ="; }; vendorSha256 = "sha256-7u2y1yBVpXf+D19tslD4s3B1KmABl4OWNzzLaBNL/2U="; From f137a6eef64aaa7071c163bebfc476b0a0d99164 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 09:40:24 +0000 Subject: [PATCH 27/67] consul-template: 0.28.0 -> 0.29.0 --- pkgs/tools/system/consul-template/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index 5d09020eec34..c265cf028bc8 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "consul-template"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "consul-template"; rev = "v${version}"; - sha256 = "sha256-9NsudhalFm0km7BmK+2QzK9LxirrVtIFzNrugpw4f8g="; + sha256 = "sha256-HxzniR4z3YzvFww3KqhtelaqMQJBsSw83pfz+jHxvKQ="; }; - vendorSha256 = "sha256-SUbQPzFZUBgFZvaLc8730hZhJvt3/ni306Vt3EZMOmU="; + vendorSha256 = "sha256-wRNfxJVX45dfIBZ0sy48qbPkAsD0CIB1PDTiGs8Fjhs="; # consul-template tests depend on vault and consul services running to # execute tests so we skip them here From 58b7695fdc0d23260550ad28eaac72ad1d21189a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 09:41:23 +0000 Subject: [PATCH 28/67] checkSSLCert: 2.24.0 -> 2.25.0 --- pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index dc0aa891bdf7..c4fb36d5a3b9 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.24.0"; + version = "2.25.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - sha256 = "sha256-TZT37W4A09t7okPFfcOJOQEAKAchH1FJ+LRftdHZQsM="; + sha256 = "sha256-WjiUsf8PMlTsldMaxnQbgnC1XLVW6wz50JyX/3MbZ+k="; }; nativeBuildInputs = [ From 1d7c4641170b92bded78ce13f71c89dbd0f9ce38 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 10:01:15 +0000 Subject: [PATCH 29/67] python310Packages.policyuniverse: 1.5.0.20220420 -> 1.5.0.20220421 --- pkgs/development/python-modules/policyuniverse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/policyuniverse/default.nix b/pkgs/development/python-modules/policyuniverse/default.nix index 9b03c3581bdf..39f3be83ca2d 100644 --- a/pkgs/development/python-modules/policyuniverse/default.nix +++ b/pkgs/development/python-modules/policyuniverse/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "policyuniverse"; - version = "1.5.0.20220420"; + version = "1.5.0.20220421"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HWyzwvsn3ikL5cbEPljMHShF2vQEOSP6umk08UZgQsI="; + sha256 = "sha256-1rY77cIxqVcde+AYE6qfRgZzB8vb3yiQ3Bj+P0o1zFM="; }; # Tests are not shipped and there are no GitHub tags From ddf6457d2dca6b7eac434d1131d06797abbe50de Mon Sep 17 00:00:00 2001 From: Jamie Quigley Date: Fri, 22 Apr 2022 12:31:35 +0100 Subject: [PATCH 30/67] comma: Fix panic due to missing `nix-index` in path --- pkgs/tools/package-management/comma/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/package-management/comma/default.nix b/pkgs/tools/package-management/comma/default.nix index 5314285061e7..a9885fc13518 100644 --- a/pkgs/tools/package-management/comma/default.nix +++ b/pkgs/tools/package-management/comma/default.nix @@ -1,11 +1,12 @@ -{ lib -, rustPlatform +{ comma , fetchFromGitHub -, nix , fzy +, lib , makeWrapper +, nix +, nix-index +, rustPlatform , testVersion -, comma }: rustPlatform.buildRustPackage rec { @@ -25,7 +26,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' wrapProgram $out/bin/comma \ - --prefix PATH : ${lib.makeBinPath [ nix fzy ]} + --prefix PATH : ${lib.makeBinPath [ nix fzy nix-index ]} ln -s $out/bin/comma $out/bin/, ''; From fda2cdf47142665e93987a1fdbde2af32513f6fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 11:45:34 +0000 Subject: [PATCH 31/67] python310Packages.crytic-compile: 0.2.2 -> 0.2.3 --- pkgs/development/python-modules/crytic-compile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/crytic-compile/default.nix b/pkgs/development/python-modules/crytic-compile/default.nix index 7260310ea03e..393dcd5e9d83 100644 --- a/pkgs/development/python-modules/crytic-compile/default.nix +++ b/pkgs/development/python-modules/crytic-compile/default.nix @@ -2,15 +2,15 @@ buildPythonPackage rec { pname = "crytic-compile"; - version = "0.2.2"; + version = "0.2.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "crytic"; repo = "crytic-compile"; - rev = version; - sha256 = "sha256-4Lz+jJdKURp+K5XJJb7ksiFbnQwzS71gZWOufBvqz/k="; + rev = "refs/tags/${version}"; + sha256 = "sha256-l8a9QXERpkVrx7zHluMlb3zBvJSODsviNtJPzvL3hDo="; }; propagatedBuildInputs = [ pysha3 setuptools ]; From 4eff2009a57c57e1989750d105ada62a456e7fff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 12:00:14 +0000 Subject: [PATCH 32/67] difftastic: 0.26.3 -> 0.27.0 --- pkgs/tools/text/difftastic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 12ad1a764fb2..3109687fd189 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.26.3"; + version = "0.27.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "11qvl78dskhawmzjbff2cd4icwvlfhg8hzf1law5w5cr768zv7yn"; + sha256 = "sha256-jdkyDsuOOG1dJmgRmMp2KhY9ermccjrxK2JAIzpO6nw="; }; - cargoSha256 = "1kmwd9m94kl3j6ajfndr7rjx66fsqvnn2jh0m54ac5qd5r9hhdc8"; + cargoSha256 = "sha256-qHG3ve8HoMWBS/x6mRbXMsrpcqNqfVcbAkfYOk7Su/0="; passthru.tests.version = testVersion { package = difftastic; }; From 6c87c725e2c94278a1fdd1b3773deb4dd3dc19cb Mon Sep 17 00:00:00 2001 From: Blake Smith Date: Sat, 16 Apr 2022 23:10:58 -0500 Subject: [PATCH 33/67] firectl: 0.1.0 -> 0.1.0-unstable-2022-03-01 The latest version of nixpkgs.firecracker (1.0.0) is incompatible with version 0.1.0 of firectl. Must use latest HEAD in upstream to pick up breaking changes in the API. See: https://github.com/firecracker-microvm/firectl/issues/82 --- .../virtualization/firectl/default.nix | 12 ++++++------ .../virtualization/firectl/gomod.patch | 15 --------------- 2 files changed, 6 insertions(+), 21 deletions(-) delete mode 100644 pkgs/applications/virtualization/firectl/gomod.patch diff --git a/pkgs/applications/virtualization/firectl/default.nix b/pkgs/applications/virtualization/firectl/default.nix index ac531b36dd21..458e2ffc7e5e 100644 --- a/pkgs/applications/virtualization/firectl/default.nix +++ b/pkgs/applications/virtualization/firectl/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "firectl"; - version = "0.1.0"; - - patches = [ ./gomod.patch ]; + # The latest upstream 0.1.0 is incompatible with firecracker + # v0.1.0. See issue: https://github.com/firecracker-microvm/firectl/issues/82 + version = "unstable-2022-03-01"; src = fetchFromGitHub { owner = "firecracker-microvm"; repo = pname; - rev = "v${version}"; - sha256 = "1ni3yx4rjhrkqk2038c6hkb2jwsdj2llx233wd5wgpvb6c57652p"; + rev = "9f1b639a446e8d75f31787a00b9f273c1e68f12c"; + sha256 = "TjzzHY9VYPpWoPt6nHYUerKX94O03sm524wGM9lGzno="; }; - vendorSha256 = "1xbpck1gvzl75xgrajf5yzl199l4f2f6j3mac5586i7b00b9jxqj"; + vendorSha256 = "3SVEvvGNx6ienyJZg0EOofHNHCPSpJUGXwHxokdRG1c="; doCheck = false; diff --git a/pkgs/applications/virtualization/firectl/gomod.patch b/pkgs/applications/virtualization/firectl/gomod.patch deleted file mode 100644 index 96c65e728221..000000000000 --- a/pkgs/applications/virtualization/firectl/gomod.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/go.mod b/go.mod -index 1044001..7bafeda 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,7 +1,10 @@ - module github.com/firecracker-microvm/firectl - -+go 1.14 -+ - require ( - github.com/firecracker-microvm/firecracker-go-sdk v0.15.1 -+ github.com/go-openapi/strfmt v0.17.1 - github.com/jessevdk/go-flags v1.4.0 - github.com/pkg/errors v0.8.0 - github.com/sirupsen/logrus v1.1.1 From 433db93155fc72aabdd0089d87f3fa971e453600 Mon Sep 17 00:00:00 2001 From: Ethin Probst Date: Sun, 10 Apr 2022 10:00:57 +0200 Subject: [PATCH 34/67] maintainers: add ethindp --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c2788a7193bb..b20b473dc679 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3849,6 +3849,13 @@ githubId = 222467; name = "Dmitry Ivanov"; }; + ethindp = { + name = "Ethin Probst"; + email = "harlydavidsen@gmail.com"; + matrix = "@ethindp:the-gdn.net"; + github = "ethindp"; + githubId = 8030501; + }; Etjean = { email = "et.jean@outlook.fr"; github = "Etjean"; From df550f6e584c9c89db2d237d27e7be2d932b7d3e Mon Sep 17 00:00:00 2001 From: Ethin Probst Date: Sat, 9 Apr 2022 21:56:47 -0500 Subject: [PATCH 35/67] espeakup: init at 0.90 Signed-off-by: Ethin Probst --- .../accessibility/espeakup/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/applications/accessibility/espeakup/default.nix diff --git a/pkgs/applications/accessibility/espeakup/default.nix b/pkgs/applications/accessibility/espeakup/default.nix new file mode 100644 index 000000000000..00f432ff4138 --- /dev/null +++ b/pkgs/applications/accessibility/espeakup/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, lib +, meson +, ninja +, espeak-ng +, fetchFromGitHub +, pkg-config +, ronn +, alsa-lib +, systemd +}: + +stdenv.mkDerivation rec { + pname = "espeakup"; + version = "0.90"; + + src = fetchFromGitHub { + owner = "linux-speakup"; + repo = "espeakup"; + rev = "v${version}"; + sha256 = "0lmjwafvfxy07zn18v3dzjwwpnid2xffgvy2dzlwkbns8gb60ds2"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ronn + ]; + + buildInputs = [ + espeak-ng + alsa-lib + systemd + ]; + + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + + meta = with lib; { + homepage = "https://github.com/linux-speakup/espeakup"; + description = "Lightweight connector for espeak-ng and speakup"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ethindp ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c544a4ad29bc..5117ec4d3092 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25838,6 +25838,8 @@ with pkgs; espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; + espeakup = callPackage ../applications/accessibility/espeakup { }; + etebase-server = with python3Packages; toPythonApplication etebase-server; etesync-dav = callPackage ../applications/misc/etesync-dav {}; From 16ed5d0446f4a7b43be34df2ece2ac800b640881 Mon Sep 17 00:00:00 2001 From: Ethin Probst Date: Sat, 9 Apr 2022 21:58:40 -0500 Subject: [PATCH 36/67] python3.pkgs.pyttsx3: init at 2.90 Signed-off-by: Ethin Probst Explain why doCheck is false in pyttsx3. Signed-off-by: Ethin Probst --- .../python-modules/pyttsx3/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/pyttsx3/default.nix diff --git a/pkgs/development/python-modules/pyttsx3/default.nix b/pkgs/development/python-modules/pyttsx3/default.nix new file mode 100644 index 000000000000..fc4762340602 --- /dev/null +++ b/pkgs/development/python-modules/pyttsx3/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, espeak-ng }: + +buildPythonPackage rec { + pname = "pyttsx3"; + version = "2.90"; + format = "wheel"; + + src = fetchPypi { + inherit pname version format; + sha256 = "a585b6d8cffc19bd92db1e0ccbd8aa9c6528dd2baa5a47045d6fed542a44aa19"; + dist = "py3"; + python = "py3"; + }; + + # This package has no tests + doCheck = false; + + meta = with lib; { + description = "Offline text-to-speech synthesis library"; + homepage = "https://github.com/nateshmbhat/pyttsx3"; + license = licenses.mpl20; + maintainers = [ maintainers.ethindp ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0ed2d95217e4..455c32c89180 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8471,6 +8471,8 @@ in { pytricia = callPackage ../development/python-modules/pytricia { }; + pyttsx3 = callPackage ../development/python-modules/pyttsx3 { }; + pytube = callPackage ../development/python-modules/pytube { }; pytun = callPackage ../development/python-modules/pytun { }; From 5e2b2659dc462eaedb029568548a8623e014596a Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 21 Apr 2022 12:05:28 -0300 Subject: [PATCH 37/67] ocamlPackages.reperf: init 1.5.1 --- .../ocaml-modules/reperf/default.nix | 41 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/ocaml-modules/reperf/default.nix diff --git a/pkgs/development/ocaml-modules/reperf/default.nix b/pkgs/development/ocaml-modules/reperf/default.nix new file mode 100644 index 000000000000..bcae9dc695cf --- /dev/null +++ b/pkgs/development/ocaml-modules/reperf/default.nix @@ -0,0 +1,41 @@ +{ buildDunePackage, fetchFromGitHub, lib, printbox-text, reason }: + +buildDunePackage rec { + pname = "reperf"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "bryphe"; + repo = "reperf"; + rev = "68ef2f96899c09e6ac7d929b0375f7a806aee067"; + sha256 = "sha256-ASujTsH4eDAYLNalB9Xt1p3C8x+FI0kMldZBYaXMCWc="; + }; + + postPatch = '' + substituteInPlace src/dune --replace "printbox" "printbox-text" + ''; + + nativeBuildInputs = [ reason ]; + + buildInputs = [ + printbox-text + ]; + + meta = with lib; { + description = "Native Reason + JSOO cross-platform performance benchmarking tools"; + longDescription = '' + Inspired by the core_bench tools from Janestreet. + + reperf helps with: + * Timing: time spent in a code block + * Call count: frequency of code-path calls + * Allocations: code-block impact to garbage collector + + Supports benchmarks, which are test cases that exercise performance scenarios. + Outputs a JSON performance report, and compare it with previous iterations - and fail if a regression is detected. + ''; + homepage = "https://github.com/bryphe/reperf"; + maintainers = with maintainers; [ superherointj ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4601739d4fef..138cf3ca8578 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1268,6 +1268,8 @@ let rebez = callPackage ../development/ocaml-modules/rebez { }; + reperf = callPackage ../development/ocaml-modules/reperf { }; + rfc7748 = callPackage ../development/ocaml-modules/rfc7748 { }; ezresto = callPackage ../development/ocaml-modules/resto/ezresto.nix { }; From e6e8c01472f7061f30dff85596257e6f8dab5b70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 12:57:36 +0000 Subject: [PATCH 38/67] python310Packages.eagle100: 0.1.0 -> 0.1.1 --- pkgs/development/python-modules/eagle100/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eagle100/default.nix b/pkgs/development/python-modules/eagle100/default.nix index 599181b11235..9d5e5d795028 100644 --- a/pkgs/development/python-modules/eagle100/default.nix +++ b/pkgs/development/python-modules/eagle100/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "eagle100"; - version = "0.1.0"; + version = "0.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-i9ZvbjxSENJlQ+9sqWnIl1fL6tVbG3E/IUhe7b59sBk="; + hash = "sha256-eyYY1x8IjIfUx5OiaOomiWunsO1++seFwXlI/iKDDLw="; }; propagatedBuildInputs = [ From 1930dbac0a9efdaa2a4e218dfc29aa05c29de0fd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Apr 2022 15:04:24 +0200 Subject: [PATCH 39/67] checkov: 2.0.1075 -> 2.0.1076 --- 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 36fff6af567b..a6d0f5d22612 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.1075"; + version = "2.0.1076"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-5KAmIJngrs4nvjLJsaUrbgZsMFe0eTTDiwquyguvKLI="; + hash = "sha256-LDO4f8SHyTtJp9zOF+exCrNAMhNoIERqHRk11BJgrFs="; }; nativeBuildInputs = with py.pkgs; [ From c1747310047966202facec0e88469ac60f8d54a7 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 22 Apr 2022 10:05:23 -0300 Subject: [PATCH 40/67] lbreakout2: rewrite --- pkgs/games/lgames/lbreakout2/default.nix | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/games/lgames/lbreakout2/default.nix b/pkgs/games/lgames/lbreakout2/default.nix index 818cd31fa59a..4645baf06244 100644 --- a/pkgs/games/lgames/lbreakout2/default.nix +++ b/pkgs/games/lgames/lbreakout2/default.nix @@ -1,19 +1,34 @@ -{ lib, stdenv, fetchurl, SDL, SDL_mixer, zlib, libpng, libintl }: +{ lib +, stdenv +, fetchurl +, SDL +, SDL_mixer +, libintl +, libpng +, zlib +}: stdenv.mkDerivation rec { pname = "lbreakout2"; version = "2.6.5"; - buildInputs = [ SDL SDL_mixer zlib libpng libintl ]; src = fetchurl { url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; sha256 = "0vwdlyvh7c4y80q5vp7fyfpzbqk9lq3w8pvavi139njkalbxc14i"; }; + buildInputs = [ + SDL + SDL_mixer + libintl + libpng + zlib + ]; + meta = with lib; { - description = "Breakout clone from the LGames series"; homepage = "http://lgames.sourceforge.net/LBreakout2/"; - license = licenses.gpl2; + description = "Breakout clone from the LGames series"; + license = licenses.gpl2Plus; maintainers = [ maintainers.ciil ]; platforms = platforms.unix; hydraPlatforms = lib.platforms.linux; # sdl-config times out on darwin From 6b841f4d89ec78c8b92ed31d1003ddc86155a19b Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 18 Apr 2022 23:57:10 -0300 Subject: [PATCH 41/67] lpairs2: init at 2.1 --- pkgs/games/lgames/lpairs2/default.nix | 33 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/games/lgames/lpairs2/default.nix diff --git a/pkgs/games/lgames/lpairs2/default.nix b/pkgs/games/lgames/lpairs2/default.nix new file mode 100644 index 000000000000..4011dd9a2948 --- /dev/null +++ b/pkgs/games/lgames/lpairs2/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchurl +, SDL2 +, SDL2_image +, SDL2_mixer +, SDL2_ttf +}: + +stdenv.mkDerivation rec { + pname = "lpairs2"; + version = "2.1"; + + src = fetchurl { + url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; + hash = "sha256-35KYDnPWOjNPu9wz9AWvSBAo1tdVDo7I2TNxtxE5RRg="; + }; + + buildInputs = [ + SDL2 + SDL2_image + SDL2_mixer + SDL2_ttf + ]; + + meta = with lib; { + homepage = "http://lgames.sourceforge.net/LPairs/"; + description = "Matching the pairs - a typical Memory Game"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab37a0d43934..5b0580165d45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31105,6 +31105,8 @@ with pkgs; lbreakout2 = callPackage ../games/lgames/lbreakout2 { }; + lpairs2 = callPackage ../games/lgames/lpairs2 { }; + ltris = callPackage ../games/lgames/ltris { }; lunar-client = callPackage ../games/lunar-client { }; From 65c84834aacbba6be72b8501e94f5f64a70bfb9b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 13:12:35 +0000 Subject: [PATCH 42/67] efm-langserver: 0.0.42 -> 0.0.44 --- pkgs/development/tools/efm-langserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/efm-langserver/default.nix b/pkgs/development/tools/efm-langserver/default.nix index a030a271b487..788c4edc9a86 100644 --- a/pkgs/development/tools/efm-langserver/default.nix +++ b/pkgs/development/tools/efm-langserver/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "efm-langserver"; - version = "0.0.42"; + version = "0.0.44"; src = fetchFromGitHub { owner = "mattn"; repo = "efm-langserver"; rev = "v${version}"; - sha256 = "sha256-1IAPtqIozp9Wp3L95mmhFuWvWvCDuTh1VsCVaJSzyfk="; + sha256 = "sha256-+yN08MAoFaixvt2EexhRNucG6I4v2FdHf44XlYIwzhA="; }; vendorSha256 = "sha256-KABezphT5/o3XWSFNe2OvfawFR8uwsGMnjsI9xh378Q="; From a8a870789da6b3d511f3316c0eaf2985d407d4b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 13:17:22 +0000 Subject: [PATCH 43/67] python310Packages.authheaders: 0.14.1 -> 0.15.1 --- pkgs/development/python-modules/authheaders/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/authheaders/default.nix b/pkgs/development/python-modules/authheaders/default.nix index 8593f7f4d742..0d9c1a4093da 100644 --- a/pkgs/development/python-modules/authheaders/default.nix +++ b/pkgs/development/python-modules/authheaders/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "authheaders"; - version = "0.14.1"; + version = "0.15.1"; src = fetchPypi { inherit pname version; - sha256 = "4e601b5b54080019a2f548fadf80ddf9c5538615607c7fb602936404aafe67e2"; + sha256 = "sha256-90rOvu+CbHtammrMDZpPx7rIboIT2X/jL1GtfjpmuOk="; }; propagatedBuildInputs = [ authres dnspython dkimpy publicsuffix2 ] From e94105fde8106c8ff65ec89a7800f8476dcd3993 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 22 Apr 2022 06:46:36 -0700 Subject: [PATCH 44/67] ammonite: 2.5.2 -> 2.5.3 (#168845) --- pkgs/development/tools/ammonite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 080a8362ba70..efeaf9df5075 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -9,7 +9,7 @@ let common = { scalaVersion, sha256 }: stdenv.mkDerivation rec { pname = "ammonite"; - version = "2.5.2"; + version = "2.5.3"; src = fetchurl { url = @@ -83,10 +83,10 @@ let in { ammonite_2_12 = common { scalaVersion = "2.12"; - sha256 = "sha256-vj0Ze+Tn8jgq1mIVZWq2q768vW6fNXHB28gMcB9bWHU="; + sha256 = "sha256-Iov55ohFjcGhur5UEng7aAZJPVua1H/JaKKW6OKS6Zg="; }; ammonite_2_13 = common { scalaVersion = "2.13"; - sha256 = "sha256-ZuPyZFD3/VRP/GegcKqXZm3bveQB/Xr5E39eQktDCJI="; + sha256 = "sha256-dzUhKUQDHrYZ4WyCk4z4CTxb6vK05qfApR/WPOwhA5s="; }; } From 34158db51669b3ee360350d35313cb50406ae837 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 19 Apr 2022 23:11:34 -0300 Subject: [PATCH 45/67] lbreakouthd: init at 1.0.9 --- pkgs/games/lgames/lbreakouthd/default.nix | 35 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/games/lgames/lbreakouthd/default.nix diff --git a/pkgs/games/lgames/lbreakouthd/default.nix b/pkgs/games/lgames/lbreakouthd/default.nix new file mode 100644 index 000000000000..4a6e2c31bbf6 --- /dev/null +++ b/pkgs/games/lgames/lbreakouthd/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, fetchurl +, SDL2 +, SDL2_image +, SDL2_mixer +, SDL2_ttf +}: + +stdenv.mkDerivation rec { + pname = "lbreakouthd"; + version = "1.0.9"; + + src = fetchurl { + url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; + hash = "sha256-MHwK4jeDfZSS4jh///jW0/q4ntM4IuB0fQ8Bsaq0d0s="; + }; + + buildInputs = [ + SDL2 + SDL2_image + SDL2_mixer + SDL2_ttf + ]; + + hardeningDisable = [ "format" ]; + + meta = with lib; { + homepage = "https://lgames.sourceforge.io/LBreakoutHD/"; + description = "A widescreen Breakout clone"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + inherit (SDL2.meta) platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b0580165d45..6433ae64f5c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31105,6 +31105,8 @@ with pkgs; lbreakout2 = callPackage ../games/lgames/lbreakout2 { }; + lbreakouthd = callPackage ../games/lgames/lbreakouthd { }; + lpairs2 = callPackage ../games/lgames/lpairs2 { }; ltris = callPackage ../games/lgames/ltris { }; From ae841fd9abdd462bc0e543fb200503fbd95e7e49 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 22 Apr 2022 12:18:13 -0300 Subject: [PATCH 46/67] barrage: init at 1.0.5 --- pkgs/games/lgames/barrage/default.nix | 31 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/games/lgames/barrage/default.nix diff --git a/pkgs/games/lgames/barrage/default.nix b/pkgs/games/lgames/barrage/default.nix new file mode 100644 index 000000000000..70f97b591001 --- /dev/null +++ b/pkgs/games/lgames/barrage/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchurl +, SDL +, SDL_mixer +}: + +stdenv.mkDerivation rec { + pname = "barrage"; + version = "1.0.5"; + + src = fetchurl { + url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; + hash = "sha256-p4iXq2qM9tU9QJO7irriBN36OiLFyrnnYiDkmH3naQQ="; + }; + + buildInputs = [ + SDL + SDL_mixer + ]; + + hardeningDisable = [ "format" ]; + + meta = with lib; { + homepage = "https://lgames.sourceforge.io/Barrage/"; + description = "A destructive action game"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + inherit (SDL.meta) platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6433ae64f5c7..f0e3805c7751 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31103,6 +31103,8 @@ with pkgs; ### GAMES/LGAMES + barrage = callPackage ../games/lgames/barrage { }; + lbreakout2 = callPackage ../games/lgames/lbreakout2 { }; lbreakouthd = callPackage ../games/lgames/lbreakouthd { }; From 77c966e06ea1f9c85200c38ae394bf56df725d0c Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 22 Apr 2022 01:23:46 -0500 Subject: [PATCH 47/67] neovim-ruby: 0.8.1 -> 0.9.0 update some Neovim Ruby gem versions --- .../editors/neovim/ruby_provider/Gemfile.lock | 4 ++-- .../editors/neovim/ruby_provider/gemset.nix | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock index 7a1975c37c6b..9a8aaeeb56c4 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock +++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock @@ -1,9 +1,9 @@ GEM remote: https://rubygems.org/ specs: - msgpack (1.4.2) + msgpack (1.5.1) multi_json (1.15.0) - neovim (0.8.1) + neovim (0.9.0) msgpack (~> 1.1) multi_json (~> 1.0) diff --git a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix index 60dcc8ba3832..1a4f517412fe 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix +++ b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix @@ -4,17 +4,17 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06iajjyhx0rvpn4yr3h1hc4w4w3k59bdmfhxnjzzh76wsrdxxrc6"; + sha256 = "sha256-fPWiGi0w4OFlMZOIf3gd21jyeYhg5t/VdLz7kK9fD8Q="; type = "gem"; }; - version = "1.4.2"; + version = "1.5.1"; }; multi_json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + sha256 = "sha256-H9BBOLbkqQAX6NG4BMA5AxOZhm/z+6u3girqNnx4YV0="; type = "gem"; }; version = "1.15.0"; @@ -25,9 +25,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lfrbi4r6lagn2q92lyivk2w22i2spw0jbdzxxlcfj2zhv2wnvvi"; + sha256 = "sha256-hRI43XGHGeqxMvpFjp0o79GGReiLXTkhwh5LYq6AQL4="; type = "gem"; }; - version = "0.8.1"; + version = "0.9.0"; }; } From 5f241076f44c9833b973b17d5074534217090d22 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Fri, 22 Apr 2022 18:30:38 +0200 Subject: [PATCH 48/67] gnome-breeze: remove --- pkgs/data/themes/gnome-breeze/default.nix | 29 ----------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 pkgs/data/themes/gnome-breeze/default.nix diff --git a/pkgs/data/themes/gnome-breeze/default.nix b/pkgs/data/themes/gnome-breeze/default.nix deleted file mode 100644 index 38733590a34e..000000000000 --- a/pkgs/data/themes/gnome-breeze/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation { - pname = "gnome-breeze"; - version = "unstable-2016-05-26"; - - src = fetchFromGitHub { - owner = "dirruk1"; - repo = "gnome-breeze"; - rev = "49a5cd67a270e13a4c04a4b904f126ef728e9221"; - sha256 = "sha256-lQYVOhFBDOYT+glUHleuymGTfHEE5bIyqUFnS/EDc0I="; - }; - - installPhase = '' - mkdir -p $out/share/themes - cp -r Breeze* $out/share/themes - ''; - - preferLocalBuild = true; - - meta = with lib; { - description = "A GTK theme built to match KDE's breeze theme"; - homepage = "https://github.com/dirruk1/gnome-breeze"; - license = licenses.lgpl2; - maintainers = with maintainers; [ bennofs ]; - platforms = platforms.all; - hydraPlatforms = []; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index db330743e50d..e960196bb6d7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -448,6 +448,7 @@ mapAliases ({ gmic_krita_qt = gmic-qt-krita; # Added 2019-09-07 gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # Added 2021-03-08 gnash = throw "gnash has been removed; broken and abandoned upstream"; # added 2022-02-06 + gnome-breeze = throw "gnome-breeze has been removed, use libsForQt5.breeze-gtk instead"; # Added 2022-04-22 gnome-firmware-updater = gnome-firmware; # added 2022-04-14 gnome-passwordsafe = gnome-secrets; # added 2022-01-30 gnome-mpv = celluloid; # Added 2019-08-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 434d94509ab4..a81369a5e943 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24131,8 +24131,6 @@ with pkgs; gsettings-desktop-schemas = callPackage ../development/libraries/gsettings-desktop-schemas { }; - gnome-breeze = callPackage ../data/themes/gnome-breeze { }; - gnome-icon-theme = callPackage ../data/icons/gnome-icon-theme { }; go-font = callPackage ../data/fonts/go-font { }; From 4f9b8a07024c3397d33df3f26906839cd03f0297 Mon Sep 17 00:00:00 2001 From: Daniel Thwaites Date: Fri, 22 Apr 2022 17:43:25 +0100 Subject: [PATCH 49/67] lib/strings: optimise hasInfix function (#168175) * lib/strings: optimise hasInfix function * lib/strings: optimise hasInfix further using regex * rstudio: call hasInfix with a string * lib/strings: remove let from hasInfix Co-authored-by: pennae <82953136+pennae@users.noreply.github.com> Co-authored-by: pennae <82953136+pennae@users.noreply.github.com> --- lib/strings.nix | 5 +---- pkgs/applications/editors/rstudio/default.nix | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/strings.nix b/lib/strings.nix index 820d1901f945..11066890ec3d 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -253,10 +253,7 @@ rec { => false */ hasInfix = infix: content: - let - drop = x: substring 1 (stringLength x) x; - in hasPrefix infix content - || content != "" && hasInfix infix (drop content); + builtins.match ".*${escapeRegex infix}.*" content != null; /* Convert a string to a list of characters (i.e. singleton strings). This allows you to, e.g., map a function over each character. However, diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index eada77eea843..8d4aa112cdb6 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -154,7 +154,7 @@ in hunspellDictionaries = with lib; filter isDerivation (unique (attrValues hunspellDicts)); # These dicts contain identically-named dict files, so we only keep the # -large versions in case of clashes - largeDicts = with lib; filter (d: hasInfix "-large-wordlist" d) hunspellDictionaries; + largeDicts = with lib; filter (d: hasInfix "-large-wordlist" d.name) hunspellDictionaries; otherDicts = with lib; filter (d: !(hasAttr "dictFileName" d && elem d.dictFileName (map (d: d.dictFileName) largeDicts))) From f195f9592c5500d77db3e5b45d8aa9e3c58ac0e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 13:42:10 +0000 Subject: [PATCH 50/67] python310Packages.azure-mgmt-reservations: 1.0.0 -> 2.0.0 --- .../python-modules/azure-mgmt-reservations/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix index 7e08b16166d7..48a8d937294a 100644 --- a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-reservations"; - version = "1.0.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "880df54fdf3869ee6b142d4fc7a3fce518c850523c42cc895b7fb8359956554e"; + sha256 = "sha256-5vXdXiRubnzPk4uTFeNHR6rwiHSGbeUREX9eW1pqC3E="; }; propagatedBuildInputs = [ From 1812c3275b01ecbdc6870435362a92c09601f387 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Apr 2022 17:06:46 +0200 Subject: [PATCH 51/67] python3Packages.azure-mgmt-reservations: disable on older Python releases --- .../python-modules/azure-mgmt-reservations/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix index 48a8d937294a..0be05eb390f1 100644 --- a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix @@ -5,18 +5,20 @@ , msrestazure , azure-common , azure-mgmt-core -, azure-mgmt-nspkg -, isPy3k +, pythonOlder }: buildPythonPackage rec { pname = "azure-mgmt-reservations"; version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-5vXdXiRubnzPk4uTFeNHR6rwiHSGbeUREX9eW1pqC3E="; + hash = "sha256-5vXdXiRubnzPk4uTFeNHR6rwiHSGbeUREX9eW1pqC3E="; }; propagatedBuildInputs = [ @@ -24,8 +26,6 @@ buildPythonPackage rec { msrestazure azure-common azure-mgmt-core - ] ++ lib.optionals (!isPy3k) [ - azure-mgmt-nspkg ]; # has no tests From 9e91af54b8b2ca8d0e7f302b0be3282781c4c54c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 14:46:09 +0000 Subject: [PATCH 52/67] python310Packages.pytest-mpl: 0.14.0 -> 0.15.0 --- pkgs/development/python-modules/pytest-mpl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index 040299ad5448..f0215ed7d7b2 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "pytest-mpl"; - version = "0.14.0"; + version = "0.15.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-iE4HjS1TgK9WQzhOIzw1jpZZgl+y2X/9r48YXENMjYk="; + sha256 = "sha256-p5/UKLVoDYclp2o/MBb2oX1pHzxsQpHjmfwU1kFSKbw="; }; nativeBuildInputs = [ From 6ca65957c9fe4bc730f31c5af2e7853d4790571c Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 22 Apr 2022 17:08:29 +0300 Subject: [PATCH 53/67] hydra-check: 1.2.0 -> 1.3.4 --- .../python-modules/hydra-check/default.nix | 31 +++++++------------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/hydra-check/default.nix b/pkgs/development/python-modules/hydra-check/default.nix index 48833d77e8bf..8c1fd56b8d3a 100644 --- a/pkgs/development/python-modules/hydra-check/default.nix +++ b/pkgs/development/python-modules/hydra-check/default.nix @@ -2,46 +2,39 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, docopt +, poetry-core , requests , beautifulsoup4 -, mypy -, types-requests +, colorama }: buildPythonPackage rec { pname = "hydra-check"; - version = "1.2.0"; - disabled = pythonOlder "3.5"; + version = "1.3.4"; + format = "pyproject"; + + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; - rev = version; - sha256 = "EegoQ8qTrFGFYbCDsbAOE4Afg9haLjYdC0Cux/yvSk8="; + rev = "v${version}"; + sha256 = "sha256-voSbpOPJUPjwzdMLVt2TC/FIi6LKk01PLd/GczOAUR8="; }; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ - docopt + colorama requests beautifulsoup4 ]; - checkInputs = [ - mypy - types-requests - ]; - - checkPhase = '' - echo -e "\x1b[32m## run mypy\x1b[0m" - mypy hydracheck - ''; + pythonImportsCheck = [ "hydra_check" ]; meta = with lib; { description = "check hydra for the build status of a package"; homepage = "https://github.com/nix-community/hydra-check"; license = licenses.mit; - maintainers = with maintainers; [ makefu ]; + maintainers = with maintainers; [ makefu artturin ]; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56467bb56ef0..c86b83517c32 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17724,7 +17724,7 @@ with pkgs; hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; - hydra-check = with python3.pkgs; toPythonApplication hydra-check; + hydra-check = with python310.pkgs; toPythonApplication hydra-check; hyena = callPackage ../development/libraries/hyena { }; From b80f570a92d04e8ace67ff09c34aa48708a5c88c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Apr 2022 17:14:37 +0200 Subject: [PATCH 54/67] python3Packages.zwave-js-server-python: 0.35.2 -> 0.35.3 --- .../python-modules/zwave-js-server-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index 5f4203634acb..028e30f4cb74 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.35.2"; + version = "0.35.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "sha256-Bte4pAi+atdkMvxYlzdN/UOrHB2WKfl44U9m/vKFMoA="; + sha256 = "sha256-vM5GEqq32VdC5UjGVlnrN8/LRcCHHkJFzEbaA2Snte8="; }; propagatedBuildInputs = [ From 89cb8c91848ce7fee00c66ea9afe8c152ea860bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 13:55:08 +0000 Subject: [PATCH 55/67] python310Packages.azure-mgmt-servicelinker: 1.0.0b1 -> 1.0.0 --- .../python-modules/azure-mgmt-servicelinker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix b/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix index 58d32853194b..55f4d9284923 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "azure-mgmt-servicelinker"; - version = "1.0.0b1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "4f70d3bcd98ba539bfef870e3c497ebdc5efed3200c2627a61718baa9ab21a61"; + sha256 = "sha256-lAjgwEa2TJDEUU8pwfwkU8EyA1bhLkcAv++I6WHb7Xs="; extension = "zip"; }; From 3838a0a7e7ef2a3faebb908cbab58d75b513b51c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 22 Apr 2022 09:40:03 +0000 Subject: [PATCH 56/67] patchelf_0_13: init at 0.13.1 The C++ compiler in our musl bootstrap for aarch64 is too old to build the latest version of patchelf, so introduce a package for the most recent version it's capable of building that we can use to get a new bootstrap. --- pkgs/development/tools/misc/patchelf/0.13.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/tools/misc/patchelf/0.13.nix diff --git a/pkgs/development/tools/misc/patchelf/0.13.nix b/pkgs/development/tools/misc/patchelf/0.13.nix new file mode 100644 index 000000000000..dd0eba508daa --- /dev/null +++ b/pkgs/development/tools/misc/patchelf/0.13.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, patchelf }: + +stdenv.mkDerivation rec { + pname = "patchelf"; + version = "0.13.1"; + + src = fetchurl { + url = "https://github.com/NixOS/${pname}/releases/download/${version}/${pname}-${version}.tar.bz2"; + sha256 = "sha256-OeiuzNdJXVTfCU0rSnwIAQ/3d3A2+q8k8o4Hd30VmOI="; + }; + + setupHook = [ ./setup-hook.sh ]; + + # fails 8 out of 24 tests, problems when loading libc.so.6 + doCheck = stdenv.name == "stdenv-linux"; + + inherit (patchelf) meta; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c86b83517c32..cdf049f550d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15801,6 +15801,7 @@ with pkgs; patchelf = callPackage ../development/tools/misc/patchelf { }; patchelf_0_9 = callPackage ../development/tools/misc/patchelf/0.9.nix { }; + patchelf_0_13 = callPackage ../development/tools/misc/patchelf/0.13.nix { }; patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { }); From e22d0b49a9553861cdaee9f71b37db4baf2bb992 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 22 Apr 2022 09:42:51 +0000 Subject: [PATCH 57/67] patchelf: use 0.13.x on aarch64+musl The C++ compiler in our musl bootstrap for aarch64 is too old to build the latest version of patchelf, so we need to use the latest version that builds with that compiler to get a new bootstrap. --- pkgs/development/tools/misc/patchelf/0.13.nix | 5 +++++ pkgs/top-level/all-packages.nix | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/patchelf/0.13.nix b/pkgs/development/tools/misc/patchelf/0.13.nix index dd0eba508daa..0111a4b065c4 100644 --- a/pkgs/development/tools/misc/patchelf/0.13.nix +++ b/pkgs/development/tools/misc/patchelf/0.13.nix @@ -1,5 +1,10 @@ { stdenv, fetchurl, patchelf }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + stdenv.mkDerivation rec { pname = "patchelf"; version = "0.13.1"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdf049f550d6..d72316c089c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15799,9 +15799,15 @@ with pkgs; parse-cli-bin = callPackage ../development/tools/parse-cli-bin { }; - patchelf = callPackage ../development/tools/misc/patchelf { }; + patchelf = if with stdenv.buildPlatform; isAarch64 && isMusl then + patchelf_0_13 + else + patchelf_0_14; patchelf_0_9 = callPackage ../development/tools/misc/patchelf/0.9.nix { }; - patchelf_0_13 = callPackage ../development/tools/misc/patchelf/0.13.nix { }; + patchelf_0_13 = callPackage ../development/tools/misc/patchelf/0.13.nix { + patchelf = patchelf_0_14; + }; + patchelf_0_14 = callPackage ../development/tools/misc/patchelf { }; patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { }); From 661dfd834787f157b70597f9f0f3e7202ba74332 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 22 Apr 2022 11:01:47 +0000 Subject: [PATCH 58/67] pkgsMusl.coreutils: fix build on aarch64 I suspect this issue is caused by the very old version of diffutils we have in the aarch64+musl bootstrap tools, so hopefully we can re-enable the tests once we have newer bootstrap tools. --- pkgs/tools/misc/coreutils/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 86a91a09c3eb..da60a80f77fc 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -113,8 +113,10 @@ stdenv.mkDerivation (rec { # Darwin (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19351), # and {Open,Free}BSD. # With non-standard storeDir: https://github.com/NixOS/nix/issues/512 + # On aarch64+musl, test-init.sh fails due to a segfault in diff. doCheck = stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.isMusl) + && !(stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64) && !stdenv.isAarch32; # Prevents attempts of running 'help2man' on cross-built binaries. From 3a73bf2b6e30e93ad363846b33f34a890b794a63 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 22 Apr 2022 09:31:42 +0000 Subject: [PATCH 59/67] patchelf: clarify license --- pkgs/development/tools/misc/patchelf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index 6919cd0f23fb..03e3d003ad1e 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/NixOS/patchelf"; - license = licenses.gpl3; + license = licenses.gpl3Plus; description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; maintainers = [ maintainers.eelco ]; platforms = platforms.all; From 3cab98701d5a2bf520a2480f49612cc18d01e6cd Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Thu, 21 Apr 2022 18:21:29 -0600 Subject: [PATCH 60/67] python310Packages.python-pae: init at 0.1.0 --- .../python-modules/python-pae/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/python-pae/default.nix diff --git a/pkgs/development/python-modules/python-pae/default.nix b/pkgs/development/python-modules/python-pae/default.nix new file mode 100644 index 000000000000..067d2a2843e6 --- /dev/null +++ b/pkgs/development/python-modules/python-pae/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, poetry-core +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "python-pae"; + version = "0.1.0"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + # Tests are on GitHub + src = fetchFromGitHub { + owner = "MatthiasValvekens"; + repo = "python-pae"; + rev = version; + sha256 = "sha256-D0X2T0ze79KR6Gno4UWpA/XvlkK6Y/jXUtLbzlOKr3E="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "python_pae" ]; + + meta = with lib; { + description = "Pre-authentication encoding (PAE) implementation in Python"; + homepage = "https://github.com/MatthiasValvekens/python-pae"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 04afc93babbb..e0b07a3274a9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8321,6 +8321,8 @@ in { python-packer = callPackage ../development/python-modules/python-packer { }; + python-pae = callPackage ../development/python-modules/python-pae { }; + python-pam = callPackage ../development/python-modules/python-pam { inherit (pkgs) pam; }; From 322a82a0ad79fa80bf12dde39ddde6226363fe5e Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Thu, 21 Apr 2022 18:22:25 -0600 Subject: [PATCH 61/67] python310Packages.python-barcode: init at 0.13.1 --- .../python-modules/python-barcode/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/python-barcode/default.nix diff --git a/pkgs/development/python-modules/python-barcode/default.nix b/pkgs/development/python-modules/python-barcode/default.nix new file mode 100644 index 000000000000..7a586c2caed2 --- /dev/null +++ b/pkgs/development/python-modules/python-barcode/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools-scm +, imagesSupport ? false +, pillow +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "python-barcode"; + version = "0.13.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-+vukqiTp2Wl3e+UhwpT/GPbCs2rWO1/C8hCNly4jslI="; + }; + + propagatedBuildInputs = [ + setuptools-scm + ] ++ lib.optionals (imagesSupport) [ + pillow + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=barcode" "" \ + --replace "--cov-report=term-missing:skip-covered" "" \ + --replace "--no-cov-on-fail" "" + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "barcode" ]; + + meta = with lib; { + description = "Create standard barcodes with Python"; + homepage = "https://github.com/WhyNotHugo/python-barcode"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e0b07a3274a9..ff67f1719779 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8139,6 +8139,8 @@ in { python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { }; + python-barcode = callPackage ../development/python-modules/python-barcode { }; + python-baseconv = callPackage ../development/python-modules/python-baseconv { }; python-benedict = callPackage ../development/python-modules/python-benedict { }; From 56cc54287d423a1c0891415cedbe7a62c92f8372 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Thu, 21 Apr 2022 18:23:08 -0600 Subject: [PATCH 62/67] python310Packages.uharfbuzz: init at 0.24.1 --- .../python-modules/uharfbuzz/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/uharfbuzz/default.nix diff --git a/pkgs/development/python-modules/uharfbuzz/default.nix b/pkgs/development/python-modules/uharfbuzz/default.nix new file mode 100644 index 000000000000..f39aa12152a1 --- /dev/null +++ b/pkgs/development/python-modules/uharfbuzz/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, cython +, setuptools-scm +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "uharfbuzz"; + version = "0.24.1"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; + + # Fetching from GitHub as Pypi contains different versions + src = fetchFromGitHub { + owner = "harfbuzz"; + repo = "uharfbuzz"; + rev = "v${version}"; + sha256 = "sha256-DyFXbwB28JH2lvmWDezRh49tjCvleviUNSE5LHG3kUg="; + fetchSubmodules = true; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + cython + setuptools-scm + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "uharfbuzz" ]; + + meta = with lib; { + description = "Streamlined Cython bindings for the harfbuzz shaping engine"; + homepage = "https://github.com/harfbuzz/uharfbuzz"; + license = licenses.asl20; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff67f1719779..49b0d981d7d9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10443,6 +10443,8 @@ in { ueagle = callPackage ../development/python-modules/ueagle { }; + uharfbuzz = callPackage ../development/python-modules/uharfbuzz { }; + ujson = callPackage ../development/python-modules/ujson { }; ukkonen = callPackage ../development/python-modules/ukkonen { }; From 8a9ba90b53571e6b3eb49e61dae182ea6947108b Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Thu, 21 Apr 2022 18:23:44 -0600 Subject: [PATCH 63/67] python310Packages.pyhanko-certvalidator: init at 0.19.5 --- .../pyhanko-certvalidator/default.nix | 73 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 75 insertions(+) create mode 100644 pkgs/development/python-modules/pyhanko-certvalidator/default.nix diff --git a/pkgs/development/python-modules/pyhanko-certvalidator/default.nix b/pkgs/development/python-modules/pyhanko-certvalidator/default.nix new file mode 100644 index 000000000000..4675e48a5646 --- /dev/null +++ b/pkgs/development/python-modules/pyhanko-certvalidator/default.nix @@ -0,0 +1,73 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, aiohttp +, asn1crypto +, cryptography +, oscrypto +, requests +, uritools +, openssl +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyhanko-certvalidator"; + version = "0.19.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + # Tests are only available on GitHub + src = fetchFromGitHub { + owner = "MatthiasValvekens"; + repo = "certvalidator"; + rev = version; + sha256 = "sha256-UxlBggKgqvbKioG98UaKvhW0YgEa6PqV913nqYvTx1I="; + }; + + propagatedBuildInputs = [ + asn1crypto + cryptography + oscrypto + requests + uritools + ]; + + checkInputs = [ + aiohttp + pytestCheckHook + ]; + + disabledTestPaths = [ + # Test looks for libcrypto.so.1.1 + "dev/stress_test.py" + # Requests + "tests/test_crl_client.py" + ]; + + disabledTests = [ + # Look for nonexisting certificates + "test_basic_certificate_validator_tls" + # Failed to fetch OCSP response from http://ocsp.digicert.com + "test_fetch_ocsp_aiohttp" + "test_fetch_ocsp_requests" + "test_fetch_ocsp_err_requests" + # Unable to build a validation path for the certificate "%s" - no issuer matching "%s" was found + "test_revocation_mode_hard_aiohttp_autofetch" + # The path could not be validated because no revocation information could be found for intermediate certificate 1 + "test_revocation_mode_hard" + ]; + + pythonImportsCheck = [ + "pyhanko_certvalidator" + ]; + + meta = with lib; { + description = "Python library for validating X.509 certificates and paths"; + homepage = "https://github.com/MatthiasValvekens/certvalidator"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 49b0d981d7d9..a6524cd8e64c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7159,6 +7159,8 @@ in { pyhamcrest = callPackage ../development/python-modules/pyhamcrest { }; + pyhanko-certvalidator = callPackage ../development/python-modules/pyhanko-certvalidator { }; + pyhaversion = callPackage ../development/python-modules/pyhaversion { }; pyhcl = callPackage ../development/python-modules/pyhcl { }; From 6d882ff425e065c4ee0f454e0c7e7fc13e1fbae0 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Thu, 21 Apr 2022 18:24:45 -0600 Subject: [PATCH 64/67] python310Packages.certomancer: init at 0.8.2 --- .../python-modules/certomancer/default.nix | 71 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/development/python-modules/certomancer/default.nix diff --git a/pkgs/development/python-modules/certomancer/default.nix b/pkgs/development/python-modules/certomancer/default.nix new file mode 100644 index 000000000000..3d863165f296 --- /dev/null +++ b/pkgs/development/python-modules/certomancer/default.nix @@ -0,0 +1,71 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, asn1crypto +, click +, oscrypto +, pyyaml +, python-dateutil +, tzlocal +, pytest-aiohttp +, pytz +, freezegun +, jinja2 +, pyhanko-certvalidator +, requests +, requests-mock +, werkzeug +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "certomancer"; + version = "0.8.2"; + format = "setuptools"; + disabled = pythonOlder "3.7"; + + # Tests are only available on GitHub + src = fetchFromGitHub { + owner = "MatthiasValvekens"; + repo = "certomancer"; + rev = version; + sha256 = "sha256-H43NlFNTwZtedHsB7c62MocwQVOi5JjVJxRcZY+Wn7Y="; + }; + + propagatedBuildInputs = [ + asn1crypto + click + oscrypto + pyyaml + python-dateutil + tzlocal + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace ", 'pytest-runner'" "" \ + --replace "pyhanko-certvalidator==0.19.2" "pyhanko-certvalidator==0.19.5" + ''; + + checkInputs = [ + freezegun + jinja2 + pyhanko-certvalidator + pytest-aiohttp + pytz + requests + requests-mock + werkzeug + pytestCheckHook + ]; + + pythonImportsCheck = [ "certomancer" ]; + + meta = with lib; { + description = "Quickly construct, mock & deploy PKI test configurations using simple declarative configuration"; + homepage = "https://github.com/MatthiasValvekens/certomancer"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a6524cd8e64c..8e4ce686c94d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1555,6 +1555,8 @@ in { certipy = callPackage ../development/python-modules/certipy { }; + certomancer = callPackage ../development/python-modules/certomancer { }; + certvalidator = callPackage ../development/python-modules/certvalidator { }; cffi = callPackage ../development/python-modules/cffi { }; From 7f3efc4ffb6c1e64aede5be27ee981fd3b848d38 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Thu, 21 Apr 2022 18:28:45 -0600 Subject: [PATCH 65/67] python310Packages.pyhanko: init at 0.12.1 --- ...0001-Updating-pytest-aiohttp-version.patch | 25 ++++ .../python-modules/pyhanko/default.nix | 132 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 159 insertions(+) create mode 100644 pkgs/development/python-modules/pyhanko/0001-Updating-pytest-aiohttp-version.patch create mode 100644 pkgs/development/python-modules/pyhanko/default.nix diff --git a/pkgs/development/python-modules/pyhanko/0001-Updating-pytest-aiohttp-version.patch b/pkgs/development/python-modules/pyhanko/0001-Updating-pytest-aiohttp-version.patch new file mode 100644 index 000000000000..562dc6461ef9 --- /dev/null +++ b/pkgs/development/python-modules/pyhanko/0001-Updating-pytest-aiohttp-version.patch @@ -0,0 +1,25 @@ +From 942d4fd37786941bae91b769ef6499a4b4da6843 Mon Sep 17 00:00:00 2001 +From: "P. R. d. O" +Date: Sat, 9 Apr 2022 12:40:59 -0600 +Subject: [PATCH] Updating pytest-aiohttp version + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index fe33d9a..694fab4 100644 +--- a/setup.py ++++ b/setup.py +@@ -85,7 +85,7 @@ setup( + tests_require=[ + 'pytest>=6.1.1', 'requests-mock>=1.8.0', + 'freezegun>=1.1.0', 'certomancer~=0.8.1', +- 'aiohttp~=3.8.0', 'pytest-aiohttp~=0.3.0', ++ 'aiohttp~=3.8.0', 'pytest-aiohttp~=1.0.3', + 'python-pae==0.1.0' + ], + keywords="signature pdf pades digital-signature pkcs11" +-- +2.35.1 + diff --git a/pkgs/development/python-modules/pyhanko/default.nix b/pkgs/development/python-modules/pyhanko/default.nix new file mode 100644 index 000000000000..2cd71ae0f33a --- /dev/null +++ b/pkgs/development/python-modules/pyhanko/default.nix @@ -0,0 +1,132 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, asn1crypto +, click +, cryptography +, pyhanko-certvalidator +, pytz +, pyyaml +, qrcode +, requests +, tzlocal +, certomancer +, freezegun +, python-pae +, pytest-aiohttp +, requests-mock +, pytestCheckHook +# Flags to add to the library +, extraPubkeyAlgsSupport ? false +, oscrypto +, opentypeSupport ? false +, fonttools +, uharfbuzz +, imageSupport ? false +, pillow +, python-barcode +, pkcs11Support ? false +, python-pkcs11 +, asyncHttpSupport ? false +, aiohttp +}: + +buildPythonPackage rec { + pname = "pyhanko"; + version = "0.12.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + # Tests are only available on GitHub + src = fetchFromGitHub { + owner = "MatthiasValvekens"; + repo = "pyHanko"; + rev = version; + sha256 = "sha256-W60NTKEtCqJ/QdtNiieKUsrl2jIjIH86Wych68R3mBc="; + }; + + propagatedBuildInputs = [ + click + pyhanko-certvalidator + pytz + pyyaml + qrcode + tzlocal + ] ++ lib.optionals (extraPubkeyAlgsSupport) [ + oscrypto + ] ++ lib.optionals (opentypeSupport) [ + fonttools + uharfbuzz + ] ++ lib.optionals (imageSupport) [ + pillow + python-barcode + ] ++ lib.optionals (pkcs11Support) [ + python-pkcs11 + ] ++ lib.optionals (asyncHttpSupport) [ + aiohttp + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace ", 'pytest-runner'" "" \ + --replace "pytest-aiohttp~=0.3.0" "pytest-aiohttp~=1.0.3" + ''; + + checkInputs = [ + aiohttp + certomancer + freezegun + python-pae + pytest-aiohttp + requests-mock + pytestCheckHook + ]; + + disabledTestPaths = lib.optionals (!opentypeSupport) [ + "pyhanko_tests/test_stamp.py" + "pyhanko_tests/test_text.py" + ] ++ lib.optionals (!imageSupport) [ + "pyhanko_tests/test_barcode.py" + ] ++ lib.optionals (!pkcs11Support) [ + "pyhanko_tests/test_pkcs11.py" + ]; + + disabledTests = [ + # Most of the test require working with local certificates, + # contacting OSCP or performing requests + "test_generic_data_sign_legacy" + "test_generic_data_sign" + "test_cms_v3_sign" + "test_detached_cms_with_self_reported_timestamp" + "test_detached_cms_with_tst" + "test_detached_cms_with_content_tst" + "test_detached_cms_with_wrong_content_tst" + "test_detached_with_malformed_content_tst" + "test_noop_attribute_prov" + "test_detached_cades_cms_with_tst" + "test_read_qr_config" + "test_no_changes_policy" + "test_bogus_metadata_manipulation" + "test_tamper_sig_obj" + "test_signed_file_diff_proxied_objs" + "test_pades_revinfo_live" + "test_diff_fallback_ok" + "test_no_diff_summary" + "test_ocsp_embed" + "test_ts_fetch_aiohttp" + "test_ts_fetch_requests" + ]; + + pythonImportsCheck = [ + "pyhanko" + ]; + + meta = with lib; { + description = "Sign and stamp PDF files"; + homepage = "https://github.com/MatthiasValvekens/pyHanko"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e4ce686c94d..b38c5873e380 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7161,6 +7161,8 @@ in { pyhamcrest = callPackage ../development/python-modules/pyhamcrest { }; + pyhanko = callPackage ../development/python-modules/pyhanko { }; + pyhanko-certvalidator = callPackage ../development/python-modules/pyhanko-certvalidator { }; pyhaversion = callPackage ../development/python-modules/pyhaversion { }; From 0ca5daa176ada1f11b51f71e4130a263f32ba6bd Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Thu, 21 Apr 2022 18:28:51 -0600 Subject: [PATCH 66/67] python310Packages.xhtml2pdf: 0.2.6 -> 0.2.7 --- pkgs/development/python-modules/xhtml2pdf/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix index 5a47fc90f67f..230e57a06430 100644 --- a/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , html5lib , pillow +, pyhanko , pypdf3 , pytestCheckHook , python-bidi @@ -14,22 +15,25 @@ buildPythonPackage rec { pname = "xhtml2pdf"; - version = "0.2.6"; + version = "0.2.7"; format = "setuptools"; disabled = pythonOlder "3.7"; + # Tests are only available on GitHub src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - hash = "sha256-EyIERvAC98LqPTMCdwWqTkm1RiMhikscL0tnMZUHIT8="; + # Currently it is not possible to fetch from version as there is a branch with the same name + rev = "afa72cdbbdaf7d459261c1605263101ffcd999af"; + sha256 = "sha256-plyIM7Ohnp5UBWz/UDTJa1UeWK9yckSZR16wxmLrpnc="; }; propagatedBuildInputs = [ arabic-reshaper html5lib pillow + pyhanko pypdf3 python-bidi reportlab From 3e5baa14fbc08be30efd0b1541ff71d063bd3db4 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Thu, 21 Apr 2022 18:18:49 +0200 Subject: [PATCH 67/67] python3Packages.blspy: unbreak --- pkgs/development/python-modules/blspy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/blspy/default.nix b/pkgs/development/python-modules/blspy/default.nix index aac2c2b97391..9f07fa764f9d 100644 --- a/pkgs/development/python-modules/blspy/default.nix +++ b/pkgs/development/python-modules/blspy/default.nix @@ -27,10 +27,10 @@ buildPythonPackage rec { src = ./dont_fetch_dependencies.patch; pybind11_src = pybind11.src; relic_src = fetchFromGitHub { - owner = "relic-toolkit"; + owner = "Chia-Network"; repo = "relic"; - rev = "1885ae3b681c423c72b65ce1fe70910142cf941c"; # pinned by blspy - hash = "sha256-tsSZTcssl8t7Nqdex4BesgQ+ACPgTdtHnJFvS9josN0="; + rev = "1d98e5abf3ca5b14fd729bd5bcced88ea70ecfd7"; # pinned by blspy + hash = "sha256-IfTD8DvTEXeLUoKe4Ejafb+PEJW5DV/VXRYuutwGQHU="; }; sodium_src = fetchFromGitHub { owner = "AmineKhaldi";