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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-05-17 06:22:23 +00:00
committed by GitHub
parent d8e62d8e41 e906410c9a
commit 3ff6965554
154 changed files with 1062 additions and 1089 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/misc/debian-devscripts/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, unzip, xz, dpkg
{lib, stdenv, fetchurl, xz, dpkg
, libxslt, docbook_xsl, makeWrapper
, python3Packages
, perlPackages, curl, gnupg, diffutils
@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
sha256 = "0xy1nvqrnifx46g8ch69pk31by0va6hn10wpi1fkrsrgncanjjh1";
};
nativeBuildInputs = [ makeWrapper unzip ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ xz dpkg libxslt python setuptools curl gnupg diffutils ] ++
(with perlPackages; [ perl CryptSSLeay LWP TimeDate DBFile FileDesktopEntry ParseDebControl LWPProtocolHttps ]);
pkgs/tools/misc/ethminer/default.nix
+1 -1
View File
@@ -79,7 +79,7 @@ in stdenv.mkDerivation rec {
description = "Ethereum miner with OpenCL${lib.optionalString cudaSupport ", CUDA"} and stratum support";
homepage = "https://github.com/ethereum-mining/ethminer";
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ nand0p atemu ];
maintainers = with maintainers; [ atemu ];
license = licenses.gpl3Only;
broken = cudaSupport;
};
pkgs/tools/misc/me_cleaner/default.nix
+1 -1
View File
@@ -19,6 +19,6 @@ buildPythonPackage rec {
with the final purpose of reducing its ability to interact with the system.
'';
license = licenses.gpl3;
maintainers = with maintainers; [ gnidorah ];
maintainers = with maintainers; [ ];
};
}
pkgs/tools/misc/vorbisgain/default.nix
+1 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, unzip, libogg, libvorbis }:
{ lib, stdenv, fetchurl, libogg, libvorbis }:
stdenv.mkDerivation rec {
name = "vorbisgain-0.37";
@@ -10,7 +10,6 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
nativeBuildInputs = [ unzip ];
buildInputs = [ libogg libvorbis ];
patchPhase = ''
pkgs/tools/misc/woeusb/default.nix
+1 -1
View File
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
description = "Create bootable USB disks from Windows ISO images";
homepage = "https://github.com/slacka/WoeUSB";
license = licenses.gpl3;
maintainers = with maintainers; [ bjornfor gnidorah ];
maintainers = with maintainers; [ bjornfor ];
platforms = platforms.linux;
};
}