From 2403464720f641bd6b3ab92a9c0386d36d0a9e83 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 7 Nov 2018 09:07:38 +0000 Subject: [PATCH 1/8] nixos/release.nix: generalize `modules` copy-paste into `makeModules` --- nixos/release.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/nixos/release.nix b/nixos/release.nix index 4647f28be18..e18b6ad310f 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -45,6 +45,7 @@ let system.nixos.revision = nixpkgs.rev or nixpkgs.shortRev; }; + makeModules = module: rest: [ configuration versionModule module rest ]; makeIso = { module, type, system, ... }: @@ -53,7 +54,9 @@ let hydraJob ((import lib/eval-config.nix { inherit system; - modules = [ configuration module versionModule { isoImage.isoBaseName = "nixos-${type}"; } ]; + modules = makeModules module { + isoImage.isoBaseName = "nixos-${type}"; + }; }).config.system.build.isoImage); @@ -64,7 +67,7 @@ let hydraJob ((import lib/eval-config.nix { inherit system; - modules = [ configuration module versionModule ]; + modules = makeModules module {}; }).config.system.build.sdImage); @@ -77,7 +80,7 @@ let config = (import lib/eval-config.nix { inherit system; - modules = [ configuration module versionModule ]; + modules = makeModules module {}; }).config; tarball = config.system.build.tarball; @@ -97,7 +100,7 @@ let buildFromConfig = module: sel: forAllSystems (system: hydraJob (sel (import ./lib/eval-config.nix { inherit system; - modules = [ configuration module versionModule ] ++ singleton + modules = makeModules module ({ ... }: { fileSystems."/".device = mkDefault "/dev/sda1"; boot.loader.grub.device = mkDefault "/dev/sda"; @@ -108,7 +111,7 @@ let let configEvaled = import lib/eval-config.nix { inherit system; - modules = [ module versionModule ]; + modules = makeModules module {}; }; build = configEvaled.config.system.build; kernelTarget = configEvaled.pkgs.stdenv.hostPlatform.platform.kernelTarget; From d2d80e6d308b0f3dec6db43768a916831c9d91f1 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 7 Nov 2018 09:07:40 +0000 Subject: [PATCH 2/8] firefox: disable pulseaudio support on non-Linux by default --- pkgs/applications/networking/browsers/firefox/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 16c9b548325..706f5c9d750 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -18,7 +18,7 @@ ## optional libraries , alsaSupport ? stdenv.isLinux, alsaLib -, pulseaudioSupport ? true, libpulseaudio +, pulseaudioSupport ? stdenv.isLinux, libpulseaudio , ffmpegSupport ? true, gstreamer, gst-plugins-base , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook , gssSupport ? true, kerberos From 2f5e4c733b1aa2caeb07c4c7637050a8e82dd506 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 7 Nov 2018 09:07:42 +0000 Subject: [PATCH 3/8] lib: commitIdFromGitRepo: simplify a tiny bit --- lib/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/sources.nix b/lib/sources.nix index e64b23414e8..1a9f3f7d1f3 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -73,7 +73,7 @@ rec { # Get the commit id of a git repo # Example: commitIdFromGitRepo commitIdFromGitRepo = - let readCommitFromFile = path: file: + let readCommitFromFile = file: path: with builtins; let fileName = toString path + "/" + file; packedRefsName = toString path + "/packed-refs"; @@ -85,7 +85,7 @@ rec { matchRef = match "^ref: (.*)$" fileContent; in if isNull matchRef then fileContent - else readCommitFromFile path (lib.head matchRef) + else readCommitFromFile (lib.head matchRef) path # Sometimes, the file isn't there at all and has been packed away in the # packed-refs file, so we have to grep through it: else if lib.pathExists packedRefsName @@ -96,7 +96,7 @@ rec { then throw ("Could not find " + file + " in " + packedRefsName) else lib.head matchRef else throw ("Not a .git directory: " + path); - in lib.flip readCommitFromFile "HEAD"; + in readCommitFromFile "HEAD"; pathHasContext = builtins.hasContext or (lib.hasPrefix builtins.storeDir); From f623f8c51e9564932e021a3fb00f9cc89ae3de36 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 7 Nov 2018 09:07:43 +0000 Subject: [PATCH 4/8] espeak-ng: tiny cleanup --- pkgs/applications/audio/espeak-ng/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix index f4160ff6f80..5d0af8cf17a 100644 --- a/pkgs/applications/audio/espeak-ng/default.nix +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source speech synthesizer that supports over 70 languages, based on eSpeak"; - homepage = https://github.com/espeak-ng/espeak-ng; + homepage = src.meta.homepage; license = licenses.gpl3; maintainers = with maintainers; [ aske ]; platforms = platforms.linux; From c0a4e467142591eb3d05aa3de41e3ac4cf63374e Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 7 Nov 2018 09:07:45 +0000 Subject: [PATCH 5/8] qt5: use https, tiny cleanup --- pkgs/development/libraries/qt-5/5.11/default.nix | 2 +- pkgs/development/libraries/qt-5/modules/qtbase.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index d65fe9d219c..bc4b0a8f33b 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -33,7 +33,7 @@ let qtCompatVersion = "5.11"; - mirror = "http://download.qt.io"; + mirror = "https://download.qt.io"; srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; } // { # Community port of the now unmaintained upstream qtwebkit. qtwebkit = { diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index b8511533a79..f5f5c69455f 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -18,7 +18,7 @@ withGtk3 ? false, dconf ? null, gtk3 ? null, # options - libGLSupported ? (!stdenv.isDarwin), + libGLSupported ? !stdenv.isDarwin, libGL, buildExamples ? false, buildTests ? false, From 3902085b3f5a2cb00d715a3c3da68dddeaae10dc Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 7 Nov 2018 09:07:48 +0000 Subject: [PATCH 6/8] mesa: tiny cleanup --- pkgs/development/libraries/mesa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index ff45162c5a8..d2539f8d54e 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -25,20 +25,20 @@ with stdenv.lib; -if ! lists.elem stdenv.hostPlatform.system platforms.mesaPlatforms then +if ! elem stdenv.hostPlatform.system platforms.mesaPlatforms then throw "unsupported platform for Mesa" else let defaultGalliumDrivers = - optionals (builtins.elem "drm" eglPlatforms) + optionals (elem "drm" eglPlatforms) (if stdenv.isAarch32 then ["virgl" "nouveau" "freedreno" "vc4" "etnaviv" "imx"] else if stdenv.isAarch64 then ["virgl" "nouveau" "vc4" ] else ["virgl" "svga" "i915" "r300" "r600" "radeonsi" "nouveau"]); defaultDriDrivers = - optionals (builtins.elem "drm" eglPlatforms) + optionals (elem "drm" eglPlatforms) (if (stdenv.isAarch32 || stdenv.isAarch64) then ["nouveau"] else ["i915" "i965" "nouveau" "radeon" "r200"]); From 67a5c0da41e865a9fba06a8ecf8d5a43904e5ad5 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 7 Nov 2018 08:41:55 +0000 Subject: [PATCH 7/8] tree-wide: fix all `rev`s of `fetchsvn` --- pkgs/games/blackshades/default.nix | 2 +- pkgs/games/blackshadeselite/default.nix | 2 +- pkgs/games/privateer/default.nix | 2 +- pkgs/games/vdrift/default.nix | 2 +- pkgs/misc/cups/drivers/splix/default.nix | 6 +++--- pkgs/os-specific/linux/kernel/linux-libre.nix | 2 +- pkgs/servers/asterisk/default.nix | 2 +- pkgs/tools/graphics/netpbm/default.nix | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix index 4b874c954b0..bf58b523e76 100644 --- a/pkgs/games/blackshades/default.nix +++ b/pkgs/games/blackshades/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "blackshades-svn-110"; src = fetchsvn { url = svn://svn.icculus.org/blackshades/trunk; - rev = 110; + rev = "110"; sha256 = "0kbrh1dympk8scjxr6av24qs2bffz44l8qmw2m5gyqf4g3rxf6ra"; }; diff --git a/pkgs/games/blackshadeselite/default.nix b/pkgs/games/blackshadeselite/default.nix index 2f503e02ec2..25b9321bec3 100644 --- a/pkgs/games/blackshadeselite/default.nix +++ b/pkgs/games/blackshadeselite/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "blackshades-elite-svn-29"; src = fetchsvn { url = svn://svn.gna.org/svn/blackshadeselite/trunk; - rev = 29; + rev = "29"; sha256 = "1lkws5pqpgcgdlar11waikp6y41z678457n9jcik7nhn53cjjr1s"; }; diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix index f6f3e600182..301249789da 100644 --- a/pkgs/games/privateer/default.nix +++ b/pkgs/games/privateer/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchsvn { #url = "mirror://sourceforge/project/privateer/Wing%20Commander%20Privateer/Privateer%20Gemini%20Gold%201.03/PrivateerGold1.03.bz2.bin"; url = "https://privateer.svn.sourceforge.net/svnroot/privateer/privgold/trunk/engine"; - rev = 294; + rev = "294"; sha256 = "e1759087d4565d3fc95e5c87d0f6ddf36b2cd5befec5695ec56ed5f3cd144c63"; }; diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index 7e43fbf2c88..6c571da561c 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -3,7 +3,7 @@ , data ? fetchsvn { url = "svn://svn.code.sf.net/p/vdrift/code/vdrift-data"; - rev = 1386; + rev = "1386"; sha256 = "0ka6zir9hg0md5p03dl461jkvbk05ywyw233hnc3ka6shz3vazi1"; } }: diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix index 012b37959d8..e227de086de 100644 --- a/pkgs/misc/cups/drivers/splix/default.nix +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchsvn, fetchurl, cups, cups-filters, jbigkit, zlib }: let - rev = "315"; color-profiles = stdenv.mkDerivation { name = "splix-color-profiles-20070625"; @@ -19,14 +18,15 @@ let ''; }; -in stdenv.mkDerivation { +in stdenv.mkDerivation rec { name = "splix-svn-${rev}"; + rev = "315"; src = fetchsvn { # We build this from svn, because splix hasn't been in released in several years # although the community has been adding some new printer models. url = "svn://svn.code.sf.net/p/splix/code/splix"; - rev = "r${rev}"; + inherit rev; sha256 = "16wbm4xnz35ca3mw2iggf5f4jaxpyna718ia190ka6y4ah932jxl"; }; diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 2195bb7a29c..31cad258921 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/"; - rev = "r15295"; + rev = "15295"; sha256 = "03kqbjy7w9zg6ry86h9sxa33z0rblznhba109lwmjwy0wx7yk1cs"; } , ... diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index b2b681bcc8b..37f93c8e87e 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -76,7 +76,7 @@ let mp3-202 = fetchsvn { url = http://svn.digium.com/svn/thirdparty/mp3/trunk; - rev = 202; + rev = "202"; sha256 = "1s9idx2miwk178sa731ig9r4fzx4gy1q8xazfqyd7q4lfd70s1cy"; }; diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 05aa7b86636..534cefe9bf6 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = 3264; + rev = "3264"; sha256 = "17fmyjbxp1l18rma7gb0m8wd9kx2iwhqs8dd6fpalsn2cr8mf8hf"; }; From 56802ad698583365b8509cad16c45eeae045a722 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 7 Nov 2018 08:41:57 +0000 Subject: [PATCH 8/8] gnuradio-rds: fix src --- pkgs/applications/misc/gnuradio/rds.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/gnuradio/rds.nix b/pkgs/applications/misc/gnuradio/rds.nix index b617791dc2e..5d9670ba307 100644 --- a/pkgs/applications/misc/gnuradio/rds.nix +++ b/pkgs/applications/misc/gnuradio/rds.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "bastibl"; repo = "gr-rds"; - rev = "$v{version}"; + rev = "v${version}"; sha256 = "008284ya464q4h4fd0zvcn6g7bym231p8fl3kdxncz9ks4zsbsxs"; };