public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next-21.05 into staging-21.05

This commit is contained in:
github-actions[bot] 2021-07-07 00:03:17 +00:00 committed by GitHub
parent c4534a22dc beef5b5c63
commit 82b9af92b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/electron-cash/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, python3Packages, qtbase, fetchpatch, wrapQtAppsHook { lib, stdenv, fetchFromGitHub, python3Packages, qtbase, fetchpatch, wrapQtAppsHook
, secp256k1 }: , secp256k1 }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec {
pytest electroncash/tests pytest electroncash/tests
''; '';
postInstall = '' postInstall = lib.optionalString stdenv.isLinux ''
substituteInPlace $out/share/applications/electron-cash.desktop \ substituteInPlace $out/share/applications/electron-cash.desktop \
--replace "Exec=electron-cash" "Exec=$out/bin/electron-cash" --replace "Exec=electron-cash" "Exec=$out/bin/electron-cash"
''; '';
@ -92,7 +92,7 @@ python3Packages.buildPythonApplication rec {
of the blockchain. of the blockchain.
''; '';
homepage = "https://www.electroncash.org/"; homepage = "https://www.electroncash.org/";
platforms = platforms.linux; platforms = platforms.unix;
maintainers = with maintainers; [ lassulus nyanloutre oxalica ]; maintainers = with maintainers; [ lassulus nyanloutre oxalica ];
license = licenses.mit; license = licenses.mit;
}; };

9
pkgs/applications/misc/makeself/default.nix
View File

@ -12,9 +12,12 @@ stdenv.mkDerivation rec {
sha256 = "07cq7q71bv3fwddkp2863ylry2ivds00f8sjy8npjpdbkailxm21"; sha256 = "07cq7q71bv3fwddkp2863ylry2ivds00f8sjy8npjpdbkailxm21";
}; };
patchPhase = "patchShebangs test"; postPatch = "patchShebangs test";
doCheck = true; # Issue #110149: our default /bin/sh apparently has 32-bit math only
# (attribute busybox-sandbox-shell), and that causes problems
# when running these tests inside build, based on free disk space.
doCheck = false;
checkTarget = "test"; checkTarget = "test";
checkInputs = [ which zstd pbzip2 ]; checkInputs = [ which zstd pbzip2 ];
@ -31,7 +34,7 @@ stdenv.mkDerivation rec {
''; '';
meta = with lib; { meta = with lib; {
homepage = "http://megastep.org/makeself"; homepage = "https://makeself.io";
description = "Utility to create self-extracting packages"; description = "Utility to create self-extracting packages";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = [ maintainers.wmertens ]; maintainers = [ maintainers.wmertens ];

1
pkgs/os-specific/linux/busybox/sandbox-shell.nix
View File

@ -8,6 +8,7 @@ busybox.override {
CONFIG_FEATURE_FANCY_ECHO y CONFIG_FEATURE_FANCY_ECHO y
CONFIG_FEATURE_SH_MATH y CONFIG_FEATURE_SH_MATH y
CONFIG_FEATURE_SH_MATH_64 y CONFIG_FEATURE_SH_MATH_64 y
CONFIG_FEATURE_TEST_64 y
CONFIG_ASH y CONFIG_ASH y
CONFIG_ASH_OPTIMIZE_FOR_SIZE y CONFIG_ASH_OPTIMIZE_FOR_SIZE y