mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 16:33:15 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
cbd2c726fb
44
pkgs/applications/blockchains/lndmanage.nix
Normal file
44
pkgs/applications/blockchains/lndmanage.nix
Normal file
@ -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 ];
|
||||
};
|
||||
}
|
||||
@ -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 = [
|
||||
|
||||
@ -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; {
|
||||
|
||||
@ -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 ];
|
||||
|
||||
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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=";
|
||||
|
||||
@ -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"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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
|
||||
|
||||
@ -21343,7 +21343,6 @@ in
|
||||
|
||||
maligned = callPackage ../development/tools/maligned { };
|
||||
|
||||
inter-ui = callPackage ../data/fonts/inter-ui { };
|
||||
inter = callPackage ../data/fonts/inter { };
|
||||
|
||||
scientifica = callPackage ../data/fonts/scientifica { };
|
||||
@ -26874,6 +26873,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;
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user