diff options
Diffstat (limited to 'pkgs/misc')
41 files changed, 95 insertions, 95 deletions
diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 01c35d99ae7e..5ff131dad9dd 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -8,7 +8,7 @@ let , extraMeta ? {} , version ? "2.1" , ... } @ args: - stdenv.mkDerivation (rec { + stdenv.mkDerivation ({ name = "arm-trusted-firmware-${platform}-${version}"; inherit version; @@ -53,7 +53,7 @@ let } // extraMeta; } // builtins.removeAttrs args [ "extraMeta" ]); -in rec { +in { inherit buildArmTrustedFirmware; armTrustedFirmwareAllwinner = buildArmTrustedFirmware rec { diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix index e7b4f81f7e04..735ea6232471 100644 --- a/pkgs/misc/base16-builder/node-packages.nix +++ b/pkgs/misc/base16-builder/node-packages.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}: let nodeEnv = import ../../development/node-packages/node-env.nix { diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix index 9c5ef1d02836..b6219e1c749e 100644 --- a/pkgs/misc/cups/drivers/canon/default.nix +++ b/pkgs/misc/cups/drivers/canon/default.nix @@ -13,7 +13,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "canon-cups-ufr2-2.90"; src = src_canon; diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix index abd50850b182..13e3013267bf 100644 --- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchzip, autoconf, automake, cups, glib, libxml2, libusb, libtool , withDebug ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cnijfilter2"; version = "5.30"; diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix index 15e3a1d97a90..a09311a8292d 100644 --- a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix @@ -6,7 +6,7 @@ /* this derivation is basically just a transcription of the rpm .spec file included in the tarball */ -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cnijfilter"; /* important note about versions: cnijfilter packages seem to use diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix index ba8cffc0e654..8866b425ca8f 100644 --- a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix @@ -11,7 +11,7 @@ let arch = else if stdenv.hostPlatform.system == "i686-linux" then "32" else throw "Unsupported system ${stdenv.hostPlatform.system}"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "cnijfilter"; /* important note about versions: cnijfilter packages seem to use diff --git a/pkgs/misc/cups/drivers/estudio/default.nix b/pkgs/misc/cups/drivers/estudio/default.nix index a2fdd1abc192..ad8b0089a871 100644 --- a/pkgs/misc/cups/drivers/estudio/default.nix +++ b/pkgs/misc/cups/drivers/estudio/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cups-toshiba-estudio"; version = "7.89"; diff --git a/pkgs/misc/cups/drivers/kyocera/default.nix b/pkgs/misc/cups/drivers/kyocera/default.nix index 21a276f9d142..cd4c049e67f7 100644 --- a/pkgs/misc/cups/drivers/kyocera/default.nix +++ b/pkgs/misc/cups/drivers/kyocera/default.nix @@ -9,7 +9,7 @@ let libPath = lib.makeLibraryPath [ cups ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cups-kyocera"; version = "1.1203"; diff --git a/pkgs/misc/cups/drivers/zj-58/default.nix b/pkgs/misc/cups/drivers/zj-58/default.nix index b70b5daa7662..87a023af1ca7 100644 --- a/pkgs/misc/cups/drivers/zj-58/default.nix +++ b/pkgs/misc/cups/drivers/zj-58/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, cups}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cups-zj-58"; version = "2018-02-22"; diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index a232552712d6..bdc8b3a75df8 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -243,7 +243,7 @@ stdenv.mkDerivation rec { ]; patchFlags = "-p0"; - configureFlags = [ "--disable-static" "--enable-dependency-reduction" "--disable-frontend"]; + configureFlags = [ "--enable-dependency-reduction" "--disable-frontend"]; postConfigure = '' echo '#define NIX_ESCI_PREFIX "'${fwdir}'"' >> config.h diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix index c65c13e886ff..3d6fb8f081ab 100644 --- a/pkgs/misc/drivers/epson-escpr/default.nix +++ b/pkgs/misc/drivers/epson-escpr/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cups }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "epson-escpr"; version = "1.6.16"; diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix index ebea49d9540a..779325c99b0b 100644 --- a/pkgs/misc/drivers/hplip/3.16.11.nix +++ b/pkgs/misc/drivers/hplip/3.16.11.nix @@ -28,14 +28,14 @@ let }; hplipPlatforms = { - "i686-linux" = "x86_32"; - "x86_64-linux" = "x86_64"; - "armv6l-linux" = "arm32"; - "armv7l-linux" = "arm32"; - "aarch64-linux" = "arm64"; + i686-linux = "x86_32"; + x86_64-linux = "x86_64"; + armv6l-linux = "arm32"; + armv7l-linux = "arm32"; + aarch64-linux = "arm64"; }; - hplipArch = hplipPlatforms."${stdenv.hostPlatform.system}" + hplipArch = hplipPlatforms.${stdenv.hostPlatform.system} or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}"); pluginArches = [ "x86_32" "x86_64" "arm32" "arm64" ]; diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/pkgs/misc/drivers/hplip/3.18.5.nix index 68220392fd00..d95eb85168e2 100644 --- a/pkgs/misc/drivers/hplip/3.18.5.nix +++ b/pkgs/misc/drivers/hplip/3.18.5.nix @@ -30,14 +30,14 @@ let }; hplipPlatforms = { - "i686-linux" = "x86_32"; - "x86_64-linux" = "x86_64"; - "armv6l-linux" = "arm32"; - "armv7l-linux" = "arm32"; - "aarch64-linux" = "arm64"; + i686-linux = "x86_32"; + x86_64-linux = "x86_64"; + armv6l-linux = "arm32"; + armv7l-linux = "arm32"; + aarch64-linux = "arm64"; }; - hplipArch = hplipPlatforms."${stdenv.hostPlatform.system}" + hplipArch = hplipPlatforms.${stdenv.hostPlatform.system} or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}"); pluginArches = [ "x86_32" "x86_64" "arm32" "arm64" ]; diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 851aa9f3f882..978fd9b9e039 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -30,13 +30,13 @@ let }; hplipPlatforms = { - "i686-linux" = "x86_32"; - "x86_64-linux" = "x86_64"; - "armv6l-linux" = "arm32"; - "armv7l-linux" = "arm32"; + i686-linux = "x86_32"; + x86_64-linux = "x86_64"; + armv6l-linux = "arm32"; + armv7l-linux = "arm32"; }; - hplipArch = hplipPlatforms."${stdenv.hostPlatform.system}" + hplipArch = hplipPlatforms.${stdenv.hostPlatform.system} or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}"); pluginArches = [ "x86_32" "x86_64" "arm32" ]; diff --git a/pkgs/misc/drivers/moltengamepad/default.nix b/pkgs/misc/drivers/moltengamepad/default.nix index fb6b4956ef17..2dd32a93219d 100644 --- a/pkgs/misc/drivers/moltengamepad/default.nix +++ b/pkgs/misc/drivers/moltengamepad/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, udev }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "moltengamepad-git"; version = "2016-05-04"; diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/misc/drivers/steamcontroller/default.nix index 366535b51c65..4b19932450ec 100644 --- a/pkgs/misc/drivers/steamcontroller/default.nix +++ b/pkgs/misc/drivers/steamcontroller/default.nix @@ -4,7 +4,7 @@ with python3Packages; -buildPythonApplication rec { +buildPythonApplication { pname = "steamcontroller"; version = "2017-08-11"; diff --git a/pkgs/misc/emulators/blastem/default.nix b/pkgs/misc/emulators/blastem/default.nix index 88e8556ec6c3..39a7e38e0346 100644 --- a/pkgs/misc/emulators/blastem/default.nix +++ b/pkgs/misc/emulators/blastem/default.nix @@ -2,7 +2,7 @@ let vasm = - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "vasm"; version = "1.8c"; src = fetchFromGitHub { @@ -18,7 +18,7 @@ let ''; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "blastem"; version = "0.5.1"; src = fetchurl { diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix index efa1a881f4ab..d8717b46eef4 100644 --- a/pkgs/misc/emulators/citra/default.nix +++ b/pkgs/misc/emulators/citra/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "citra"; version = "2019-05-25"; diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index 7312ad41ada5..d8f5f1cbdb03 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, curl, boost, eigen , freeimage, freetype, libGLU_combined, SDL2, alsaLib, libarchive }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "emulationstation"; version = "2.0.1a"; diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/misc/emulators/kega-fusion/default.nix index c2494d702708..da6a7c8bf2f3 100644 --- a/pkgs/misc/emulators/kega-fusion/default.nix +++ b/pkgs/misc/emulators/kega-fusion/default.nix @@ -3,7 +3,7 @@ let libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsaLib libSM libX11 gdk-pixbuf pango libXinerama ]; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "kega-fusion"; version = "3.63x"; diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/misc/emulators/openmsx/default.nix index 8a95d6f28837..6ac6f93750e5 100644 --- a/pkgs/misc/emulators/openmsx/default.nix +++ b/pkgs/misc/emulators/openmsx/default.nix @@ -6,7 +6,7 @@ , freetype, tcl, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "openmsx"; version = "git-2017-11-02"; diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 3f20390fba73..fbde2ff54c9e 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -67,7 +67,7 @@ in with stdenv.lib.licenses; buildPhase = "make"; }; - beetle-pce-fast = let der = (mkLibRetroCore rec { + beetle-pce-fast = let der = (mkLibRetroCore { core = "mednafen-pce-fast"; src = fetchRetro { repo = "beetle-pce-fast-libretro"; @@ -81,7 +81,7 @@ in with stdenv.lib.licenses; name = "beetle-pce-fast-${der.version}"; }; - beetle-psx = let der = (mkLibRetroCore rec { + beetle-psx = let der = (mkLibRetroCore { core = "mednafen-psx"; src = fetchRetro { repo = "beetle-psx-libretro"; @@ -95,7 +95,7 @@ in with stdenv.lib.licenses; name = "beetle-psx-${der.version}"; }; - beetle-saturn = let der = (mkLibRetroCore rec { + beetle-saturn = let der = (mkLibRetroCore { core = "mednafen-saturn"; src = fetchRetro { repo = "beetle-saturn-libretro"; @@ -110,7 +110,7 @@ in with stdenv.lib.licenses; meta.platforms = [ "x86_64-linux" ]; }; - bsnes-mercury = let bname = "bsnes-mercury"; in (mkLibRetroCore rec { + bsnes-mercury = let bname = "bsnes-mercury"; in (mkLibRetroCore { core = bname + "-accuracy"; src = fetchRetro { repo = bname; @@ -204,7 +204,7 @@ in with stdenv.lib.licenses; license = gpl2; }; - genesis-plus-gx = mkLibRetroCore rec { + genesis-plus-gx = mkLibRetroCore { core = "genesis-plus-gx"; src = fetchRetro { repo = "Genesis-Plus-GX"; @@ -215,7 +215,7 @@ in with stdenv.lib.licenses; license = "Non-commercial"; }; - higan-sfc = (mkLibRetroCore rec { + higan-sfc = (mkLibRetroCore { core = "higan-sfc"; src = fetchFromGitLab { owner = "higan"; @@ -346,7 +346,7 @@ in with stdenv.lib.licenses; buildPhase = "make"; }; - quicknes = (mkLibRetroCore rec { + quicknes = (mkLibRetroCore { core = "quicknes"; src = fetchRetro { repo = "QuickNES_Core"; diff --git a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix index 8bdc79f2d8ec..d751c4f7fc43 100644 --- a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix +++ b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix @@ -17,7 +17,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "kodi-retroarch-advanced-launchers"; version = "0.2"; diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix index 25af4f8d50a7..44571de3489d 100644 --- a/pkgs/misc/emulators/retrofe/default.nix +++ b/pkgs/misc/emulators/retrofe/default.nix @@ -2,7 +2,7 @@ , python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "retrofe"; version = "0.6.169"; diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index ae1b1bf6bda2..674222dc3555 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -9,7 +9,7 @@ let majorVersion = "0.0.6"; gitVersion = "8187-790962425"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rpcs3"; version = "${majorVersion}-${gitVersion}"; diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix index 0f2abedd3b53..e866a1937d69 100644 --- a/pkgs/misc/gnash/default.nix +++ b/pkgs/misc/gnash/default.nix @@ -64,7 +64,7 @@ assert length toolkits == 0 -> throw "at least one GUI toolkit must be enabled" assert length renderers == 0 -> throw "at least one renderer must be enabled"; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gnash"; version = "0.8.11-2019-30-01"; diff --git a/pkgs/misc/gnuk/default.nix b/pkgs/misc/gnuk/default.nix index f3d5450c94ba..4597fa40390d 100644 --- a/pkgs/misc/gnuk/default.nix +++ b/pkgs/misc/gnuk/default.nix @@ -1,6 +1,6 @@ { callPackage, fetchgit, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.0.4"; src = fetchgit { diff --git a/pkgs/misc/mnemonicode/default.nix b/pkgs/misc/mnemonicode/default.nix index 06a6a7e65505..ec0dd0b1fd52 100644 --- a/pkgs/misc/mnemonicode/default.nix +++ b/pkgs/misc/mnemonicode/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mnemonicode"; version = "2015-11-30"; src = fetchFromGitHub { diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/misc/screensavers/physlock/default.nix index 5cfddaaea571..f69b0794ce3a 100644 --- a/pkgs/misc/screensavers/physlock/default.nix +++ b/pkgs/misc/screensavers/physlock/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pam, systemd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "11-dev"; pname = "physlock"; src = fetchFromGitHub { diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/misc/sound-of-sorting/default.nix index f61c9f5e1b9b..1072bac7816a 100644 --- a/pkgs/misc/sound-of-sorting/default.nix +++ b/pkgs/misc/sound-of-sorting/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit , SDL2, wxGTK }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sound-of-sorting"; version = "unstable-2015-07-21"; diff --git a/pkgs/misc/stabber/default.nix b/pkgs/misc/stabber/default.nix index b5dc7a13f183..d0d3fbdf2d73 100644 --- a/pkgs/misc/stabber/default.nix +++ b/pkgs/misc/stabber/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "stabber-unstable"; version = "2016-11-09"; diff --git a/pkgs/misc/themes/arc-kde/default.nix b/pkgs/misc/themes/arc-kde/default.nix index 054cd1aeffc3..decdbdfac2dc 100644 --- a/pkgs/misc/themes/arc-kde/default.nix +++ b/pkgs/misc/themes/arc-kde/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "arc-kde-theme"; version = "2017-11-09"; diff --git a/pkgs/misc/themes/numix-sx/default.nix b/pkgs/misc/themes/numix-sx/default.nix index dfa788f6ea7b..72e87e2e2740 100644 --- a/pkgs/misc/themes/numix-sx/default.nix +++ b/pkgs/misc/themes/numix-sx/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gtk-engine-murrine }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2017-04-24"; pname = "numix-sx-gtk-theme"; diff --git a/pkgs/misc/themes/paper/default.nix b/pkgs/misc/themes/paper/default.nix index 2f7a53dc2d43..e7235a900cf9 100644 --- a/pkgs/misc/themes/paper/default.nix +++ b/pkgs/misc/themes/paper/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, gtk_engines }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2016-08-16"; pname = "paper-gtk-theme"; diff --git a/pkgs/misc/themes/solarc/default.nix b/pkgs/misc/themes/solarc/default.nix index 3d9403b84f46..96843e8d78b4 100644 --- a/pkgs/misc/themes/solarc/default.nix +++ b/pkgs/misc/themes/solarc/default.nix @@ -2,7 +2,7 @@ gtk-engine-murrine, gtk3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "solarc-gtk-theme"; version = "1.0.2"; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 6fe1a2081d22..6f1c8af390c8 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -13,7 +13,7 @@ let , extraMakeFlags ? [] , extraMeta ? {} , ... } @ args: - stdenv.mkDerivation (rec { + stdenv.mkDerivation ({ pname = "uboot-${defconfig}"; inherit version; @@ -86,10 +86,10 @@ let } // extraMeta; } // removeAttrs args [ "extraMeta" ]); -in rec { +in { inherit buildUBoot; - ubootTools = buildUBoot rec { + ubootTools = buildUBoot { defconfig = "allnoconfig"; installDir = "$out/bin"; hardeningDisable = []; |