From 81038268cdcdbbd13d2474d16e5fa8b890757cff Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 2 Jun 2022 21:49:06 -0300 Subject: [PATCH 01/15] asymptote: use new SRI hash format --- pkgs/tools/graphics/asymptote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 657d215147ce..eef97b55cca9 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { owner = "vectorgraphics"; repo = pname; rev = version; - sha256 = "sha256:1lawj2gf0985clzbyym26s5mxxp2syl1dqqxfzk0sq9s30l2rj3l"; + hash = "sha256-dMgsKBg6YQ3mdx3jFqjX4vZeizaier8+ZQUl4J6QXNE="; }; patches = (lib.optional (lib.versionOlder version "2.68") (fetchpatch { url = "https://github.com/vectorgraphics/asymptote/commit/3361214340d58235f4dbb8f24017d0cd5d94da72.patch"; - sha256 = "sha256:1z2b41x8v7683myd45lq6niixpdjy0b185x0xl61130vrijhq5nm"; + hash = "sha256-1RYMZcwbjBAM7aAXFBbwst0eozWYFtJ8HcicjXogS/w="; })) ; From ed1657fb58b7e5534365aa5b8f96e8480ba60a85 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 2 Jun 2022 21:49:34 -0300 Subject: [PATCH 02/15] flexoptix-app: use new SRI hash format --- pkgs/tools/misc/flexoptix-app/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/flexoptix-app/default.nix b/pkgs/tools/misc/flexoptix-app/default.nix index 507fbb7dcc71..4438d9d637ba 100644 --- a/pkgs/tools/misc/flexoptix-app/default.nix +++ b/pkgs/tools/misc/flexoptix-app/default.nix @@ -6,12 +6,12 @@ src = fetchurl { name = "${name}.AppImage"; url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage"; - sha256 = "sha256:1hzdb2fbkwpsf0d3ws4z32blk6549jwhf1lrlqmcxhzqfvkr4gin"; + hash = "sha256-Nj6S53b4w84qppkGB7lMpJhJlxifaD4acPryuZxY7cM="; }; udevRules = fetchurl { url = "https://www.flexoptix.net/skin/udev_rules/99-tprogrammer.rules"; - sha256 = "0mr1bhgvavq1ax4206z1vr2y64s3r676w9jjl9ysziklbrsvk5rr"; + hash = "sha256-OZe5dV50xq99olImbo7JQxPjRd7hGyBIVwFvtR9cIVc="; }; appimageContents = (appimageTools.extract { inherit name src; }).overrideAttrs (oA: { From ed6560b2d111b771a2014a79aa1c941cb6254f3a Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 2 Jun 2022 21:50:03 -0300 Subject: [PATCH 03/15] octofetch: use new SRI hash format --- pkgs/tools/misc/octofetch/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/octofetch/default.nix b/pkgs/tools/misc/octofetch/default.nix index e0cf9d98d651..3d2d2919aa56 100644 --- a/pkgs/tools/misc/octofetch/default.nix +++ b/pkgs/tools/misc/octofetch/default.nix @@ -1,9 +1,9 @@ { lib , stdenv , fetchFromGitHub -, rustPlatform -, pkg-config , openssl +, pkg-config +, rustPlatform , Security }: @@ -18,15 +18,16 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-/AXE1e02NfxQzJZd0QX6gJDjmFFmuUTOndulZElgIMI="; }; - cargoSha256 = "sha256:1ddyzbpsiy54r13nb9yrm64cbbifixnhkskwg5fvhhzj4ri4ks4a"; + cargoSha256 = "sha256-iuhJYibyQ7hdeXzqCW2PLq7FiKnZp2VHyKT4qO/6vrU="; nativeBuildInputs = [ pkg-config ]; + buildInputs = lib.optionals stdenv.isLinux [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { - description = "Github user information on terminal"; homepage = "https://github.com/azur1s/octofetch"; + description = "Github user information on terminal"; license = licenses.mit; maintainers = with maintainers; [ jyooru ]; }; From 53840781789a0a2a572ea5d8cd312f7f98af6294 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 2 Jun 2022 21:51:57 -0300 Subject: [PATCH 04/15] precice-config-visualizer: use new SRI hash format --- pkgs/tools/misc/precice-config-visualizer/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/precice-config-visualizer/default.nix b/pkgs/tools/misc/precice-config-visualizer/default.nix index 7605f49b1535..be6e7f0a9bb6 100644 --- a/pkgs/tools/misc/precice-config-visualizer/default.nix +++ b/pkgs/tools/misc/precice-config-visualizer/default.nix @@ -1,4 +1,7 @@ -{ lib, python3Packages, fetchFromGitHub}: +{ lib +, python3Packages +, fetchFromGitHub +}: python3Packages.buildPythonApplication rec { pname = "config-visualizer"; @@ -8,15 +11,16 @@ python3Packages.buildPythonApplication rec { owner = "precice"; repo = pname; rev = "60f2165f25352c8261f370dc4ceb64a8b422d4ec"; - sha256 = "sha256:0mqzp2qdvbqbxaczlvc9xxxdz6hclraznbmc08ldx11xwy8yknfr"; + hash = "sha256-2dnpkec9hN4oAqwu+1WmDJrfeu+JbfqZ6guv3bC4H1c="; }; propagatedBuildInputs = with python3Packages; [ lxml pydot ]; + doCheck = false; meta = with lib; { - description = "Small python tool for visualizing the preCICE xml configuration "; homepage = "https://github.com/precice/config-visualizer"; + description = "Small python tool for visualizing the preCICE xml configuration "; license = licenses.gpl3Only; maintainers = with maintainers; [ Scriptkiddi ]; }; From f1ab6c919becac24ab44602249ad14dae9ebe8f5 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 2 Jun 2022 21:52:59 -0300 Subject: [PATCH 05/15] openapi-generator-cli/example.nix: use new SRI hash format --- pkgs/tools/networking/openapi-generator-cli/example.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/openapi-generator-cli/example.nix b/pkgs/tools/networking/openapi-generator-cli/example.nix index f59173b9744a..047c02a9a912 100644 --- a/pkgs/tools/networking/openapi-generator-cli/example.nix +++ b/pkgs/tools/networking/openapi-generator-cli/example.nix @@ -4,7 +4,7 @@ runCommand "openapi-generator-cli-test" { nativeBuildInputs = [ openapi-generator-cli ]; petstore = fetchurl { url = "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/14c0908becbccd78252be49bd92be8c53cd2b9e3/examples/v3.0/petstore.yaml"; - sha256 = "sha256:1mgdbzv42alv0b1a18dqbabqyvyhrg3brynr5hqsrm3qljfzaq5b"; + hash = "sha256-q2D1naR41KwxLNn6vMbL0G+Pl1q4oaDCApsqQfZf7dU="; }; config = builtins.toJSON { elmVersion = "0.19"; From bb2fe109d5942837e7fbd252984758536d2c844d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 2 Jun 2022 21:53:41 -0300 Subject: [PATCH 06/15] vpnc-scripts: use new SRI hash format --- pkgs/tools/networking/vpnc-scripts/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/vpnc-scripts/default.nix b/pkgs/tools/networking/vpnc-scripts/default.nix index f0d5991d34bc..a3b6b0f738ab 100644 --- a/pkgs/tools/networking/vpnc-scripts/default.nix +++ b/pkgs/tools/networking/vpnc-scripts/default.nix @@ -1,15 +1,24 @@ -{ lib, stdenv, fetchgit +{ lib +, stdenv +, fetchgit +, coreutils +, gawk +, gnugrep +, iproute2 , makeWrapper -, nettools, gawk, systemd, openresolv, coreutils, gnugrep, iproute2 +, nettools +, openresolv +, systemd }: stdenv.mkDerivation { pname = "vpnc-scripts"; version = "unstable-2021-09-24"; + src = fetchgit { url = "https://gitlab.com/openconnect/vpnc-scripts.git"; rev = "b749c2cadc2f32e2efffa69302861f9a7d4a4e5f"; - sha256 = "sha256:19aj6mfkclbkx6ycyd4xm7id1bq78ismw0y6z23f6s016k3sjc8c"; + sha256 = "sha256-DDGpxzQBaOOG+MYDXnVEB6/Q4qmdNM+86XNRNl01UqU="; }; nativeBuildInputs = [ makeWrapper ]; @@ -32,8 +41,8 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "script for vpnc to configure the network routing and name service"; homepage = "https://www.infradead.org/openconnect/"; + description = "Script for vpnc to configure the network routing and name service"; license = licenses.gpl2Only; maintainers = with maintainers; [ jerith666 ]; platforms = platforms.linux ++ platforms.darwin; From 37f592134430521fe1b7dacf5946a82b7151b255 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 2 Jun 2022 21:54:04 -0300 Subject: [PATCH 07/15] pcsclite: use new SRI hash format --- pkgs/tools/security/pcsclite/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index db3ddd167a60..bcc7163bec2f 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://pcsclite.apdu.fr/files/pcsc-lite-${version}.tar.bz2"; - sha256 = "sha256:024x0hadn0kc0m9yz3l2pqzc5mdqyza9lmckg0bn4xak6frzkqwy"; + hash = "sha256-nuP5szNTdWIXeJNVmtT3uNXCPr6Cju9TBWwC2xQEnQg="; }; patches = [ ./no-dropdir-literals.patch ]; From a78c3a93adc4bfc2761841b9363b2dc4fae448f1 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 2 Jun 2022 21:54:33 -0300 Subject: [PATCH 08/15] pomerium-cli: use new SRI hash format --- pkgs/tools/security/pomerium-cli/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/pomerium-cli/default.nix b/pkgs/tools/security/pomerium-cli/default.nix index 7dc7e3a7a903..9463e0851898 100644 --- a/pkgs/tools/security/pomerium-cli/default.nix +++ b/pkgs/tools/security/pomerium-cli/default.nix @@ -9,15 +9,17 @@ let in buildGoModule rec { pname = "pomerium-cli"; - version = pomerium.version; + inherit (pomerium) version; + src = fetchFromGitHub { owner = "pomerium"; repo = "cli"; rev = "v${version}"; - hash = "sha256:0230b22xjnpykj8bcdahzzlsvlrd63z2cmg6yb246c5ngjs835q1"; + hash = "sha256-AZeBtHy2MEPE8uZVJv4wLdOt6f9QNbaQnP5a2YVYYAg="; }; - vendorSha256 = "sha256:0xx22lmh6wip1d1bjrp4lgab3q9yilw54v4lg24lf3xhbsr5si9b"; + vendorSha256 = "sha256-K0Vdsl6wD0eJeJRsUjiNPuGx1KPkZrlCCzdyAysVonc="; + subPackages = [ "cmd/pomerium-cli" ]; @@ -45,7 +47,11 @@ buildGoModule rec { ]; installPhase = '' + runHook preInstall + install -Dm0755 $GOPATH/bin/pomerium-cli $out/bin/pomerium-cli + + runHook postInstall ''; meta = with lib; { From a9f927d32140ed8fa495d80e117dd36f9469f115 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 2 Jun 2022 21:55:26 -0300 Subject: [PATCH 09/15] softhsm: use new SRI hash format --- pkgs/tools/security/softhsm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix index 873cfdbbb056..b218a3241f9f 100644 --- a/pkgs/tools/security/softhsm/default.nix +++ b/pkgs/tools/security/softhsm/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dist.opendnssec.org/source/${pname}-${version}.tar.gz"; - hash = "sha256:1wkmyi6n3z2pak1cj5yk6v6bv9w0m24skycya48iikab0mrr8931"; + hash = "sha256-YSSUcwVLzRgRUZ75qYmogKe9zDbTF8nCVFf8YU30dfI="; }; configureFlags = [ From 1d75611d1caea3ba08baf73632030ed8a7029f19 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 2 Jun 2022 21:56:04 -0300 Subject: [PATCH 10/15] retry: use new SRI hash format --- pkgs/tools/system/retry/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/retry/default.nix b/pkgs/tools/system/retry/default.nix index 48125d2df37e..2dcd1aa37660 100644 --- a/pkgs/tools/system/retry/default.nix +++ b/pkgs/tools/system/retry/default.nix @@ -1,23 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, which, txt2man }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, txt2man +, which +}: + stdenv.mkDerivation rec { pname = "retry"; version = "1.0.4"; - nativeBuildInputs = [ autoreconfHook which txt2man ]; - src = fetchFromGitHub { owner = "minfrin"; repo = "retry"; rev = "${pname}-${version}"; - sha256 = "sha256:0jrx4yrwlf4fn3309kxraj7zgwk7gq6rz5ibswq3w3b3jfvxi8qb"; + hash = "sha256-C6PYt5NjDT4w1yuWnw1+Z/L3j1S5zwTGsI44yrMnPUs="; }; + nativeBuildInputs = [ autoreconfHook txt2man which ]; + meta = with lib; { homepage = "https://github.com/minfrin/retry"; description = "Retry a command until the command succeeds"; - platforms = platforms.all; license = licenses.asl20; maintainers = with maintainers; [ gfrascadorio ]; + platforms = platforms.all; }; } From 34b9e86a1087a7380d1e759863fa0fa7bd75a54d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 2 Jun 2022 21:56:16 -0300 Subject: [PATCH 11/15] cidrgrep: use new SRI hash format --- pkgs/tools/text/cidrgrep/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/cidrgrep/default.nix b/pkgs/tools/text/cidrgrep/default.nix index cfbfee48938a..c636eef3c46e 100644 --- a/pkgs/tools/text/cidrgrep/default.nix +++ b/pkgs/tools/text/cidrgrep/default.nix @@ -8,10 +8,10 @@ buildGoModule { owner = "tomdoherty"; repo = "cidrgrep"; rev = "8ad5af533e8dc33ea18ff19b7c6a41550748fe0e"; - sha256 = "sha256:0jvwm9jq5jd270b6l9nkvc5pr3rgf158sw83lrprmwmz7r4mr786"; + hash = "sha256-Bp1cST6/8ppvpgNxjUpwL498C9vTJmoWOKLJgmWqfEs="; }; - vendorSha256 = "sha256:0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; postInstall = '' mv $out/bin/cmd $out/bin/cidrgrep @@ -19,7 +19,7 @@ buildGoModule { meta = { description = "Like grep but for IPv4 CIDRs"; - maintainers = with lib.maintainers; [ das_j ]; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ das_j ]; }; } From e7ef797f044aebed4d54bce15e2cc55a9de5686a Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 2 Jun 2022 21:56:38 -0300 Subject: [PATCH 12/15] coq2html: use new SRI hash format --- pkgs/tools/typesetting/coq2html/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/coq2html/default.nix b/pkgs/tools/typesetting/coq2html/default.nix index 924eea3c0a86..267309e2e35b 100644 --- a/pkgs/tools/typesetting/coq2html/default.nix +++ b/pkgs/tools/typesetting/coq2html/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "xavierleroy"; repo = "coq2html"; rev = "v${version}"; - sha256 = "sha256:1ad825yifn518wk1c2y2ji10q3m468r8ajjgw2nzzy7d608nx7yq"; + hash = "sha256-2J9uETDt+P+t4E9KhTIypA4MQpTCCxYmR6FYF30RqKk="; }; nativeBuildInputs = [ ocaml ]; From 5842fde37aa31df8aa713b2016dc8a1ac8cb8972 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 2 Jun 2022 21:57:11 -0300 Subject: [PATCH 13/15] yash: use new SRI hash format --- pkgs/shells/yash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/yash/default.nix b/pkgs/shells/yash/default.nix index 01340df5e9a1..773801eca17e 100644 --- a/pkgs/shells/yash/default.nix +++ b/pkgs/shells/yash/default.nix @@ -6,15 +6,15 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://osdn.net/dl/yash/yash-${version}.tar.xz"; - sha256 = "sha256:1jdmj4cyzwxxyyqf20y1zi578h7md860ryffp02qi143zpppn4sm"; + hash = "sha256-VRN77/2DhIgFuM75DAxq9UB0SvzBA+Gw973z7xmRtck="; }; strictDeps = true; buildInputs = [ gettext ncurses ]; meta = with lib; { - description = "Yet another POSIX-compliant shell"; homepage = "https://yash.osdn.jp/index.html.en"; + description = "Yet another POSIX-compliant shell"; license = licenses.gpl2Plus; maintainers = with maintainers; [ qbit ]; platforms = platforms.all; From 71834a1a26fb7e76d75356b537efb86cd0d7d78d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 2 Jun 2022 22:00:28 -0300 Subject: [PATCH 14/15] buildDhallUrl: use new SRI hash format --- pkgs/test/dhall/buildDhallUrl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/test/dhall/buildDhallUrl/default.nix b/pkgs/test/dhall/buildDhallUrl/default.nix index d2e214fb9770..a75101a303d6 100644 --- a/pkgs/test/dhall/buildDhallUrl/default.nix +++ b/pkgs/test/dhall/buildDhallUrl/default.nix @@ -9,6 +9,6 @@ dhallPackages.buildDhallUrl { url = "https://raw.githubusercontent.com/cdepillabout/example-dhall-nix/e6a675c72ecd4dd23d254a02aea8181fe875747f/mydhallfile.dhall"; hash = "sha256-434x+QjHRzuprBdw0h6wmwB1Zj6yZqQb533me8XdO4c="; - dhallHash = "sha256:e37e31f908c7473ba9ac1770d21eb09b0075663eb266a41be77de67bc5dd3b87"; + dhallHash = "sha256-434x+QjHRzuprBdw0h6wmwB1Zj6yZqQb533me8XdO4c="; source = true; } From c428ad43d1c6cb00bdfdbd5d03d24a98544e0760 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 2 Jun 2022 22:00:01 -0300 Subject: [PATCH 15/15] pkgs/test/cuda/cuda-samples/generic.nix: use new SRI hash format --- pkgs/test/cuda/cuda-samples/generic.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/test/cuda/cuda-samples/generic.nix b/pkgs/test/cuda/cuda-samples/generic.nix index c5a9e24abd43..eeb3d6fcb520 100644 --- a/pkgs/test/cuda/cuda-samples/generic.nix +++ b/pkgs/test/cuda/cuda-samples/generic.nix @@ -1,20 +1,16 @@ -{ addOpenGLRunpath -, cudatoolkit +{ lib +, stdenv , fetchFromGitHub , fetchpatch -, lib +, addOpenGLRunpath +, cudatoolkit , pkg-config , sha256 -, stdenv }: -let +stdenv.mkDerivation rec { pname = "cuda-samples"; version = lib.versions.majorMinor cudatoolkit.version; -in - -stdenv.mkDerivation { - inherit pname version; src = fetchFromGitHub { owner = "NVIDIA"; @@ -31,7 +27,7 @@ stdenv.mkDerivation { patches = lib.optionals (version == "11.3") [ (fetchpatch { url = "https://github.com/NVIDIA/cuda-samples/commit/5c3ec60faeb7a3c4ad9372c99114d7bb922fda8d.patch"; - sha256 = "sha256:15bydf59scmfnldz5yawbjacdxafi50ahgpzq93zlc5xsac5sz6i"; + sha256 = "sha256-0XxdmNK9MPpHwv8+qECJTvXGlFxc+fIbta4ynYprfpU="; }) ];