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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-04-18 12:06:03 +00:00 committed by GitHub
commit 2095c2cd0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 20 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/CODEOWNERS vendored
View File

@ -126,9 +126,6 @@
# Jetbrains
/pkgs/applications/editors/jetbrains @edwtjo
# Eclipse
/pkgs/applications/editors/eclipse @rycee
# Licenses
/lib/licenses.nix @alyssais

2
maintainers/scripts/nix-generate-from-cpan.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation {
'';
meta = {
maintainers = with lib.maintainers; [ eelco rycee ];
maintainers = with lib.maintainers; [ eelco ];
description = "Utility to generate a Nix expression for a Perl package from CPAN";
platforms = lib.platforms.unix;
};

1
pkgs/applications/audio/cd-discid/default.nix
View File

@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "http://linukz.org/cd-discid.shtml";
license = licenses.gpl2Plus;
maintainers = [ maintainers.rycee ];
platforms = platforms.unix;
description = "Command-line utility to get CDDB discid information from a CD-ROM disc";

1
pkgs/applications/audio/mpg321/default.nix
View File

@ -37,7 +37,6 @@ stdenv.mkDerivation rec {
description = "Command-line MP3 player";
homepage = "http://mpg321.sourceforge.net/";
license = licenses.gpl2;
maintainers = [ maintainers.rycee ];
platforms = platforms.gnu ++ platforms.linux;
};
}

2
pkgs/applications/audio/whipper/default.nix
View File

@ -55,7 +55,7 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
homepage = "https://github.com/whipper-team/whipper";
description = "A CD ripper aiming for accuracy over speed";
maintainers = with maintainers; [ rycee emily ];
maintainers = with maintainers; [ emily ];
license = licenses.gpl3Plus;
platforms = platforms.linux;
};

18
pkgs/applications/editors/eclipse/plugins.nix
View File

@ -110,7 +110,6 @@ rec {
description = "Provides fast jumps to text based on initial letter";
license = licenses.mit;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
@ -133,7 +132,6 @@ rec {
description = "Adds support for ANSI escape sequences in the Eclipse console";
license = licenses.asl20;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
@ -156,7 +154,6 @@ rec {
homepage = "https://www.antlr.org/";
license = licenses.bsd3;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
@ -179,7 +176,6 @@ rec {
homepage = "https://www.antlr.org/";
license = licenses.bsd3;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
@ -202,7 +198,6 @@ rec {
description = "Adds new tools to the context menu of text-based editors";
license = licenses.epl10;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
@ -225,7 +220,6 @@ rec {
description = "Show file encoding and line ending for the active editor in the eclipse status bar";
license = licenses.epl10;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
@ -248,7 +242,6 @@ rec {
description = "Shows disassembled bytecode of current java editor or class file";
license = licenses.bsd2;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
@ -287,7 +280,6 @@ rec {
description = "Checkstyle integration into the Eclipse IDE";
license = licenses.lgpl21;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
@ -311,7 +303,6 @@ rec {
description = "Plugin to switch color themes conveniently and without side effects";
license = licenses.epl10;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
@ -386,7 +377,6 @@ rec {
description = "EclEmma is a free Java code coverage tool for Eclipse";
license = licenses.epl10;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
@ -409,7 +399,6 @@ rec {
description = "Plugin that uses static analysis to look for bugs in Java code";
license = licenses.epl10;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
@ -482,7 +471,6 @@ rec {
homepage = "https://github.com/boothen/Json-Eclipse-Plugin";
license = licenses.epl10;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
@ -501,7 +489,6 @@ rec {
description = "Eclipse Java development tools";
license = licenses.epl10;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
@ -524,7 +511,6 @@ rec {
description = "Provides JDT Java CodeMining";
license = licenses.epl10;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
@ -567,7 +553,6 @@ rec {
description = "The Scala IDE for Eclipse";
license = licenses.bsd3;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
@ -586,7 +571,6 @@ rec {
description = "Plugin that uses static analysis to look for bugs in Java code";
license = licenses.lgpl21;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
@ -609,7 +593,6 @@ rec {
description = "Eclipse plugin for the TestNG testing framework";
license = licenses.asl20;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
@ -654,7 +637,6 @@ rec {
description = "A YAML editor plugin for Eclipse";
license = licenses.epl10;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};

2
pkgs/data/fonts/andagii/default.nix
View File

@ -20,7 +20,7 @@ in fetchzip {
meta = with lib; {
homepage = "http://www.i18nguy.com/unicode/unicode-font.html";
description = "Unicode Plane 1 Osmanya script font";
maintainers = with maintainers; [ raskin rycee ];
maintainers = with maintainers; [ raskin ];
license = "unknown";
platforms = platforms.all;
};

2
pkgs/data/fonts/anonymous-pro/default.nix
View File

@ -23,7 +23,7 @@ in fetchzip rec {
most Western and Central European Latin-based languages, plus
Greek and Cyrillic. It is designed by Mark Simonson.
'';
maintainers = with maintainers; [ raskin rycee ];
maintainers = with maintainers; [ raskin ];
license = licenses.ofl;
platforms = platforms.all;
};

2
pkgs/data/fonts/inconsolata/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation {
meta = with lib; {
homepage = "https://www.levien.com/type/myfonts/inconsolata.html";
description = "A monospace font for both screen and print";
maintainers = with maintainers; [ mikoim raskin rycee ];
maintainers = with maintainers; [ mikoim raskin ];
license = licenses.ofl;
platforms = platforms.all;
};

2
pkgs/data/fonts/oldstandard/default.nix
View File

@ -18,7 +18,7 @@ in fetchzip rec {
meta = with lib; {
homepage = "https://github.com/akryukov/oldstand";
description = "An attempt to revive a specific type of Modern style of serif typefaces";
maintainers = with maintainers; [ raskin rycee ];
maintainers = with maintainers; [ raskin ];
license = licenses.ofl;
platforms = platforms.all;
};

1
pkgs/data/fonts/undefined-medium/default.nix
View File

@ -21,7 +21,6 @@ fetchzip rec {
whatever else you can think of … it’s pretty undefined.
'';
license = licenses.ofl;
maintainers = [ maintainers.rycee ];
platforms = platforms.all;
};
}

2
pkgs/data/themes/vertex/default.nix
View File

@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
description = "Theme for GTK 3, GTK 2, Gnome-Shell, and Cinnamon";
license = licenses.gpl3;
platforms = platforms.unix;
maintainers = with maintainers; [ rycee romildo ];
maintainers = with maintainers; [ romildo ];
};
}

6
pkgs/development/compilers/sdcc/default.nix
View File

@ -17,7 +17,9 @@ stdenv.mkDerivation rec {
sha256 = "042fxw5mnsfhpc0z9lxfsw88kdkm32pwrxacp88kj2n2dy0814a8";
};
buildInputs = [ autoconf bison boost flex gputils texinfo zlib ];
buildInputs = [ boost gputils texinfo zlib ];
nativeBuildInputs = [ autoconf bison flex ];
configureFlags = map (f: "--disable-${f}-port") excludedPorts;
@ -32,7 +34,7 @@ stdenv.mkDerivation rec {
PIC18 targets. It can be retargeted for other microprocessors.
'';
homepage = "http://sdcc.sourceforge.net/";
license = with licenses; if (gputils == null) then gpl2 else unfreeRedistributable;
license = with licenses; if (gputils == null) then gpl2Plus else unfreeRedistributable;
maintainers = with maintainers; [ bjornfor yorickvp ];
platforms = platforms.all;
};

1
pkgs/development/python-modules/pycdio/default.nix
View File

@ -40,7 +40,6 @@ buildPythonPackage rec {
meta = with lib; {
homepage = "https://www.gnu.org/software/libcdio/";
description = "Wrapper around libcdio (CD Input and Control library)";
maintainers = with maintainers; [ rycee ];
license = licenses.gpl3Plus;
};

1
pkgs/development/python-modules/pyicu/default.nix
View File

@ -24,7 +24,6 @@ buildPythonPackage rec {
description = "Python extension wrapping the ICU C++ API";
license = licenses.mit;
platforms = platforms.unix;
maintainers = [ maintainers.rycee ];
};
}

1
pkgs/development/python-modules/slob/default.nix
View File

@ -28,7 +28,6 @@ buildPythonPackage {
homepage = "https://github.com/itkach/slob/";
description = "Reference implementation of the slob (sorted list of blobs) format";
license = licenses.gpl3;
maintainers = [ maintainers.rycee ];
};
}

1
pkgs/os-specific/linux/flashbench/default.nix
View File

@ -27,6 +27,5 @@ stdenv.mkDerivation {
homepage = "https://github.com/bradfa/flashbench";
platforms = platforms.linux;
license = licenses.gpl2Only;
maintainers = [ maintainers.rycee ];
};
}

8
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@ -28,10 +28,10 @@ rec {
# Policy: use the highest stable version as the default (on our master).
stable = if stdenv.hostPlatform.system == "x86_64-linux"
then generic {
version = "460.67";
sha256_64bit = "L2cRySVw7mgYSN25mJV+b4uOeHTdjLGvFPEkwyFgtec=";
settingsSha256 = "DB+ZeKm6cYQuVkJWjVd71qOTOmwIcRqx1CxfkgMbDpg=";
persistencedSha256 = "HCmZZRlNhOHi5yN2lNHhBILZkdng73q0vCbv7CIX/8s=";
version = "460.73.01";
sha256_64bit = "120ymf59l6nipczszf82lrm2p4ihhqyv2pfwwfg9wy96vqcckc8i";
settingsSha256 = "08jh7g34p9yxv5fh1cw0r2pjx65ryiv3w2lk1qg0gxn2r7xypkx0";
persistencedSha256 = "040gx4wqp3hxcfb4aba4sl7b01ixr5slhzw0xldwcqlmhpwqphi5";
}
else legacy_390;

2
pkgs/os-specific/linux/nvidia-x11/generic.nix
View File

@ -51,7 +51,7 @@ let
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = args.url or "https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run";
url = args.url or "https://us.download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run";
sha256 = sha256_64bit;
}
else if stdenv.hostPlatform.system == "i686-linux" then

1
pkgs/os-specific/linux/radeontop/default.nix
View File

@ -40,6 +40,5 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/clbr/radeontop";
platforms = platforms.linux;
license = licenses.gpl3;
maintainers = with maintainers; [ rycee ];
};
}

6
pkgs/tools/misc/miniserve/default.nix
View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "miniserve";
version = "0.13.0";
version = "0.14.0";
src = fetchFromGitHub {
owner = "svenstaro";
repo = "miniserve";
rev = "v${version}";
sha256 = "sha256-1nXhAYvvvUQb0RcWidsRMQOhU8eXt7ngzodsMkYvqvg=";
sha256 = "sha256-Hv1aefuiu7pOlSMUjZLGY6bxVy+6myFH1afZZ5gtmi0=";
};
cargoSha256 = "sha256-P5ukE7eXBRJMrc7+T9/TMq2uGs0AuZliHTtoqiZXNZw=";
cargoSha256 = "sha256-CgiHluc9+5+hKwsC7UZimy1586QBUsj+TVlb2lQRXs0=";
nativeBuildInputs = [ installShellFiles pkg-config zlib ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];

1
pkgs/tools/misc/svtplay-dl/default.nix
View File

@ -47,6 +47,5 @@ in stdenv.mkDerivation rec {
description = "Command-line tool to download videos from svtplay.se and other sites";
license = licenses.mit;
platforms = lib.platforms.unix;
maintainers = [ maintainers.rycee ];
};
}

2
pkgs/tools/misc/xdaliclock/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A clock application that morphs digits when they are changed";
maintainers = with maintainers; [ raskin rycee ];
maintainers = with maintainers; [ raskin ];
platforms = with platforms; linux ++ freebsd;
license = licenses.free; #TODO BSD on Gentoo, looks like MIT
downloadPage = "http://www.jwz.org/xdaliclock/";

1
pkgs/tools/misc/xdxf2slob/default.nix
View File

@ -16,7 +16,6 @@ python3Packages.buildPythonApplication {
description = "Tool to convert XDXF dictionary files to slob format";
homepage = "https://github.com/itkach/xdxf2slob/";
license = licenses.gpl3;
maintainers = [ maintainers.rycee ];
platforms = platforms.all;
};
}