From e4f3e9b0093b9ec35bc3f6fc29a0935d541decaa Mon Sep 17 00:00:00 2001 From: Julius de Bruijn Date: Fri, 16 Apr 2021 10:17:39 +0200 Subject: [PATCH 1/6] nvidia-x11: 460.67 -> 460.73.01 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 1da25db7ae35..aa1b810976d2 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -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; From 952d9a35d38088d97e406e9b418977da02a7e5e7 Mon Sep 17 00:00:00 2001 From: Julius de Bruijn Date: Fri, 16 Apr 2021 11:48:20 +0200 Subject: [PATCH 2/6] The driver download url has changed --- pkgs/os-specific/linux/nvidia-x11/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 75453d955ad0..2d325ab3d565 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -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 From 831e64bad4616a5be3281537c431087be2d372f8 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 18 Apr 2021 09:00:18 +0200 Subject: [PATCH 3/6] Drop maintainership for some packages --- .github/CODEOWNERS | 3 --- maintainers/scripts/nix-generate-from-cpan.nix | 2 +- pkgs/applications/audio/cd-discid/default.nix | 1 - pkgs/applications/audio/mpg321/default.nix | 1 - pkgs/applications/audio/whipper/default.nix | 2 +- pkgs/applications/editors/eclipse/plugins.nix | 18 ------------------ pkgs/data/fonts/andagii/default.nix | 2 +- pkgs/data/fonts/anonymous-pro/default.nix | 2 +- pkgs/data/fonts/inconsolata/default.nix | 2 +- pkgs/data/fonts/oldstandard/default.nix | 2 +- pkgs/data/fonts/undefined-medium/default.nix | 1 - pkgs/data/themes/vertex/default.nix | 2 +- .../python-modules/pycdio/default.nix | 1 - .../python-modules/pyicu/default.nix | 1 - .../python-modules/slob/default.nix | 1 - pkgs/os-specific/linux/flashbench/default.nix | 1 - pkgs/os-specific/linux/radeontop/default.nix | 1 - pkgs/tools/misc/svtplay-dl/default.nix | 1 - pkgs/tools/misc/xdaliclock/default.nix | 2 +- pkgs/tools/misc/xdxf2slob/default.nix | 1 - 20 files changed, 8 insertions(+), 39 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b15d89219f43..b85e92261218 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -126,9 +126,6 @@ # Jetbrains /pkgs/applications/editors/jetbrains @edwtjo -# Eclipse -/pkgs/applications/editors/eclipse @rycee - # Licenses /lib/licenses.nix @alyssais diff --git a/maintainers/scripts/nix-generate-from-cpan.nix b/maintainers/scripts/nix-generate-from-cpan.nix index 411e0d77feb3..fecca7f0c737 100644 --- a/maintainers/scripts/nix-generate-from-cpan.nix +++ b/maintainers/scripts/nix-generate-from-cpan.nix @@ -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; }; diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix index 109ce1295b48..16c574e8d038 100644 --- a/pkgs/applications/audio/cd-discid/default.nix +++ b/pkgs/applications/audio/cd-discid/default.nix @@ -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"; diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index 0079947438ce..37f647a4a478 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -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; }; } diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index 97d42eb9c69f..3405cf99ddd3 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -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; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 2f97e3613227..dc86ebca2146 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -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 ]; }; }; diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix index 700680a54b27..6d0b5f483ec4 100644 --- a/pkgs/data/fonts/andagii/default.nix +++ b/pkgs/data/fonts/andagii/default.nix @@ -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; }; diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/data/fonts/anonymous-pro/default.nix index 0f8289fe18aa..cb6ec6d89445 100644 --- a/pkgs/data/fonts/anonymous-pro/default.nix +++ b/pkgs/data/fonts/anonymous-pro/default.nix @@ -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; }; diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix index 530bb0380d23..327b7fa2ca52 100644 --- a/pkgs/data/fonts/inconsolata/default.nix +++ b/pkgs/data/fonts/inconsolata/default.nix @@ -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; }; diff --git a/pkgs/data/fonts/oldstandard/default.nix b/pkgs/data/fonts/oldstandard/default.nix index 5284ec7e119f..ddff3666b0b4 100644 --- a/pkgs/data/fonts/oldstandard/default.nix +++ b/pkgs/data/fonts/oldstandard/default.nix @@ -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; }; diff --git a/pkgs/data/fonts/undefined-medium/default.nix b/pkgs/data/fonts/undefined-medium/default.nix index 4c13a297c6f6..5773aa94d5b5 100644 --- a/pkgs/data/fonts/undefined-medium/default.nix +++ b/pkgs/data/fonts/undefined-medium/default.nix @@ -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; }; } diff --git a/pkgs/data/themes/vertex/default.nix b/pkgs/data/themes/vertex/default.nix index d25df29013ba..cff886440e32 100644 --- a/pkgs/data/themes/vertex/default.nix +++ b/pkgs/data/themes/vertex/default.nix @@ -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 ]; }; } diff --git a/pkgs/development/python-modules/pycdio/default.nix b/pkgs/development/python-modules/pycdio/default.nix index 7e06b18e32b2..7dee3229f77f 100644 --- a/pkgs/development/python-modules/pycdio/default.nix +++ b/pkgs/development/python-modules/pycdio/default.nix @@ -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; }; diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 75bbcde09cd2..efb7467e485e 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -24,7 +24,6 @@ buildPythonPackage rec { description = "Python extension wrapping the ICU C++ API"; license = licenses.mit; platforms = platforms.unix; - maintainers = [ maintainers.rycee ]; }; } diff --git a/pkgs/development/python-modules/slob/default.nix b/pkgs/development/python-modules/slob/default.nix index 0caec499a95b..09359d2798d8 100644 --- a/pkgs/development/python-modules/slob/default.nix +++ b/pkgs/development/python-modules/slob/default.nix @@ -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 ]; }; } diff --git a/pkgs/os-specific/linux/flashbench/default.nix b/pkgs/os-specific/linux/flashbench/default.nix index 44bcbba205e0..619aea69aa64 100644 --- a/pkgs/os-specific/linux/flashbench/default.nix +++ b/pkgs/os-specific/linux/flashbench/default.nix @@ -27,6 +27,5 @@ stdenv.mkDerivation { homepage = "https://github.com/bradfa/flashbench"; platforms = platforms.linux; license = licenses.gpl2Only; - maintainers = [ maintainers.rycee ]; }; } diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix index e6aa07e6cd17..b172fad6adcb 100644 --- a/pkgs/os-specific/linux/radeontop/default.nix +++ b/pkgs/os-specific/linux/radeontop/default.nix @@ -40,6 +40,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/clbr/radeontop"; platforms = platforms.linux; license = licenses.gpl3; - maintainers = with maintainers; [ rycee ]; }; } diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 58c488f7b800..cad7f5e3881e 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -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 ]; }; } diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index 6aaee0f00b51..7f453892934b 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -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/"; diff --git a/pkgs/tools/misc/xdxf2slob/default.nix b/pkgs/tools/misc/xdxf2slob/default.nix index b898aa2fc242..28c952400f17 100644 --- a/pkgs/tools/misc/xdxf2slob/default.nix +++ b/pkgs/tools/misc/xdxf2slob/default.nix @@ -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; }; } From 73fdc55b4fccd8f06e5cef6b6ecc10cbfc399e97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 18 Apr 2021 09:49:46 +0200 Subject: [PATCH 4/6] sdcc: clarify license Ref https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/unclear-gpl.md --- pkgs/development/compilers/sdcc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index 500c0b4d3951..5a4610880b68 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -32,7 +32,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; }; From c6df94ce561456492babc7628042fdc1c5fa0d5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 18 Apr 2021 09:50:47 +0200 Subject: [PATCH 5/6] sdcc: use nativeBuildInputs Ref https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/build-tools-in-build-inputs.md --- pkgs/development/compilers/sdcc/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index 5a4610880b68..173433d600a8 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -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; From faab9ed66b27a1c191cf8cd5135a167ec2100191 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 18 Apr 2021 19:20:40 +1000 Subject: [PATCH 6/6] miniserve: 0.13.0 -> 0.14.0 https://github.com/svenstaro/miniserve/releases/tag/v0.14.0 --- pkgs/tools/misc/miniserve/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index 1223432ad7da..98fb83357888 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -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 ];