From b2f2d04f01b3de3abad0dd9bc48ad7a3ee32bbc6 Mon Sep 17 00:00:00 2001 From: Sandro Date: Sun, 18 Apr 2021 04:13:31 +0200 Subject: [PATCH 1/5] rnix-hashes: fix tests, add me as maintainer (#119749) * rnix-hashes: fix tests, add me as maintainer * Update pkgs/tools/nix/rnix-hashes/default.nix --- pkgs/tools/nix/rnix-hashes/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/nix/rnix-hashes/default.nix b/pkgs/tools/nix/rnix-hashes/default.nix index 607884b8ac9..acdf230749c 100644 --- a/pkgs/tools/nix/rnix-hashes/default.nix +++ b/pkgs/tools/nix/rnix-hashes/default.nix @@ -1,4 +1,5 @@ { lib, rustPlatform, fetchFromGitHub, fetchpatch }: + rustPlatform.buildRustPackage rec { pname = "rnix-hashes"; version = "0.2.0"; @@ -10,12 +11,20 @@ rustPlatform.buildRustPackage rec { sha256 = "SzHyG5cEjaaPjTkn8puht6snjHMl8DtorOGDjxakJfA="; }; + patches = [ + # fix test failure + (fetchpatch { + url = "https://github.com/numtide/rnix-hashes/commit/62ab96cfd1efeade7d98efd9829eae8677bac9cc.patch"; + sha256 = "sha256-oE2fBt20FmO2cEUGivu2mKo3z6rbhVLXSF8SRvhibFs="; + }) + ]; + cargoSha256 = "vaG+0t+XAckV9F4iIgcTkbIUurxdQsTCfOnRnrOKoRc="; meta = with lib; { description = "Nix Hash Converter"; homepage = "https://github.com/numtide/rnix-hashes"; license = licenses.asl20; - maintainers = with maintainers; [ rizary ]; + maintainers = with maintainers; [ rizary SuperSandro2000 ]; }; } From 5594aa424c471c9cbff9f628916acd1742860002 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Thu, 15 Apr 2021 17:43:59 +0200 Subject: [PATCH 2/5] elpi: 1.13.0 -> 1.13.1 --- pkgs/development/ocaml-modules/elpi/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index 5c93c111040..38ba8f478bd 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -1,10 +1,11 @@ { stdenv, lib, fetchzip, buildDunePackage, camlp5 , ppxlib, ppx_deriving, re, perl, ncurses -, version ? "1.13.0" +, version ? "1.13.1" }: with lib; let fetched = import ../../../build-support/coq/meta-fetch/default.nix {inherit lib stdenv fetchzip; } ({ + release."1.13.1".sha256 = "12a9nbdvg9gybpw63lx3nw5wnxfznpraprb0wj3l68v1w43xq044"; release."1.13.0".sha256 = "0dmzy058m1mkndv90byjaik6lzzfk3aaac7v84mpmkv6my23bygr"; release."1.12.0".sha256 = "1agisdnaq9wrw3r73xz14yrq3wx742i6j8i5icjagqk0ypmly2is"; release."1.11.4".sha256 = "1m0jk9swcs3jcrw5yyw5343v8mgax238cjb03s8gc4wipw1fn9f5"; From 9400e49ddf9a2b2f0c514ebc573edef730d80c90 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Thu, 15 Apr 2021 17:44:44 +0200 Subject: [PATCH 3/5] coq-elpi: 1.9.5 -> 1.9.7 --- pkgs/development/coq-modules/coq-elpi/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index f945096ee9a..9b7680784df 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -4,7 +4,7 @@ with builtins; with lib; let elpi = coq.ocamlPackages.elpi.override (lib.switch coq.coq-version [ { case = "8.11"; out = { version = "1.11.4"; };} { case = "8.12"; out = { version = "1.12.0"; };} - { case = "8.13"; out = { version = "1.13.0"; };} + { case = "8.13"; out = { version = "1.13.1"; };} ] {}); in mkCoqDerivation { pname = "elpi"; @@ -12,10 +12,11 @@ in mkCoqDerivation { owner = "LPCIC"; inherit version; defaultVersion = lib.switch coq.coq-version [ - { case = "8.13"; out = "1.9.5"; } + { case = "8.13"; out = "1.9.7"; } { case = "8.12"; out = "1.8.2_8.12"; } { case = "8.11"; out = "1.6.2_8.11"; } ] null; + release."1.9.7".sha256 = "0rvn12h9dpk9s4pxy32p8j0a1h7ib7kg98iv1cbrdg25y5vs85n1"; release."1.9.5".sha256 = "0gjdwmb6bvb5gh0a6ra48bz5fb3pr5kpxijb7a8mfydvar5i9qr6"; release."1.9.4".sha256 = "0nii7238mya74f9g6147qmpg6gv6ic9b54x5v85nb6q60d9jh0jq"; release."1.9.3".sha256 = "198irm800fx3n8n56vx1c6f626cizp1d7jfkrc6ba4iqhb62ma0z"; From 5feab34f2e174847d20b5cee304fdcb3402b8494 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Thu, 15 Apr 2021 17:45:07 +0200 Subject: [PATCH 4/5] coq-elpi: 1.8.2 -> 1.8.3 --- pkgs/development/coq-modules/coq-elpi/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 9b7680784df..53b4345909f 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -13,7 +13,7 @@ in mkCoqDerivation { inherit version; defaultVersion = lib.switch coq.coq-version [ { case = "8.13"; out = "1.9.7"; } - { case = "8.12"; out = "1.8.2_8.12"; } + { case = "8.12"; out = "1.8.3_8.12"; } { case = "8.11"; out = "1.6.2_8.11"; } ] null; release."1.9.7".sha256 = "0rvn12h9dpk9s4pxy32p8j0a1h7ib7kg98iv1cbrdg25y5vs85n1"; @@ -21,6 +21,8 @@ in mkCoqDerivation { release."1.9.4".sha256 = "0nii7238mya74f9g6147qmpg6gv6ic9b54x5v85nb6q60d9jh0jq"; release."1.9.3".sha256 = "198irm800fx3n8n56vx1c6f626cizp1d7jfkrc6ba4iqhb62ma0z"; release."1.9.2".sha256 = "1rr2fr8vjkc0is7vh1461aidz2iwkigdkp6bqss4hhv0c3ijnn07"; + release."1.8.3_8.12".sha256 = "15z2l4zy0qpw0ws7bvsmpmyv543aqghrfnl48nlwzn9q0v89p557"; + release."1.8.3_8.12".version = "1.8.3"; release."1.8.2_8.12".sha256 = "1n6jwcdazvjgj8vsv2r9zgwpw5yqr5a1ndc2pwhmhqfl04b5dk4y"; release."1.8.2_8.12".version = "1.8.2"; release."1.8.1".sha256 = "1fbbdccdmr8g4wwpihzp4r2xacynjznf817lhijw6kqfav75zd0r"; From 38cef0ba3b4c215cf1d4d03d137c66d948bdf1be Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Thu, 15 Apr 2021 17:45:24 +0200 Subject: [PATCH 5/5] coq-elpi: 1.6.2 -> 1.6.3 --- pkgs/development/coq-modules/coq-elpi/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 53b4345909f..0aff0e3b54d 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -14,7 +14,7 @@ in mkCoqDerivation { defaultVersion = lib.switch coq.coq-version [ { case = "8.13"; out = "1.9.7"; } { case = "8.12"; out = "1.8.3_8.12"; } - { case = "8.11"; out = "1.6.2_8.11"; } + { case = "8.11"; out = "1.6.3_8.11"; } ] null; release."1.9.7".sha256 = "0rvn12h9dpk9s4pxy32p8j0a1h7ib7kg98iv1cbrdg25y5vs85n1"; release."1.9.5".sha256 = "0gjdwmb6bvb5gh0a6ra48bz5fb3pr5kpxijb7a8mfydvar5i9qr6"; @@ -28,6 +28,8 @@ in mkCoqDerivation { release."1.8.1".sha256 = "1fbbdccdmr8g4wwpihzp4r2xacynjznf817lhijw6kqfav75zd0r"; release."1.8.0".sha256 = "13ywjg94zkbki22hx7s4gfm9rr87r4ghsgan23xyl3l9z8q0idd1"; release."1.7.0".sha256 = "1ws5cqr0xawv69prgygbl3q6dgglbaw0vc397h9flh90kxaqgyh8"; + release."1.6.3_8.11".sha256 = "1j340cr2bv95clzzkkfmsjkklham1mj84cmiyprzwv20q89zr1hp"; + release."1.6.3_8.11".version = "1.6.3"; release."1.6.2_8.11".sha256 = "06xrx0ljilwp63ik2sxxr7h617dgbch042xfcnfpy5x96br147rn"; release."1.6.2_8.11".version = "1.6.2"; release."1.6.1_8.11".sha256 = "0yyyh35i1nb3pg4hw7cak15kj4y6y9l84nwar9k1ifdsagh5zq53";