From 03f9e1979d82a0ce3a73810eed385d2bb84c811c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 22 Mar 2021 13:52:42 +0000 Subject: [PATCH 01/12] openethereum: 3.1.1 -> 3.2.1 --- pkgs/applications/blockchains/openethereum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix index 5dc35e996be..e4d8d72fb4c 100644 --- a/pkgs/applications/blockchains/openethereum/default.nix +++ b/pkgs/applications/blockchains/openethereum/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "openethereum"; - version = "3.1.1"; + version = "3.2.1"; src = fetchFromGitHub { owner = "openethereum"; repo = "openethereum"; rev = "v${version}"; - sha256 = "sha256-RUrJuJF0R0mc7XdLyk915fRWtMfzjp5QE6oeWxHfyEQ="; + sha256 = "sha256-+bzMo0s+wdp8T/YjPk6mrPSPid1G8WScB8FJhXdL9JQ="; }; - cargoSha256 = "sha256-b+winsCzU0sXGDX6nUtWq4JrIyTcJ3uva7RlV5VsXfk="; + cargoSha256 = "sha256-ibjjJ5zGF6wbO24/RoYKsTYsMNXHb1EdekDwSICPc5g="; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; nativeBuildInputs = [ From c4da20ce294a15def4bb77f9d1dbe7c960941cba Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 22 Mar 2021 16:42:43 +0000 Subject: [PATCH 02/12] stripe-cli: 1.5.10 -> 1.5.11 --- pkgs/tools/admin/stripe-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index 347a936c3a9..dd754742150 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.5.10"; + version = "1.5.11"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cedreUdLjUONA8iVlQ/OfOJtM8EgCI8zaKDCbruUIVo="; + sha256 = "sha256-aoflV4C7eH0RNdq8j7kPeAfnOEZECmfZ91/QBQy7oxY="; }; - vendorSha256 = "sha256-hYvW5xAbnxOEapFc70wOF9ybbDv7hLGljKqHI+1Itaw="; + vendorSha256 = "sha256-e7EZ5o30vDpS904/R1y7/Mds7HxQNmsIftrnc1Bj2bc="; subPackages = [ "cmd/stripe" From c9405e3ad6fd6a26db46ed82eb59a401bdbb226b Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Mon, 22 Mar 2021 20:11:08 +0100 Subject: [PATCH 03/12] lndmanage: init at 0.11.0 --- pkgs/applications/blockchains/lndmanage.nix | 44 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/applications/blockchains/lndmanage.nix diff --git a/pkgs/applications/blockchains/lndmanage.nix b/pkgs/applications/blockchains/lndmanage.nix new file mode 100644 index 00000000000..56db469ff45 --- /dev/null +++ b/pkgs/applications/blockchains/lndmanage.nix @@ -0,0 +1,44 @@ +{ lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "lndmanage"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "bitromortac"; + repo = pname; + rev = "v${version}"; + sha256 = "19sqf7cjslwpfzcdbyq182dx7gnn9hii77sahbnh88v69qxgwzvb"; + }; + + propagatedBuildInputs = with python3Packages; [ + cycler + decorator + googleapis-common-protos + grpcio + grpcio-tools + kiwisolver + networkx + numpy + protobuf + pyparsing + python-dateutil + six + pygments + ]; + + preBuild = '' + substituteInPlace setup.py --replace '==' '>=' + ''; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + meta = with lib; { + description = "Channel management tool for lightning network daemon (LND) operators"; + homepage = "https://github.com/bitromortac/lndmanage"; + license = licenses.mit; + maintainers = with maintainers; [ mmilata ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c46cf63bfa..a2a3e43a7d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26797,6 +26797,8 @@ in lndconnect = callPackage ../applications/blockchains/lndconnect { }; + lndmanage = callPackage ../applications/blockchains/lndmanage.nix { }; + monero = callPackage ../applications/blockchains/monero { inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; boost = boost17x; From 415788b8d33a8f4e08ee951fb955aba2a0b377c3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 27 Mar 2021 11:09:44 +0000 Subject: [PATCH 04/12] git-extras: 6.1.0 -> 6.2.0 --- .../version-management/git-and-tools/git-extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index f2291882b2b..387a1cb59c5 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "git-extras"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "tj"; repo = "git-extras"; rev = version; - sha256 = "12ff9rhgqd71xm72r385hx0h8g75hz0ag0adzqcwfa54k0lhrrrz"; + sha256 = "sha256-ACuTb1DGft2/32Ezg23jhpl9yua5kUTZ2kKL8KHU+BU="; }; nativeBuildInputs = [ unixtools.column which ]; From dc90f0c0b2c8ec4a3d84e68e3389fd6a43ef3f85 Mon Sep 17 00:00:00 2001 From: Marin Usalj Date: Sat, 27 Mar 2021 15:08:18 -0400 Subject: [PATCH 05/12] inter-ui: [duplicate] remove inter-ui This font seems to be a duplicate and outdated version of: https://github.com/NixOS/nixpkgs/blob/master/pkgs/data/fonts/inter/default.nix --- pkgs/data/fonts/inter-ui/default.nix | 29 ---------------------------- 1 file changed, 29 deletions(-) delete mode 100644 pkgs/data/fonts/inter-ui/default.nix diff --git a/pkgs/data/fonts/inter-ui/default.nix b/pkgs/data/fonts/inter-ui/default.nix deleted file mode 100644 index 37b48f7ceb2..00000000000 --- a/pkgs/data/fonts/inter-ui/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, fetchzip }: - -# XXX: IMPORTANT: -# For compat, keep this at the last version that used the name "Inter UI" -# For newer versions, which are now simply named "Inter", -# see the expression for `inter` (../inter/default.nix). -let - version = "3.2"; -in fetchzip { - name = "inter-ui-${version}"; - - url = "https://github.com/rsms/inter/releases/download/v${version}/Inter-UI-${version}.zip"; - - postFetch = '' - mkdir -p $out/share/fonts/opentype - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; - - sha256 = "01d2ql803jrhss6g60djvs08x9xl7z6b3snkn03vqnrajdgifcl4"; - - meta = with lib; { - homepage = "https://rsms.me/inter/"; - description = "A typeface specially designed for user interfaces"; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ demize ]; - }; -} - From a2bc84a4a2ed11b21be3f4d7d8bc586ef2f52369 Mon Sep 17 00:00:00 2001 From: Marin Usalj Date: Sat, 27 Mar 2021 15:29:31 -0400 Subject: [PATCH 06/12] remove from package list --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68ede4a7ef7..77b74038e1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21337,7 +21337,6 @@ in maligned = callPackage ../development/tools/maligned { }; - inter-ui = callPackage ../data/fonts/inter-ui { }; inter = callPackage ../data/fonts/inter { }; scientifica = callPackage ../data/fonts/scientifica { }; From 6493604b1eebed72fb0cf9a58be7a37f9a52ed12 Mon Sep 17 00:00:00 2001 From: Marin Usalj Date: Sat, 27 Mar 2021 16:03:08 -0400 Subject: [PATCH 07/12] add alias --- pkgs/top-level/aliases.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7c10ae6480d..27a933c0f93 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -313,6 +313,7 @@ mapAliases ({ inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped."; infiniband-diags = rdma-core; # added 2019-08-09 inotifyTools = inotify-tools; + inte-ui = inter; # added 2021-03-27 i-score = throw "i-score has been removed: abandoned upstream."; # added 2020-11-21 jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21 jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # added 2021-03-15 From f94168c983a19956bc76eb0ccaa618a36f476761 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 27 Mar 2021 15:35:24 -0700 Subject: [PATCH 08/12] factorio: 1.1.27 -> 1.1.30 --- pkgs/games/factorio/versions.json | 48 +++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 1f8b2010226..6460e262d0d 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,56 +2,56 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.27.tar.xz", + "name": "factorio_alpha_x64-1.1.30.tar.xz", "needsAuth": true, - "sha256": "0s8qnr2p819r4pjby71jp5in679yvsz235iy1csmjjm2d2q6igln", + "sha256": "14mcf9pj6s5ms2hl68n3r5jk1q5y2qzw88wiahsb5plkv9qyqyp6", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.27/alpha/linux64", - "version": "1.1.27" + "url": "https://factorio.com/get-download/1.1.30/alpha/linux64", + "version": "1.1.30" }, "stable": { - "name": "factorio_alpha_x64-1.1.27.tar.xz", + "name": "factorio_alpha_x64-1.1.30.tar.xz", "needsAuth": true, - "sha256": "0s8qnr2p819r4pjby71jp5in679yvsz235iy1csmjjm2d2q6igln", + "sha256": "14mcf9pj6s5ms2hl68n3r5jk1q5y2qzw88wiahsb5plkv9qyqyp6", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.27/alpha/linux64", - "version": "1.1.27" + "url": "https://factorio.com/get-download/1.1.30/alpha/linux64", + "version": "1.1.30" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.27.tar.xz", + "name": "factorio_demo_x64-1.1.30.tar.xz", "needsAuth": false, - "sha256": "0cgnv6w8bxxskf0gxqcg9hq0zl4idnwh5d61b0510axah1m6i57z", + "sha256": "1b3na8xn9lhlvrsd6hxr130nf9p81s26n25a4qdgkczz6waysgjv", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.27/demo/linux64", - "version": "1.1.27" + "url": "https://factorio.com/get-download/1.1.30/demo/linux64", + "version": "1.1.30" }, "stable": { - "name": "factorio_demo_x64-1.1.27.tar.xz", + "name": "factorio_demo_x64-1.1.30.tar.xz", "needsAuth": false, - "sha256": "0cgnv6w8bxxskf0gxqcg9hq0zl4idnwh5d61b0510axah1m6i57z", + "sha256": "1b3na8xn9lhlvrsd6hxr130nf9p81s26n25a4qdgkczz6waysgjv", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.27/demo/linux64", - "version": "1.1.27" + "url": "https://factorio.com/get-download/1.1.30/demo/linux64", + "version": "1.1.30" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.27.tar.xz", + "name": "factorio_headless_x64-1.1.30.tar.xz", "needsAuth": false, - "sha256": "08bny927jiph0zj101yx2wirm16194sap3ifk9rs582s506i1p2w", + "sha256": "1rac6d8v8swiw1nn2hl53rhjfhsyv98qg8hfnwhfqn76jgspspdl", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.27/headless/linux64", - "version": "1.1.27" + "url": "https://factorio.com/get-download/1.1.30/headless/linux64", + "version": "1.1.30" }, "stable": { - "name": "factorio_headless_x64-1.1.27.tar.xz", + "name": "factorio_headless_x64-1.1.30.tar.xz", "needsAuth": false, - "sha256": "08bny927jiph0zj101yx2wirm16194sap3ifk9rs582s506i1p2w", + "sha256": "1rac6d8v8swiw1nn2hl53rhjfhsyv98qg8hfnwhfqn76jgspspdl", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.27/headless/linux64", - "version": "1.1.27" + "url": "https://factorio.com/get-download/1.1.30/headless/linux64", + "version": "1.1.30" } } } From 53aac393e8b7c8059f7d71f8e4a3a2a3fdc973d1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 27 Mar 2021 23:41:31 +0000 Subject: [PATCH 09/12] yq-go: 4.6.2 -> 4.6.3 --- pkgs/development/tools/yq-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 9ea5dcc55fa..26e93614336 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yq-go"; - version = "4.6.2"; + version = "4.6.3"; src = fetchFromGitHub { owner = "mikefarah"; rev = "v${version}"; repo = "yq"; - sha256 = "sha256-Hv1o1MzkpapmeIsZJ4peyG5kSHt0EXjTA+gE0iq1XF8="; + sha256 = "sha256-+qSGdskv8qUZRl7wYKn8WsgAcD8DYw1BwZnVKK6g/sI="; }; vendorSha256 = "sha256-vpvIl1lfaziuoHs+oDEIztufH1somphiBAn6qTaQaZw="; From 2749351acd828a1fbddf8cb6efd1a9cb33d22e0f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 28 Mar 2021 01:00:07 -0700 Subject: [PATCH 10/12] gremlin-console: 3.4.8 -> 3.4.10 Also add install hooks --- pkgs/applications/misc/gremlin-console/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix index 22444e22054..e6350dfb7cb 100644 --- a/pkgs/applications/misc/gremlin-console/default.nix +++ b/pkgs/applications/misc/gremlin-console/default.nix @@ -2,21 +2,23 @@ stdenv.mkDerivation rec { pname = "gremlin-console"; - version = "3.4.8"; + version = "3.4.10"; src = fetchzip { url = "http://www-eu.apache.org/dist/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; - sha256 = "13ycr6ppyrz9rq7dasabjdk8lcsxdj3krb4j7d2jmbh2hij1rdvf"; + sha256 = "sha256-4/EcVjIc+8OMkll8OxE5oXiqk+w9k1Nv9ld8N7oFFp0="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/opt cp -r ext lib $out/opt/ install -D bin/gremlin.sh $out/opt/bin/gremlin-console makeWrapper $out/opt/bin/gremlin-console $out/bin/gremlin-console \ --prefix PATH ":" "${openjdk}/bin/" \ --set CLASSPATH "$out/opt/lib/" + runHook postInstall ''; meta = with lib; { From c7aef6dedb29392ef2aad8fe70fa9745597c84ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 28 Mar 2021 12:06:05 +0200 Subject: [PATCH 11/12] metrics: drop requiredSystemFeatures; /cc #76776 The build hasn't worked for months (even on 20.09). Now also my dedicated machine broke, and I don't feel like maintaining it until the job has any chance of succeeding. (I don't know why exactly it's failing.) --- pkgs/top-level/metrics.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/metrics.nix b/pkgs/top-level/metrics.nix index 2bfcb9d5d80..590a24fb2b0 100644 --- a/pkgs/top-level/metrics.nix +++ b/pkgs/top-level/metrics.nix @@ -4,7 +4,8 @@ with pkgs; runCommand "nixpkgs-metrics" { nativeBuildInputs = with pkgs.lib; map getBin [ nix time jq ]; - requiredSystemFeatures = [ "benchmark" ]; + #FIXME: the job doesn't work, see issue #76776 + #requiredSystemFeatures = [ "benchmark" ]; # dedicated machine, by @vcunat last time } '' export NIX_STATE_DIR=$TMPDIR From 6a2a2d6503f450941bd471d9933e55c35e80625e Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 28 Mar 2021 17:39:05 +0700 Subject: [PATCH 12/12] julia: use system blas only when not darwin --- pkgs/development/compilers/julia/1.0.nix | 2 +- pkgs/development/compilers/julia/1.3.nix | 2 +- pkgs/development/compilers/julia/1.5.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix index 98d7ce90de3..5b1a4674a88 100644 --- a/pkgs/development/compilers/julia/1.0.nix +++ b/pkgs/development/compilers/julia/1.0.nix @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { "prefix=$(out)" "SHELL=${stdenv.shell}" - "USE_SYSTEM_BLAS=1" + (lib.optionalString (!stdenv.isDarwin) "USE_SYSTEM_BLAS=1") "USE_BLAS64=${if blas.isILP64 then "1" else "0"}" "USE_SYSTEM_LAPACK=1" diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix index da60fa8b988..5e431a55233 100644 --- a/pkgs/development/compilers/julia/1.3.nix +++ b/pkgs/development/compilers/julia/1.3.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { "prefix=$(out)" "SHELL=${stdenv.shell}" - "USE_SYSTEM_BLAS=1" + (lib.optionalString (!stdenv.isDarwin) "USE_SYSTEM_BLAS=1") "USE_BLAS64=${if blas.isILP64 then "1" else "0"}" "USE_SYSTEM_LAPACK=1" diff --git a/pkgs/development/compilers/julia/1.5.nix b/pkgs/development/compilers/julia/1.5.nix index 2a68090a04b..b4c33faa44c 100644 --- a/pkgs/development/compilers/julia/1.5.nix +++ b/pkgs/development/compilers/julia/1.5.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { "prefix=$(out)" "SHELL=${stdenv.shell}" - "USE_SYSTEM_BLAS=1" + (lib.optionalString (!stdenv.isDarwin) "USE_SYSTEM_BLAS=1") "USE_BLAS64=${if blas.isILP64 then "1" else "0"}" "USE_SYSTEM_LAPACK=1"