diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-09-06 22:47:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-06 22:47:23 +0200 |
| commit | 076860e0340a5e4a909b9a710e186508b14d1c90 (patch) | |
| tree | fa53c32dfef1265496170172a28a3c71bb32a655 /pkgs | |
| parent | cfe51be04f8b7c36fe9f71ca5835bd683ede087f (diff) | |
| parent | 66bc7fc1b3e7a85a2cfde9bb121498a181d411a4 (diff) | |
| download | nixpkgs-076860e0340a5e4a909b9a710e186508b14d1c90.tar nixpkgs-076860e0340a5e4a909b9a710e186508b14d1c90.tar.gz nixpkgs-076860e0340a5e4a909b9a710e186508b14d1c90.tar.bz2 nixpkgs-076860e0340a5e4a909b9a710e186508b14d1c90.tar.lz nixpkgs-076860e0340a5e4a909b9a710e186508b14d1c90.tar.xz nixpkgs-076860e0340a5e4a909b9a710e186508b14d1c90.tar.zst nixpkgs-076860e0340a5e4a909b9a710e186508b14d1c90.zip | |
Merge pull request #68203 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs')
2157 files changed, 4407 insertions, 4434 deletions
diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index b94fed41341..28331720048 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -4,7 +4,7 @@ let inherit (python2Packages) python dbus-python; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "a2jmidid"; version = "8"; diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index a4aa6428097..ff3c456c364 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -6,21 +6,18 @@ , curl, ffmpeg, gdk-pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras }: -let +mkDerivation { pname = "amarok"; - version = "2.9.0-20180618"; - -in mkDerivation { - name = "${pname}-${version}"; + version = "2.9.0-20190731"; src = fetchgit { # master has the Qt5 version as of April 2018 but a formal release has not # yet been made so change this back to the proper upstream when such a # release is out url = git://anongit.kde.org/amarok.git; - # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - rev = "5d43efa454b6a6c9c833a6f3d7f8ff3cae738c96"; - sha256 = "0fyrbgldg4wbb2darm4aav5fpzbacxzfjrdqwkhv9xr13j7zsvm3"; + # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.CZ"; + rev = "783da6d8e93737f5e41a3bc017906dc1f94bb94f"; + sha256 = "08bypxk5kaay98hbwz9pj3hwgiyk3qmn9qw99bnjkkkw9wzsxiy6"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 292f28554d0..bdbf6a45a6d 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -35,7 +35,7 @@ let withUdisks = (withTaglib && withDevices); -in mkDerivation rec { +in mkDerivation { name = "${pname}-${version}"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix index 9c2f17c5cc9..1ab39311258 100644 --- a/pkgs/applications/audio/caudec/default.nix +++ b/pkgs/applications/audio/caudec/default.nix @@ -4,7 +4,7 @@ let version = "1.7.5"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "caudec"; inherit version; diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/applications/audio/cmusfm/default.nix index 51b88607208..54f1050da46 100644 --- a/pkgs/applications/audio/cmusfm/default.nix +++ b/pkgs/applications/audio/cmusfm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, libnotify, gdk-pixbuf }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2018-10-11"; pname = "cmusfm-unstable"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/csound/csound-manual/default.nix b/pkgs/applications/audio/csound/csound-manual/default.nix index df0fcb0ee9c..5cc8d71383b 100644 --- a/pkgs/applications/audio/csound/csound-manual/default.nix +++ b/pkgs/applications/audio/csound/csound-manual/default.nix @@ -4,7 +4,7 @@ libxslt }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "csound-manual"; version = "unstable-2019-02-22"; diff --git a/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix b/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix index 97e054bda64..699f9d86f68 100644 --- a/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix +++ b/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, deadbeef, gtkmm3, libxmlxx3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "deadbeef-lyricbar-plugin"; version = "unstable-2019-01-29"; diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix index 6d56f53bd16..1fcdda40896 100644 --- a/pkgs/applications/audio/dirt/default.nix +++ b/pkgs/applications/audio/dirt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, libjack2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "dirt-2018-01-01"; src = fetchFromGitHub { repo = "Dirt"; diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 4268a783c8d..3b6ca9e4053 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -3,7 +3,7 @@ , bc, coreutils, which }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "faustlive"; version = "2017-12-05"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index fb5390cb46e..df3aa987c3f 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libogg }: stdenv.mkDerivation rec { - name = "flac-1.3.2"; + name = "flac-1.3.3"; src = fetchurl { url = "http://downloads.xiph.org/releases/flac/${name}.tar.xz"; - sha256 = "0gymm2j3276kr9nz6vmgfwsdfrq6c449n40a0mzz8h6wc7nw7kwi"; + sha256 = "0j0p9sf56a2fm2hkjnf7x3py5ir49jyavg4q5zdyd7bcf6yq4gi1"; }; buildInputs = [ libogg ]; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 404c9cc825e..bb86787a3cf 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -19,7 +19,7 @@ in with versionMap.${version}; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "fluidsynth-${fluidsynthVersion}"; version = fluidsynthVersion; diff --git a/pkgs/applications/audio/fmsynth/default.nix b/pkgs/applications/audio/fmsynth/default.nix index dc163de8ade..5e95d717968 100644 --- a/pkgs/applications/audio/fmsynth/default.nix +++ b/pkgs/applications/audio/fmsynth/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, gtkmm2, lv2, lvtk, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "fmsynth-unstable"; version = "2015-02-07"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix index 330ae56f13f..b17561e1567 100644 --- a/pkgs/applications/audio/foo-yc20/default.nix +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "git-2015-05-21"; pname = "foo-yc20"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index 3406f317884..eeafdc80344 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -3,7 +3,7 @@ # TODO: build from git for easier updates # rustPlatform.buildRustPackage rec { -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.4.6"; pname = "gnome-podcasts"; diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix index 94d0f5eb50f..c4a8f2fce02 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -18,7 +18,7 @@ let version = "7.2"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "gradio"; inherit version; diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix index d32c55122c5..64de722afe9 100644 --- a/pkgs/applications/audio/helm/default.nix +++ b/pkgs/applications/audio/helm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2 , lv2, pkgconfig, libGLU_combined }: - stdenv.mkDerivation rec { + stdenv.mkDerivation { version = "0.9.0"; pname = "helm"; diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix index 1fd8531fb7f..a893390d74e 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/applications/audio/iannix/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "iannix"; version = "2016-01-31"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix index 83644dd5ea5..fe7c83dd56f 100644 --- a/pkgs/applications/audio/jackmix/default.nix +++ b/pkgs/applications/audio/jackmix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, scons, qt4, lash, libjack2, jack ? libjack2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "jackmix-0.5.2"; src = fetchurl { url = https://github.com/kampfschlaefer/jackmix/archive/v0.5.2.tar.gz; diff --git a/pkgs/applications/audio/lv2bm/default.nix b/pkgs/applications/audio/lv2bm/default.nix index 7288d39ce77..f1eddb62624 100644 --- a/pkgs/applications/audio/lv2bm/default.nix +++ b/pkgs/applications/audio/lv2bm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, glib, lilv, lv2, pkgconfig, serd, sord, sratom }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lv2bm"; version = "git-2015-11-29"; diff --git a/pkgs/applications/audio/mod-distortion/default.nix b/pkgs/applications/audio/mod-distortion/default.nix index 3fbe927be4b..c20f04ec947 100644 --- a/pkgs/applications/audio/mod-distortion/default.nix +++ b/pkgs/applications/audio/mod-distortion/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, lv2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mod-distortion-git"; version = "2016-08-19"; diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix index 8582fd78192..02b1d8ea511 100644 --- a/pkgs/applications/audio/muse/default.nix +++ b/pkgs/applications/audio/muse/default.nix @@ -16,7 +16,7 @@ , gitAndTools }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "muse-sequencer"; version = "3.1pre1"; diff --git a/pkgs/applications/audio/musly/default.nix b/pkgs/applications/audio/musly/default.nix index 47370d4bc2f..e7a9e22c2d6 100644 --- a/pkgs/applications/audio/musly/default.nix +++ b/pkgs/applications/audio/musly/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, eigen, libav_all }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "musly"; version = "unstable-2017-04-26"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix index 94cf32f8f82..5f8c82b98d0 100644 --- a/pkgs/applications/audio/non/default.nix +++ b/pkgs/applications/audio/non/default.nix @@ -2,7 +2,7 @@ , libsndfile, ladspaH, liblrdf, liblo, libsigcxx, wafHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "non"; version = "2018-02-15"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix index 91443bb1ef7..0bb970500bd 100644 --- a/pkgs/applications/audio/nova-filters/default.nix +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, sconsPackages, boost, ladspaH, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.2-2"; pname = "nova-filters"; diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index 8116bcaf0bd..c9d69b5c7f2 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -3,7 +3,7 @@ let version = "0.4.1"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "openmpt123"; inherit version; diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix index 4f76aefb5ed..e7c4cab9af1 100644 --- a/pkgs/applications/audio/patchage/default.nix +++ b/pkgs/applications/audio/patchage/default.nix @@ -2,7 +2,7 @@ , gtkmm2, libjack2, pkgconfig, python2, wafHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "patchage"; version = "1.0.1"; src = fetchsvn { diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix index faa914e1328..6c7a4b03ef5 100644 --- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix +++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip, puredata }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "helmholtz"; src = fetchurl { diff --git a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix index 9e7de39218d..028a4667cb2 100644 --- a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix +++ b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, puredata }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mrpeach"; version = "1.1"; diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix index c2c4672be12..448b219a1af 100644 --- a/pkgs/applications/audio/pianobooster/default.nix +++ b/pkgs/applications/audio/pianobooster/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, alsaLib, cmake, libGLU_combined, makeWrapper, qt4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pianobooster"; version = "0.6.4b"; diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/applications/audio/plugin-torture/default.nix index 346387be7e3..f444ad6cb32 100644 --- a/pkgs/applications/audio/plugin-torture/default.nix +++ b/pkgs/applications/audio/plugin-torture/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, boost, ladspaH, lilv, lv2, pkgconfig, serd, sord, sratom }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "plugin-torture"; version = "2016-07-25"; diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix index d414cb75611..a9f56cca001 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/default.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix @@ -17,7 +17,7 @@ assert vorbisSupport -> vorbisTools != null; let zeroconf = pythonPackages.callPackage ./zeroconf.nix { }; -in pythonPackages.buildPythonApplication rec { +in pythonPackages.buildPythonApplication { pname = "pulseaudio-dlna"; version = "2017-11-01"; diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix index c34b27edd96..e3eb750496b 100644 --- a/pkgs/applications/audio/rhvoice/default.nix +++ b/pkgs/applications/audio/rhvoice/default.nix @@ -3,7 +3,7 @@ let version = "unstable-2018-02-10"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "rhvoice"; inherit version; diff --git a/pkgs/applications/audio/shntool/default.nix b/pkgs/applications/audio/shntool/default.nix index dc8d95d2c49..e3bfc60a40a 100644 --- a/pkgs/applications/audio/shntool/default.nix +++ b/pkgs/applications/audio/shntool/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, flac }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "3.0.10"; pname = "shntool"; diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix index 01f0708d115..30ff41da369 100644 --- a/pkgs/applications/audio/soundscape-renderer/default.nix +++ b/pkgs/applications/audio/soundscape-renderer/default.nix @@ -14,7 +14,7 @@ , libGLU_combined # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "soundscape-renderer-unstable"; version = "2016-11-03"; diff --git a/pkgs/applications/audio/speech-denoiser/default.nix b/pkgs/applications/audio/speech-denoiser/default.nix index 2401dc60b09..6598d24fb07 100644 --- a/pkgs/applications/audio/speech-denoiser/default.nix +++ b/pkgs/applications/audio/speech-denoiser/default.nix @@ -8,7 +8,7 @@ let sha256 = "189l6lz8sz5vr6bjyzgcsrvksl1w6crqsg0q65r94b5yjsmjnpr4"; }; - rnnoise-nu = stdenv.mkDerivation rec { + rnnoise-nu = stdenv.mkDerivation { pname = "rnnoise-nu"; version = "unstable-07-10-2019"; src = speech-denoiser-src; @@ -18,7 +18,7 @@ let installTargets = [ "install-rnnoise-nu" ]; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "speech-denoiser"; version = "unstable-07-10-2019"; diff --git a/pkgs/applications/audio/spotifywm/default.nix b/pkgs/applications/audio/spotifywm/default.nix index 3447049099b..2380c8e5d9e 100644 --- a/pkgs/applications/audio/spotifywm/default.nix +++ b/pkgs/applications/audio/spotifywm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, spotify, xorg, runtimeShell }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "spotifywm-unstable"; version = "2016-11-28"; diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix index d25e61c37f5..8acd8e0b88b 100644 --- a/pkgs/applications/audio/svox/default.nix +++ b/pkgs/applications/audio/svox/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "svox"; version = "2017-07-18"; diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix index 0f70f956713..9188003ce66 100644 --- a/pkgs/applications/audio/traverso/default.nix +++ b/pkgs/applications/audio/traverso/default.nix @@ -2,7 +2,7 @@ , alsaLib, fftw, flac, lame, libjack2, libmad, libpulseaudio , libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "traverso"; version = "0.49.6"; diff --git a/pkgs/applications/audio/uade123/default.nix b/pkgs/applications/audio/uade123/default.nix index b5ff8e41fe0..844eea11f51 100644 --- a/pkgs/applications/audio/uade123/default.nix +++ b/pkgs/applications/audio/uade123/default.nix @@ -2,7 +2,7 @@ let version = "2.13"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "uade123"; inherit version; src = fetchurl { diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index cc04632cfb5..eeeb8ae2ea4 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit , boost, libX11, libGLU_combined, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "zam-plugins"; version = "3.11"; diff --git a/pkgs/applications/backup/areca/default.nix b/pkgs/applications/backup/areca/default.nix index a9647b11eee..d02aa4b8444 100644 --- a/pkgs/applications/backup/areca/default.nix +++ b/pkgs/applications/backup/areca/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ant, jre, jdk, swt, acl, attr }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "areca-7.5"; src = fetchurl { diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index 2ff51db5404..7120a1934f6 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace deja-dup/nautilus/NautilusExtension.c --subst-var-by DEJA_DUP_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas + substituteInPlace deja-dup/nautilus/NautilusExtension.c --subst-var-by DEJA_DUP_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} ''; nativeBuildInputs = [ diff --git a/pkgs/applications/blockchains/ethabi.nix b/pkgs/applications/blockchains/ethabi.nix index 21d69f14d7f..5bc81a6daf6 100644 --- a/pkgs/applications/blockchains/ethabi.nix +++ b/pkgs/applications/blockchains/ethabi.nix @@ -3,7 +3,7 @@ with rustPlatform; buildRustPackage rec { - name = "ethabi-${version}"; + pname = "ethabi"; version = "7.0.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/blockchains/parity/parity.nix b/pkgs/applications/blockchains/parity/parity.nix index fbc43cd3402..7f28d97bf81 100644 --- a/pkgs/applications/blockchains/parity/parity.nix +++ b/pkgs/applications/blockchains/parity/parity.nix @@ -13,7 +13,7 @@ , systemd }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "parity"; inherit version; inherit cargoSha256; diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 26c9192ee6f..100c0f8ba41 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -6,7 +6,7 @@ }: rustPlatform.buildRustPackage rec { - name = "polkadot-${version}"; + pname = "polkadot"; version = "0.2.17"; src = fetchFromGitHub { diff --git a/pkgs/applications/blockchains/zcash/librustzcash/default.nix b/pkgs/applications/blockchains/zcash/librustzcash/default.nix index 3aeee7e6972..634d4e8538a 100644 --- a/pkgs/applications/blockchains/zcash/librustzcash/default.nix +++ b/pkgs/applications/blockchains/zcash/librustzcash/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "librustzcash-unstable-${version}"; + pname = "librustzcash-unstable"; version = "2017-03-17"; src = fetchFromGitHub { diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix index 8302303a08e..accdea3ae2d 100644 --- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix @@ -2,7 +2,7 @@ , dbus, pcre, epoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs , gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.2.1"; pname = "lightdm-enso-os-greeter"; diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 0bd1f5e90f1..1df67578b3a 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -61,7 +61,6 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--sysconfdir=/etc" "--disable-tests" - "--disable-static" "--disable-dmrc" ] ++ optional withQt4 "--enable-liblightdm-qt" ++ optional withQt5 "--enable-liblightdm-qt5"; diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index fc61d43436d..526041124bc 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -6,7 +6,7 @@ let version = "0.18.1"; -in mkDerivation rec { +in mkDerivation { pname = "sddm"; inherit version; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 282e2c93226..b5381983240 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,7 +18,7 @@ let build = "192.5842447"; sha256Hash = "0qyvqm0ihp6czx77skia87qnz87wrsp1a6la04dr4b0xln2c8m5b"; }; -in rec { +in { # Attributes are named by their corresponding release channels stable = mkStudio (stableVersion // { diff --git a/pkgs/applications/editors/aseprite/skia.nix b/pkgs/applications/editors/aseprite/skia.nix index 038ff96ad3b..8bf2adf484e 100644 --- a/pkgs/applications/editors/aseprite/skia.nix +++ b/pkgs/applications/editors/aseprite/skia.nix @@ -7,7 +7,7 @@ let # skia-deps.nix is generated by: ./skia-make-deps.sh 'angle2|dng_sdk|piex|sfntly' depSrcs = import ./skia-deps.nix { inherit fetchgit; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "skia-aseprite-m71"; src = fetchFromGitHub { diff --git a/pkgs/applications/editors/edit/default.nix b/pkgs/applications/editors/edit/default.nix index acda484ba3a..27c13c0cb39 100644 --- a/pkgs/applications/editors/edit/default.nix +++ b/pkgs/applications/editors/edit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, unzip, pkgconfig, ncurses, libX11, libXft, cwebbin }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "edit-nightly"; version = "20160425"; diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix index 078b8a03b5d..4b7e4c8a3ca 100644 --- a/pkgs/applications/editors/elvis/default.nix +++ b/pkgs/applications/editors/elvis/default.nix @@ -1,6 +1,6 @@ { fetchurl, fetchpatch, stdenv, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "elvis-2.2_0"; src = fetchurl { diff --git a/pkgs/applications/editors/emacs-modes/cedille/default.nix b/pkgs/applications/editors/emacs-modes/cedille/default.nix index ce9f57ef40b..3af53cda492 100644 --- a/pkgs/applications/editors/emacs-modes/cedille/default.nix +++ b/pkgs/applications/editors/emacs-modes/cedille/default.nix @@ -1,6 +1,6 @@ { stdenv, cedille, emacs }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cedille-mode"; version = cedille.version; diff --git a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix index fb3de6ea3d9..3d34c7a462e 100644 --- a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix +++ b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix @@ -2,7 +2,7 @@ let commit = "412713a0fcedd520d208a7b783fea03d710bcc61"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "color-theme-solarized-1.0.0"; src = fetchzip { diff --git a/pkgs/applications/editors/emacs-modes/libgenerated.nix b/pkgs/applications/editors/emacs-modes/libgenerated.nix index 73d66dc2b3c..0529fce2b16 100644 --- a/pkgs/applications/editors/emacs-modes/libgenerated.nix +++ b/pkgs/applications/editors/emacs-modes/libgenerated.nix @@ -53,7 +53,7 @@ in { , sha256 ? null , ... }@args: let - sourceArgs = args."${variant}"; + sourceArgs = args.${variant}; version = sourceArgs.version or null; deps = sourceArgs.deps or null; error = sourceArgs.error or args.error or null; @@ -78,7 +78,7 @@ in { inherit sha256; }; packageRequires = lib.optional (! isNull deps) - (map (dep: pkgargs."${dep}" or self."${dep}" or null) + (map (dep: pkgargs.${dep} or self.${dep} or null) deps); meta = (sourceArgs.meta or {}) // { inherit broken; diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix index 582a8b5e71b..545ad5a5e0c 100644 --- a/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -59,7 +59,7 @@ font-lock-plus = callPackage ./font-lock-plus { }; - ghc-mod = melpaBuild rec { + ghc-mod = melpaBuild { pname = "ghc"; version = external.ghc-mod.version; src = external.ghc-mod.src; @@ -75,7 +75,7 @@ }; }; - haskell-unicode-input-method = melpaBuild rec { + haskell-unicode-input-method = melpaBuild { pname = "emacs-haskell-unicode-input-method"; version = "20110905.2307"; src = pkgs.fetchFromGitHub { @@ -104,7 +104,7 @@ icicles = callPackage ./icicles { }; - rtags = melpaBuild rec { + rtags = melpaBuild { inherit (external.rtags) version src meta; pname = "rtags"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 8b83b556246..fe440c146ae 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -418,7 +418,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac }; }); - in pkgs.stdenv.mkDerivation rec { + in pkgs.stdenv.mkDerivation { inherit (super.vterm) name version src; nativeBuildInputs = [ pkgs.cmake ]; @@ -451,6 +451,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac }; }; - in super // overrides."${variant}"); + in super // overrides.${variant}); in generateMelpa { } diff --git a/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix b/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix index 1937a94cad1..241ec3b42c9 100644 --- a/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix +++ b/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, emacs}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "org-mac-link-1.2"; src = fetchurl { diff --git a/pkgs/applications/editors/emacs-modes/perl-completion/default.nix b/pkgs/applications/editors/emacs-modes/perl-completion/default.nix index 97d063d452c..9f251f54d6a 100644 --- a/pkgs/applications/editors/emacs-modes/perl-completion/default.nix +++ b/pkgs/applications/editors/emacs-modes/perl-completion/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "perl-completion"; src = fetchurl { diff --git a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix index 1f218439a5f..54e5a89dd9f 100644 --- a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix +++ b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, emacs}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "rect-mark-1.4"; src = fetchurl { diff --git a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix index f5aeb35d184..165e0c13c8f 100644 --- a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix +++ b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, emacs}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "session-management-for-emacs-2.2a"; src = fetchurl { diff --git a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix index aa27e302e5d..fcb37e7ebad 100644 --- a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix +++ b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchgit, emacs}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "sunrise-commander-6r435"; src = fetchgit { diff --git a/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix b/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix index e147fd53b22..209a99245ec 100644 --- a/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix +++ b/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, emacs}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "yaoddmuse-0.1.2"; src = fetchurl { diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index ec05f0f8262..3abe2834db4 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -4,7 +4,7 @@ let libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "gobby-unstable-2018-04-03"; src = fetchFromGitHub { owner = "gobby"; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 92355552fce..a33b9531730 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -11,7 +11,7 @@ let # Sorted alphabetically buildClion = { name, version, src, license, description, wmClass, ... }: - lib.overrideDerivation (mkJetBrainsProduct rec { + lib.overrideDerivation (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "CLion"; meta = with stdenv.lib; { @@ -121,7 +121,7 @@ let }); buildIdea = { name, version, src, license, description, wmClass, ... }: - (mkJetBrainsProduct rec { + (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "IDEA"; meta = with stdenv.lib; { @@ -156,7 +156,7 @@ let }); buildPycharm = { name, version, src, license, description, wmClass, ... }: - (mkJetBrainsProduct rec { + (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "PyCharm"; meta = with stdenv.lib; { @@ -183,7 +183,7 @@ let }; buildRider = { name, version, src, license, description, wmClass, ... }: - lib.overrideDerivation (mkJetBrainsProduct rec { + lib.overrideDerivation (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "Rider"; meta = with stdenv.lib; { @@ -209,7 +209,7 @@ let }); buildRubyMine = { name, version, src, license, description, wmClass, ... }: - (mkJetBrainsProduct rec { + (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "RubyMine"; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/jupyter/kernel.nix b/pkgs/applications/editors/jupyter/kernel.nix index 4a079625d18..205c32d5f80 100644 --- a/pkgs/applications/editors/jupyter/kernel.nix +++ b/pkgs/applications/editors/jupyter/kernel.nix @@ -26,7 +26,7 @@ in # Definitions is an attribute set. - create = { definitions ? default }: with lib; stdenv.mkDerivation rec { + create = { definitions ? default }: with lib; stdenv.mkDerivation { name = "jupyter-kernels"; diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix index df46cb12338..a106c316674 100644 --- a/pkgs/applications/editors/kodestudio/default.nix +++ b/pkgs/applications/editors/kodestudio/default.nix @@ -20,7 +20,7 @@ let in - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "kodestudio"; inherit version; diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index ff824d8b45b..bd433436eb0 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper python3 ]; propagatedBuildInputs = with python3.pkgs; [ pyqt5 docutils ]; - desktopItem = makeDesktopItem rec { + desktopItem = makeDesktopItem { name = "leo-editor"; exec = "leo %U"; icon = "leoapp32"; diff --git a/pkgs/applications/editors/nano/nanorc/default.nix b/pkgs/applications/editors/nano/nanorc/default.nix index 7902ddc410c..eab37fba19a 100644 --- a/pkgs/applications/editors/nano/nanorc/default.nix +++ b/pkgs/applications/editors/nano/nanorc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nanorc"; version = "2018-09-05"; diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix index 82c89ebdca6..a7a6b35a24a 100644 --- a/pkgs/applications/editors/nvi/default.nix +++ b/pkgs/applications/editors/nvi/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "nvi-1.79"; src = fetchurl { diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix index a7dc02a9a63..dd49b0a1cf7 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/applications/editors/retext/default.nix @@ -8,7 +8,7 @@ let version = "7.0.4"; python = let packageOverrides = self: super: { - markdown = super.markdown.overridePythonAttrs(old: rec { + markdown = super.markdown.overridePythonAttrs(old: { src = super.fetchPypi { version = "3.0.1"; pname = "Markdown"; @@ -16,7 +16,7 @@ let }; }); - chardet = super.chardet.overridePythonAttrs(old: rec { + chardet = super.chardet.overridePythonAttrs(old: { src = super.fetchPypi { version = "2.3.0"; pname = "chardet"; diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix index 2dceee0a37d..78dd0d09541 100644 --- a/pkgs/applications/editors/scite/default.nix +++ b/pkgs/applications/editors/scite/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gtk2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "scite"; version = "4.0.5"; diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index 629bd9d019d..5a13d91aef2 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -4,17 +4,17 @@ let version = "3.0.15"; plat = { - "i386-linux" = "i386"; - "x86_64-linux" = "x86_64"; + i386-linux = "i386"; + x86_64-linux = "x86_64"; }.${stdenv.hostPlatform.system}; sha256 = { - "i386-linux" = "0v2nsis6vb1lnhmjd28vrfxqwwpycv02j0nvjlfzcgj4b3400j7a"; - "x86_64-linux" = "130n586cw0836zsbwqcz3pp3h0d4ny74ngqs4k4cvfb92556r7xh"; + i386-linux = "0v2nsis6vb1lnhmjd28vrfxqwwpycv02j0nvjlfzcgj4b3400j7a"; + x86_64-linux = "130n586cw0836zsbwqcz3pp3h0d4ny74ngqs4k4cvfb92556r7xh"; }.${stdenv.hostPlatform.system}; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "standardnotes"; inherit version; diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix index b8fef39d3ea..82d92ba2fe1 100644 --- a/pkgs/applications/editors/sublime/3/packages.nix +++ b/pkgs/applications/editors/sublime/3/packages.nix @@ -3,7 +3,7 @@ let common = opts: callPackage (import ./common.nix opts); in - rec { + { sublime3-dev = common { buildVersion = "3208"; dev = true; diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix index efbca2949dd..6714f917315 100644 --- a/pkgs/applications/editors/supertux-editor/default.nix +++ b/pkgs/applications/editors/supertux-editor/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkgconfig, makeWrapper, gnome2, gtk2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "git-2014-08-20"; pname = "supertux-editor"; diff --git a/pkgs/applications/editors/uemacs/default.nix b/pkgs/applications/editors/uemacs/default.nix index fad4e82d37f..0a2df6b6d4b 100644 --- a/pkgs/applications/editors/uemacs/default.nix +++ b/pkgs/applications/editors/uemacs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "uemacs"; version = "2014-12-08"; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 1d65be3e73d..d21d0ad5ee0 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { inherit (common) version postPatch hardeningDisable enableParallelBuilding meta; src = builtins.getAttr source { - "default" = common.src; # latest release + default = common.src; # latest release }; patches = [ ./cflags-prune.diff ] ++ stdenv.lib.optional ftNixSupport ./ft-nix-support.patch; diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 732bfbf0bfd..ae4e9ac8a9c 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -12,7 +12,7 @@ let common = callPackage ./common.nix {}; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "vim"; inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta; diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 82977c2e6bc..6081bbc8b0c 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -24,7 +24,7 @@ let ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "macvim"; version = "8.1.1722"; diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index 5b9548df7f1..1bda6958206 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { --prefix VIS_PATH : "\$HOME/.config:$out/share/vis" ''; - desktopItem = makeDesktopItem rec { + desktopItem = makeDesktopItem { name = "vis"; exec = "vis %U"; type = "Application"; diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index e42ca8a0bbf..7b7209a5e1f 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -11,7 +11,7 @@ let inherit (stdenv.hostPlatform) system; in - stdenv.mkDerivation rec { + stdenv.mkDerivation { inherit pname version src sourceRoot; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 75abb563c5a..fb0c32f72d7 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -4,8 +4,8 @@ let inherit (stdenv.hostPlatform) system; plat = { - "x86_64-linux" = "linux-x64"; - "x86_64-darwin" = "darwin"; + x86_64-linux = "linux-x64"; + x86_64-darwin = "darwin"; }.${system}; archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index f06cf18e4ec..33a6a26d8b3 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -4,8 +4,8 @@ let inherit (stdenv.hostPlatform) system; plat = { - "x86_64-linux" = "linux-x64"; - "x86_64-darwin" = "darwin"; + x86_64-linux = "linux-x64"; + x86_64-darwin = "darwin"; }.${system}; archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix index 100e64fc197..fe5fcc1724b 100644 --- a/pkgs/applications/editors/yi/wrapper.nix +++ b/pkgs/applications/editors/yi/wrapper.nix @@ -8,7 +8,7 @@ let yiEnv = haskellPackages.ghcWithPackages (self: [ self.yi ] ++ extraPackages self); in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "yi-custom"; version = "0.0.0.1"; dontUnpack = true; diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 1ae1221a330..feb79f444b8 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -2,7 +2,7 @@ libharu, opencv, vigra, postgresql, Cocoa, unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull, giflib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "saga"; version = "7.3.0"; diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index d82bdc66549..4c7f9cde5ce 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -1,6 +1,6 @@ { stdenv, rustPlatform , fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { - name = "whitebox_tools-${version}"; + pname = "whitebox_tools"; version = "0.9.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index cbd930668f9..654363d36f2 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -19,7 +19,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "imagemagick"; inherit (cfg) version; diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 59f471ab4e3..993d4ba7ecd 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -31,7 +31,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "imagemagick"; inherit (cfg) version; diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index 7d800d57b63..3c39aadda98 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -8,7 +8,7 @@ let gitBranch = "develop"; gitTag = "0.9.3"; in - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "antimony"; version = "2018-10-20"; diff --git a/pkgs/applications/graphics/autotrace/autofig.nix b/pkgs/applications/graphics/autotrace/autofig.nix index 31ee0ff0d07..0f53965786b 100644 --- a/pkgs/applications/graphics/autotrace/autofig.nix +++ b/pkgs/applications/graphics/autotrace/autofig.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "autofig-0.1"; src = fetchurl { diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index 43f8f561e2f..b827a12f81c 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -22,7 +22,7 @@ let install -D bin-linux/QtnPEG $out/bin/QtnPEG ''; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "awesomebump"; inherit version; diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix index 4e864d953df..ad86e66204b 100644 --- a/pkgs/applications/graphics/c3d/default.nix +++ b/pkgs/applications/graphics/c3d/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, cmake, itk, Cocoa }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "c3d"; version = "2018-10-04"; diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index b0e32678a14..a1f96337d74 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -3,7 +3,7 @@ libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, hicolor-icon-theme, gtk-mac-integration-gtk2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "dia"; version = "0.97.3.20170622"; diff --git a/pkgs/applications/graphics/graphicsmagick/compat.nix b/pkgs/applications/graphics/graphicsmagick/compat.nix index be8885caff1..9517aa78ee4 100644 --- a/pkgs/applications/graphics/graphicsmagick/compat.nix +++ b/pkgs/applications/graphics/graphicsmagick/compat.nix @@ -1,6 +1,6 @@ { stdenv, graphicsmagick }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "graphicsmagick-imagemagick-compat"; inherit (graphicsmagick) version; diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix index 7d5a9013035..6472712bcb4 100644 --- a/pkgs/applications/graphics/imagej/default.nix +++ b/pkgs/applications/graphics/imagej/default.nix @@ -7,7 +7,7 @@ # on linux systems, but we here do not attempt to fix it.) let - imagej150 = stdenv.mkDerivation rec { + imagej150 = stdenv.mkDerivation { pname = "imagej"; version = "150"; diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix index 5fdd20825cd..49868bbd831 100644 --- a/pkgs/applications/graphics/imlibsetroot/default.nix +++ b/pkgs/applications/graphics/imlibsetroot/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libX11, libXinerama, imlib2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "imlibsetroot"; version = "1.2"; src = fetchurl { diff --git a/pkgs/applications/graphics/jpeg-archive/default.nix b/pkgs/applications/graphics/jpeg-archive/default.nix index b5664d51a14..97c15d2eec0 100644 --- a/pkgs/applications/graphics/jpeg-archive/default.nix +++ b/pkgs/applications/graphics/jpeg-archive/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, mozjpeg, makeWrapper, coreutils, parallel, findutils }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "jpeg-archive"; version = "2.2.0"; # can be found here https://github.com/danielgtaylor/jpeg-archive/blob/master/src/util.c#L15 diff --git a/pkgs/applications/graphics/meh/default.nix b/pkgs/applications/graphics/meh/default.nix index c25c1277ee0..7ad8c388a20 100644 --- a/pkgs/applications/graphics/meh/default.nix +++ b/pkgs/applications/graphics/meh/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, libX11, libXext, libjpeg, libpng, giflib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "meh-unstable-2015-04-11"; src = fetchFromGitHub { diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index 5ad5ab6acc6..1b51732b918 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -3,7 +3,7 @@ let inherit (python2Packages) python pycairo pygobject3 numpy; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "mypaint"; version = "1.2.1"; diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/applications/graphics/pbrt/default.nix index a0aaed49c9c..78f6d8bcbaf 100644 --- a/pkgs/applications/graphics/pbrt/default.nix +++ b/pkgs/applications/graphics/pbrt/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, flex, bison, cmake, git, zlib}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2018-08-15"; pname = "pbrt-v3"; diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix index 6bd2fa98b1b..09b5bd37839 100644 --- a/pkgs/applications/graphics/photivo/default.nix +++ b/pkgs/applications/graphics/photivo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchhg, fetchpatch, cmake, qt4, fftw, graphicsmagick_q16, lcms2, lensfun, pkgconfig, libjpeg, exiv2, liblqr1 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "photivo-2014-01-25"; src = fetchhg { diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix index 395179ff70a..14efe48f30d 100644 --- a/pkgs/applications/graphics/scantailor/default.nix +++ b/pkgs/applications/graphics/scantailor/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, qt4, cmake, libjpeg, libtiff, boost }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "scantailor-0.9.12.1"; src = fetchurl { diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index 527a21f93fe..957692b4ba1 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -13,7 +13,7 @@ let EncodeLocale TryTiny TypesSerialiser LWPMediaTypes ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "shutter-0.94.3"; src = fetchurl { diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 34294d27129..188f7cb2934 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -6,7 +6,7 @@ let version = "1.0.2"; - ETL = stdenv.mkDerivation rec { + ETL = stdenv.mkDerivation { name = "ETL-0.04.19"; src = fetchFromGitHub { @@ -21,7 +21,7 @@ let nativeBuildInputs = [ autoreconfHook ]; }; - synfig = stdenv.mkDerivation rec { + synfig = stdenv.mkDerivation { pname = "synfig"; inherit version; @@ -47,7 +47,7 @@ let meta.broken = true; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "synfigstudio"; inherit version; diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index 39b4640dc43..131d83f0d58 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -24,7 +24,7 @@ assert withGimpPlugin -> gimp != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ufraw"; version = "unstable-2019-06-12"; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 6027d8daa9d..9b146aa5036 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -38,7 +38,7 @@ let let inherit (args) name; sname = args.sname or name; - inherit (srcs."${sname}") src version; + inherit (srcs.${sname}) src version; mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; in @@ -129,6 +129,7 @@ let kmix = callPackage ./kmix.nix {}; kmplot = callPackage ./kmplot.nix {}; knotes = callPackage ./knotes.nix {}; + kolf = callPackage ./kolf.nix {}; kolourpaint = callPackage ./kolourpaint.nix {}; kompare = callPackage ./kompare.nix {}; konsole = callPackage ./konsole.nix {}; diff --git a/pkgs/applications/kde/kolf.nix b/pkgs/applications/kde/kolf.nix new file mode 100644 index 00000000000..f9fa31b665b --- /dev/null +++ b/pkgs/applications/kde/kolf.nix @@ -0,0 +1,16 @@ +{ lib +, mkDerivation +, extra-cmake-modules +, kdoctools +, libkdegames, kconfig, kio, ktextwidgets +}: + +mkDerivation { + name = "kolf"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ libkdegames kio ktextwidgets ]; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = with lib.maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/applications/misc/antfs-cli/default.nix b/pkgs/applications/misc/antfs-cli/default.nix index f21438dfcec..8108b9e4ddb 100644 --- a/pkgs/applications/misc/antfs-cli/default.nix +++ b/pkgs/applications/misc/antfs-cli/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python3Packages }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "antfs-cli"; version = "unstable-2017-02-11"; diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix index 791e2d0f52e..b03d2aa208b 100644 --- a/pkgs/applications/misc/artha/default.nix +++ b/pkgs/applications/misc/artha/default.nix @@ -1,6 +1,6 @@ { stdenv, autoreconfHook, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "artha"; version = "1.0.3"; diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/applications/misc/autospotting/default.nix index 444a8da7036..b00686fb24f 100644 --- a/pkgs/applications/misc/autospotting/default.nix +++ b/pkgs/applications/misc/autospotting/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "autospotting"; version = "unstable-2018-11-17"; goPackagePath = "github.com/AutoSpotting/AutoSpotting"; diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index 4227b4155ac..165bee76b69 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -1,6 +1,6 @@ { stdenv, runtimeShell, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "avrdudess-2.2.20140102"; src = fetchurl { diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index 89c32668be9..8945ffbb384 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -9,7 +9,7 @@ assert ncursesSupport -> ncurses != null; assert waylandSupport -> wayland != null; assert x11Support -> xlibs != null && xorg != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bemenu"; version = "0.1.0"; diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index dae6e404a9d..5f4e24f4d3c 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -10,7 +10,7 @@ , sha256 , rev }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit version; pname = "cataract"; diff --git a/pkgs/applications/misc/catclock/default.nix b/pkgs/applications/misc/catclock/default.nix index 75f5ab406fe..09c36f9eb2f 100644 --- a/pkgs/applications/misc/catclock/default.nix +++ b/pkgs/applications/misc/catclock/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, xlibsWrapper, motif }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "catclock-2015-10-04"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix index 04f32a67b84..c05c7423d9a 100644 --- a/pkgs/applications/misc/cgminer/default.nix +++ b/pkgs/applications/misc/cgminer/default.nix @@ -1,7 +1,7 @@ { fetchgit, stdenv, pkgconfig, libtool, autoconf, automake , curl, ncurses, ocl-icd, opencl-headers, xorg, jansson }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "3.7.2"; pname = "cgminer"; diff --git a/pkgs/applications/misc/cura/lulzbot/libarcus.nix b/pkgs/applications/misc/cura/lulzbot/libarcus.nix index 589111df78b..4d32328af8b 100644 --- a/pkgs/applications/misc/cura/lulzbot/libarcus.nix +++ b/pkgs/applications/misc/cura/lulzbot/libarcus.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchgit, fetchurl, cmake, sip, protobuf, pythonOlder }: -buildPythonPackage rec { +buildPythonPackage { pname = "libarcus"; version = "3.6.18"; format = "other"; diff --git a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix index 7a1781f62ce..f8ffbf041bd 100644 --- a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix +++ b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, pythonOlder, fetchgit, cmake, sip }: -buildPythonPackage rec { +buildPythonPackage { pname = "libsavitar-lulzbot"; name = "libsavitar-lulzbot"; version = "3.6.18"; diff --git a/pkgs/applications/misc/cura/lulzbot/uranium.nix b/pkgs/applications/misc/cura/lulzbot/uranium.nix index 43869a0edc6..1ad755cdfbd 100644 --- a/pkgs/applications/misc/cura/lulzbot/uranium.nix +++ b/pkgs/applications/misc/cura/lulzbot/uranium.nix @@ -1,7 +1,7 @@ { stdenv, callPackage, fetchurl, fetchgit, buildPythonPackage, fetchFromGitHub, python, cmake , pyqt5, numpy, scipy, shapely, libarcusLulzbot, doxygen, gettext, pythonOlder }: -buildPythonPackage rec { +buildPythonPackage { version = "3.6.18"; pname = "uranium"; name = "uraniumLulzbot"; diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix index 283b66318ea..0016f89746d 100644 --- a/pkgs/applications/misc/diff-pdf/default.nix +++ b/pkgs/applications/misc/diff-pdf/default.nix @@ -7,7 +7,7 @@ let else [ wxGTK ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "diff-pdf"; version = "2017-12-30"; diff --git a/pkgs/applications/misc/doing/default.nix b/pkgs/applications/misc/doing/default.nix index 20c802a1cbd..d72a5b84826 100644 --- a/pkgs/applications/misc/doing/default.nix +++ b/pkgs/applications/misc/doing/default.nix @@ -1,7 +1,7 @@ { lib, bundlerEnv, ruby, bundlerUpdateScript }: -bundlerEnv rec { +bundlerEnv { pname = "doing"; version = (import ./gemset.nix).doing.version; diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index 8cfadd77ece..1332b265d54 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -1,6 +1,6 @@ { stdenv, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "doomseeker"; version = "2018-03-05"; diff --git a/pkgs/applications/misc/electrum/dash.nix b/pkgs/applications/misc/electrum/dash.nix index 98ed10b0c7c..8ba562de1cb 100644 --- a/pkgs/applications/misc/electrum/dash.nix +++ b/pkgs/applications/misc/electrum/dash.nix @@ -2,7 +2,7 @@ python2Packages.buildPythonApplication rec { version = "2.9.3.1"; - name = "electrum-dash-${version}"; + pname = "electrum-dash"; src = fetchurl { url = "https://github.com/akhavr/electrum-dash/releases/download/${version}/Electrum-DASH-${version}.tar.gz"; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 8940c8dfd22..c48d458567d 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -40,7 +40,7 @@ let }; in -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "electrum"; inherit version; diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix index d1161aa6822..984ade077a8 100644 --- a/pkgs/applications/misc/evilvte/default.nix +++ b/pkgs/applications/misc/evilvte/default.nix @@ -3,7 +3,7 @@ configH ? "" }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "evilvte"; version = "0.5.2-20140827"; diff --git a/pkgs/applications/misc/gnome15/default.nix b/pkgs/applications/misc/gnome15/default.nix index e2cf8245ce6..7a918d961f6 100644 --- a/pkgs/applications/misc/gnome15/default.nix +++ b/pkgs/applications/misc/gnome15/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python2, gnome_python, gnome_python_desktop }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "gnome15-2016-06-10"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 6a5f4c9ce03..e917cc024d5 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchFromGitHub, pkgconfig, libXtst, libvorbis, hunspell , libao, ffmpeg, libeb, lzo, xz, libtiff, opencc , qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake }: -mkDerivation rec { +mkDerivation { name = "goldendict-2019-08-01"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix index 308f084bd58..d86db7adb9d 100644 --- a/pkgs/applications/misc/green-pdfviewer/default.nix +++ b/pkgs/applications/misc/green-pdfviewer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, poppler, pkgconfig, gdk-pixbuf, SDL, gtk2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "green-pdfviewer"; version = "nightly-2014-04-22"; diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix index 37352915cb8..97303c43fb1 100644 --- a/pkgs/applications/misc/guake/default.nix +++ b/pkgs/applications/misc/guake/default.nix @@ -3,7 +3,7 @@ let version = "3.6.3"; -in python3.pkgs.buildPythonApplication rec { +in python3.pkgs.buildPythonApplication { name = "guake-${version}"; format = "other"; diff --git a/pkgs/applications/misc/hello-unfree/default.nix b/pkgs/applications/misc/hello-unfree/default.nix index a2d2e8ad735..a5a9187ab0f 100644 --- a/pkgs/applications/misc/hello-unfree/default.nix +++ b/pkgs/applications/misc/hello-unfree/default.nix @@ -1,6 +1,6 @@ { stdenv, runtimeShell }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "example-unfree-package"; version = "1.0"; diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index 607dff29318..ce35e91d927 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -2,7 +2,7 @@ let houdini-runtime = callPackage ./runtime.nix { }; -in buildFHSUserEnv rec { +in buildFHSUserEnv { name = "houdini-${houdini-runtime.version}"; extraBuildCommands = '' diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix index 9ae9ab254e8..4d4dd248bc5 100644 --- a/pkgs/applications/misc/jekyll/default.nix +++ b/pkgs/applications/misc/jekyll/default.nix @@ -21,7 +21,7 @@ let # Else: Don't modify the arguments: exec ${ruby}/bin/ruby "$@" ''; -in bundlerApp rec { +in bundlerApp { pname = "jekyll"; exes = [ "jekyll" ]; diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 89778f670ff..898186b714b 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -82,7 +82,6 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--disable-static" "--disable-staticbins" ]; diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix index 38078d11931..e9dba4bcf46 100644 --- a/pkgs/applications/misc/lilyterm/default.nix +++ b/pkgs/applications/misc/lilyterm/default.nix @@ -29,7 +29,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lilyterm"; inherit (stuff) src version; diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix index 291e225d6c4..f84ac6d600a 100644 --- a/pkgs/applications/misc/loxodo/default.nix +++ b/pkgs/applications/misc/loxodo/default.nix @@ -3,7 +3,7 @@ let py = python27Packages; python = py.python; in -py.buildPythonApplication rec { +py.buildPythonApplication { name = "loxodo-0.20150124"; src = fetchgit { diff --git a/pkgs/applications/misc/ltwheelconf/default.nix b/pkgs/applications/misc/ltwheelconf/default.nix index 42905fa3cb4..61151cb1550 100644 --- a/pkgs/applications/misc/ltwheelconf/default.nix +++ b/pkgs/applications/misc/ltwheelconf/default.nix @@ -1,6 +1,6 @@ { stdenv, libusb1, pkgconfig, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ltwheelconf"; version = "0.2.7"; diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix index 8ce353e85b9..0802a32d92b 100644 --- a/pkgs/applications/misc/lxterminal/default.nix +++ b/pkgs/applications/misc/lxterminal/default.nix @@ -4,7 +4,7 @@ let version = "0.3.2"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lxterminal"; inherit version; diff --git a/pkgs/applications/misc/metamorphose2/default.nix b/pkgs/applications/misc/metamorphose2/default.nix index 318c7c25242..a81aec9d036 100644 --- a/pkgs/applications/misc/metamorphose2/default.nix +++ b/pkgs/applications/misc/metamorphose2/default.nix @@ -2,7 +2,7 @@ , python27, python2Packages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "metamorphose2"; version = "0.9.0beta"; diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix index 6c1dcd5e150..2eee9ad40c1 100644 --- a/pkgs/applications/misc/milu/default.nix +++ b/pkgs/applications/misc/milu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, unzip, pkgconfig, glib, llvmPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "milu-nightly"; version = "2016-05-09"; diff --git a/pkgs/applications/misc/minergate-cli/default.nix b/pkgs/applications/misc/minergate-cli/default.nix index 95ceaddb4f0..eff93c8e99c 100644 --- a/pkgs/applications/misc/minergate-cli/default.nix +++ b/pkgs/applications/misc/minergate-cli/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, dpkg, makeWrapper, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "8.2"; pname = "minergate-cli"; src = fetchurl { diff --git a/pkgs/applications/misc/minergate/default.nix b/pkgs/applications/misc/minergate/default.nix index fdd1238d870..a8402d97593 100644 --- a/pkgs/applications/misc/minergate/default.nix +++ b/pkgs/applications/misc/minergate/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, dpkg, makeWrapper, fontconfig, freetype, openssl, xorg, xkeyboard_config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "8.1"; pname = "minergate"; src = fetchurl { diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index d3e7f9e8cd4..303b9fe5e8b 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { install -D -t $out/share/applications $desktopItem/share/applications/* ''; - desktopItem = makeDesktopItem rec { + desktopItem = makeDesktopItem { name = "mlterm"; exec = "mlterm %U"; icon = "mlterm"; diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index 0f4e72502bb..e734e44a2e0 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "moolticute-${version}"; + pname = "moolticute"; version = "0.30.8"; src = fetchurl { diff --git a/pkgs/applications/misc/mpvc/default.nix b/pkgs/applications/misc/mpvc/default.nix index fffa9595262..35de284c0ba 100644 --- a/pkgs/applications/misc/mpvc/default.nix +++ b/pkgs/applications/misc/mpvc/default.nix @@ -1,6 +1,6 @@ { stdenv, socat, fetchFromGitHub, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "mpvc-unstable-2017-03-18"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/omegat.nix b/pkgs/applications/misc/omegat.nix index 411b318a392..27d7ad8730b 100644 --- a/pkgs/applications/misc/omegat.nix +++ b/pkgs/applications/misc/omegat.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip, jdk, makeWrapper}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "4.3.0"; pname = "omegat"; diff --git a/pkgs/applications/misc/osmctools/default.nix b/pkgs/applications/misc/osmctools/default.nix index 4cbd7cb7119..2dfbb7a2370 100644 --- a/pkgs/applications/misc/osmctools/default.nix +++ b/pkgs/applications/misc/osmctools/default.nix @@ -16,7 +16,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "osmctools"; version = "0.8.5plus1.4.0"; diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix index bc6f5965e89..9756d9b42b0 100644 --- a/pkgs/applications/misc/pdf-quench/default.nix +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgs, pythonPackages, wrapGAppsHook}: -pythonPackages.buildPythonApplication rec { +pythonPackages.buildPythonApplication { pname = "pdf-quench"; version = "1.0.5"; diff --git a/pkgs/applications/misc/phwmon/default.nix b/pkgs/applications/misc/phwmon/default.nix index e8ddec91e62..6fb70f1c9a2 100644 --- a/pkgs/applications/misc/phwmon/default.nix +++ b/pkgs/applications/misc/phwmon/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, pythonPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "phwmon"; version = "2017-04-10"; diff --git a/pkgs/applications/misc/pmenu/default.nix b/pkgs/applications/misc/pmenu/default.nix index 16c49d5f946..bd3796a572b 100644 --- a/pkgs/applications/misc/pmenu/default.nix +++ b/pkgs/applications/misc/pmenu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, python2Packages, gnome-menus }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pmenu"; version = "2018-01-01"; diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix index 45db856dbb9..7209ee3e400 100644 --- a/pkgs/applications/misc/posterazor/default.nix +++ b/pkgs/applications/misc/posterazor/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, unzip, pkgconfig, libXpm, fltk13, freeimage }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "posterazor-1.5.1"; src = fetchurl { diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix index ecc372dc674..ab15855b910 100644 --- a/pkgs/applications/misc/qolibri/default.nix +++ b/pkgs/applications/misc/qolibri/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, libeb, lzo, qtbase , qtmultimedia, qttools, qtwebengine }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qolibri"; version = "2018-11-14"; diff --git a/pkgs/applications/misc/qt-box-editor/default.nix b/pkgs/applications/misc/qt-box-editor/default.nix index 47b4641234f..702cadfdaa9 100644 --- a/pkgs/applications/misc/qt-box-editor/default.nix +++ b/pkgs/applications/misc/qt-box-editor/default.nix @@ -7,7 +7,7 @@ , tesseract }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qt-box-editor"; version = "unstable-2019-07-12"; diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 17cea90ac27..b6676a0bf70 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -18,7 +18,7 @@ let }; in -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ name = "${pname}${if perlSupport then "-with-perl" else ""}${if unicode3Support then "-with-unicode3" else ""}-${version}"; diff --git a/pkgs/applications/misc/sequelpro/default.nix b/pkgs/applications/misc/sequelpro/default.nix index 114404c2597..e81c0b99264 100644 --- a/pkgs/applications/misc/sequelpro/default.nix +++ b/pkgs/applications/misc/sequelpro/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, undmg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sequel-pro"; version = "1.1.2"; diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index cb2cd3f1e62..f2e1aa6bdb6 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -3,7 +3,7 @@ # Although we copy in the udev rules here, you probably just want to use logitech-udev-rules instead of # adding this to services.udev.packages on NixOS -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "solaar-unstable"; version = "2019-01-30"; diff --git a/pkgs/applications/misc/ssocr/default.nix b/pkgs/applications/misc/ssocr/default.nix index eb408eaf6ee..bb1655b4463 100644 --- a/pkgs/applications/misc/ssocr/default.nix +++ b/pkgs/applications/misc/ssocr/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, imlib2, libX11 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ssocr"; version = "unstable-2018-08-11"; diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/misc/stupidterm/default.nix index 74f9fc7c58c..ecaf9d5a34a 100644 --- a/pkgs/applications/misc/stupidterm/default.nix +++ b/pkgs/applications/misc/stupidterm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, vte, gtk }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "stupidterm"; version = "2019-03-26"; diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index a29dad2c444..960b7b9eeef 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -6,7 +6,7 @@ let version = "4.8.2"; - libdc = stdenv.mkDerivation rec { + libdc = stdenv.mkDerivation { pname = "libdivecomputer-ssrf"; inherit version; @@ -66,7 +66,7 @@ let }; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "subsurface"; inherit version; diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index ee42c1389fc..9dcdf8fd2b0 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -71,7 +71,7 @@ let d2u = stdenv.lib.replaceChars ["."] ["_"]; -in rec { +in { application = mkSweetHome3D rec { version = "6.2"; diff --git a/pkgs/applications/misc/taskjuggler/3.x/gemset.nix b/pkgs/applications/misc/taskjuggler/3.x/gemset.nix index e65ab3451a6..deeeac10694 100644 --- a/pkgs/applications/misc/taskjuggler/3.x/gemset.nix +++ b/pkgs/applications/misc/taskjuggler/3.x/gemset.nix @@ -1,5 +1,5 @@ { - "mail" = { + mail = { version = "2.6.3"; source = { type = "gem"; @@ -9,14 +9,14 @@ "mime-types" ]; }; - "mime-types" = { + mime-types = { version = "2.6.1"; source = { type = "gem"; sha256 = "1vnrvf245ijfyxzjbj9dr6i1hkjbyrh4yj88865wv9bs75axc5jv"; }; }; - "taskjuggler" = { + taskjuggler = { version = "3.5.0"; source = { type = "gem"; @@ -27,7 +27,7 @@ "term-ansicolor" ]; }; - "term-ansicolor" = { + term-ansicolor = { version = "1.3.2"; source = { type = "gem"; @@ -37,7 +37,7 @@ "tins" ]; }; - "tins" = { + tins = { version = "1.6.0"; source = { type = "gem"; diff --git a/pkgs/applications/misc/taskopen/default.nix b/pkgs/applications/misc/taskopen/default.nix index 9f1773b191d..847092356d2 100644 --- a/pkgs/applications/misc/taskopen/default.nix +++ b/pkgs/applications/misc/taskopen/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, makeWrapper, which, perl, perlPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "taskopen-1.1.4"; src = fetchurl { url = "https://github.com/ValiValpas/taskopen/archive/v1.1.4.tar.gz"; diff --git a/pkgs/applications/misc/tdrop/default.nix b/pkgs/applications/misc/tdrop/default.nix index 15ee275c0e1..547eea4f2d2 100644 --- a/pkgs/applications/misc/tdrop/default.nix +++ b/pkgs/applications/misc/tdrop/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper , xwininfo, xdotool, xprop }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tdrop"; version = "unstable-2018-11-13"; diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index 095681d136d..aae17905cb7 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -19,7 +19,7 @@ , hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tilix"; version = "unstable-2019-08-03"; diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix index 5bb2b5b9461..93f233a4f92 100644 --- a/pkgs/applications/misc/todiff/default.nix +++ b/pkgs/applications/misc/todiff/default.nix @@ -1,7 +1,7 @@ { stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { - name = "todiff-${version}"; + pname = "todiff"; version = "0.6.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 413f082fb22..4ccf204357c 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -7,7 +7,7 @@ let pname = "tootle"; version = "0.2.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index 04c6cc3606e..2aef45748ca 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qtbase, qtx11extras, qmake, pkgconfig, boost }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "twmn-git-2018-10-01"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix index e482e7e7c02..3561135ce61 100644 --- a/pkgs/applications/misc/volnoti/default.nix +++ b/pkgs/applications/misc/volnoti/default.nix @@ -2,7 +2,7 @@ , pkgconfig, dbus, gdk-pixbuf, glib, libX11, gtk2, librsvg , dbus-glib, autoreconfHook, wrapGAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "volnoti-unstable"; version = "2013-09-23"; diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix index 9040bb4318d..295d721d3c5 100644 --- a/pkgs/applications/misc/xautoclick/default.nix +++ b/pkgs/applications/misc/xautoclick/default.nix @@ -3,7 +3,7 @@ , qtSupport ? true, qt4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.31"; pname = "xautoclick"; src = fetchurl { diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index 0661a625e97..f3bbbf42d5b 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, xorg, pcre, gst_all_1, glib , xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xneur"; version = "0.20.0"; diff --git a/pkgs/applications/misc/xrq/default.nix b/pkgs/applications/misc/xrq/default.nix index fe65004b32a..244a2c43a15 100644 --- a/pkgs/applications/misc/xrq/default.nix +++ b/pkgs/applications/misc/xrq/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, libX11}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "xrq-unstable-2016-01-15"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix index 06e12416baa..f2da2957bd3 100644 --- a/pkgs/applications/misc/yarssr/default.nix +++ b/pkgs/applications/misc/yarssr/default.nix @@ -23,7 +23,7 @@ let gtk2 ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "git-2017-12-01"; pname = "yarssr"; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 45c12598512..a3645e97e25 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -150,21 +150,11 @@ let ] ++ optionals (useVaapi) [ # source: https://aur.archlinux.org/cgit/aur.git/plain/chromium-vaapi.patch?h=chromium-vaapi ./patches/chromium-vaapi.patch - ] ++ optionals (!stdenv.cc.isClang && (versionRange "71" "72")) [ - ( githubPatch "65be571f6ac2f7942b4df9e50b24da517f829eec" "1sqv0aba0mpdi4x4f21zdkxz2cf8ji55ffgbfcr88c5gcg0qn2jh" ) - ] ++ optional stdenv.isAarch64 - (if (versionOlder version "71") then - fetchpatch { - url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch; - sha256 = "0dkchqair8cy2f5a5p5vi24r9b4d28pgn2bfvm1568lypbjw6iab"; - } - else - fetchpatch { - url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch; - postFetch = "substituteInPlace $out --replace __aarch64__ SK_CPU_ARM64"; - sha256 = "018fbdzyw9rvia8m0qkk5gv8q8gl7x34rrjbn7mi1fgxdsayn22s"; - } - ); + ] ++ optional stdenv.isAarch64 (fetchpatch { + url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch; + postFetch = "substituteInPlace $out --replace __aarch64__ SK_CPU_ARM64"; + sha256 = "018fbdzyw9rvia8m0qkk5gv8q8gl7x34rrjbn7mi1fgxdsayn22s"; + }); postPatch = '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX diff --git a/pkgs/applications/networking/browsers/chromium/update.nix b/pkgs/applications/networking/browsers/chromium/update.nix index 2334dc6a71e..6dff17c69dd 100644 --- a/pkgs/applications/networking/browsers/chromium/update.nix +++ b/pkgs/applications/networking/browsers/chromium/update.nix @@ -35,7 +35,7 @@ let "http://repo.fdzh.org/chrome/deb/pool/main/g" ]; -in rec { +in { getChannel = channel: let chanAttrs = builtins.getAttr channel sources; in { diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 4f4741ce0bd..da6a7bc4715 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -10,7 +10,7 @@ assert enableGuile -> guile != null; assert enablePython -> python != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "elinks-0.12pre6"; src = fetchurl { diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index dea752874dd..537a30c01a2 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -58,8 +58,8 @@ let inherit (generated) version sources; mozillaPlatforms = { - "i686-linux" = "linux-i686"; - "x86_64-linux" = "linux-x86_64"; + i686-linux = "linux-i686"; + x86_64-linux = "linux-x86_64"; }; arch = mozillaPlatforms.${stdenv.hostPlatform.system}; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 20509439d2f..c74ac2f8dab 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -159,7 +159,7 @@ rec { }; }); -in rec { +in { icecat = iccommon rec { ffversion = "60.3.0"; @@ -249,7 +249,7 @@ in rec { in rec { - tor-browser-7-5 = (tbcommon rec { + tor-browser-7-5 = (tbcommon { ffversion = "52.9.0esr"; tbversion = "7.5.6"; @@ -265,7 +265,7 @@ in rec { gtk3Support = false; }; - tor-browser-8-5 = tbcommon rec { + tor-browser-8-5 = tbcommon { ffversion = "60.8.0esr"; tbversion = "8.5.4"; diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 977b40e4a7e..9f49925b267 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -64,7 +64,7 @@ let suffix = if channel != "stable" then "-" + channel else ""; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit version; name = "google-chrome${suffix}-${version}"; diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index 69beeb16759..d679eb56f5b 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -31,8 +31,7 @@ stdenv.mkDerivation rec { # TODO: why is not this the default? The test runner adds # ';./lib/?.lua;./lib/?/init.lua' to package.path, but the build-utils # scripts don't add an equivalent - export LUA_PATH="$NIX_LUA_PATH;./?.lua;./?/init.lua" - export LUA_CPATH="$NIX_LUA_CPATH" + export LUA_PATH="$LUA_PATH;./?.lua;./?/init.lua" ''; makeFlags = [ @@ -49,8 +48,8 @@ stdenv.mkDerivation rec { in '' gappsWrapperArgs+=( --prefix XDG_CONFIG_DIRS : "$out/etc/xdg" - --prefix LUA_PATH ';' "${luaKitPath};$NIX_LUA_PATH" - --prefix LUA_CPATH ';' "$NIX_LUA_CPATH" + --prefix LUA_PATH ';' "${luaKitPath};$LUA_PATH" + --prefix LUA_CPATH ';' "$LUA_CPATH" ) ''; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 2d2d2a69100..c603dc6cf9f 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -48,7 +48,7 @@ , debug ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "flashplayer-standalone"; version = "32.0.0.238"; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix index fa455eb0b7a..10ae0eb1da6 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix @@ -9,7 +9,7 @@ let url="http://nspluginwrapper.org/download/nspluginwrapper-1.4.4.tar.gz"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (srcData) name version; src = fetchurl{ diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index fc3cc2e89a9..c0cb85eb177 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -94,7 +94,7 @@ let lang = "en-US"; srcs = { - "x86_64-linux" = fetchurl { + x86_64-linux = fetchurl { urls = [ "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" @@ -102,7 +102,7 @@ let sha256 = "0nnzynk3nlnd847c8jjghs9anmr5a2hv7nk1qxigigxqa5vqy96z"; }; - "i686-linux" = fetchurl { + i686-linux = fetchurl { urls = [ "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { pname = "tor-browser-bundle-bin"; inherit version; - src = srcs."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}"); + src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); preferLocalBuild = true; allowSubstitutes = false; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index f15bf165e82..7ff099853e2 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -71,7 +71,7 @@ let ffmpeg ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tor-browser-bundle"; version = tor-browser-unwrapped.version; diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index 136c14d34d4..373fa43c72c 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -15,7 +15,7 @@ assert mouseSupport -> gpm-ncurses != null; with stdenv.lib; let - mktable = buildPackages.stdenv.mkDerivation rec { + mktable = buildPackages.stdenv.mkDerivation { name = "w3m-mktable"; inherit (w3m) src; nativeBuildInputs = [ pkgconfig boehmgc ]; diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index 09be379b240..4c1f7ea7749 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -20,7 +20,7 @@ let startupNotify = "true"; }; - in stdenv.mkDerivation rec { + in stdenv.mkDerivation { pname = "charles"; inherit version; @@ -54,7 +54,7 @@ let }; }; -in rec { +in { charles4 = (generic { version = "4.2.8"; sha256 = "1jzjdhzxgrq7pdfryfkg0hsjpyni14ma4x8jbdk1rqll78ccr080"; diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix index bd8eb545152..f4d6fce3545 100644 --- a/pkgs/applications/networking/cluster/click/default.nix +++ b/pkgs/applications/networking/cluster/click/default.nix @@ -3,7 +3,7 @@ with rustPlatform; buildRustPackage rec { - name = "click-${version}"; + pname = "click"; version = "0.4.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix index 0c210dcc535..9bf801ee93d 100644 --- a/pkgs/applications/networking/cluster/habitat/default.nix +++ b/pkgs/applications/networking/cluster/habitat/default.nix @@ -4,7 +4,7 @@ with rustPlatform; buildRustPackage rec { - name = "habitat-${version}"; + pname = "habitat"; version = "0.30.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 438fdfb2eba..5fc35e6a0af 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -65,7 +65,7 @@ let installPhase = "mv hadoop-dist/target/hadoop-${version} $out"; }; in - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "hadoop"; inherit version; diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix index 982f36def69..89d06474509 100644 --- a/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/pkgs/applications/networking/cluster/kubeval/default.nix @@ -4,7 +4,7 @@ let # Cache schema as a package so network calls are not # necessary at runtime, allowing use in package builds - schema = stdenv.mkDerivation rec { + schema = stdenv.mkDerivation { name = "kubeval-schema"; src = fetchFromGitHub { owner = "garethr"; diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 256bce9b6ec..8c0265d1491 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildGoModule }: -buildGoModule rec { +buildGoModule { pname = "linkerd-unstablle"; version = "2019-07-26"; diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix index c74f5789d84..d71b863f881 100644 --- a/pkgs/applications/networking/droopy/default.nix +++ b/pkgs/applications/networking/droopy/default.nix @@ -2,7 +2,7 @@ with lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "droopy"; version = "20160830"; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index d820d40f7a3..9a05a92cfb3 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -10,8 +10,8 @@ let version = "73.4.118"; arch = { - "x86_64-linux" = "x86_64"; - "i686-linux" = "x86"; + x86_64-linux = "x86_64"; + i686-linux = "x86"; }.${stdenv.hostPlatform.system}; installer = "https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.${arch}-${version}.tar.gz"; diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index a5b4c577b4c..640421bef8f 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -3,7 +3,7 @@ with rustPlatform; buildRustPackage rec { - name = "cfdyndns-${version}"; + pname = "cfdyndns"; version = "0.0.1"; src = fetchFromGitHub { owner = "colemickens"; diff --git a/pkgs/applications/networking/enhanced-ctorrent/default.nix b/pkgs/applications/networking/enhanced-ctorrent/default.nix index bb3ab98d1a4..59b48df1cd0 100644 --- a/pkgs/applications/networking/enhanced-ctorrent/default.nix +++ b/pkgs/applications/networking/enhanced-ctorrent/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "3.3.2"; pname = "enhanced-ctorrent-dhn"; diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index 708d3c1ed80..2535d0dc31d 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, openssl, curl, coreutils, gawk, bash, which }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "esniper-2.35.0-15-g91d2665"; src = fetchgit { diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 2795ac4e46e..f7a9521c993 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -2,11 +2,11 @@ , asciidoc, docbook_xml_dtd_45, libxslt, docbook_xsl, libiconv, Security, makeWrapper }: rustPlatform.buildRustPackage rec { - name = "newsboat-${version}"; + pname = "newsboat"; version = "2.16.1"; src = fetchurl { - url = "https://newsboat.org/releases/${version}/${name}.tar.xz"; + url = "https://newsboat.org/releases/${version}/${pname}-${version}.tar.xz"; sha256 = "0lxdsfcwa4byhfnn0gv34w3rr531f4nfqgi8j4qqmh3gncbwh8s0"; }; diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix index 6bdaf2ffaf4..7304fd2f654 100644 --- a/pkgs/applications/networking/feedreaders/rawdog/default.nix +++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { - name = "rawdog-${version}"; + pname = "rawdog"; version = "2.23"; src = fetchurl { - url = "https://offog.org/files/${name}.tar.gz"; + url = "https://offog.org/files/${pname}-${version}.tar.gz"; sha256 = "18nyg19mwxyqdnykplkqmzb4n27vvrhvp639zai8f81gg9vdbsjp"; }; diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index c0a6185309a..3e7909c91c0 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cppcheck, libmrss }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rsstail"; version = "2.1"; diff --git a/pkgs/applications/networking/flent/http-getter.nix b/pkgs/applications/networking/flent/http-getter.nix index 63c18d6e092..2bebf4b0960 100644 --- a/pkgs/applications/networking/flent/http-getter.nix +++ b/pkgs/applications/networking/flent/http-getter.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake , curl, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "http-getter"; version = "unstable-2018-06-06"; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 54783518af1..8de098b85e7 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -14,8 +14,8 @@ , icu }: -stdenv.mkDerivation rec { - name = "dino-unstable-2019-08-27"; +stdenv.mkDerivation { + name = "dino-unstable-2019-03-07"; src = fetchFromGitHub { owner = "dino"; diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index f04afb6f1f7..2db13e1586b 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -4,7 +4,7 @@ let version = "5.2.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "franz"; inherit version; src = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index e2203dfe6ee..169ddf65b29 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -2,7 +2,7 @@ assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2"; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "jackline"; version = "2019-08-08"; diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix index 7b76154021a..7122a509215 100644 --- a/pkgs/applications/networking/instant-messengers/mm/default.nix +++ b/pkgs/applications/networking/instant-messengers/mm/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitLab }: -buildGoPackage rec { +buildGoPackage { pname = "mm"; version = "2016.11.04"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix index 9a1e46e5ac5..bb51adfbfee 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix @@ -3,7 +3,7 @@ let version = "54b2992"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pidgin-mra"; inherit version; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix index 34755809e39..057e447eb1c 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pidgin, glib, json-glib, nss, nspr, libgnome-keyring } : -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pidgin-opensteamworks"; version = "unstable-2018-08-02"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix index 936974a1a88..7302ba89a71 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix @@ -3,7 +3,7 @@ let version = "0.8"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pidgin-xmpp-receipts"; inherit version; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix index 1e998bcc806..6695f8cb69b 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "purple-discord"; version = "unstable-2018-04-10"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix index d226490b275..5d2292b50ad 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchhg, pidgin, glib, json-glib, protobuf, protobufc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "purple-hangouts-hg"; version = "2018-12-02"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 3c416927487..310d419718f 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -3,7 +3,7 @@ let version = "2018-08-03"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "purple-matrix-unstable"; inherit version; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix index 22554a4abf8..9f73dba2d99 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix @@ -3,7 +3,7 @@ let version = "40ddb6d"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "purple-vk-plugin"; inherit version; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix index 8990aeee8ec..83904531753 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, pidgin, glib, libxml2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "purple-xmpp-upload-2017-12-31"; src = fetchgit { diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 6a43344fbd3..a78e5d1c2d1 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -10,7 +10,7 @@ let version = "1.16.3"; rev = "v${version}"; -in mkDerivation rec { +in mkDerivation { pname = "qtox"; inherit version; diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 65562830897..569c7b68edc 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -3,7 +3,7 @@ , libqmatrixclient_0_5 }: let - generic = version: sha256: prefix: library: mkDerivation rec { + generic = version: sha256: prefix: library: mkDerivation { pname = "quaternion"; inherit version; diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix index 97c722f0935..30b12963b33 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix @@ -14,7 +14,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit version; pname = "sencha-bare"; diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix index add337d3f08..3768ecd137f 100644 --- a/pkgs/applications/networking/instant-messengers/ratox/default.nix +++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; let configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "ratox-0.4.20180303"; src = fetchgit { diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix index 8dc053631e9..97c00924d6c 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix @@ -78,7 +78,7 @@ let CFLAGS = "-g -DPJ_ICE_MAX_CAND=256 -DPJ_ICE_MAX_CHECKS=150 -DPJ_ICE_COMP_BITS=2 -DPJ_ICE_MAX_STUN=3 -DPJSIP_MAX_PKT_LEN=8000"; }); in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ring-daemon"; version = "2017-07-11"; diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix index d1f1c033361..d4298a3d32f 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix @@ -6,7 +6,7 @@ , patches }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "restbed"; version = "2016-09-15"; diff --git a/pkgs/applications/networking/instant-messengers/spectral/default.nix b/pkgs/applications/networking/instant-messengers/spectral/default.nix index 72069ec81c1..29b314417c7 100644 --- a/pkgs/applications/networking/instant-messengers/spectral/default.nix +++ b/pkgs/applications/networking/instant-messengers/spectral/default.nix @@ -18,7 +18,7 @@ let qtbase.bin qtdeclarative.bin qtquickcontrols2.bin qtgraphicaleffects qtmultimedia ]; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "spectral"; version = "2019-03-03"; diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index cd5109320c7..923ce373753 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -3,7 +3,7 @@ , xorgproto, libX11, libXScrnSaver , xz, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "vacuum-im"; version = "1.3.0.20160104"; diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index b0824c78022..1b3e1c8ad81 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -3,7 +3,7 @@ libpulseaudio, libxml2, libxslt, libGLU_combined, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "viber"; version = "7.0.0.1035"; diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index da4c5073000..9dbff13aca6 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -21,7 +21,7 @@ let tarball = "Wavebox_${replaceStrings ["."] ["_"] (toString version)}_linux_${bits}.tar.gz"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "wavebox"; inherit version; src = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 36bd10781dc..af253a5e03f 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -102,7 +102,7 @@ let ''; }; - darwin = stdenv.mkDerivation rec { + darwin = stdenv.mkDerivation { inherit pname version meta; src = fetchurl { diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix index 39631bfc5c8..dc646f9471e 100644 --- a/pkgs/applications/networking/ipfs-migrator/default.nix +++ b/pkgs/applications/networking/ipfs-migrator/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "ipfs-migrator"; version = "7"; diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix index d1a0b2d4b02..d2d9a67fb4d 100644 --- a/pkgs/applications/networking/iptraf/default.nix +++ b/pkgs/applications/networking/iptraf/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, ncurses}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "iptraf-3.0.1"; src = fetchurl { diff --git a/pkgs/applications/networking/irc/irccloud/default.nix b/pkgs/applications/networking/irc/irccloud/default.nix index 5648d027d9e..93ab9f828f6 100644 --- a/pkgs/applications/networking/irc/irccloud/default.nix +++ b/pkgs/applications/networking/irc/irccloud/default.nix @@ -14,7 +14,7 @@ let inherit name src; }; -in appimageTools.wrapType2 rec { +in appimageTools.wrapType2 { inherit name src; extraPkgs = pkgs: with pkgs; [ at-spi2-core ]; diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 0f11d9a6df0..b37e0b00ce7 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2Packages, gnupg1orig, openssl, git }: python2Packages.buildPythonApplication rec { - name = "mailpile-${version}"; + pname = "mailpile"; version = "1.0.0rc2"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/applications/networking/mailreaders/msgviewer/default.nix index 88e573f6cf4..fc8c167e984 100644 --- a/pkgs/applications/networking/mailreaders/msgviewer/default.nix +++ b/pkgs/applications/networking/mailreaders/msgviewer/default.nix @@ -5,7 +5,7 @@ let name = "msgviewer-${version}"; uname = "MSGViewer-${version}"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit name; src = fetchurl { diff --git a/pkgs/applications/networking/mailreaders/notbit/default.nix b/pkgs/applications/networking/mailreaders/notbit/default.nix index b87728dd2cd..fcf1464ba23 100644 --- a/pkgs/applications/networking/mailreaders/notbit/default.nix +++ b/pkgs/applications/networking/mailreaders/notbit/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "notbit"; version = "2018-01-09"; diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix index 67c673bc913..86aef501134 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix @@ -3,7 +3,7 @@ let version = "9"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "notmuch-addrlookup"; inherit version; diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix index b3001c96057..c2a84971bc2 100644 --- a/pkgs/applications/networking/netperf/default.nix +++ b/pkgs/applications/networking/netperf/default.nix @@ -1,6 +1,6 @@ { libsmbios, stdenv, autoreconfHook, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "netperf"; version = "20180613"; diff --git a/pkgs/applications/networking/nntp-proxy/default.nix b/pkgs/applications/networking/nntp-proxy/default.nix index 58e1fffdbda..96bdc0b1dfa 100644 --- a/pkgs/applications/networking/nntp-proxy/default.nix +++ b/pkgs/applications/networking/nntp-proxy/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, libconfig, pkgconfig, libevent, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nntp-proxy"; version = "2014-01-06"; diff --git a/pkgs/applications/networking/p2p/gnunet/git.nix b/pkgs/applications/networking/p2p/gnunet/git.nix index 9428b276458..c9e2f8f6714 100644 --- a/pkgs/applications/networking/p2p/gnunet/git.nix +++ b/pkgs/applications/networking/p2p/gnunet/git.nix @@ -7,7 +7,7 @@ let rev = "ce2864cfaa27e55096b480bf35db5f8cee2a5e7e"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "gnunet-git-${rev}"; src = fetchgit { diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 629e748fcac..0ead4b7e3ec 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ocamlPackages, zlib, bzip2, ncurses, file, gd, libpng, libjpeg }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ name = "mldonkey-3.1.6"; src = fetchurl { diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix index bcfe8f01e4a..704c439bb27 100644 --- a/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -17,7 +17,7 @@ let mainbin = "SoulseekQt-" + (version) +"-"+ (if stdenv.is64bit then "64bit" else "32bit"); srcs = { - "x86_64-linux" = fetchurl { + x86_64-linux = fetchurl { url = "https://www.dropbox.com/s/0vi87eef3ooh7iy/${mainbin}.tgz"; sha256 = "0d1cayxr1a4j19bc5a3qp9pg22ggzmd55b6f5av3lc6lvwqqg4w6"; }; @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { pname = "soulseekqt"; inherit version; - src = srcs."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}"); + src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); dontBuild = true; diff --git a/pkgs/applications/networking/protocol/default.nix b/pkgs/applications/networking/protocol/default.nix index 305aceec62b..7fdb062ef80 100644 --- a/pkgs/applications/networking/protocol/default.nix +++ b/pkgs/applications/networking/protocol/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonApplication, fetchFromGitHub }: -buildPythonApplication rec { +buildPythonApplication { pname = "protocol"; version = "20171226"; diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index bf8e7a16a4f..60ea01ae451 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -21,7 +21,7 @@ let categories = "Utility;Security;Network;Email"; }; -in mkDerivation rec { +in mkDerivation { pname = "protonmail-bridge"; inherit version; diff --git a/pkgs/applications/networking/ps2client/default.nix b/pkgs/applications/networking/ps2client/default.nix index be4cc5830d5..d75f92cb25c 100644 --- a/pkgs/applications/networking/ps2client/default.nix +++ b/pkgs/applications/networking/ps2client/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "unstable-2018-10-18"; pname = "ps2client"; diff --git a/pkgs/applications/networking/pyload/beautifulsoup.nix b/pkgs/applications/networking/pyload/beautifulsoup.nix index 571df924e1f..66470bf8f31 100644 --- a/pkgs/applications/networking/pyload/beautifulsoup.nix +++ b/pkgs/applications/networking/pyload/beautifulsoup.nix @@ -1,6 +1,6 @@ { pythonPackages, isPy3k, pkgs }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonPackage { name = "beautifulsoup-3.2.1"; disabled = isPy3k; diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 5255b492ec6..30130f60028 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -4,18 +4,18 @@ let sha256 = { - "x86_64-linux" = "08kdxsg9npb1nmlr2jyq7p238735kqkp7c5xckxn6rc4cp12n2y2"; - "i686-linux" = "11r5d4234zbkkgyrd7q9x3w7s7lailnq7z4x8cnhpr8vipzrg7h2"; - }."${stdenv.hostPlatform.system}" or (throw "system ${stdenv.hostPlatform.system} not supported"); + x86_64-linux = "08kdxsg9npb1nmlr2jyq7p238735kqkp7c5xckxn6rc4cp12n2y2"; + i686-linux = "11r5d4234zbkkgyrd7q9x3w7s7lailnq7z4x8cnhpr8vipzrg7h2"; + }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported"); arch = { - "x86_64-linux" = "amd64"; - "i686-linux" = "i686"; - }."${stdenv.hostPlatform.system}" or (throw "system ${stdenv.hostPlatform.system} not supported"); + x86_64-linux = "amd64"; + i686-linux = "i686"; + }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported"); description = "Desktop sharing application, providing remote support and online meetings"; - desktopItem = makeDesktopItem rec { + desktopItem = makeDesktopItem { name = "anydesk"; exec = "@out@/bin/anydesk"; icon = "anydesk"; diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 2cfbfb1b201..13bcbf9b57e 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh , mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkgconfig }: -mkDerivation rec { +mkDerivation { pname = "x2goclient"; version = "unstable-2019-07-24"; diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index ecce7172def..e9d0727d31c 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -2,8 +2,8 @@ let arch = { - "x86_64-linux" = "x64"; - "i686-linux" = "i386"; + x86_64-linux = "x64"; + i686-linux = "i386"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; @@ -14,8 +14,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz"; sha256 = { - "x86_64-linux" = "114k7dsxn7lzv6mjq9alsqxypvkah4lmjn5w6brbvgd6m6pdwslz"; - "i686-linux" = "1dh0hxbd33bs51xib3qwxw58h9j30v0dc10b4x4rwkbgsj11nc83"; + x86_64-linux = "114k7dsxn7lzv6mjq9alsqxypvkah4lmjn5w6brbvgd6m6pdwslz"; + i686-linux = "1dh0hxbd33bs51xib3qwxw58h9j30v0dc10b4x4rwkbgsj11nc83"; }.${stdenv.hostPlatform.system}; }; diff --git a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix index a38a9140b49..158e6c5dad1 100644 --- a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix +++ b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; -python27Packages.buildPythonApplication rec { +python27Packages.buildPythonApplication { pname = "nicotine-plus"; version = "1.4.1"; diff --git a/pkgs/applications/networking/ssb/patchwork-classic/default.nix b/pkgs/applications/networking/ssb/patchwork-classic/default.nix index c70723284fd..74a02f47c3b 100644 --- a/pkgs/applications/networking/ssb/patchwork-classic/default.nix +++ b/pkgs/applications/networking/ssb/patchwork-classic/default.nix @@ -5,7 +5,7 @@ glibc, systemd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2.12.0"; diff --git a/pkgs/applications/networking/sync/backintime/qt4.nix b/pkgs/applications/networking/sync/backintime/qt4.nix index fb47d9bc510..b72ddc8bae6 100644 --- a/pkgs/applications/networking/sync/backintime/qt4.nix +++ b/pkgs/applications/networking/sync/backintime/qt4.nix @@ -1,6 +1,6 @@ {stdenv, makeWrapper, gettext, backintime-common, python3, python3Packages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (backintime-common) version src installFlags; pname = "backintime-qt4"; diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix index 1eb5e44ba24..cdec695d90f 100644 --- a/pkgs/applications/networking/sync/casync/default.nix +++ b/pkgs/applications/networking/sync/casync/default.nix @@ -7,7 +7,7 @@ , glibcLocales, rsync }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "casync"; version = "2-152-ge4a3c5e"; diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix index 12f992d44a5..19e2eaa5fa2 100644 --- a/pkgs/applications/networking/sync/rsync/rrsync.nix +++ b/pkgs/applications/networking/sync/rsync/rrsync.nix @@ -3,7 +3,7 @@ let base = import ./base.nix { inherit stdenv fetchurl; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "rrsync-${base.version}"; src = base.src; diff --git a/pkgs/applications/networking/transporter/default.nix b/pkgs/applications/networking/transporter/default.nix index 46649c06911..a3cde14f34c 100644 --- a/pkgs/applications/networking/transporter/default.nix +++ b/pkgs/applications/networking/transporter/default.nix @@ -18,7 +18,7 @@ let pname = "Transporter"; version = "1.3.3"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index fce885a2594..54e148f0833 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -15,7 +15,7 @@ let passthru.module_name = module_name; }); -in rec { +in { backlog = zncDerivation rec { name = "znc-backlog-${version}"; diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index 9eec315217c..aefd696ae4e 100644 --- a/pkgs/applications/office/beancount/bean-add.nix +++ b/pkgs/applications/office/beancount/bean-add.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python3Packages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "bean-add-2018-01-08"; src = fetchFromGitHub { diff --git a/pkgs/applications/office/docear/default.nix b/pkgs/applications/office/docear/default.nix index 0d2341113b4..fb9578c909d 100644 --- a/pkgs/applications/office/docear/default.nix +++ b/pkgs/applications/office/docear/default.nix @@ -3,7 +3,7 @@ , antialiasFont ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "docear"; version = "1.2"; diff --git a/pkgs/applications/office/ledger-web/default.nix b/pkgs/applications/office/ledger-web/default.nix index df8298579e8..0a8f68bc096 100644 --- a/pkgs/applications/office/ledger-web/default.nix +++ b/pkgs/applications/office/ledger-web/default.nix @@ -3,7 +3,7 @@ , withSqlite ? false, sqlite }: -bundlerApp rec { +bundlerApp { pname = "ledger_web"; gemdir = ./.; exes = [ "ledger_web" ]; diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix index 6b4a3869af9..103288c03c6 100644 --- a/pkgs/applications/office/moneyplex/default.nix +++ b/pkgs/applications/office/moneyplex/default.nix @@ -18,7 +18,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "moneyplex"; version = "16.0.22424"; diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix index dd7f0ace26c..050222451cf 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/applications/office/mytetra/default.nix @@ -2,7 +2,7 @@ let version = "1.44.55"; -in mkDerivation rec { +in mkDerivation { pname = "mytetra"; inherit version; src = fetchurl { diff --git a/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix b/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix index d3668d057ee..c1e0f7da30f 100644 --- a/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix +++ b/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub , pytest, pytest-django, django }: -buildPythonPackage rec { +buildPythonPackage { pname = "django-crispy-forms"; version = "2019.04.21"; diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix index 6f4f9c43b0f..b76e09d4d1d 100644 --- a/pkgs/applications/office/zanshin/default.nix +++ b/pkgs/applications/office/zanshin/default.nix @@ -7,15 +7,15 @@ krunner, kwallet }: -mkDerivation rec { +mkDerivation { pname = "zanshin"; - version = "2017-11-25"; + version = "2019-07-28"; src = fetchFromGitHub { owner = "KDE"; repo = "zanshin"; - rev = "3df91dd81682d2ccfe542c4582dc1d5f98537c89"; - sha256 = "18wx7bdqzp81xmwi266gphh2lfbcp5s0fzyp654gki40yhkqph6m"; + rev = "a8c223e745ed7e6aa3dd3cb0786a625a5c54e378"; + sha256 = "0jglwh30x7qrl41n3dhawn4c25dmrzscpvcajhgb6fwcl4w8cgfm"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 5221add8ff6..334a380d914 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { sed -i '/pref("app.update.enabled", true);/c\pref("app.update.enabled", false);' defaults/preferences/prefs.js ''; - desktopItem = makeDesktopItem rec { + desktopItem = makeDesktopItem { name = "zotero-${version}"; exec = "zotero -url %U"; icon = "zotero"; diff --git a/pkgs/applications/radio/dabtools/default.nix b/pkgs/applications/radio/dabtools/default.nix index c9dbc59323e..401e207ba4f 100644 --- a/pkgs/applications/radio/dabtools/default.nix +++ b/pkgs/applications/radio/dabtools/default.nix @@ -2,7 +2,7 @@ , libusb1, rtl-sdr, fftw } : -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "dabtools"; version = "20180405"; diff --git a/pkgs/applications/radio/gnuradio/ais.nix b/pkgs/applications/radio/gnuradio/ais.nix index 6b23858aee4..c26d3e77c70 100644 --- a/pkgs/applications/radio/gnuradio/ais.nix +++ b/pkgs/applications/radio/gnuradio/ais.nix @@ -5,7 +5,7 @@ assert pythonSupport -> python != null && swig != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gr-ais"; version = "2015-12-20"; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { owner = "bistromath"; repo = "gr-ais"; # Upstream PR: https://github.com/bistromath/gr-ais/commit/8502d0252a2a1a9b8d1a71795eaeb5d820684054 - "rev" = "8502d0252a2a1a9b8d1a71795eaeb5d820684054"; - "sha256" = "1b9j0kc74cw12a7jv4lii77dgzqzg2s8ndzp4xmisxksgva1qfvh"; + rev = "8502d0252a2a1a9b8d1a71795eaeb5d820684054"; + sha256 = "1b9j0kc74cw12a7jv4lii77dgzqzg2s8ndzp4xmisxksgva1qfvh"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/radio/gnuradio/gsm.nix b/pkgs/applications/radio/gnuradio/gsm.nix index 80583c0ff3b..27cdfc74aab 100644 --- a/pkgs/applications/radio/gnuradio/gsm.nix +++ b/pkgs/applications/radio/gnuradio/gsm.nix @@ -5,7 +5,7 @@ assert pythonSupport -> python != null && swig != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gr-gsm"; version = "2016-08-25"; diff --git a/pkgs/applications/radio/gnuradio/limesdr.nix b/pkgs/applications/radio/gnuradio/limesdr.nix index d56994e46ff..ec1b802c659 100644 --- a/pkgs/applications/radio/gnuradio/limesdr.nix +++ b/pkgs/applications/radio/gnuradio/limesdr.nix @@ -7,7 +7,7 @@ assert pythonSupport -> python != null && swig != null; let version = "2.0.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "gr-limesdr"; inherit version; diff --git a/pkgs/applications/radio/gnuradio/nacl.nix b/pkgs/applications/radio/gnuradio/nacl.nix index d357db91344..3026c81e8ef 100644 --- a/pkgs/applications/radio/gnuradio/nacl.nix +++ b/pkgs/applications/radio/gnuradio/nacl.nix @@ -5,7 +5,7 @@ assert pythonSupport -> python != null && swig != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gr-nacl"; version = "2017-04-10"; diff --git a/pkgs/applications/radio/gnuradio/osmosdr.nix b/pkgs/applications/radio/gnuradio/osmosdr.nix index b8cc60544c9..3bb632a819c 100644 --- a/pkgs/applications/radio/gnuradio/osmosdr.nix +++ b/pkgs/applications/radio/gnuradio/osmosdr.nix @@ -12,7 +12,7 @@ assert pythonSupport -> python != null && swig != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gr-osmosdr"; version = "2018-08-15"; diff --git a/pkgs/applications/radio/inspectrum/default.nix b/pkgs/applications/radio/inspectrum/default.nix index e2232c4b2ec..ef4bd6129a8 100644 --- a/pkgs/applications/radio/inspectrum/default.nix +++ b/pkgs/applications/radio/inspectrum/default.nix @@ -9,7 +9,7 @@ , liquid-dsp }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "inspectrum-unstable-2017-05-31"; src = fetchFromGitHub { diff --git a/pkgs/applications/radio/kalibrate-hackrf/default.nix b/pkgs/applications/radio/kalibrate-hackrf/default.nix index 0bd6f573ead..3964a8c3737 100644 --- a/pkgs/applications/radio/kalibrate-hackrf/default.nix +++ b/pkgs/applications/radio/kalibrate-hackrf/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fftw, hackrf, libusb1 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "kalibrate-hackrf-unstable-20160827"; # There are no tags/releases, so use the latest commit from git master. diff --git a/pkgs/applications/radio/kalibrate-rtl/default.nix b/pkgs/applications/radio/kalibrate-rtl/default.nix index 19ebd05e23c..879cd6e3aac 100644 --- a/pkgs/applications/radio/kalibrate-rtl/default.nix +++ b/pkgs/applications/radio/kalibrate-rtl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, autoreconfHook, pkgconfig, fftw, rtl-sdr, libusb1 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "kalibrate-rtl-20131214"; # There are no tags/releases, so use the latest commit from git master. diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix index a06ac2d7a03..3d519255ab4 100644 --- a/pkgs/applications/radio/rtl_433/default.nix +++ b/pkgs/applications/radio/rtl_433/default.nix @@ -2,7 +2,7 @@ , libusb1, rtl-sdr, soapysdr-with-plugins }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "18.12"; pname = "rtl_433"; diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix index 56de61da1c5..1ebfa2fca57 100644 --- a/pkgs/applications/science/biology/cmtk/default.nix +++ b/pkgs/applications/science/biology/cmtk/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, cmake}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "cmtk-3.3.1"; src = fetchurl { diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix index 854e91b2fcb..c1d20a11ca9 100644 --- a/pkgs/applications/science/biology/diamond/default.nix +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "diamond-0.8.36"; src = fetchurl { diff --git a/pkgs/applications/science/biology/platypus/default.nix b/pkgs/applications/science/biology/platypus/default.nix index fc6cfbb158c..6907c6e3ec8 100644 --- a/pkgs/applications/science/biology/platypus/default.nix +++ b/pkgs/applications/science/biology/platypus/default.nix @@ -2,7 +2,7 @@ let python = python27.withPackages (ps: with ps; [ cython ]); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "platypus-unstable"; version = "2018-07-22"; diff --git a/pkgs/applications/science/chemistry/siesta/default.nix b/pkgs/applications/science/chemistry/siesta/default.nix index a27355afdc8..9d7880f57df 100644 --- a/pkgs/applications/science/chemistry/siesta/default.nix +++ b/pkgs/applications/science/chemistry/siesta/default.nix @@ -3,7 +3,7 @@ , mpi ? null, scalapack }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "4.1-b3"; pname = "siesta"; diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/pkgs/applications/science/electronics/alliance/default.nix index b351c892c2c..c863fe6aea8 100644 --- a/pkgs/applications/science/electronics/alliance/default.nix +++ b/pkgs/applications/science/electronics/alliance/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--prefix=$(out)" - "--disable-static" ]; preConfigure = '' diff --git a/pkgs/applications/science/electronics/bitscope/packages.nix b/pkgs/applications/science/electronics/bitscope/packages.nix index 58e01f4f9f4..11e1ed524ed 100644 --- a/pkgs/applications/science/electronics/bitscope/packages.nix +++ b/pkgs/applications/science/electronics/bitscope/packages.nix @@ -110,7 +110,7 @@ in { proto = let toolName = "bitscope-proto"; version = "0.9.FG13B"; - in mkBitscope rec { + in mkBitscope { inherit toolName version; # NOTE: this is meant as a demo by BitScope # NOTE: clicking on logo produces error diff --git a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix index 8aa8275510c..c2cfc69c50c 100644 --- a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix +++ b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix @@ -3,7 +3,7 @@ glib, libzip, libserialport, check, libusb, libftdi, systemd, alsaLib, dsview }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (dsview) version src; pname = "libsigrok4dsl"; diff --git a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix index 12d375cf88a..b7fe5140864 100644 --- a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix +++ b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix @@ -2,7 +2,7 @@ glib, check, python3, dsview }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (dsview) version src; pname = "libsigrokdecode4dsl"; diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix index 0d6f23e1edb..4eb666ada7c 100644 --- a/pkgs/applications/science/electronics/fped/default.nix +++ b/pkgs/applications/science/electronics/fped/default.nix @@ -4,7 +4,7 @@ }: with lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "fped"; version = "unstable-2017-05-11"; diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix index 71101d7cd74..1aaa5496ff3 100644 --- a/pkgs/applications/science/electronics/geda/default.nix +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, guile, gtk2, flex, gawk, perl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "geda"; version = "1.8.2-20130925"; diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix index 3f61a13eab8..fa5bdbbebdb 100644 --- a/pkgs/applications/science/electronics/gerbv/default.nix +++ b/pkgs/applications/science/electronics/gerbv/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, pkgconfig, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gerbv"; version = "2015-10-08"; diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index 110552d1d64..fb931ec9162 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qtbase, qttools, qmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "librepcb"; version = "0.1.0"; diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index fd50fc825a0..c832d12627a 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, stdenv, readline, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "abc-verifier"; version = "2018-07-08"; diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix index bf8d3cf03b8..d6190942efa 100644 --- a/pkgs/applications/science/logic/aspino/default.nix +++ b/pkgs/applications/science/logic/aspino/default.nix @@ -7,7 +7,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "aspino-unstable-2017-03-09"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix index 668fd9fea72..9b59828ddab 100644 --- a/pkgs/applications/science/logic/avy/default.nix +++ b/pkgs/applications/science/logic/avy/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, cmake, zlib, boost }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "avy"; version = "2017.10.16"; diff --git a/pkgs/applications/science/logic/btor2tools/default.nix b/pkgs/applications/science/logic/btor2tools/default.nix index 9d6c866faea..2d00e9f3046 100644 --- a/pkgs/applications/science/logic/btor2tools/default.nix +++ b/pkgs/applications/science/logic/btor2tools/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "btor2tools"; version = "pre55_8c150b39"; diff --git a/pkgs/applications/science/logic/clprover/clprover.nix b/pkgs/applications/science/logic/clprover/clprover.nix index e2f48b34029..0319069660e 100644 --- a/pkgs/applications/science/logic/clprover/clprover.nix +++ b/pkgs/applications/science/logic/clprover/clprover.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "clprover"; version = "1.0.3"; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index dfe1277d5ac..a04ec0bb16c 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -29,7 +29,7 @@ let "8.9.0" = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh"; "8.9.1" = "1xrq6mkhpq994bncmnijf8jwmwn961kkpl4mwwlv7j3dgnysrcv2"; "8.10+beta2" = "0jk7pwydhd17ab7ii69zvi4sgrr630q2lsxhckaj3sz55cpjlhal"; - }."${version}"; + }.${version}; coq-version = stdenv.lib.versions.majorMinor version; versionAtLeast = stdenv.lib.versionAtLeast coq-version; ideFlags = stdenv.lib.optionalString (buildIde && !versionAtLeast "8.10") diff --git a/pkgs/applications/science/logic/drat-trim/default.nix b/pkgs/applications/science/logic/drat-trim/default.nix index 50454847baf..4c4ea0f14ce 100644 --- a/pkgs/applications/science/logic/drat-trim/default.nix +++ b/pkgs/applications/science/logic/drat-trim/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "drat-trim-2017-08-31"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index bc4f526bb3a..f9a911d8210 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -1,7 +1,7 @@ { stdenv, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "elan-${version}"; + pname = "elan"; version = "0.7.5"; cargoSha256 = "0lc320m3vw76d6pa5wp6c9jblac6lmyf9qqnxmsnkn4ixdhnghsd"; diff --git a/pkgs/applications/science/logic/fast-downward/default.nix b/pkgs/applications/science/logic/fast-downward/default.nix index 21ce6be3e6c..ed757e444b7 100644 --- a/pkgs/applications/science/logic/fast-downward/default.nix +++ b/pkgs/applications/science/logic/fast-downward/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchhg, cmake, which, python3, osi, cplex }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "fast-downward-2019-05-13"; src = fetchhg { diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix index 22177798647..8cc50bb5e29 100644 --- a/pkgs/applications/science/logic/lean2/default.nix +++ b/pkgs/applications/science/logic/lean2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, gmp, mpfr, python , gperftools, ninja, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lean2"; version = "2017-07-22"; diff --git a/pkgs/applications/science/logic/lingeling/default.nix b/pkgs/applications/science/logic/lingeling/default.nix index dbd34f1da6e..287dbd36eab 100644 --- a/pkgs/applications/science/logic/lingeling/default.nix +++ b/pkgs/applications/science/logic/lingeling/default.nix @@ -2,7 +2,7 @@ , aiger }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lingeling"; # This is the version used in satcomp2018, which was # relicensed, and also known as version 'bcj' diff --git a/pkgs/applications/science/logic/metis-prover/default.nix b/pkgs/applications/science/logic/metis-prover/default.nix index 7e46dbeb074..ed1218c401b 100644 --- a/pkgs/applications/science/logic/metis-prover/default.nix +++ b/pkgs/applications/science/logic/metis-prover/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, perl, mlton }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "metis-prover"; version = "2.3.20160713"; diff --git a/pkgs/applications/science/logic/minisat/unstable.nix b/pkgs/applications/science/logic/minisat/unstable.nix index f1a42f8215e..ef46c694acb 100644 --- a/pkgs/applications/science/logic/minisat/unstable.nix +++ b/pkgs/applications/science/logic/minisat/unstable.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, zlib, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "minisat-unstable-2013-09-25"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix index 54bedc7c5e9..30d47687a3e 100644 --- a/pkgs/applications/science/logic/monosat/default.nix +++ b/pkgs/applications/science/logic/monosat/default.nix @@ -20,7 +20,7 @@ let inherit rev sha256; }; - core = stdenv.mkDerivation rec { + core = stdenv.mkDerivation { name = "${pname}-${version}"; inherit src; buildInputs = [ cmake zlib gmp jdk8 ]; diff --git a/pkgs/applications/science/logic/open-wbo/default.nix b/pkgs/applications/science/logic/open-wbo/default.nix index 48546a86112..32ce9fde0c3 100644 --- a/pkgs/applications/science/logic/open-wbo/default.nix +++ b/pkgs/applications/science/logic/open-wbo/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, zlib, gmp }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "open-wbo-2.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix index 3f8305ff403..d357bef2c7a 100644 --- a/pkgs/applications/science/logic/saw-tools/default.nix +++ b/pkgs/applications/science/logic/saw-tools/default.nix @@ -22,7 +22,7 @@ let sha256 = "07gyf319v6ama6n1aj96403as04bixi8mbisfy7f7va689zklflr"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "saw-tools"; version = "0.1.1-20150731"; diff --git a/pkgs/applications/science/logic/spass/default.nix b/pkgs/applications/science/logic/spass/default.nix index 2645aa102d9..ece6f0b9f6a 100644 --- a/pkgs/applications/science/logic/spass/default.nix +++ b/pkgs/applications/science/logic/spass/default.nix @@ -8,7 +8,7 @@ let + " dfg2ascii dfg2dfg tptp2dfg dimacs2dfg pgen rescmp"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "spass"; version = "${baseVersion}.${minorVersion}"; diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index 29eb8026366..ed66c77dcab 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, yosys, bash, python3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "symbiyosys"; version = "2019.08.13"; diff --git a/pkgs/applications/science/logic/verit/default.nix b/pkgs/applications/science/logic/verit/default.nix index a04ab46c669..2c68191b800 100644 --- a/pkgs/applications/science/logic/verit/default.nix +++ b/pkgs/applications/science/logic/verit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, autoreconfHook, gmp, flex, bison }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "veriT"; version = "2016"; diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 3cb14d7da21..6f338f21478 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -1,7 +1,7 @@ { callPackage, fetchurl, stdenv , ocamlPackages, coqPackages, rubber, hevea, emacs }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "why3"; version = "1.2.0"; diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix index 340073b016e..4469e7f06e0 100644 --- a/pkgs/applications/science/machine-learning/labelimg/default.nix +++ b/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -1,6 +1,6 @@ { stdenv, python2Packages, fetchurl }: python2Packages.buildPythonApplication rec { - name = "labelImg-${version}"; + pname = "labelImg"; version = "1.6.0"; src = fetchurl { url = "https://github.com/tzutalin/labelImg/archive/v${version}.tar.gz"; diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix index 9c4f2402143..73272df9922 100644 --- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix +++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix @@ -94,7 +94,7 @@ let # rockspec = "lua-cjson-2.1devel-1.rockspec"; # }; - lua-cjson = stdenv.mkDerivation rec { + lua-cjson = stdenv.mkDerivation { name = "lua-cjson"; src = "${distro_src}/extra/lua-cjson"; @@ -179,7 +179,7 @@ let rockspec = "rocks/${name}-scm-1.rockspec"; }; - sys = buildLuaRocks rec { + sys = buildLuaRocks { name = "sys"; luadeps = [torch]; buildInputs = [readline cmake]; @@ -190,14 +190,14 @@ let ''; }; - xlua = buildLuaRocks rec { + xlua = buildLuaRocks { name = "xlua"; luadeps = [torch sys]; src = "${distro_src}/pkg/xlua"; rockspec = "xlua-1.0-0.rockspec"; }; - nn = buildLuaRocks rec { + nn = buildLuaRocks { name = "nn"; luadeps = [torch luaffifb]; buildInputs = [cmake]; @@ -208,7 +208,7 @@ let ''; }; - graph = buildLuaRocks rec { + graph = buildLuaRocks { name = "graph"; luadeps = [ torch ]; buildInputs = [cmake]; @@ -219,7 +219,7 @@ let ''; }; - nngraph = buildLuaRocks rec { + nngraph = buildLuaRocks { name = "nngraph"; luadeps = [ torch nn graph ]; buildInputs = [cmake]; @@ -229,7 +229,7 @@ let ''; }; - image = buildLuaRocks rec { + image = buildLuaRocks { name = "image"; luadeps = [ torch dok sys xlua ]; buildInputs = [cmake libjpeg libpng]; @@ -240,7 +240,7 @@ let ''; }; - optim = buildLuaRocks rec { + optim = buildLuaRocks { name = "optim"; luadeps = [ torch ]; buildInputs = [cmake]; @@ -251,7 +251,7 @@ let ''; }; - gnuplot = buildLuaRocks rec { + gnuplot = buildLuaRocks { name = "gnuplot"; luadeps = [ torch paths ]; runtimeDeps = [ pkgs_gnuplot less ]; @@ -259,7 +259,7 @@ let rockspec = "rocks/gnuplot-scm-1.rockspec"; }; - unsup = buildLuaRocks rec { + unsup = buildLuaRocks { name = "unsup"; luadeps = [ torch xlua optim ]; buildInputs = [ cmake ]; @@ -275,7 +275,7 @@ let meta.broken = true; }; - trepl = buildLuaRocks rec { + trepl = buildLuaRocks { name = "trepl"; luadeps = [torch gnuplot paths penlight graph nn nngraph image gnuplot optim sys dok unsup]; runtimeDeps = [ ncurses readline ]; @@ -285,7 +285,7 @@ let }; }; - lbase64 = buildLuaRocks rec { + lbase64 = buildLuaRocks { name = "lbase64"; src = fetchgit { url = "https://github.com/LuaDist2/lbase64"; @@ -295,7 +295,7 @@ let meta.broken = true; # 2018-04-11 }; - luuid = stdenv.mkDerivation rec { + luuid = stdenv.mkDerivation { name = "luuid"; src = fetchgit { url = "https://github.com/LuaDist/luuid"; @@ -314,7 +314,7 @@ let }; # Doesn't work due to missing deps (according to luarocs). - itorch = buildLuaRocks rec { + itorch = buildLuaRocks { name = "itorch"; luadeps = [torch gnuplot paths penlight graph nn nngraph image gnuplot optim sys dok lbase64 lua-cjson luuid]; diff --git a/pkgs/applications/science/math/LiE/default.nix b/pkgs/applications/science/math/LiE/default.nix index 6909cfd8ef6..d59ec57c1a8 100644 --- a/pkgs/applications/science/math/LiE/default.nix +++ b/pkgs/applications/science/math/LiE/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl , bison, readline }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2.2.2"; # The current version of LiE is 2.2.2, which is more or less unchanged # since about the year 2000. Minor bugfixes do get applied now and then. diff --git a/pkgs/applications/science/math/form/default.nix b/pkgs/applications/science/math/form/default.nix index eb42315f015..0dbafebf2c0 100644 --- a/pkgs/applications/science/math/form/default.nix +++ b/pkgs/applications/science/math/form/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gmp, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "4.2.1"; pname = "form"; diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index 1023e7ca3d5..aaa1c02ec0a 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { name = "mathematica-9.0.0"; - src = requireFile rec { + src = requireFile { name = "Mathematica_9.0.0_LINUX.sh"; message = '' This nix expression requires that Mathematica_9.0.0_LINUX.sh is diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix index c86354234e3..bd116b02e29 100644 --- a/pkgs/applications/science/math/nauty/default.nix +++ b/pkgs/applications/science/math/nauty/default.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { # Prevent nauty from sniffing some cpu features. While those are very # widely available, it can lead to nasty bugs when they are not available: # https://groups.google.com/forum/#!topic/sage-packaging/Pe4SRDNYlhA - "default" = [ "--disable-clz" "--disable-popcnt" ]; - "westmere" = [ "--disable-clz" ]; - "sandybridge" = [ "--disable-clz" ]; - "ivybridge" = [ "--disable-clz" ]; + default = [ "--disable-clz" "--disable-popcnt" ]; + westmere = [ "--disable-clz" ]; + sandybridge = [ "--disable-clz" ]; + ivybridge = [ "--disable-clz" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"} or []; buildInputs = []; installPhase = '' diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/applications/science/math/sage/sage-tests.nix index 856d604d751..93ec1e33cf6 100644 --- a/pkgs/applications/science/math/sage/sage-tests.nix +++ b/pkgs/applications/science/math/sage/sage-tests.nix @@ -23,7 +23,7 @@ let relpathToArg = relpath: lib.escapeShellArg "${src}/${relpath}"; # paths need to be absolute testFileList = lib.concatStringsSep " " (map relpathToArg files); in -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = src.version; pname = "sage-tests"; inherit src; diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix index 21ce53e70c5..8e85cece9b2 100644 --- a/pkgs/applications/science/math/scilab-bin/default.nix +++ b/pkgs/applications/science/math/scilab-bin/default.nix @@ -15,7 +15,7 @@ let else badArch; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit name; src = fetchurl { diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix index 17b2fe27f29..577c8ecfa05 100644 --- a/pkgs/applications/science/misc/gephi/default.nix +++ b/pkgs/applications/science/misc/gephi/default.nix @@ -27,7 +27,7 @@ let outputHash = "1p7yf97dn0nvr005cbs6vdk3i341s8fya4kfccj8qqad2qgxflif"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gephi"; inherit version; diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/applications/science/misc/megam/default.nix index 59f5afb2f43..f86bed854a2 100644 --- a/pkgs/applications/science/misc/megam/default.nix +++ b/pkgs/applications/science/misc/megam/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, ocaml, makeWrapper, ncurses }: let version = "0.92"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "megam"; inherit version; diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index 43d57feab71..bb067fbca7a 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -2,7 +2,7 @@ , eigen, opencv, ceres-solver, cgal, boost, vcg , gmp, mpfr, glog, gflags, libjpeg_turbo }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "openmvs-unstable-2018-05-26"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index daa8b494322..0dfcbfda002 100644 --- a/pkgs/applications/science/misc/rink/default.nix +++ b/pkgs/applications/science/misc/rink/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { version = "0.4.4"; - name = "rink-${version}"; + pname = "rink"; src = fetchFromGitHub { owner = "tiffany352"; diff --git a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix b/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix index c7692dde13a..b0ed5e94637 100644 --- a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix +++ b/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix @@ -2,7 +2,7 @@ , gfortran, mpi }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "1.10"; pname = "DL_POLY_Classic"; diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix index dd092a2ce9a..80417f0fcc1 100644 --- a/pkgs/applications/science/physics/sacrifice/default.nix +++ b/pkgs/applications/science/physics/sacrifice/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, boost, hepmc2, lhapdf, pythia, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sacrifice"; version = "1.0.0"; diff --git a/pkgs/applications/science/robotics/gazebo/6.nix b/pkgs/applications/science/robotics/gazebo/6.nix index 0d1aa4a9085..80c52b49e47 100644 --- a/pkgs/applications/science/robotics/gazebo/6.nix +++ b/pkgs/applications/science/robotics/gazebo/6.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, callPackage, ignition, gazeboSimulator, ... } @ args: -callPackage ./default.nix (args // rec { +callPackage ./default.nix (args // { version = "6.5.1"; src-sha256 = "96260aa23f1a1f24bc116f8e359d31f3bc65011033977cb7fb2c64d574321908"; sdformat = gazeboSimulator.sdformat3; diff --git a/pkgs/applications/search/grepm/default.nix b/pkgs/applications/search/grepm/default.nix index f3fc1e24401..bad8d35623c 100644 --- a/pkgs/applications/search/grepm/default.nix +++ b/pkgs/applications/search/grepm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perlPackages, mutt }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "grepm"; version = "0.6"; diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix index d16ea271050..0dfa1988202 100644 --- a/pkgs/applications/version-management/bazaar/tools.nix +++ b/pkgs/applications/version-management/bazaar/tools.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { - name = "bzr-tools-${version}"; + pname = "bzr-tools"; version = "2.6.0"; src = fetchurl { diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix index a2ebb8195db..4c818060d22 100644 --- a/pkgs/applications/version-management/cvs2svn/default.nix +++ b/pkgs/applications/version-management/cvs2svn/default.nix @@ -4,11 +4,11 @@ }: python2Packages.buildPythonApplication rec { - name = "cvs2svn-${version}"; + pname = "cvs2svn"; version = "2.5.0"; src = fetchurl { - url = "http://cvs2svn.tigris.org/files/documents/1462/49543/${name}.tar.gz"; + url = "http://cvs2svn.tigris.org/files/documents/1462/49543/${pname}-${version}.tar.gz"; sha256 = "1ska0z15sjhyfi860rjazz9ya1gxbf5c0h8dfqwz88h7fccd22b4"; }; diff --git a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix index 0e28258915f..454458cdec6 100644 --- a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, ruby, gnugrep, diffutils, git, darcs }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "darcs-to-git"; version = "2015-06-04"; diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix index 2d171df8bf2..32b9c8a980d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix @@ -4,8 +4,6 @@ python2Packages.buildPythonApplication rec { pname = "git-big-picture"; version = "0.10.1"; - name = "${pname}-${version}"; - src = fetchFromGitHub { owner = "esc"; repo = pname; diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix index e502c73adfd..5edf9a7b5a5 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix @@ -2,7 +2,7 @@ , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, makeWrapper, xmlto , pythonPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "git-bz"; version = "3.2015-09-08"; diff --git a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix index fbbb2d95242..418cf2e5866 100644 --- a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix @@ -1,6 +1,6 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { - name = "git-codeowners-${version}"; + pname = "git-codeowners"; version = "0.1.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index 90b8b54434b..77fc0428115 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -16,7 +16,7 @@ with rustPlatform; buildRustPackage rec { - name = "git-dit-${version}"; + pname = "git-dit"; version = "0.4.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix index 2d6de24167b..f4aa4878f62 100644 --- a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix @@ -1,6 +1,6 @@ { stdenv, bundlerEnv, ruby, bundlerUpdateScript }: -bundlerEnv rec { +bundlerEnv { inherit ruby; pname = "git_fame"; diff --git a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix b/pkgs/applications/version-management/git-and-tools/git-stree/default.nix index e8eaf885c71..ae40e011f85 100644 --- a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-stree/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "git-stree"; version = "0.4.5"; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 3a4fcc09934..47da7f7a1d7 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -21,7 +21,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.22.1"; + version = "2.23.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "093qjgagha937w96izkpsjkhxf5drsa7rvk5snlyjivqnwxgkqac"; + sha256 = "0rv0y45gcd3h191isppn77acih695v4pipdj031jvs9rd1ds0kr3"; }; outputs = [ "out" ]; diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index 1de631e8b6a..8cf9662d8f9 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -1,6 +1,6 @@ {callPackage, stdenv, fetchFromGitHub, ...}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gitstatus"; version = "unstable-2019-05-06"; diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix index 22f35e22fb5..0ff7fae2878 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix @@ -1,6 +1,6 @@ {fetchFromGitHub, libgit2, ...}: -libgit2.overrideAttrs (oldAttrs: rec { +libgit2.overrideAttrs (oldAttrs: { cmakeFlags = oldAttrs.cmakeFlags ++ [ "-DUSE_BUNDLED_ZLIB=ON" "-DUSE_ICONV=OFF" diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix index ecc054df47e..3a7f8632d2c 100644 --- a/pkgs/applications/version-management/git-review/default.nix +++ b/pkgs/applications/version-management/git-review/default.nix @@ -8,7 +8,7 @@ pythonPackages.buildPythonApplication rec { # upstream repository (and we are installing from tarball instead) PBR_VERSION = "${version}"; - src = fetchFromGitHub rec { + src = fetchFromGitHub { owner = "openstack-infra"; repo = pname; rev = version; diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix index 45c97868c4b..ba0625c433d 100644 --- a/pkgs/applications/version-management/git-up/default.nix +++ b/pkgs/applications/version-management/git-up/default.nix @@ -2,10 +2,10 @@ python2Packages.buildPythonApplication rec { version = "1.4.2"; - name = "git-up-${version}"; + pname = "git-up"; src = fetchurl { - url = "mirror://pypi/g/git-up/${name}.zip"; + url = "mirror://pypi/g/git-up/${pname}-${version}.zip"; sha256 = "121ia5gyjy7js6fbsx9z98j2qpq7rzwpsj8gnfvsbz2d69g0vl7q"; }; diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix index 2428c6cebdd..4467e9746ce 100644 --- a/pkgs/applications/version-management/gitinspector/default.nix +++ b/pkgs/applications/version-management/gitinspector/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchzip, python2Packages}: python2Packages.buildPythonApplication rec { - name = "gitinspector-${version}"; + pname = "gitinspector"; version = "0.4.4"; namePrefix = ""; src = fetchzip { url = "https://github.com/ejwa/gitinspector/archive/v${version}.tar.gz"; sha256 = "1pfsw6xldm6jigs3nhysvqaxk8a0zf8zczgfkrp920as9sya3c7m"; - name = name + "-src"; + name = "${pname}-${version}" + "-src"; }; checkInputs = with python2Packages; [ diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 20f0937274e..35ac8a18c45 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -44,7 +44,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "gitlab${if gitlabEnterprise then "-ee" else ""}-${version}"; src = sources.gitlab; diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix index 0aa8afa9361..92bc9f51cac 100644 --- a/pkgs/applications/version-management/guitone/default.nix +++ b/pkgs/applications/version-management/guitone/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchmtn, qt4, qmake4Hook, pkgconfig, graphviz }: let version = "1.0-mtn-head"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "guitone"; inherit version; diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix index 23278e9e748..a4632399df0 100644 --- a/pkgs/applications/version-management/mr/default.nix +++ b/pkgs/applications/version-management/mr/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, perl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mr"; version = "1.20180726"; diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 180664d3386..6d0e39d47bf 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, nettle, clang, libclang, pkgconfig }: rustPlatform.buildRustPackage rec { - name = "pijul-${version}"; + pname = "pijul"; version = "0.12.0"; src = fetchurl { - url = "https://pijul.org/releases/${name}.tar.gz"; + url = "https://pijul.org/releases/${pname}-${version}.tar.gz"; sha256 = "1rm787kkh3ya8ix0rjvj7sbrg9armm0rnpkga6gjmsbg5bx20y4q"; }; diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix index d3b027fada6..e9950c32549 100644 --- a/pkgs/applications/version-management/rabbitvcs/default.nix +++ b/pkgs/applications/version-management/rabbitvcs/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, lib, python2Packages, meld, subversion, gvfs, xdg_utils }: python2Packages.buildPythonApplication rec { - name = "rabbitvcs-${version}"; + pname = "rabbitvcs"; version = "0.17.1"; namePrefix = ""; diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index 7d655bfc5d3..a225c23ceeb 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -3,7 +3,7 @@ libiconv, CoreFoundation, Security }: rustPlatform.buildRustPackage rec { - name = "sit-${version}"; + pname = "sit"; version = "0.4.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix index c68cc928848..c769ec0a66d 100644 --- a/pkgs/applications/version-management/tailor/default.nix +++ b/pkgs/applications/version-management/tailor/default.nix @@ -1,7 +1,7 @@ { fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { - name = "tailor-${version}"; + pname = "tailor"; version = "0.9.35"; src = fetchurl { diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index a6cdf2e4373..779c33627e8 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -21,7 +21,7 @@ let }; }; -in python2Packages.buildPythonApplication rec { +in python2Packages.buildPythonApplication { inherit (tortoisehgSrc.meta) name version; src = tortoisehgSrc; diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix index 577f2f01416..8a014a63393 100644 --- a/pkgs/applications/version-management/vcsh/default.nix +++ b/pkgs/applications/version-management/vcsh/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, which, git, ronn, perlPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "1.20170915"; # date of commit we're pulling pname = "vcsh"; diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix index 3d598086329..f16f655b95d 100644 --- a/pkgs/applications/video/avxsynth/default.nix +++ b/pkgs/applications/video/avxsynth/default.nix @@ -7,7 +7,7 @@ let inherit (stdenv.lib) enableFeature optional; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "avxsynth"; version = "2015-04-07"; diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index 0f1b185ed22..10685a72f10 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, wrapGAppsHook, which, gnome3, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1, xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.2.3.alpha"; pname = "byzanz"; diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix index 10a8f4019fc..a2de52468f2 100644 --- a/pkgs/applications/video/coriander/default.nix +++ b/pkgs/applications/video/coriander/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, pkgconfig, glib, gtk2, libgnomeui, libXv, libraw1394, libdc1394 , SDL, automake, GConf }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coriander-2.0.1"; src = fetchurl { diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix index d614523f534..388476cbf8e 100644 --- a/pkgs/applications/video/devede/default.nix +++ b/pkgs/applications/video/devede/default.nix @@ -4,7 +4,7 @@ let inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3; -in buildPythonApplication rec { +in buildPythonApplication { name = "devede-4.8.8"; namePrefix = ""; diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 03557209975..773c63b0036 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -143,7 +143,7 @@ let postPatch = cmakeProtoPatch; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "kodi-${lib.optionalString useWayland "wayland-"}${kodiVersion}"; src = kodi_src; diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 1cb51078069..dad52ccb9a7 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -51,7 +51,7 @@ let self = rec { }; mkKodiPlugin = { plugin, namespace, version, sourceDir ? null, ... }@args: - toKodiPlugin (stdenv.mkDerivation (rec { + toKodiPlugin (stdenv.mkDerivation ({ name = "kodi-plugin-${plugin}-${version}"; dontStrip = true; @@ -70,7 +70,7 @@ let self = rec { mkKodiABIPlugin = { plugin, namespace, version, extraBuildInputs ? [], extraRuntimeDependencies ? [], extraInstallPhase ? "", ... }@args: - toKodiPlugin (stdenv.mkDerivation (rec { + toKodiPlugin (stdenv.mkDerivation ({ name = "kodi-plugin-${plugin}-${version}"; dontStrip = true; @@ -172,7 +172,7 @@ let self = rec { }; mkController = controller: { - "${controller}" = mkKodiPlugin rec { + ${controller} = mkKodiPlugin rec { plugin = pname + "-" + controller; namespace = "game.controller." + controller; sourceDir = "addons/" + namespace; @@ -310,7 +310,7 @@ let self = rec { }; - steam-launcher = mkKodiPlugin rec { + steam-launcher = mkKodiPlugin { plugin = "steam-launcher"; namespace = "script.steam.launcher"; diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index 0dc97410f54..1ab7e2c991b 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -76,7 +76,7 @@ let }; # Lightworks expects some files in /usr/share/lightworks -in buildFHSUserEnv rec { +in buildFHSUserEnv { name = lightworks.name; targetPkgs = pkgs: [ diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/pkgs/applications/video/mjpg-streamer/default.nix index 14db747d2ce..d1efae4a924 100644 --- a/pkgs/applications/video/mjpg-streamer/default.nix +++ b/pkgs/applications/video/mjpg-streamer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, libjpeg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mjpg-streamer"; version = "unstable-2019-05-24"; diff --git a/pkgs/applications/video/recordmydesktop/gtk.nix b/pkgs/applications/video/recordmydesktop/gtk.nix index d59b02d4b0a..cf02825501f 100644 --- a/pkgs/applications/video/recordmydesktop/gtk.nix +++ b/pkgs/applications/video/recordmydesktop/gtk.nix @@ -4,7 +4,7 @@ let binPath = lib.makeBinPath [ recordmydesktop jack2 xwininfo ]; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "gtk-recordmydesktop"; version = "0.3.8-svn${recordmydesktop.rev}"; diff --git a/pkgs/applications/video/recordmydesktop/qt.nix b/pkgs/applications/video/recordmydesktop/qt.nix index 0864edfcf38..573a18f62ce 100644 --- a/pkgs/applications/video/recordmydesktop/qt.nix +++ b/pkgs/applications/video/recordmydesktop/qt.nix @@ -4,7 +4,7 @@ let binPath = lib.makeBinPath [ recordmydesktop jack2 xwininfo ]; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "qt-recordmydesktop"; version = "0.3.8-svn${recordmydesktop.rev}"; diff --git a/pkgs/applications/video/subdl/default.nix b/pkgs/applications/video/subdl/default.nix index 32bd731f16e..36a92f0f1af 100644 --- a/pkgs/applications/video/subdl/default.nix +++ b/pkgs/applications/video/subdl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "subdl-0.0pre.2017.11.06"; src = fetchFromGitHub { diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index 3f0042c1362..f628c3b214e 100644 --- a/pkgs/applications/video/subtitleeditor/default.nix +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -7,7 +7,7 @@ let version = "0.54.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "subtitleeditor"; inherit version; diff --git a/pkgs/applications/video/uvccapture/default.nix b/pkgs/applications/video/uvccapture/default.nix index dd595baa52e..f52ffa923d2 100644 --- a/pkgs/applications/video/uvccapture/default.nix +++ b/pkgs/applications/video/uvccapture/default.nix @@ -8,7 +8,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "uvccapture-0.5"; src = fetchurl { diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 022f4382a49..2ee196baccc 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -201,7 +201,7 @@ in { }; - text2skin = stdenv.mkDerivation rec { + text2skin = stdenv.mkDerivation { name = "vdr-text2skin-1.3.4-20170702"; src = fetchgit { diff --git a/pkgs/applications/video/xscast/default.nix b/pkgs/applications/video/xscast/default.nix index ba72763cdaf..3c4c59a0ee8 100644 --- a/pkgs/applications/video/xscast/default.nix +++ b/pkgs/applications/video/xscast/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, ffmpeg, imagemagick, dzen2, xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xscast-unstable"; version = "2016-07-26"; diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix index 6e61ef098f3..e16fcb84b05 100644 --- a/pkgs/applications/virtualization/8086tiny/default.nix +++ b/pkgs/applications/virtualization/8086tiny/default.nix @@ -4,7 +4,7 @@ assert sdlSupport -> (SDL != null); -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "8086tiny"; version = "1.25"; diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix index 23084c6286a..13afe0a4261 100644 --- a/pkgs/applications/virtualization/cntr/default.nix +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -1,7 +1,7 @@ { stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { - name = "cntr-${version}"; + pname = "cntr"; version = "1.2.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index a1125f25e81..72b885b79e7 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -15,7 +15,7 @@ rec { , tiniRev, tiniSha256 } : let - docker-runc = runc.overrideAttrs (oldAttrs: rec { + docker-runc = runc.overrideAttrs (oldAttrs: { name = "docker-runc-${version}"; inherit version; src = fetchFromGitHub { @@ -28,7 +28,7 @@ rec { patches = []; }); - docker-containerd = containerd.overrideAttrs (oldAttrs: rec { + docker-containerd = containerd.overrideAttrs (oldAttrs: { name = "docker-containerd-${version}"; inherit version; src = fetchFromGitHub { @@ -41,7 +41,7 @@ rec { hardeningDisable = [ "fortify" ]; }); - docker-tini = tini.overrideAttrs (oldAttrs: rec { + docker-tini = tini.overrideAttrs (oldAttrs: { name = "docker-init-${version}"; inherit version; src = fetchFromGitHub { @@ -60,7 +60,7 @@ rec { ]; }); in - stdenv.mkDerivation ((optionalAttrs (stdenv.isLinux) rec { + stdenv.mkDerivation ((optionalAttrs (stdenv.isLinux) { inherit docker-runc docker-containerd docker-proxy docker-tini; @@ -70,7 +70,7 @@ rec { ++ optional (lvm2 == null) "exclude_graphdriver_devicemapper" ++ optional (libseccomp != null) "seccomp"; - }) // rec { + }) // { inherit version rev; name = "docker-${version}"; diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/applications/virtualization/nvidia-docker/default.nix index b58a5108eba..e11ca04f6b3 100644 --- a/pkgs/applications/virtualization/nvidia-docker/default.nix +++ b/pkgs/applications/virtualization/nvidia-docker/default.nix @@ -24,7 +24,7 @@ with lib; let sha256 = "0jcj5xxbg7x7gyhbb67h3ds6vly62gx7j02zm6lg102h34jajj7a"; }; - nvidia-container-runtime-hook = buildGoPackage rec { + nvidia-container-runtime-hook = buildGoPackage { pname = "nvidia-container-runtime-hook"; version = "1.4.0"; diff --git a/pkgs/applications/virtualization/railcar/default.nix b/pkgs/applications/virtualization/railcar/default.nix index 0a139448cb3..bce25406142 100644 --- a/pkgs/applications/virtualization/railcar/default.nix +++ b/pkgs/applications/virtualization/railcar/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, rustPlatform, libseccomp }: rustPlatform.buildRustPackage rec { - name = "railcar-${version}"; + pname = "railcar"; version = "1.0.4"; src = fetchFromGitHub { diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix index 382ebba3c57..9fc167f5e9d 100644 --- a/pkgs/applications/virtualization/virt-top/default.nix +++ b/pkgs/applications/virtualization/virt-top/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, ocamlPackages, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "virt-top"; version = "2017-11-18-unstable"; diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix index f3055fc79c3..042b01e8678 100644 --- a/pkgs/applications/virtualization/xen/4.10.nix +++ b/pkgs/applications/virtualization/xen/4.10.nix @@ -47,7 +47,7 @@ callPackage (import ./generic.nix (rec { # Sources needed to build tools and firmwares. xenfiles = optionalAttrs withInternalQemu { - "qemu-xen" = { + qemu-xen = { src = fetchgit { url = https://xenbits.xen.org/git-http/qemu-xen.git; # rev = "refs/tags/qemu-xen-${version}"; @@ -67,7 +67,7 @@ callPackage (import ./generic.nix (rec { meta.description = "Xen's fork of upstream Qemu"; }; } // optionalAttrs withInternalTraditionalQemu { - "qemu-xen-traditional" = { + qemu-xen-traditional = { src = fetchgit { url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git; # rev = "refs/tags/xen-${version}"; @@ -114,7 +114,7 @@ callPackage (import ./generic.nix (rec { meta.description = "Xen's fork of iPXE"; }; } // optionalAttrs withLibHVM { - "xen-libhvm-dir-remote" = { + xen-libhvm-dir-remote = { src = fetchgit { name = "xen-libhvm"; url = https://github.com/michalpalka/xen-libhvm; diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index 64704f73e7b..af4721516ec 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -50,7 +50,7 @@ callPackage (import ./generic.nix (rec { # Sources needed to build tools and firmwares. xenfiles = optionalAttrs withInternalQemu { - "qemu-xen" = { + qemu-xen = { src = fetchgit { url = https://xenbits.xen.org/git-http/qemu-xen.git; rev = "refs/tags/qemu-xen-${version}"; @@ -86,7 +86,7 @@ callPackage (import ./generic.nix (rec { meta.description = "Xen's fork of upstream Qemu"; }; } // optionalAttrs withInternalTraditionalQemu { - "qemu-xen-traditional" = { + qemu-xen-traditional = { src = fetchgit { url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git; rev = "refs/tags/xen-${version}"; @@ -152,7 +152,7 @@ callPackage (import ./generic.nix (rec { meta.description = "Xen's fork of iPXE"; }; } // optionalAttrs withLibHVM { - "xen-libhvm-dir-remote" = { + xen-libhvm-dir-remote = { src = fetchgit { name = "xen-libhvm"; url = https://github.com/ts468/xen-libhvm; diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index 8ad8edde8cc..1608fabf4b2 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -64,7 +64,7 @@ callPackage (import ./generic.nix (rec { # Sources needed to build tools and firmwares. xenfiles = optionalAttrs withInternalQemu { - "qemu-xen" = { + qemu-xen = { src = fetchgit { url = https://xenbits.xen.org/git-http/qemu-xen.git; rev = "refs/tags/qemu-xen-${version}"; @@ -78,7 +78,7 @@ callPackage (import ./generic.nix (rec { meta.description = "Xen's fork of upstream Qemu"; }; } // optionalAttrs withInternalTraditionalQemu { - "qemu-xen-traditional" = { + qemu-xen-traditional = { src = fetchgit { url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git; rev = "refs/tags/xen-${version}"; @@ -123,7 +123,7 @@ callPackage (import ./generic.nix (rec { meta.description = "Xen's fork of iPXE"; }; } // optionalAttrs withLibHVM { - "xen-libhvm-dir-remote" = { + xen-libhvm-dir-remote = { src = fetchgit { name = "xen-libhvm"; url = https://github.com/michalpalka/xen-libhvm; diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/pkgs/applications/virtualization/xen/xsa-patches.nix index 727546b69fb..de692820d8f 100644 --- a/pkgs/applications/virtualization/xen/xsa-patches.nix +++ b/pkgs/applications/virtualization/xen/xsa-patches.nix @@ -5,7 +5,7 @@ let url = "https://xenbits.xen.org/xsa/xsa${name}.patch"; inherit sha256; }); -in rec { +in { # 4.5 XSA_190 = (xsaPatch { name = "190-4.5"; diff --git a/pkgs/applications/window-managers/bspwm/unstable.nix b/pkgs/applications/window-managers/bspwm/unstable.nix index 09c7c8e0e08..eeadfa248d7 100644 --- a/pkgs/applications/window-managers/bspwm/unstable.nix +++ b/pkgs/applications/window-managers/bspwm/unstable.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, libxcb, libXinerama, xcbutil, xcbutilkeysyms, xcbutilwm }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "bspwm-unstable-2016-09-30"; diff --git a/pkgs/applications/window-managers/clfswm/default.nix b/pkgs/applications/window-managers/clfswm/default.nix index cc00f1e4b6e..e2c39887a32 100644 --- a/pkgs/applications/window-managers/clfswm/default.nix +++ b/pkgs/applications/window-managers/clfswm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4 , makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "clfswm"; src = fetchgit { diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix index 0b611906a46..1354171dcfa 100644 --- a/pkgs/applications/window-managers/cwm/default.nix +++ b/pkgs/applications/window-managers/cwm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, yacc, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "cwm-5.6"; src = fetchFromGitHub { diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index eac15ca7141..1787e40eb96 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -8,7 +8,7 @@ let in rustPlatform.buildRustPackage rec { - name = "dwm-status-${version}"; + pname = "dwm-status"; version = "1.6.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/window-managers/dzen2/default.nix b/pkgs/applications/window-managers/dzen2/default.nix index 7bc76d5c2bf..96dcfb93800 100644 --- a/pkgs/applications/window-managers/dzen2/default.nix +++ b/pkgs/applications/window-managers/dzen2/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libX11, libXft, libXinerama, libXpm }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "dzen2-0.9.5"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix index 2246d77173a..ef03216d499 100644 --- a/pkgs/applications/window-managers/i3/blocks.nix +++ b/pkgs/applications/window-managers/i3/blocks.nix @@ -2,7 +2,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "i3blocks"; version = "unstable-2019-02-07"; diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix index 7df2847669f..db33b27ddd8 100644 --- a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix +++ b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, libXpm, libGL, fltk, hicolor-icon-theme, glib, gnome2, which }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "jwm-settings-manager"; version = "2018-10-19"; diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/applications/window-managers/kbdd/default.nix index 08b79927d21..bcfcbe3c5f5 100644 --- a/pkgs/applications/window-managers/kbdd/default.nix +++ b/pkgs/applications/window-managers/kbdd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, dbus-glib, autoreconfHook, xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "kbdd"; version = "unstable-2017-01-29"; diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix index ed34e75f35d..9d6e0f27f93 100644 --- a/pkgs/applications/window-managers/lemonbar/default.nix +++ b/pkgs/applications/window-managers/lemonbar/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perl, libxcb }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "lemonbar-1.3"; src = fetchurl { diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix index a1334112cf9..ff34f1dfee7 100644 --- a/pkgs/applications/window-managers/lemonbar/xft.nix +++ b/pkgs/applications/window-managers/lemonbar/xft.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, perl, libxcb, libXft }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "lemonbar-xft-unstable-2016-02-17"; src = fetchFromGitHub { diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix index 7233ff2410b..ba43403d9bb 100644 --- a/pkgs/applications/window-managers/spectrwm/default.nix +++ b/pkgs/applications/window-managers/spectrwm/default.nix @@ -12,7 +12,7 @@ , stdenv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "spectrwm"; version = "2.7.2"; diff --git a/pkgs/applications/window-managers/stumpish/default.nix b/pkgs/applications/window-managers/stumpish/default.nix index a6f2961ed3f..00f4b95b3f2 100644 --- a/pkgs/applications/window-managers/stumpish/default.nix +++ b/pkgs/applications/window-managers/stumpish/default.nix @@ -1,6 +1,6 @@ { stdenv, substituteAll, fetchFromGitHub, gnused, ncurses, xorg, rlwrap }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "stumpish"; version = "0.0.1"; diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 3ed7f4325f2..b39585092ed 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -10,7 +10,7 @@ let sha256 = "1ml6mjk2fsfv4sf65fdbji3q5x0qiq99g1k8w7a99gsl2i8h60gc"; }); versionSpec = { - "latest" = { + latest = { name = "1.0.0"; rev = "refs/tags/1.0.0"; sha256 = "16r0lwhxl8g71masmfbjr7s7m7fah4ii4smi1g8zpbpiqjz48ryb"; @@ -22,7 +22,7 @@ let sha256 = "0hmvbdk2yr5wrkiwn9dfzf65s4xc2qifj0sn6w2mghzp96cph79k"; patches = [ ./fix-module-path.patch ]; }; - "git" = { + git = { name = "git-20170203"; rev = "d20f24e58ab62afceae2afb6262ffef3cc318b97"; sha256 = "1gi29ds1x6dq7lz8lamnhcvcrr3cvvrg5yappfkggyhyvib1ii70"; @@ -30,7 +30,7 @@ let }; }.${version}; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "stumpwm-${versionSpec.name}"; src = fetchgit { diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix index 0943881da28..c391532376e 100644 --- a/pkgs/applications/window-managers/tabbed/default.nix +++ b/pkgs/applications/window-managers/tabbed/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "tabbed-20180310"; src = fetchgit { diff --git a/pkgs/applications/window-managers/way-cooler/crates-io.nix b/pkgs/applications/window-managers/way-cooler/crates-io.nix index 955dfe9b44a..01638c6332c 100644 --- a/pkgs/applications/window-managers/way-cooler/crates-io.nix +++ b/pkgs/applications/window-managers/way-cooler/crates-io.nix @@ -20,7 +20,7 @@ rec { (crates."memchr"."${deps."aho_corasick"."0.5.3"."memchr"}" deps) ]); }; - features_.aho_corasick."0.5.3" = deps: f: updateFeatures f (rec { + features_.aho_corasick."0.5.3" = deps: f: updateFeatures f ({ aho_corasick."0.5.3".default = (f.aho_corasick."0.5.3".default or true); memchr."${deps.aho_corasick."0.5.3".memchr}".default = true; }) [ @@ -39,7 +39,7 @@ rec { sha256 = "0an03kibhfcc0mcxf6a0mvbab0s7cggnvflw8jn0b15i351h828c"; features = mkFeatures (features."bitflags"."0.4.0" or {}); }; - features_.bitflags."0.4.0" = deps: f: updateFeatures f (rec { + features_.bitflags."0.4.0" = deps: f: updateFeatures f ({ bitflags."0.4.0".default = (f.bitflags."0.4.0".default or true); }) []; @@ -54,7 +54,7 @@ rec { authors = [ "The Rust Project Developers" ]; sha256 = "1znq4b770mdp3kdj9yz199ylc2pmf8l5j2f281jjrcfhg1mm22h6"; }; - features_.bitflags."0.6.0" = deps: f: updateFeatures f (rec { + features_.bitflags."0.6.0" = deps: f: updateFeatures f ({ bitflags."0.6.0".default = (f.bitflags."0.6.0".default or true); }) []; @@ -69,7 +69,7 @@ rec { authors = [ "The Rust Project Developers" ]; sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; }; - features_.bitflags."0.7.0" = deps: f: updateFeatures f (rec { + features_.bitflags."0.7.0" = deps: f: updateFeatures f ({ bitflags."0.7.0".default = (f.bitflags."0.7.0".default or true); }) []; @@ -107,7 +107,7 @@ rec { sha256 = "1g1wmz2001qmfrd37dnd5qiss5njrw26aywmg6yhkmkbyrhjxb08"; features = mkFeatures (features."bitflags"."1.0.4" or {}); }; - features_.bitflags."1.0.4" = deps: f: updateFeatures f (rec { + features_.bitflags."1.0.4" = deps: f: updateFeatures f ({ bitflags."1.0.4".default = (f.bitflags."1.0.4".default or true); }) []; @@ -122,7 +122,7 @@ rec { authors = [ "Guillaume Gomez <guillaume1.gomez@gmail.com>" ]; sha256 = "15gm72wx9kd0n51454i58rmpkmig8swghrj2440frxxi9kqg97xd"; }; - features_.c_vec."1.2.1" = deps: f: updateFeatures f (rec { + features_.c_vec."1.2.1" = deps: f: updateFeatures f ({ c_vec."1.2.1".default = (f.c_vec."1.2.1".default or true); }) []; @@ -284,7 +284,7 @@ rec { authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; sha256 = "11qrix06wagkplyk908i3423ps9m9np6c4vbcq81s9fyl244xv3n"; }; - features_.cfg_if."0.1.6" = deps: f: updateFeatures f (rec { + features_.cfg_if."0.1.6" = deps: f: updateFeatures f ({ cfg_if."0.1.6".default = (f.cfg_if."0.1.6".default or true); }) []; @@ -336,7 +336,7 @@ rec { (crates."pkg_config"."${deps."dbus"."0.4.1"."pkg_config"}" deps) ]); }; - features_.dbus."0.4.1" = deps: f: updateFeatures f (rec { + features_.dbus."0.4.1" = deps: f: updateFeatures f ({ dbus."0.4.1".default = (f.dbus."0.4.1".default or true); libc."${deps.dbus."0.4.1".libc}".default = true; pkg_config."${deps.dbus."0.4.1".pkg_config}".default = true; @@ -359,7 +359,7 @@ rec { (crates."dbus"."${deps."dbus_macros"."0.0.6"."dbus"}" deps) ]); }; - features_.dbus_macros."0.0.6" = deps: f: updateFeatures f (rec { + features_.dbus_macros."0.0.6" = deps: f: updateFeatures f ({ dbus."${deps.dbus_macros."0.0.6".dbus}".default = true; dbus_macros."0.0.6".default = (f.dbus_macros."0.0.6".default or true); }) [ @@ -381,7 +381,7 @@ rec { ]); features = mkFeatures (features."dlib"."0.3.1" or {}); }; - features_.dlib."0.3.1" = deps: f: updateFeatures f (rec { + features_.dlib."0.3.1" = deps: f: updateFeatures f ({ dlib."0.3.1".default = (f.dlib."0.3.1".default or true); libloading."${deps.dlib."0.3.1".libloading}".default = true; }) [ @@ -403,7 +403,7 @@ rec { ]); features = mkFeatures (features."dlib"."0.4.1" or {}); }; - features_.dlib."0.4.1" = deps: f: updateFeatures f (rec { + features_.dlib."0.4.1" = deps: f: updateFeatures f ({ dlib."0.4.1".default = (f.dlib."0.4.1".default or true); libloading."${deps.dlib."0.4.1".libloading}".default = true; }) [ @@ -421,7 +421,7 @@ rec { authors = [ "David Tolnay <dtolnay@gmail.com>" ]; sha256 = "1xysdxdm24sk5ysim7lps4r2qaxfnj0sbakhmps4d42yssx30cw8"; }; - features_.dtoa."0.4.3" = deps: f: updateFeatures f (rec { + features_.dtoa."0.4.3" = deps: f: updateFeatures f ({ dtoa."0.4.3".default = (f.dtoa."0.4.3".default or true); }) []; @@ -441,7 +441,7 @@ rec { (crates."wayland_sys"."${deps."dummy_rustwlc"."0.7.1"."wayland_sys"}" deps) ]); }; - features_.dummy_rustwlc."0.7.1" = deps: f: updateFeatures f (rec { + features_.dummy_rustwlc."0.7.1" = deps: f: updateFeatures f ({ bitflags."${deps.dummy_rustwlc."0.7.1".bitflags}".default = true; dummy_rustwlc."0.7.1".default = (f.dummy_rustwlc."0.7.1".default or true); libc."${deps.dummy_rustwlc."0.7.1".libc}".default = true; @@ -498,7 +498,7 @@ rec { authors = [ "bluss" ]; sha256 = "1bkb5aq7h9p4rzlgxagnda1f0dd11q0qz41bmdy11z18q1p8igy1"; }; - features_.fixedbitset."0.1.9" = deps: f: updateFeatures f (rec { + features_.fixedbitset."0.1.9" = deps: f: updateFeatures f ({ fixedbitset."0.1.9".default = (f.fixedbitset."0.1.9".default or true); }) []; @@ -517,7 +517,7 @@ rec { (crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps) ]); }; - features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f (rec { + features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f ({ bitflags."${deps.fuchsia_zircon."0.3.3".bitflags}".default = true; fuchsia_zircon."0.3.3".default = (f.fuchsia_zircon."0.3.3".default or true); fuchsia_zircon_sys."${deps.fuchsia_zircon."0.3.3".fuchsia_zircon_sys}".default = true; @@ -537,7 +537,7 @@ rec { authors = [ "Raph Levien <raph@google.com>" ]; sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; }; - features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f (rec { + features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f ({ fuchsia_zircon_sys."0.3.3".default = (f.fuchsia_zircon_sys."0.3.3".default or true); }) []; @@ -712,7 +712,7 @@ rec { (crates."unicode_width"."${deps."getopts"."0.2.18"."unicode_width"}" deps) ]); }; - features_.getopts."0.2.18" = deps: f: updateFeatures f (rec { + features_.getopts."0.2.18" = deps: f: updateFeatures f ({ getopts."0.2.18".default = (f.getopts."0.2.18".default or true); unicode_width."${deps.getopts."0.2.18".unicode_width}".default = true; }) [ @@ -1033,7 +1033,7 @@ rec { sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9"; features = mkFeatures (features."itoa"."0.3.4" or {}); }; - features_.itoa."0.3.4" = deps: f: updateFeatures f (rec { + features_.itoa."0.3.4" = deps: f: updateFeatures f ({ itoa."0.3.4".default = (f.itoa."0.3.4".default or true); }) []; @@ -1051,7 +1051,7 @@ rec { (crates."rustc_serialize"."${deps."json_macro"."0.1.1"."rustc_serialize"}" deps) ]); }; - features_.json_macro."0.1.1" = deps: f: updateFeatures f (rec { + features_.json_macro."0.1.1" = deps: f: updateFeatures f ({ json_macro."0.1.1".default = (f.json_macro."0.1.1".default or true); rustc_serialize."${deps.json_macro."0.1.1".rustc_serialize}".default = true; }) [ @@ -1078,7 +1078,7 @@ rec { (crates."winapi_build"."${deps."kernel32_sys"."0.2.2"."winapi_build"}" deps) ]); }; - features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f (rec { + features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f ({ kernel32_sys."0.2.2".default = (f.kernel32_sys."0.2.2".default or true); winapi."${deps.kernel32_sys."0.2.2".winapi}".default = true; winapi_build."${deps.kernel32_sys."0.2.2".winapi_build}".default = true; @@ -1199,7 +1199,7 @@ rec { (crates."target_build_utils"."${deps."libloading"."0.3.4"."target_build_utils"}" deps) ]); }; - features_.libloading."0.3.4" = deps: f: updateFeatures f (rec { + features_.libloading."0.3.4" = deps: f: updateFeatures f ({ kernel32_sys."${deps.libloading."0.3.4".kernel32_sys}".default = true; lazy_static."${deps.libloading."0.3.4".lazy_static}".default = true; libloading."0.3.4".default = (f.libloading."0.3.4".default or true); @@ -1231,7 +1231,7 @@ rec { (crates."cc"."${deps."libloading"."0.5.0"."cc"}" deps) ]); }; - features_.libloading."0.5.0" = deps: f: updateFeatures f (rec { + features_.libloading."0.5.0" = deps: f: updateFeatures f ({ cc."${deps.libloading."0.5.0".cc}".default = true; libloading."0.5.0".default = (f.libloading."0.5.0".default or true); winapi = fold recursiveUpdate {} [ @@ -1340,7 +1340,7 @@ rec { ]); features = mkFeatures (features."log"."0.4.6" or {}); }; - features_.log."0.4.6" = deps: f: updateFeatures f (rec { + features_.log."0.4.6" = deps: f: updateFeatures f ({ cfg_if."${deps.log."0.4.6".cfg_if}".default = true; log."0.4.6".default = (f.log."0.4.6".default or true); }) [ @@ -1361,7 +1361,7 @@ rec { (crates."libc"."${deps."memchr"."0.1.11"."libc"}" deps) ]); }; - features_.memchr."0.1.11" = deps: f: updateFeatures f (rec { + features_.memchr."0.1.11" = deps: f: updateFeatures f ({ libc."${deps.memchr."0.1.11".libc}".default = true; memchr."0.1.11".default = (f.memchr."0.1.11".default or true); }) [ @@ -1392,7 +1392,7 @@ rec { ]); features = mkFeatures (features."nix"."0.6.0" or {}); }; - features_.nix."0.6.0" = deps: f: updateFeatures f (rec { + features_.nix."0.6.0" = deps: f: updateFeatures f ({ bitflags."${deps.nix."0.6.0".bitflags}".default = true; cfg_if."${deps.nix."0.6.0".cfg_if}".default = true; libc."${deps.nix."0.6.0".libc}".default = true; @@ -1426,7 +1426,7 @@ rec { (crates."void"."${deps."nix"."0.9.0"."void"}" deps) ]); }; - features_.nix."0.9.0" = deps: f: updateFeatures f (rec { + features_.nix."0.9.0" = deps: f: updateFeatures f ({ bitflags."${deps.nix."0.9.0".bitflags}".default = true; cfg_if."${deps.nix."0.9.0".cfg_if}".default = true; libc."${deps.nix."0.9.0".libc}".default = true; @@ -1453,7 +1453,7 @@ rec { (crates."num_traits"."${deps."num_traits"."0.1.43"."num_traits"}" deps) ]); }; - features_.num_traits."0.1.43" = deps: f: updateFeatures f (rec { + features_.num_traits."0.1.43" = deps: f: updateFeatures f ({ num_traits = fold recursiveUpdate {} [ { "${deps.num_traits."0.1.43".num_traits}".default = true; } { "0.1.43".default = (f.num_traits."0.1.43".default or true); } @@ -1620,7 +1620,7 @@ rec { (crates."phf_shared"."${deps."phf_codegen"."0.7.23"."phf_shared"}" deps) ]); }; - features_.phf_codegen."0.7.23" = deps: f: updateFeatures f (rec { + features_.phf_codegen."0.7.23" = deps: f: updateFeatures f ({ phf_codegen."0.7.23".default = (f.phf_codegen."0.7.23".default or true); phf_generator."${deps.phf_codegen."0.7.23".phf_generator}".default = true; phf_shared."${deps.phf_codegen."0.7.23".phf_shared}".default = true; @@ -1644,7 +1644,7 @@ rec { (crates."rand"."${deps."phf_generator"."0.7.23"."rand"}" deps) ]); }; - features_.phf_generator."0.7.23" = deps: f: updateFeatures f (rec { + features_.phf_generator."0.7.23" = deps: f: updateFeatures f ({ phf_generator."0.7.23".default = (f.phf_generator."0.7.23".default or true); phf_shared."${deps.phf_generator."0.7.23".phf_shared}".default = true; rand."${deps.phf_generator."0.7.23".rand}".default = true; @@ -1669,7 +1669,7 @@ rec { ]); features = mkFeatures (features."phf_shared"."0.7.23" or {}); }; - features_.phf_shared."0.7.23" = deps: f: updateFeatures f (rec { + features_.phf_shared."0.7.23" = deps: f: updateFeatures f ({ phf_shared."0.7.23".default = (f.phf_shared."0.7.23".default or true); siphasher."${deps.phf_shared."0.7.23".siphasher}".default = true; }) [ @@ -1687,7 +1687,7 @@ rec { authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; sha256 = "0207fsarrm412j0dh87lfcas72n8mxar7q3mgflsbsrqnb140sv6"; }; - features_.pkg_config."0.3.14" = deps: f: updateFeatures f (rec { + features_.pkg_config."0.3.14" = deps: f: updateFeatures f ({ pkg_config."0.3.14".default = (f.pkg_config."0.3.14".default or true); }) []; @@ -2004,7 +2004,7 @@ rec { authors = [ "The Rust Project Developers" ]; sha256 = "1mzhphkbwppwd1zam2jkgjk550cqgf6506i87bw2yzrvcsraiw7m"; }; - features_.regex_syntax."0.3.9" = deps: f: updateFeatures f (rec { + features_.regex_syntax."0.3.9" = deps: f: updateFeatures f ({ regex_syntax."0.3.9".default = (f.regex_syntax."0.3.9".default or true); }) []; @@ -2057,7 +2057,7 @@ rec { authors = [ "The Rust Project Developers" ]; sha256 = "0rfk6p66mqkd3g36l0ddlv2rvnp1mp3lrq5frq9zz5cbnz5pmmxn"; }; - features_.rustc_serialize."0.3.24" = deps: f: updateFeatures f (rec { + features_.rustc_serialize."0.3.24" = deps: f: updateFeatures f ({ rustc_serialize."0.3.24".default = (f.rustc_serialize."0.3.24".default or true); }) []; @@ -2075,7 +2075,7 @@ rec { (crates."semver"."${deps."rustc_version"."0.1.7"."semver"}" deps) ]); }; - features_.rustc_version."0.1.7" = deps: f: updateFeatures f (rec { + features_.rustc_version."0.1.7" = deps: f: updateFeatures f ({ rustc_version."0.1.7".default = (f.rustc_version."0.1.7".default or true); semver."${deps.rustc_version."0.1.7".semver}".default = true; }) [ @@ -2131,7 +2131,7 @@ rec { authors = [ "The Rust Project Developers" ]; sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n"; }; - features_.semver."0.1.20" = deps: f: updateFeatures f (rec { + features_.semver."0.1.20" = deps: f: updateFeatures f ({ semver."0.1.20".default = (f.semver."0.1.20".default or true); }) []; @@ -2225,7 +2225,7 @@ rec { authors = [ "Frank Denis <github@pureftpd.org>" ]; sha256 = "1ganj1grxqnkvv4ds3vby039bm999jrr58nfq2x3kjhzkw2bnqkw"; }; - features_.siphasher."0.2.3" = deps: f: updateFeatures f (rec { + features_.siphasher."0.2.3" = deps: f: updateFeatures f ({ siphasher."0.2.3".default = (f.siphasher."0.2.3".default or true); }) []; @@ -2282,7 +2282,7 @@ rec { (crates."libc"."${deps."thread_id"."2.0.0"."libc"}" deps) ]); }; - features_.thread_id."2.0.0" = deps: f: updateFeatures f (rec { + features_.thread_id."2.0.0" = deps: f: updateFeatures f ({ kernel32_sys."${deps.thread_id."2.0.0".kernel32_sys}".default = true; libc."${deps.thread_id."2.0.0".libc}".default = true; thread_id."2.0.0".default = (f.thread_id."2.0.0".default or true); @@ -2305,7 +2305,7 @@ rec { (crates."thread_id"."${deps."thread_local"."0.2.7"."thread_id"}" deps) ]); }; - features_.thread_local."0.2.7" = deps: f: updateFeatures f (rec { + features_.thread_local."0.2.7" = deps: f: updateFeatures f ({ thread_id."${deps.thread_local."0.2.7".thread_id}".default = true; thread_local."0.2.7".default = (f.thread_local."0.2.7".default or true); }) [ @@ -2323,7 +2323,7 @@ rec { authors = [ "Victor Berger <victor.berger@m4x.org>" ]; sha256 = "1v7acraqyh6iibg87pwkxm41v783sminxm5k9f4ndra7r0vq4zvq"; }; - features_.token_store."0.1.2" = deps: f: updateFeatures f (rec { + features_.token_store."0.1.2" = deps: f: updateFeatures f ({ token_store."0.1.2".default = (f.token_store."0.1.2".default or true); }) []; @@ -2339,7 +2339,7 @@ rec { sha256 = "0886lc2aymwgy0lhavwn6s48ik3c61ykzzd3za6prgnw51j7bi4w"; features = mkFeatures (features."unicode_width"."0.1.5" or {}); }; - features_.unicode_width."0.1.5" = deps: f: updateFeatures f (rec { + features_.unicode_width."0.1.5" = deps: f: updateFeatures f ({ unicode_width."0.1.5".default = (f.unicode_width."0.1.5".default or true); }) []; @@ -2354,7 +2354,7 @@ rec { authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; sha256 = "1cj548a91a93j8375p78qikaiam548xh84cb0ck8y119adbmsvbp"; }; - features_.utf8_ranges."0.1.3" = deps: f: updateFeatures f (rec { + features_.utf8_ranges."0.1.3" = deps: f: updateFeatures f ({ utf8_ranges."0.1.3".default = (f.utf8_ranges."0.1.3".default or true); }) []; @@ -2542,7 +2542,7 @@ rec { (crates."xml_rs"."${deps."wayland_scanner"."0.12.5"."xml_rs"}" deps) ]); }; - features_.wayland_scanner."0.12.5" = deps: f: updateFeatures f (rec { + features_.wayland_scanner."0.12.5" = deps: f: updateFeatures f ({ wayland_scanner."0.12.5".default = (f.wayland_scanner."0.12.5".default or true); xml_rs."${deps.wayland_scanner."0.12.5".xml_rs}".default = true; }) [ @@ -2737,7 +2737,7 @@ rec { authors = [ "Peter Atashian <retep998@gmail.com>" ]; sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; }; - features_.winapi."0.2.8" = deps: f: updateFeatures f (rec { + features_.winapi."0.2.8" = deps: f: updateFeatures f ({ winapi."0.2.8".default = (f.winapi."0.2.8".default or true); }) []; @@ -2760,7 +2760,7 @@ rec { ]) else []); features = mkFeatures (features."winapi"."0.3.6" or {}); }; - features_.winapi."0.3.6" = deps: f: updateFeatures f (rec { + features_.winapi."0.3.6" = deps: f: updateFeatures f ({ winapi."0.3.6".default = (f.winapi."0.3.6".default or true); winapi_i686_pc_windows_gnu."${deps.winapi."0.3.6".winapi_i686_pc_windows_gnu}".default = true; winapi_x86_64_pc_windows_gnu."${deps.winapi."0.3.6".winapi_x86_64_pc_windows_gnu}".default = true; @@ -2781,7 +2781,7 @@ rec { sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; libName = "build"; }; - features_.winapi_build."0.1.1" = deps: f: updateFeatures f (rec { + features_.winapi_build."0.1.1" = deps: f: updateFeatures f ({ winapi_build."0.1.1".default = (f.winapi_build."0.1.1".default or true); }) []; @@ -2797,7 +2797,7 @@ rec { sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp"; build = "build.rs"; }; - features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec { + features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({ winapi_i686_pc_windows_gnu."0.4.0".default = (f.winapi_i686_pc_windows_gnu."0.4.0".default or true); }) []; @@ -2813,7 +2813,7 @@ rec { sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj"; build = "build.rs"; }; - features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec { + features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({ winapi_x86_64_pc_windows_gnu."0.4.0".default = (f.winapi_x86_64_pc_windows_gnu."0.4.0".default or true); }) []; @@ -2992,7 +2992,7 @@ rec { (crates."bitflags"."${deps."xml_rs"."0.7.0"."bitflags"}" deps) ]); }; - features_.xml_rs."0.7.0" = deps: f: updateFeatures f (rec { + features_.xml_rs."0.7.0" = deps: f: updateFeatures f ({ bitflags."${deps.xml_rs."0.7.0".bitflags}".default = true; xml_rs."0.7.0".default = (f.xml_rs."0.7.0".default or true); }) [ diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/pkgs/applications/window-managers/way-cooler/default.nix index 9ebb0b5ffcf..7bc6ac70020 100644 --- a/pkgs/applications/window-managers/way-cooler/default.nix +++ b/pkgs/applications/window-managers/way-cooler/default.nix @@ -16,23 +16,23 @@ let # https://nest.pijul.com/pmeunier/carnix/discussions/22 version = "0.8.1"; deps = (callPackage ./way-cooler.nix {}).deps; - way_cooler_ = f: cratesIO.crates.way_cooler."${version}" deps { - features = cratesIO.features_.way_cooler."${version}" deps { - "way_cooler"."${version}" = f; + way_cooler_ = f: cratesIO.crates.way_cooler.${version} deps { + features = cratesIO.features_.way_cooler.${version} deps { + way_cooler.${version} = f; }; }; way-cooler = ((way_cooler_ { builtin-lua = true; }).override { crateOverrides = defaultCrateOverrides // { way-cooler = attrs: { buildInputs = [ wlc cairo libxkbcommon fakegit gdk-pixbuf wayland ]; }; - };}).overrideAttrs (oldAttrs: rec { + };}).overrideAttrs (oldAttrs: { postBuild = '' mkdir -p $out/etc cp -r config $out/etc/way-cooler ''; }); - wc-bg = ((callPackage ./wc-bg.nix {}).wc_bg {}).overrideAttrs (oldAttrs: rec { + wc-bg = ((callPackage ./wc-bg.nix {}).wc_bg {}).overrideAttrs (oldAttrs: { nativeBuildInputs = [ makeWrapper ]; postFixup = '' @@ -47,7 +47,7 @@ let crateOverrides = defaultCrateOverrides // { wc-lock = attrs: { buildInputs = [ pam ]; }; - };}).overrideAttrs (oldAttrs: rec { + };}).overrideAttrs (oldAttrs: { nativeBuildInputs = [ makeWrapper ]; postFixup = '' @@ -87,7 +87,7 @@ let sleep 5 ${wc-bar-bare}/bin/bar.py $SELECTED $BACKGROUND $SELECTED_OTHER_WORKSPACE 2> /tmp/bar_debug.txt | ${lemonbar}/bin/lemonbar -B $BACKGROUND -F "#FFF" -n "lemonbar" -p -d ''; -in symlinkJoin rec { +in symlinkJoin { inherit version; name = "way-cooler-with-extensions-${version}"; paths = [ way-cooler wc-bg wc-grab wc-lock wc-bar ]; diff --git a/pkgs/applications/window-managers/way-cooler/wc-bg.nix b/pkgs/applications/window-managers/way-cooler/wc-bg.nix index 4d527715c5f..a797e7aacde 100644 --- a/pkgs/applications/window-managers/way-cooler/wc-bg.nix +++ b/pkgs/applications/window-managers/way-cooler/wc-bg.nix @@ -508,7 +508,7 @@ rec { inherit dependencies buildDependencies features; }; ansi_term_0_9_0 = { features?(ansi_term_0_9_0_features {}) }: ansi_term_0_9_0_ {}; - ansi_term_0_9_0_features = f: updateFeatures f (rec { + ansi_term_0_9_0_features = f: updateFeatures f ({ ansi_term_0_9_0.default = (f.ansi_term_0_9_0.default or true); }) []; atty_0_2_3 = { features?(atty_0_2_3_features {}) }: atty_0_2_3_ { @@ -516,7 +516,7 @@ rec { ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_32 ]) else []) ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); }; - atty_0_2_3_features = f: updateFeatures f (rec { + atty_0_2_3_features = f: updateFeatures f ({ atty_0_2_3.default = (f.atty_0_2_3.default or true); kernel32_sys_0_2_2.default = true; libc_0_2_32.default = (f.libc_0_2_32.default or false); @@ -524,7 +524,7 @@ rec { winapi_0_2_8.default = true; }) [ termion_1_5_1_features libc_0_2_32_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {}; - bitflags_0_7_0_features = f: updateFeatures f (rec { + bitflags_0_7_0_features = f: updateFeatures f ({ bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true); }) []; bitflags_0_9_1 = { features?(bitflags_0_9_1_features {}) }: bitflags_0_9_1_ { @@ -631,25 +631,25 @@ rec { dependencies = mapFeatures features ([ either_1_2_0 scopeguard_0_3_2 ]); features = mkFeatures (features.coco_0_1_1 or {}); }; - coco_0_1_1_features = f: updateFeatures f (rec { + coco_0_1_1_features = f: updateFeatures f ({ coco_0_1_1.default = (f.coco_0_1_1.default or true); either_1_2_0.default = true; scopeguard_0_3_2.default = true; }) [ either_1_2_0_features scopeguard_0_3_2_features ]; color_quant_1_0_0 = { features?(color_quant_1_0_0_features {}) }: color_quant_1_0_0_ {}; - color_quant_1_0_0_features = f: updateFeatures f (rec { + color_quant_1_0_0_features = f: updateFeatures f ({ color_quant_1_0_0.default = (f.color_quant_1_0_0.default or true); }) []; dlib_0_3_1 = { features?(dlib_0_3_1_features {}) }: dlib_0_3_1_ { dependencies = mapFeatures features ([ libloading_0_3_4 ]); features = mkFeatures (features.dlib_0_3_1 or {}); }; - dlib_0_3_1_features = f: updateFeatures f (rec { + dlib_0_3_1_features = f: updateFeatures f ({ dlib_0_3_1.default = (f.dlib_0_3_1.default or true); libloading_0_3_4.default = true; }) [ libloading_0_3_4_features ]; dtoa_0_4_2 = { features?(dtoa_0_4_2_features {}) }: dtoa_0_4_2_ {}; - dtoa_0_4_2_features = f: updateFeatures f (rec { + dtoa_0_4_2_features = f: updateFeatures f ({ dtoa_0_4_2.default = (f.dtoa_0_4_2.default or true); }) []; either_1_2_0 = { features?(either_1_2_0_features {}) }: either_1_2_0_ { @@ -665,7 +665,7 @@ rec { enum_primitive_0_1_1 = { features?(enum_primitive_0_1_1_features {}) }: enum_primitive_0_1_1_ { dependencies = mapFeatures features ([ num_traits_0_1_40 ]); }; - enum_primitive_0_1_1_features = f: updateFeatures f (rec { + enum_primitive_0_1_1_features = f: updateFeatures f ({ enum_primitive_0_1_1.default = (f.enum_primitive_0_1_1.default or true); num_traits_0_1_40.default = (f.num_traits_0_1_40.default or false); }) [ num_traits_0_1_40_features ]; @@ -698,14 +698,14 @@ rec { fuchsia_zircon_0_2_1 = { features?(fuchsia_zircon_0_2_1_features {}) }: fuchsia_zircon_0_2_1_ { dependencies = mapFeatures features ([ fuchsia_zircon_sys_0_2_0 ]); }; - fuchsia_zircon_0_2_1_features = f: updateFeatures f (rec { + fuchsia_zircon_0_2_1_features = f: updateFeatures f ({ fuchsia_zircon_0_2_1.default = (f.fuchsia_zircon_0_2_1.default or true); fuchsia_zircon_sys_0_2_0.default = true; }) [ fuchsia_zircon_sys_0_2_0_features ]; fuchsia_zircon_sys_0_2_0 = { features?(fuchsia_zircon_sys_0_2_0_features {}) }: fuchsia_zircon_sys_0_2_0_ { dependencies = mapFeatures features ([ bitflags_0_7_0 ]); }; - fuchsia_zircon_sys_0_2_0_features = f: updateFeatures f (rec { + fuchsia_zircon_sys_0_2_0_features = f: updateFeatures f ({ bitflags_0_7_0.default = true; fuchsia_zircon_sys_0_2_0.default = (f.fuchsia_zircon_sys_0_2_0.default or true); }) [ bitflags_0_7_0_features ]; @@ -741,7 +741,7 @@ rec { lzw_0_10_0.default = true; }) [ color_quant_1_0_0_features lzw_0_10_0_features ]; glob_0_2_11 = { features?(glob_0_2_11_features {}) }: glob_0_2_11_ {}; - glob_0_2_11_features = f: updateFeatures f (rec { + glob_0_2_11_features = f: updateFeatures f ({ glob_0_2_11.default = (f.glob_0_2_11.default or true); }) []; image_0_10_4 = { features?(image_0_10_4_features {}) }: image_0_10_4_ { @@ -828,13 +828,13 @@ rec { inflate_0_1_1 = { features?(inflate_0_1_1_features {}) }: inflate_0_1_1_ { features = mkFeatures (features.inflate_0_1_1 or {}); }; - inflate_0_1_1_features = f: updateFeatures f (rec { + inflate_0_1_1_features = f: updateFeatures f ({ inflate_0_1_1.default = (f.inflate_0_1_1.default or true); }) []; itoa_0_3_4 = { features?(itoa_0_3_4_features {}) }: itoa_0_3_4_ { features = mkFeatures (features.itoa_0_3_4 or {}); }; - itoa_0_3_4_features = f: updateFeatures f (rec { + itoa_0_3_4_features = f: updateFeatures f ({ itoa_0_3_4.default = (f.itoa_0_3_4.default or true); }) []; jpeg_decoder_0_1_13 = { features?(jpeg_decoder_0_1_13_features {}) }: jpeg_decoder_0_1_13_ { @@ -855,7 +855,7 @@ rec { dependencies = mapFeatures features ([ winapi_0_2_8 ]); buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); }; - kernel32_sys_0_2_2_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2_features = f: updateFeatures f ({ kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); winapi_0_2_8.default = true; winapi_build_0_1_1.default = true; @@ -890,7 +890,7 @@ rec { ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); buildDependencies = mapFeatures features ([ target_build_utils_0_3_1 ]); }; - libloading_0_3_4_features = f: updateFeatures f (rec { + libloading_0_3_4_features = f: updateFeatures f ({ kernel32_sys_0_2_2.default = true; lazy_static_0_2_9.default = true; libloading_0_3_4.default = (f.libloading_0_3_4.default or true); @@ -911,7 +911,7 @@ rec { dependencies = mapFeatures features ([ libc_0_2_32 ]); buildDependencies = mapFeatures features ([ cc_1_0_0 ]); }; - miniz_sys_0_1_10_features = f: updateFeatures f (rec { + miniz_sys_0_1_10_features = f: updateFeatures f ({ cc_1_0_0.default = true; libc_0_2_32.default = true; miniz_sys_0_1_10.default = (f.miniz_sys_0_1_10.default or true); @@ -940,14 +940,14 @@ rec { num_integer_0_1_35 = { features?(num_integer_0_1_35_features {}) }: num_integer_0_1_35_ { dependencies = mapFeatures features ([ num_traits_0_1_40 ]); }; - num_integer_0_1_35_features = f: updateFeatures f (rec { + num_integer_0_1_35_features = f: updateFeatures f ({ num_integer_0_1_35.default = (f.num_integer_0_1_35.default or true); num_traits_0_1_40.default = true; }) [ num_traits_0_1_40_features ]; num_iter_0_1_34 = { features?(num_iter_0_1_34_features {}) }: num_iter_0_1_34_ { dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_40 ]); }; - num_iter_0_1_34_features = f: updateFeatures f (rec { + num_iter_0_1_34_features = f: updateFeatures f ({ num_integer_0_1_35.default = true; num_iter_0_1_34.default = (f.num_iter_0_1_34.default or true); num_traits_0_1_40.default = true; @@ -978,13 +978,13 @@ rec { rustc_serialize_0_3_24.default = true; }) [ num_bigint_0_1_40_features num_integer_0_1_35_features num_traits_0_1_40_features rustc_serialize_0_3_24_features ]; num_traits_0_1_40 = { features?(num_traits_0_1_40_features {}) }: num_traits_0_1_40_ {}; - num_traits_0_1_40_features = f: updateFeatures f (rec { + num_traits_0_1_40_features = f: updateFeatures f ({ num_traits_0_1_40.default = (f.num_traits_0_1_40.default or true); }) []; num_cpus_1_7_0 = { features?(num_cpus_1_7_0_features {}) }: num_cpus_1_7_0_ { dependencies = mapFeatures features ([ libc_0_2_32 ]); }; - num_cpus_1_7_0_features = f: updateFeatures f (rec { + num_cpus_1_7_0_features = f: updateFeatures f ({ libc_0_2_32.default = true; num_cpus_1_7_0.default = (f.num_cpus_1_7_0.default or true); }) [ libc_0_2_32_features ]; @@ -1007,7 +1007,7 @@ rec { phf_codegen_0_7_21 = { features?(phf_codegen_0_7_21_features {}) }: phf_codegen_0_7_21_ { dependencies = mapFeatures features ([ phf_generator_0_7_21 phf_shared_0_7_21 ]); }; - phf_codegen_0_7_21_features = f: updateFeatures f (rec { + phf_codegen_0_7_21_features = f: updateFeatures f ({ phf_codegen_0_7_21.default = (f.phf_codegen_0_7_21.default or true); phf_generator_0_7_21.default = true; phf_shared_0_7_21.default = true; @@ -1015,7 +1015,7 @@ rec { phf_generator_0_7_21 = { features?(phf_generator_0_7_21_features {}) }: phf_generator_0_7_21_ { dependencies = mapFeatures features ([ phf_shared_0_7_21 rand_0_3_17 ]); }; - phf_generator_0_7_21_features = f: updateFeatures f (rec { + phf_generator_0_7_21_features = f: updateFeatures f ({ phf_generator_0_7_21.default = (f.phf_generator_0_7_21.default or true); phf_shared_0_7_21.default = true; rand_0_3_17.default = true; @@ -1024,7 +1024,7 @@ rec { dependencies = mapFeatures features ([ siphasher_0_2_2 ]); features = mkFeatures (features.phf_shared_0_7_21 or {}); }; - phf_shared_0_7_21_features = f: updateFeatures f (rec { + phf_shared_0_7_21_features = f: updateFeatures f ({ phf_shared_0_7_21.default = (f.phf_shared_0_7_21.default or true); siphasher_0_2_2.default = true; }) [ siphasher_0_2_2_features ]; @@ -1065,14 +1065,14 @@ rec { rayon_0_8_2 = { features?(rayon_0_8_2_features {}) }: rayon_0_8_2_ { dependencies = mapFeatures features ([ rayon_core_1_2_1 ]); }; - rayon_0_8_2_features = f: updateFeatures f (rec { + rayon_0_8_2_features = f: updateFeatures f ({ rayon_0_8_2.default = (f.rayon_0_8_2.default or true); rayon_core_1_2_1.default = true; }) [ rayon_core_1_2_1_features ]; rayon_core_1_2_1 = { features?(rayon_core_1_2_1_features {}) }: rayon_core_1_2_1_ { dependencies = mapFeatures features ([ coco_0_1_1 futures_0_1_16 lazy_static_0_2_9 libc_0_2_32 num_cpus_1_7_0 rand_0_3_17 ]); }; - rayon_core_1_2_1_features = f: updateFeatures f (rec { + rayon_core_1_2_1_features = f: updateFeatures f ({ coco_0_1_1.default = true; futures_0_1_16.default = true; lazy_static_0_2_9.default = true; @@ -1082,24 +1082,24 @@ rec { rayon_core_1_2_1.default = (f.rayon_core_1_2_1.default or true); }) [ coco_0_1_1_features futures_0_1_16_features lazy_static_0_2_9_features libc_0_2_32_features num_cpus_1_7_0_features rand_0_3_17_features ]; redox_syscall_0_1_31 = { features?(redox_syscall_0_1_31_features {}) }: redox_syscall_0_1_31_ {}; - redox_syscall_0_1_31_features = f: updateFeatures f (rec { + redox_syscall_0_1_31_features = f: updateFeatures f ({ redox_syscall_0_1_31.default = (f.redox_syscall_0_1_31.default or true); }) []; redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ { dependencies = mapFeatures features ([ redox_syscall_0_1_31 ]); }; - redox_termios_0_1_1_features = f: updateFeatures f (rec { + redox_termios_0_1_1_features = f: updateFeatures f ({ redox_syscall_0_1_31.default = true; redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true); }) [ redox_syscall_0_1_31_features ]; rustc_serialize_0_3_24 = { features?(rustc_serialize_0_3_24_features {}) }: rustc_serialize_0_3_24_ {}; - rustc_serialize_0_3_24_features = f: updateFeatures f (rec { + rustc_serialize_0_3_24_features = f: updateFeatures f ({ rustc_serialize_0_3_24.default = (f.rustc_serialize_0_3_24.default or true); }) []; scoped_threadpool_0_1_8 = { features?(scoped_threadpool_0_1_8_features {}) }: scoped_threadpool_0_1_8_ { features = mkFeatures (features.scoped_threadpool_0_1_8 or {}); }; - scoped_threadpool_0_1_8_features = f: updateFeatures f (rec { + scoped_threadpool_0_1_8_features = f: updateFeatures f ({ scoped_threadpool_0_1_8.default = (f.scoped_threadpool_0_1_8.default or true); }) []; scopeguard_0_3_2 = { features?(scopeguard_0_3_2_features {}) }: scopeguard_0_3_2_ { @@ -1159,11 +1159,11 @@ rec { siphasher_0_2_2 = { features?(siphasher_0_2_2_features {}) }: siphasher_0_2_2_ { dependencies = mapFeatures features ([]); }; - siphasher_0_2_2_features = f: updateFeatures f (rec { + siphasher_0_2_2_features = f: updateFeatures f ({ siphasher_0_2_2.default = (f.siphasher_0_2_2.default or true); }) []; strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {}; - strsim_0_6_0_features = f: updateFeatures f (rec { + strsim_0_6_0_features = f: updateFeatures f ({ strsim_0_6_0.default = (f.strsim_0_6_0.default or true); }) []; target_build_utils_0_3_1 = { features?(target_build_utils_0_3_1_features {}) }: target_build_utils_0_3_1_ { @@ -1188,7 +1188,7 @@ rec { ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_32 ]) else []) ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); }; - tempfile_2_2_0_features = f: updateFeatures f (rec { + tempfile_2_2_0_features = f: updateFeatures f ({ kernel32_sys_0_2_2.default = true; libc_0_2_32.default = true; rand_0_3_17.default = true; @@ -1226,7 +1226,7 @@ rec { dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_32 ]) else []) ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_31 redox_termios_0_1_1 ]) else []); }; - termion_1_5_1_features = f: updateFeatures f (rec { + termion_1_5_1_features = f: updateFeatures f ({ libc_0_2_32.default = true; redox_syscall_0_1_31.default = true; redox_termios_0_1_1.default = true; @@ -1235,7 +1235,7 @@ rec { textwrap_0_8_0 = { features?(textwrap_0_8_0_features {}) }: textwrap_0_8_0_ { dependencies = mapFeatures features ([ term_size_0_3_0 unicode_width_0_1_4 ]); }; - textwrap_0_8_0_features = f: updateFeatures f (rec { + textwrap_0_8_0_features = f: updateFeatures f ({ term_size_0_3_0.default = true; textwrap_0_8_0.default = (f.textwrap_0_8_0.default or true); unicode_width_0_1_4.default = true; @@ -1243,7 +1243,7 @@ rec { unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ { features = mkFeatures (features.unicode_width_0_1_4 or {}); }; - unicode_width_0_1_4_features = f: updateFeatures f (rec { + unicode_width_0_1_4_features = f: updateFeatures f ({ unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true); }) []; vec_map_0_8_0 = { features?(vec_map_0_8_0_features {}) }: vec_map_0_8_0_ { @@ -1264,7 +1264,7 @@ rec { way_cooler_client_helpers_0_1_0 = { features?(way_cooler_client_helpers_0_1_0_features {}) }: way_cooler_client_helpers_0_1_0_ { dependencies = mapFeatures features ([ wayland_client_0_9_10 wayland_sys_0_9_10 ]); }; - way_cooler_client_helpers_0_1_0_features = f: updateFeatures f (rec { + way_cooler_client_helpers_0_1_0_features = f: updateFeatures f ({ way_cooler_client_helpers_0_1_0.default = (f.way_cooler_client_helpers_0_1_0.default or true); wayland_client_0_9_10.cursor = true; wayland_client_0_9_10.default = true; @@ -1309,7 +1309,7 @@ rec { wayland_scanner_0_9_10 = { features?(wayland_scanner_0_9_10_features {}) }: wayland_scanner_0_9_10_ { dependencies = mapFeatures features ([ xml_rs_0_6_1 ]); }; - wayland_scanner_0_9_10_features = f: updateFeatures f (rec { + wayland_scanner_0_9_10_features = f: updateFeatures f ({ wayland_scanner_0_9_10.default = (f.wayland_scanner_0_9_10.default or true); xml_rs_0_6_1.default = true; }) [ xml_rs_0_6_1_features ]; @@ -1339,7 +1339,7 @@ rec { dependencies = mapFeatures features ([ byteorder_0_5_3 clap_2_26_2 image_0_10_4 tempfile_2_2_0 way_cooler_client_helpers_0_1_0 wayland_client_0_9_10 wayland_sys_0_9_10 ]); buildDependencies = mapFeatures features ([ wayland_scanner_0_9_10 ]); }; - wc_bg_0_3_0_features = f: updateFeatures f (rec { + wc_bg_0_3_0_features = f: updateFeatures f ({ byteorder_0_5_3.default = true; clap_2_26_2.default = true; image_0_10_4.default = true; @@ -1355,17 +1355,17 @@ rec { wc_bg_0_3_0.default = (f.wc_bg_0_3_0.default or true); }) [ byteorder_0_5_3_features clap_2_26_2_features image_0_10_4_features tempfile_2_2_0_features way_cooler_client_helpers_0_1_0_features wayland_client_0_9_10_features wayland_sys_0_9_10_features wayland_scanner_0_9_10_features ]; winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; - winapi_0_2_8_features = f: updateFeatures f (rec { + winapi_0_2_8_features = f: updateFeatures f ({ winapi_0_2_8.default = (f.winapi_0_2_8.default or true); }) []; winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; - winapi_build_0_1_1_features = f: updateFeatures f (rec { + winapi_build_0_1_1_features = f: updateFeatures f ({ winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); }) []; xml_rs_0_6_1 = { features?(xml_rs_0_6_1_features {}) }: xml_rs_0_6_1_ { dependencies = mapFeatures features ([ bitflags_0_9_1 ]); }; - xml_rs_0_6_1_features = f: updateFeatures f (rec { + xml_rs_0_6_1_features = f: updateFeatures f ({ bitflags_0_9_1.default = true; xml_rs_0_6_1.default = (f.xml_rs_0_6_1.default or true); }) [ bitflags_0_9_1_features ]; diff --git a/pkgs/applications/window-managers/way-cooler/wc-grab.nix b/pkgs/applications/window-managers/way-cooler/wc-grab.nix index 6f936eb2e43..3264357b2fd 100644 --- a/pkgs/applications/window-managers/way-cooler/wc-grab.nix +++ b/pkgs/applications/window-managers/way-cooler/wc-grab.nix @@ -305,25 +305,25 @@ rec { inherit dependencies buildDependencies features; }; adler32_1_0_0 = { features?(adler32_1_0_0_features {}) }: adler32_1_0_0_ {}; - adler32_1_0_0_features = f: updateFeatures f (rec { + adler32_1_0_0_features = f: updateFeatures f ({ adler32_1_0_0.default = (f.adler32_1_0_0.default or true); }) []; ansi_term_0_9_0 = { features?(ansi_term_0_9_0_features {}) }: ansi_term_0_9_0_ {}; - ansi_term_0_9_0_features = f: updateFeatures f (rec { + ansi_term_0_9_0_features = f: updateFeatures f ({ ansi_term_0_9_0.default = (f.ansi_term_0_9_0.default or true); }) []; atty_0_2_2 = { features?(atty_0_2_2_features {}) }: atty_0_2_2_ { dependencies = (if !(kernel == "windows") then mapFeatures features ([ libc_0_2_21 ]) else []) ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); }; - atty_0_2_2_features = f: updateFeatures f (rec { + atty_0_2_2_features = f: updateFeatures f ({ atty_0_2_2.default = (f.atty_0_2_2.default or true); kernel32_sys_0_2_2.default = true; libc_0_2_21.default = true; winapi_0_2_8.default = true; }) [ libc_0_2_21_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {}; - bitflags_0_7_0_features = f: updateFeatures f (rec { + bitflags_0_7_0_features = f: updateFeatures f ({ bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true); }) []; bitflags_0_8_0 = { features?(bitflags_0_8_0_features {}) }: bitflags_0_8_0_ { @@ -402,7 +402,7 @@ rec { vec_map_0_7_0.default = true; }) [ ansi_term_0_9_0_features atty_0_2_2_features bitflags_0_8_0_features strsim_0_6_0_features term_size_0_2_3_features unicode_segmentation_1_1_0_features unicode_width_0_1_4_features vec_map_0_7_0_features ]; color_quant_1_0_0 = { features?(color_quant_1_0_0_features {}) }: color_quant_1_0_0_ {}; - color_quant_1_0_0_features = f: updateFeatures f (rec { + color_quant_1_0_0_features = f: updateFeatures f ({ color_quant_1_0_0.default = (f.color_quant_1_0_0.default or true); }) []; dbus_0_5_2 = { features?(dbus_0_5_2_features {}) }: dbus_0_5_2_ { @@ -410,7 +410,7 @@ rec { buildDependencies = mapFeatures features ([ metadeps_1_1_1 ]); features = mkFeatures (features.dbus_0_5_2 or {}); }; - dbus_0_5_2_features = f: updateFeatures f (rec { + dbus_0_5_2_features = f: updateFeatures f ({ dbus_0_5_2.default = (f.dbus_0_5_2.default or true); libc_0_2_21.default = true; metadeps_1_1_1.default = true; @@ -418,7 +418,7 @@ rec { deflate_0_7_5 = { features?(deflate_0_7_5_features {}) }: deflate_0_7_5_ { dependencies = mapFeatures features ([ adler32_1_0_0 byteorder_1_0_0 ]); }; - deflate_0_7_5_features = f: updateFeatures f (rec { + deflate_0_7_5_features = f: updateFeatures f ({ adler32_1_0_0.default = true; byteorder_1_0_0.default = true; deflate_0_7_5.default = (f.deflate_0_7_5.default or true); @@ -426,14 +426,14 @@ rec { deque_0_3_1 = { features?(deque_0_3_1_features {}) }: deque_0_3_1_ { dependencies = mapFeatures features ([ rand_0_3_15 ]); }; - deque_0_3_1_features = f: updateFeatures f (rec { + deque_0_3_1_features = f: updateFeatures f ({ deque_0_3_1.default = (f.deque_0_3_1.default or true); rand_0_3_15.default = true; }) [ rand_0_3_15_features ]; enum_primitive_0_1_1 = { features?(enum_primitive_0_1_1_features {}) }: enum_primitive_0_1_1_ { dependencies = mapFeatures features ([ num_traits_0_1_37 ]); }; - enum_primitive_0_1_1_features = f: updateFeatures f (rec { + enum_primitive_0_1_1_features = f: updateFeatures f ({ enum_primitive_0_1_1.default = (f.enum_primitive_0_1_1.default or true); num_traits_0_1_37.default = (f.num_traits_0_1_37.default or false); }) [ num_traits_0_1_37_features ]; @@ -470,7 +470,7 @@ rec { lzw_0_10_0.default = true; }) [ color_quant_1_0_0_features lzw_0_10_0_features ]; glob_0_2_11 = { features?(glob_0_2_11_features {}) }: glob_0_2_11_ {}; - glob_0_2_11_features = f: updateFeatures f (rec { + glob_0_2_11_features = f: updateFeatures f ({ glob_0_2_11.default = (f.glob_0_2_11.default or true); }) []; image_0_12_3 = { features?(image_0_12_3_features {}) }: image_0_12_3_ { @@ -557,7 +557,7 @@ rec { inflate_0_1_1 = { features?(inflate_0_1_1_features {}) }: inflate_0_1_1_ { features = mkFeatures (features.inflate_0_1_1 or {}); }; - inflate_0_1_1_features = f: updateFeatures f (rec { + inflate_0_1_1_features = f: updateFeatures f ({ inflate_0_1_1.default = (f.inflate_0_1_1.default or true); }) []; jpeg_decoder_0_1_11 = { features?(jpeg_decoder_0_1_11_features {}) }: jpeg_decoder_0_1_11_ { @@ -578,7 +578,7 @@ rec { dependencies = mapFeatures features ([ winapi_0_2_8 ]); buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); }; - kernel32_sys_0_2_2_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2_features = f: updateFeatures f ({ kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); winapi_0_2_8.default = true; winapi_build_0_1_1.default = true; @@ -606,7 +606,7 @@ rec { metadeps_1_1_1 = { features?(metadeps_1_1_1_features {}) }: metadeps_1_1_1_ { dependencies = mapFeatures features ([ error_chain_0_7_2 pkg_config_0_3_9 toml_0_2_1 ]); }; - metadeps_1_1_1_features = f: updateFeatures f (rec { + metadeps_1_1_1_features = f: updateFeatures f ({ error_chain_0_7_2.default = (f.error_chain_0_7_2.default or false); metadeps_1_1_1.default = (f.metadeps_1_1_1.default or true); pkg_config_0_3_9.default = true; @@ -615,14 +615,14 @@ rec { num_integer_0_1_33 = { features?(num_integer_0_1_33_features {}) }: num_integer_0_1_33_ { dependencies = mapFeatures features ([ num_traits_0_1_37 ]); }; - num_integer_0_1_33_features = f: updateFeatures f (rec { + num_integer_0_1_33_features = f: updateFeatures f ({ num_integer_0_1_33.default = (f.num_integer_0_1_33.default or true); num_traits_0_1_37.default = true; }) [ num_traits_0_1_37_features ]; num_iter_0_1_33 = { features?(num_iter_0_1_33_features {}) }: num_iter_0_1_33_ { dependencies = mapFeatures features ([ num_integer_0_1_33 num_traits_0_1_37 ]); }; - num_iter_0_1_33_features = f: updateFeatures f (rec { + num_iter_0_1_33_features = f: updateFeatures f ({ num_integer_0_1_33.default = true; num_iter_0_1_33.default = (f.num_iter_0_1_33.default or true); num_traits_0_1_37.default = true; @@ -649,18 +649,18 @@ rec { num_traits_0_1_37.default = true; }) [ num_integer_0_1_33_features num_traits_0_1_37_features ]; num_traits_0_1_37 = { features?(num_traits_0_1_37_features {}) }: num_traits_0_1_37_ {}; - num_traits_0_1_37_features = f: updateFeatures f (rec { + num_traits_0_1_37_features = f: updateFeatures f ({ num_traits_0_1_37.default = (f.num_traits_0_1_37.default or true); }) []; num_cpus_1_3_0 = { features?(num_cpus_1_3_0_features {}) }: num_cpus_1_3_0_ { dependencies = mapFeatures features ([ libc_0_2_21 ]); }; - num_cpus_1_3_0_features = f: updateFeatures f (rec { + num_cpus_1_3_0_features = f: updateFeatures f ({ libc_0_2_21.default = true; num_cpus_1_3_0.default = (f.num_cpus_1_3_0.default or true); }) [ libc_0_2_21_features ]; pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {}; - pkg_config_0_3_9_features = f: updateFeatures f (rec { + pkg_config_0_3_9_features = f: updateFeatures f ({ pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true); }) []; png_0_6_2 = { features?(png_0_6_2_features {}) }: png_0_6_2_ { @@ -686,7 +686,7 @@ rec { rand_0_3_15 = { features?(rand_0_3_15_features {}) }: rand_0_3_15_ { dependencies = mapFeatures features ([ libc_0_2_21 ]); }; - rand_0_3_15_features = f: updateFeatures f (rec { + rand_0_3_15_features = f: updateFeatures f ({ libc_0_2_21.default = true; rand_0_3_15.default = (f.rand_0_3_15.default or true); }) [ libc_0_2_21_features ]; @@ -694,7 +694,7 @@ rec { dependencies = mapFeatures features ([ deque_0_3_1 libc_0_2_21 num_cpus_1_3_0 rand_0_3_15 ]); features = mkFeatures (features.rayon_0_6_0 or {}); }; - rayon_0_6_0_features = f: updateFeatures f (rec { + rayon_0_6_0_features = f: updateFeatures f ({ deque_0_3_1.default = true; libc_0_2_21.default = true; num_cpus_1_3_0.default = true; @@ -704,11 +704,11 @@ rec { scoped_threadpool_0_1_7 = { features?(scoped_threadpool_0_1_7_features {}) }: scoped_threadpool_0_1_7_ { features = mkFeatures (features.scoped_threadpool_0_1_7 or {}); }; - scoped_threadpool_0_1_7_features = f: updateFeatures f (rec { + scoped_threadpool_0_1_7_features = f: updateFeatures f ({ scoped_threadpool_0_1_7.default = (f.scoped_threadpool_0_1_7.default or true); }) []; strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {}; - strsim_0_6_0_features = f: updateFeatures f (rec { + strsim_0_6_0_features = f: updateFeatures f ({ strsim_0_6_0.default = (f.strsim_0_6_0.default or true); }) []; term_size_0_2_3 = { features?(term_size_0_2_3_features {}) }: term_size_0_2_3_ { @@ -750,13 +750,13 @@ rec { unicode_segmentation_1_1_0 = { features?(unicode_segmentation_1_1_0_features {}) }: unicode_segmentation_1_1_0_ { features = mkFeatures (features.unicode_segmentation_1_1_0 or {}); }; - unicode_segmentation_1_1_0_features = f: updateFeatures f (rec { + unicode_segmentation_1_1_0_features = f: updateFeatures f ({ unicode_segmentation_1_1_0.default = (f.unicode_segmentation_1_1_0.default or true); }) []; unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ { features = mkFeatures (features.unicode_width_0_1_4 or {}); }; - unicode_width_0_1_4_features = f: updateFeatures f (rec { + unicode_width_0_1_4_features = f: updateFeatures f ({ unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true); }) []; vec_map_0_7_0 = { features?(vec_map_0_7_0_features {}) }: vec_map_0_7_0_ { @@ -777,18 +777,18 @@ rec { wc_grab_0_3_0 = { features?(wc_grab_0_3_0_features {}) }: wc_grab_0_3_0_ { dependencies = mapFeatures features ([ clap_2_22_0 dbus_0_5_2 image_0_12_3 ]); }; - wc_grab_0_3_0_features = f: updateFeatures f (rec { + wc_grab_0_3_0_features = f: updateFeatures f ({ clap_2_22_0.default = true; dbus_0_5_2.default = true; image_0_12_3.default = true; wc_grab_0_3_0.default = (f.wc_grab_0_3_0.default or true); }) [ clap_2_22_0_features dbus_0_5_2_features image_0_12_3_features ]; winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; - winapi_0_2_8_features = f: updateFeatures f (rec { + winapi_0_2_8_features = f: updateFeatures f ({ winapi_0_2_8.default = (f.winapi_0_2_8.default or true); }) []; winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; - winapi_build_0_1_1_features = f: updateFeatures f (rec { + winapi_build_0_1_1_features = f: updateFeatures f ({ winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); }) []; } diff --git a/pkgs/applications/window-managers/way-cooler/wc-lock.nix b/pkgs/applications/window-managers/way-cooler/wc-lock.nix index 1b9e3df3508..6ffc5779a0b 100644 --- a/pkgs/applications/window-managers/way-cooler/wc-lock.nix +++ b/pkgs/applications/window-managers/way-cooler/wc-lock.nix @@ -557,21 +557,21 @@ rec { inherit dependencies buildDependencies features; }; ansi_term_0_9_0 = { features?(ansi_term_0_9_0_features {}) }: ansi_term_0_9_0_ {}; - ansi_term_0_9_0_features = f: updateFeatures f (rec { + ansi_term_0_9_0_features = f: updateFeatures f ({ ansi_term_0_9_0.default = (f.ansi_term_0_9_0.default or true); }) []; atty_0_2_2 = { features?(atty_0_2_2_features {}) }: atty_0_2_2_ { dependencies = (if !(kernel == "windows") then mapFeatures features ([ libc_0_2_23 ]) else []) ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); }; - atty_0_2_2_features = f: updateFeatures f (rec { + atty_0_2_2_features = f: updateFeatures f ({ atty_0_2_2.default = (f.atty_0_2_2.default or true); kernel32_sys_0_2_2.default = true; libc_0_2_23.default = true; winapi_0_2_8.default = true; }) [ libc_0_2_23_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {}; - bitflags_0_7_0_features = f: updateFeatures f (rec { + bitflags_0_7_0_features = f: updateFeatures f ({ bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true); }) []; bitflags_0_8_2 = { features?(bitflags_0_8_2_features {}) }: bitflags_0_8_2_ { @@ -674,20 +674,20 @@ rec { dependencies = mapFeatures features ([ either_1_2_0 scopeguard_0_3_2 ]); features = mkFeatures (features.coco_0_1_1 or {}); }; - coco_0_1_1_features = f: updateFeatures f (rec { + coco_0_1_1_features = f: updateFeatures f ({ coco_0_1_1.default = (f.coco_0_1_1.default or true); either_1_2_0.default = true; scopeguard_0_3_2.default = true; }) [ either_1_2_0_features scopeguard_0_3_2_features ]; color_quant_1_0_0 = { features?(color_quant_1_0_0_features {}) }: color_quant_1_0_0_ {}; - color_quant_1_0_0_features = f: updateFeatures f (rec { + color_quant_1_0_0_features = f: updateFeatures f ({ color_quant_1_0_0.default = (f.color_quant_1_0_0.default or true); }) []; dbus_0_5_4 = { features?(dbus_0_5_4_features {}) }: dbus_0_5_4_ { dependencies = mapFeatures features ([ libc_0_2_23 libdbus_sys_0_1_1 ]); features = mkFeatures (features.dbus_0_5_4 or {}); }; - dbus_0_5_4_features = f: updateFeatures f (rec { + dbus_0_5_4_features = f: updateFeatures f ({ dbus_0_5_4.default = (f.dbus_0_5_4.default or true); libc_0_2_23.default = true; libdbus_sys_0_1_1.default = true; @@ -696,12 +696,12 @@ rec { dependencies = mapFeatures features ([ libloading_0_3_4 ]); features = mkFeatures (features.dlib_0_3_1 or {}); }; - dlib_0_3_1_features = f: updateFeatures f (rec { + dlib_0_3_1_features = f: updateFeatures f ({ dlib_0_3_1.default = (f.dlib_0_3_1.default or true); libloading_0_3_4.default = true; }) [ libloading_0_3_4_features ]; dtoa_0_4_1 = { features?(dtoa_0_4_1_features {}) }: dtoa_0_4_1_ {}; - dtoa_0_4_1_features = f: updateFeatures f (rec { + dtoa_0_4_1_features = f: updateFeatures f ({ dtoa_0_4_1.default = (f.dtoa_0_4_1.default or true); }) []; either_1_2_0 = { features?(either_1_2_0_features {}) }: either_1_2_0_ { @@ -717,7 +717,7 @@ rec { enum_primitive_0_1_1 = { features?(enum_primitive_0_1_1_features {}) }: enum_primitive_0_1_1_ { dependencies = mapFeatures features ([ num_traits_0_1_37 ]); }; - enum_primitive_0_1_1_features = f: updateFeatures f (rec { + enum_primitive_0_1_1_features = f: updateFeatures f ({ enum_primitive_0_1_1.default = (f.enum_primitive_0_1_1.default or true); num_traits_0_1_37.default = (f.num_traits_0_1_37.default or false); }) [ num_traits_0_1_37_features ]; @@ -765,7 +765,7 @@ rec { fs2_0_2_5 = { features?(fs2_0_2_5_features {}) }: fs2_0_2_5_ { dependencies = mapFeatures features ([ kernel32_sys_0_2_2 libc_0_2_23 winapi_0_2_8 ]); }; - fs2_0_2_5_features = f: updateFeatures f (rec { + fs2_0_2_5_features = f: updateFeatures f ({ fs2_0_2_5.default = (f.fs2_0_2_5.default or true); kernel32_sys_0_2_2.default = true; libc_0_2_23.default = true; @@ -814,7 +814,7 @@ rec { lzw_0_10_0.default = true; }) [ color_quant_1_0_0_features lzw_0_10_0_features ]; glob_0_2_11 = { features?(glob_0_2_11_features {}) }: glob_0_2_11_ {}; - glob_0_2_11_features = f: updateFeatures f (rec { + glob_0_2_11_features = f: updateFeatures f ({ glob_0_2_11.default = (f.glob_0_2_11.default or true); }) []; image_0_10_4 = { features?(image_0_10_4_features {}) }: image_0_10_4_ { @@ -901,11 +901,11 @@ rec { inflate_0_1_1 = { features?(inflate_0_1_1_features {}) }: inflate_0_1_1_ { features = mkFeatures (features.inflate_0_1_1 or {}); }; - inflate_0_1_1_features = f: updateFeatures f (rec { + inflate_0_1_1_features = f: updateFeatures f ({ inflate_0_1_1.default = (f.inflate_0_1_1.default or true); }) []; itoa_0_3_1 = { features?(itoa_0_3_1_features {}) }: itoa_0_3_1_ {}; - itoa_0_3_1_features = f: updateFeatures f (rec { + itoa_0_3_1_features = f: updateFeatures f ({ itoa_0_3_1.default = (f.itoa_0_3_1.default or true); }) []; jpeg_decoder_0_1_13 = { features?(jpeg_decoder_0_1_13_features {}) }: jpeg_decoder_0_1_13_ { @@ -926,7 +926,7 @@ rec { dependencies = mapFeatures features ([ winapi_0_2_8 ]); buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); }; - kernel32_sys_0_2_2_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2_features = f: updateFeatures f ({ kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); winapi_0_2_8.default = true; winapi_build_0_1_1.default = true; @@ -958,7 +958,7 @@ rec { }) []; libdbus_sys_0_1_1 = { features?(libdbus_sys_0_1_1_features {}) }: libdbus_sys_0_1_1_ { buildDependencies = mapFeatures features ([ metadeps_1_1_2 ]);}; - libdbus_sys_0_1_1_features = f: updateFeatures f (rec { + libdbus_sys_0_1_1_features = f: updateFeatures f ({ libdbus_sys_0_1_1.default = (f.libdbus_sys_0_1_1.default or true); metadeps_1_1_2.default = true; }) [ metadeps_1_1_2_features ]; @@ -967,7 +967,7 @@ rec { ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); buildDependencies = mapFeatures features ([ target_build_utils_0_3_1 ]); }; - libloading_0_3_4_features = f: updateFeatures f (rec { + libloading_0_3_4_features = f: updateFeatures f ({ kernel32_sys_0_2_2.default = true; lazy_static_0_2_8.default = true; libloading_0_3_4.default = (f.libloading_0_3_4.default or true); @@ -987,7 +987,7 @@ rec { memmap_0_4_0 = { features?(memmap_0_4_0_features {}) }: memmap_0_4_0_ { dependencies = mapFeatures features ([ fs2_0_2_5 kernel32_sys_0_2_2 libc_0_2_23 winapi_0_2_8 ]); }; - memmap_0_4_0_features = f: updateFeatures f (rec { + memmap_0_4_0_features = f: updateFeatures f ({ fs2_0_2_5.default = true; kernel32_sys_0_2_2.default = true; libc_0_2_23.default = true; @@ -997,7 +997,7 @@ rec { metadeps_1_1_2 = { features?(metadeps_1_1_2_features {}) }: metadeps_1_1_2_ { dependencies = mapFeatures features ([ error_chain_0_10_0 pkg_config_0_3_9 toml_0_2_1 ]); }; - metadeps_1_1_2_features = f: updateFeatures f (rec { + metadeps_1_1_2_features = f: updateFeatures f ({ error_chain_0_10_0.default = (f.error_chain_0_10_0.default or false); metadeps_1_1_2.default = (f.metadeps_1_1_2.default or true); pkg_config_0_3_9.default = true; @@ -1007,7 +1007,7 @@ rec { dependencies = mapFeatures features ([ libc_0_2_23 ]); buildDependencies = mapFeatures features ([ cc_1_0_0 ]); }; - miniz_sys_0_1_10_features = f: updateFeatures f (rec { + miniz_sys_0_1_10_features = f: updateFeatures f ({ cc_1_0_0.default = true; libc_0_2_23.default = true; miniz_sys_0_1_10.default = (f.miniz_sys_0_1_10.default or true); @@ -1036,14 +1036,14 @@ rec { num_integer_0_1_35 = { features?(num_integer_0_1_35_features {}) }: num_integer_0_1_35_ { dependencies = mapFeatures features ([ num_traits_0_1_37 ]); }; - num_integer_0_1_35_features = f: updateFeatures f (rec { + num_integer_0_1_35_features = f: updateFeatures f ({ num_integer_0_1_35.default = (f.num_integer_0_1_35.default or true); num_traits_0_1_37.default = true; }) [ num_traits_0_1_37_features ]; num_iter_0_1_34 = { features?(num_iter_0_1_34_features {}) }: num_iter_0_1_34_ { dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_37 ]); }; - num_iter_0_1_34_features = f: updateFeatures f (rec { + num_iter_0_1_34_features = f: updateFeatures f ({ num_integer_0_1_35.default = true; num_iter_0_1_34.default = (f.num_iter_0_1_34.default or true); num_traits_0_1_37.default = true; @@ -1074,13 +1074,13 @@ rec { rustc_serialize_0_3_24.default = true; }) [ num_bigint_0_1_40_features num_integer_0_1_35_features num_traits_0_1_37_features rustc_serialize_0_3_24_features ]; num_traits_0_1_37 = { features?(num_traits_0_1_37_features {}) }: num_traits_0_1_37_ {}; - num_traits_0_1_37_features = f: updateFeatures f (rec { + num_traits_0_1_37_features = f: updateFeatures f ({ num_traits_0_1_37.default = (f.num_traits_0_1_37.default or true); }) []; num_cpus_1_6_2 = { features?(num_cpus_1_6_2_features {}) }: num_cpus_1_6_2_ { dependencies = mapFeatures features ([ libc_0_2_23 ]); }; - num_cpus_1_6_2_features = f: updateFeatures f (rec { + num_cpus_1_6_2_features = f: updateFeatures f ({ libc_0_2_23.default = true; num_cpus_1_6_2.default = (f.num_cpus_1_6_2.default or true); }) [ libc_0_2_23_features ]; @@ -1103,7 +1103,7 @@ rec { phf_codegen_0_7_21 = { features?(phf_codegen_0_7_21_features {}) }: phf_codegen_0_7_21_ { dependencies = mapFeatures features ([ phf_generator_0_7_21 phf_shared_0_7_21 ]); }; - phf_codegen_0_7_21_features = f: updateFeatures f (rec { + phf_codegen_0_7_21_features = f: updateFeatures f ({ phf_codegen_0_7_21.default = (f.phf_codegen_0_7_21.default or true); phf_generator_0_7_21.default = true; phf_shared_0_7_21.default = true; @@ -1111,7 +1111,7 @@ rec { phf_generator_0_7_21 = { features?(phf_generator_0_7_21_features {}) }: phf_generator_0_7_21_ { dependencies = mapFeatures features ([ phf_shared_0_7_21 rand_0_3_15 ]); }; - phf_generator_0_7_21_features = f: updateFeatures f (rec { + phf_generator_0_7_21_features = f: updateFeatures f ({ phf_generator_0_7_21.default = (f.phf_generator_0_7_21.default or true); phf_shared_0_7_21.default = true; rand_0_3_15.default = true; @@ -1120,12 +1120,12 @@ rec { dependencies = mapFeatures features ([ siphasher_0_2_2 ]); features = mkFeatures (features.phf_shared_0_7_21 or {}); }; - phf_shared_0_7_21_features = f: updateFeatures f (rec { + phf_shared_0_7_21_features = f: updateFeatures f ({ phf_shared_0_7_21.default = (f.phf_shared_0_7_21.default or true); siphasher_0_2_2.default = true; }) [ siphasher_0_2_2_features ]; pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {}; - pkg_config_0_3_9_features = f: updateFeatures f (rec { + pkg_config_0_3_9_features = f: updateFeatures f ({ pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true); }) []; png_0_5_2 = { features?(png_0_5_2_features {}) }: png_0_5_2_ { @@ -1151,21 +1151,21 @@ rec { rand_0_3_15 = { features?(rand_0_3_15_features {}) }: rand_0_3_15_ { dependencies = mapFeatures features ([ libc_0_2_23 ]); }; - rand_0_3_15_features = f: updateFeatures f (rec { + rand_0_3_15_features = f: updateFeatures f ({ libc_0_2_23.default = true; rand_0_3_15.default = (f.rand_0_3_15.default or true); }) [ libc_0_2_23_features ]; rayon_0_8_2 = { features?(rayon_0_8_2_features {}) }: rayon_0_8_2_ { dependencies = mapFeatures features ([ rayon_core_1_2_1 ]); }; - rayon_0_8_2_features = f: updateFeatures f (rec { + rayon_0_8_2_features = f: updateFeatures f ({ rayon_0_8_2.default = (f.rayon_0_8_2.default or true); rayon_core_1_2_1.default = true; }) [ rayon_core_1_2_1_features ]; rayon_core_1_2_1 = { features?(rayon_core_1_2_1_features {}) }: rayon_core_1_2_1_ { dependencies = mapFeatures features ([ coco_0_1_1 futures_0_1_16 lazy_static_0_2_8 libc_0_2_23 num_cpus_1_6_2 rand_0_3_15 ]); }; - rayon_core_1_2_1_features = f: updateFeatures f (rec { + rayon_core_1_2_1_features = f: updateFeatures f ({ coco_0_1_1.default = true; futures_0_1_16.default = true; lazy_static_0_2_8.default = true; @@ -1175,20 +1175,20 @@ rec { rayon_core_1_2_1.default = (f.rayon_core_1_2_1.default or true); }) [ coco_0_1_1_features futures_0_1_16_features lazy_static_0_2_8_features libc_0_2_23_features num_cpus_1_6_2_features rand_0_3_15_features ]; rustc_serialize_0_3_24 = { features?(rustc_serialize_0_3_24_features {}) }: rustc_serialize_0_3_24_ {}; - rustc_serialize_0_3_24_features = f: updateFeatures f (rec { + rustc_serialize_0_3_24_features = f: updateFeatures f ({ rustc_serialize_0_3_24.default = (f.rustc_serialize_0_3_24.default or true); }) []; rustc_version_0_1_7 = { features?(rustc_version_0_1_7_features {}) }: rustc_version_0_1_7_ { dependencies = mapFeatures features ([ semver_0_1_20 ]); }; - rustc_version_0_1_7_features = f: updateFeatures f (rec { + rustc_version_0_1_7_features = f: updateFeatures f ({ rustc_version_0_1_7.default = (f.rustc_version_0_1_7.default or true); semver_0_1_20.default = true; }) [ semver_0_1_20_features ]; scoped_threadpool_0_1_8 = { features?(scoped_threadpool_0_1_8_features {}) }: scoped_threadpool_0_1_8_ { features = mkFeatures (features.scoped_threadpool_0_1_8 or {}); }; - scoped_threadpool_0_1_8_features = f: updateFeatures f (rec { + scoped_threadpool_0_1_8_features = f: updateFeatures f ({ scoped_threadpool_0_1_8.default = (f.scoped_threadpool_0_1_8.default or true); }) []; scopeguard_0_3_2 = { features?(scopeguard_0_3_2_features {}) }: scopeguard_0_3_2_ { @@ -1202,7 +1202,7 @@ rec { (scopeguard_0_3_2.default or false); }) []; semver_0_1_20 = { features?(semver_0_1_20_features {}) }: semver_0_1_20_ {}; - semver_0_1_20_features = f: updateFeatures f (rec { + semver_0_1_20_features = f: updateFeatures f ({ semver_0_1_20.default = (f.semver_0_1_20.default or true); }) []; serde_0_9_15 = { features?(serde_0_9_15_features {}) }: serde_0_9_15_ { @@ -1252,11 +1252,11 @@ rec { siphasher_0_2_2 = { features?(siphasher_0_2_2_features {}) }: siphasher_0_2_2_ { dependencies = mapFeatures features ([]); }; - siphasher_0_2_2_features = f: updateFeatures f (rec { + siphasher_0_2_2_features = f: updateFeatures f ({ siphasher_0_2_2.default = (f.siphasher_0_2_2.default or true); }) []; strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {}; - strsim_0_6_0_features = f: updateFeatures f (rec { + strsim_0_6_0_features = f: updateFeatures f ({ strsim_0_6_0.default = (f.strsim_0_6_0.default or true); }) []; target_build_utils_0_3_1 = { features?(target_build_utils_0_3_1_features {}) }: target_build_utils_0_3_1_ { @@ -1281,7 +1281,7 @@ rec { ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); buildDependencies = mapFeatures features ([ rustc_version_0_1_7 ]); }; - tempfile_2_1_5_features = f: updateFeatures f (rec { + tempfile_2_1_5_features = f: updateFeatures f ({ kernel32_sys_0_2_2.default = true; libc_0_2_23.default = true; rand_0_3_15.default = true; @@ -1328,13 +1328,13 @@ rec { unicode_segmentation_1_2_0 = { features?(unicode_segmentation_1_2_0_features {}) }: unicode_segmentation_1_2_0_ { features = mkFeatures (features.unicode_segmentation_1_2_0 or {}); }; - unicode_segmentation_1_2_0_features = f: updateFeatures f (rec { + unicode_segmentation_1_2_0_features = f: updateFeatures f ({ unicode_segmentation_1_2_0.default = (f.unicode_segmentation_1_2_0.default or true); }) []; unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ { features = mkFeatures (features.unicode_width_0_1_4 or {}); }; - unicode_width_0_1_4_features = f: updateFeatures f (rec { + unicode_width_0_1_4_features = f: updateFeatures f ({ unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true); }) []; vec_map_0_8_0 = { features?(vec_map_0_8_0_features {}) }: vec_map_0_8_0_ { @@ -1355,7 +1355,7 @@ rec { way_cooler_client_helpers_0_1_0 = { features?(way_cooler_client_helpers_0_1_0_features {}) }: way_cooler_client_helpers_0_1_0_ { dependencies = mapFeatures features ([ wayland_client_0_9_6 wayland_sys_0_9_6 ]); }; - way_cooler_client_helpers_0_1_0_features = f: updateFeatures f (rec { + way_cooler_client_helpers_0_1_0_features = f: updateFeatures f ({ way_cooler_client_helpers_0_1_0.default = (f.way_cooler_client_helpers_0_1_0.default or true); wayland_client_0_9_6.cursor = true; wayland_client_0_9_6.default = true; @@ -1400,7 +1400,7 @@ rec { wayland_kbd_0_9_0 = { features?(wayland_kbd_0_9_0_features {}) }: wayland_kbd_0_9_0_ { dependencies = mapFeatures features ([ bitflags_0_7_0 dlib_0_3_1 lazy_static_0_2_8 memmap_0_4_0 wayland_client_0_9_6 ]); }; - wayland_kbd_0_9_0_features = f: updateFeatures f (rec { + wayland_kbd_0_9_0_features = f: updateFeatures f ({ bitflags_0_7_0.default = true; dlib_0_3_1.default = true; lazy_static_0_2_8.default = true; @@ -1411,7 +1411,7 @@ rec { wayland_scanner_0_9_6 = { features?(wayland_scanner_0_9_6_features {}) }: wayland_scanner_0_9_6_ { dependencies = mapFeatures features ([ xml_rs_0_3_6 ]); }; - wayland_scanner_0_9_6_features = f: updateFeatures f (rec { + wayland_scanner_0_9_6_features = f: updateFeatures f ({ wayland_scanner_0_9_6.default = (f.wayland_scanner_0_9_6.default or true); xml_rs_0_3_6.default = true; }) [ xml_rs_0_3_6_features ]; @@ -1441,7 +1441,7 @@ rec { dependencies = mapFeatures features ([ byteorder_0_5_3 clap_2_24_2 dbus_0_5_4 image_0_10_4 libc_0_2_23 rand_0_3_15 tempfile_2_1_5 way_cooler_client_helpers_0_1_0 wayland_client_0_9_6 wayland_kbd_0_9_0 wayland_sys_0_9_6 ]); buildDependencies = mapFeatures features ([ gcc_0_3_50 wayland_scanner_0_9_6 ]); }; - wc_lock_0_2_1_features = f: updateFeatures f (rec { + wc_lock_0_2_1_features = f: updateFeatures f ({ byteorder_0_5_3.default = true; clap_2_24_2.default = true; dbus_0_5_4.default = true; @@ -1462,17 +1462,17 @@ rec { wc_lock_0_2_1.default = (f.wc_lock_0_2_1.default or true); }) [ byteorder_0_5_3_features clap_2_24_2_features dbus_0_5_4_features image_0_10_4_features libc_0_2_23_features rand_0_3_15_features tempfile_2_1_5_features way_cooler_client_helpers_0_1_0_features wayland_client_0_9_6_features wayland_kbd_0_9_0_features wayland_sys_0_9_6_features gcc_0_3_50_features wayland_scanner_0_9_6_features ]; winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; - winapi_0_2_8_features = f: updateFeatures f (rec { + winapi_0_2_8_features = f: updateFeatures f ({ winapi_0_2_8.default = (f.winapi_0_2_8.default or true); }) []; winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; - winapi_build_0_1_1_features = f: updateFeatures f (rec { + winapi_build_0_1_1_features = f: updateFeatures f ({ winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); }) []; xml_rs_0_3_6 = { features?(xml_rs_0_3_6_features {}) }: xml_rs_0_3_6_ { dependencies = mapFeatures features ([ bitflags_0_7_0 ]); }; - xml_rs_0_3_6_features = f: updateFeatures f (rec { + xml_rs_0_3_6_features = f: updateFeatures f ({ bitflags_0_7_0.default = true; xml_rs_0_3_6.default = (f.xml_rs_0_3_6.default or true); }) [ bitflags_0_7_0_features ]; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 99416fcf778..34ad2bcc732 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, meson, ninja, pkgconfig , wayland, libGL, mesa, libxkbcommon, cairo, libxcb , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev -, colord, lcms2 +, colord, lcms2, pipewire ? null , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null , libwebp ? null, xwayland ? null, wayland-protocols # beware of null defaults, as the parameters *are* supplied by callPackage by default @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "weston"; - version = "6.0.1"; + version = "7.0.0"; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "1d2m658ll8x7prlsfk71qgw89c7dz6y7d6nndfxwl49fmrd6sbxz"; + sha256 = "0r4sj11hq4brv3ryrgp2wmkkfz1h59vh9ih18igzjibagch6s2m0"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva libwebp wayland-protocols - colord lcms2 + colord lcms2 pipewire ]; mesonFlags= [ @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { "-Dbackend-rdp=${boolToString (freerdp != null)}" "-Dxwayland=${boolToString (xwayland != null)}" # Default is true! "-Dremoting=false" # TODO + "-Dpipewire=${boolToString (pipewire != null)}" "-Dimage-webp=${boolToString (libwebp != null)}" "-Dsimple-dmabuf-drm=" # Disables all drivers "-Ddemo-clients=false" diff --git a/pkgs/applications/window-managers/wmfs/default.nix b/pkgs/applications/window-managers/wmfs/default.nix index ad611f8dabe..2013096d6fe 100644 --- a/pkgs/applications/window-managers/wmfs/default.nix +++ b/pkgs/applications/window-managers/wmfs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, gnumake, libX11, libXinerama, libXrandr, libXpm, libXft, imlib2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "wmfs"; version = "201902"; diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix index 60d3e61fdf9..36ca00b776b 100644 --- a/pkgs/applications/window-managers/wtftw/default.nix +++ b/pkgs/applications/window-managers/wtftw/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, rustPlatform, libXinerama, libX11, pkgconfig }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { name = "wtftw-0.0pre20170921"; src = fetchFromGitHub { owner = "kintaro"; diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index e1ec09bc95a..e02e77de45e 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -180,10 +180,10 @@ stdenv.mkDerivation { else if targetPlatform.isx86_64 then "x86-64" else if targetPlatform.isx86_32 then "i386" else if targetPlatform.isMips then { - "mips" = "btsmipn32"; # n32 variant - "mipsel" = "ltsmipn32"; # n32 variant - "mips64" = "btsmip"; - "mips64el" = "ltsmip"; + mips = "btsmipn32"; # n32 variant + mipsel = "ltsmipn32"; # n32 variant + mips64 = "btsmip"; + mips64el = "ltsmip"; }.${targetPlatform.parsed.cpu.name} else if targetPlatform.isPower then if targetPlatform.isBigEndian then "ppc" else "lppc" else if targetPlatform.isSparc then "sparc" diff --git a/pkgs/build-support/fetchdocker/default.nix b/pkgs/build-support/fetchdocker/default.nix index bbd2bae46df..57d2e4ad82d 100644 --- a/pkgs/build-support/fetchdocker/default.nix +++ b/pkgs/build-support/fetchdocker/default.nix @@ -37,8 +37,8 @@ let repositories = writeText "repositories" (builtins.toJSON { - "${repoTag1}" = { - "${tag}" = lib.last layers; + ${repoTag1} = { + ${tag} = lib.last layers; }; }); diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 1ca1e45f2fb..ec7d289996b 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -1,4 +1,4 @@ -rec { +{ # Content-addressable Nix mirrors. hashedMirrors = [ diff --git a/pkgs/build-support/release/maven-build.nix b/pkgs/build-support/release/maven-build.nix index f7ea07baccb..71eb63b850d 100644 --- a/pkgs/build-support/release/maven-build.nix +++ b/pkgs/build-support/release/maven-build.nix @@ -15,7 +15,7 @@ let mvnFlags = "-Dmaven.repo.local=$M2_REPO ${if doTest then "" else "-Dmaven.test.skip.exec=true"} ${extraMvnFlags}"; in -stdenv.mkDerivation ( rec { +stdenv.mkDerivation ( { inherit name src; phases = "setupPhase unpackPhase patchPhase mvnCompile ${if doTestCompile then "mvnTestCompile mvnTestJar" else ""} ${if doTest then "mvnTest" else ""} ${if doJavadoc then "mvnJavadoc" else ""} ${if doCheckstyle then "mvnCheckstyle" else ""} mvnJar mvnAssembly mvnRelease finalPhase"; diff --git a/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix index 068cc5a9884..ab9b0a13ae7 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix @@ -44,7 +44,7 @@ rec { alloc_no_stdlib_1_3_0 = { features?(alloc_no_stdlib_1_3_0_features {}) }: alloc_no_stdlib_1_3_0_ { features = mkFeatures (features.alloc_no_stdlib_1_3_0 or {}); }; - alloc_no_stdlib_1_3_0_features = f: updateFeatures f (rec { + alloc_no_stdlib_1_3_0_features = f: updateFeatures f ({ alloc_no_stdlib_1_3_0.default = (f.alloc_no_stdlib_1_3_0.default or true); }) []; brotli_2_5_0 = { features?(brotli_2_5_0_features {}) }: brotli_2_5_0_ { @@ -52,20 +52,20 @@ rec { features = mkFeatures (features.brotli_2_5_0 or {}); }; brotli_2_5_0_features = f: updateFeatures f (rec { - alloc_no_stdlib_1_3_0."no-stdlib" = - (f.alloc_no_stdlib_1_3_0."no-stdlib" or false) || - (brotli_2_5_0."no-stdlib" or false) || - (f.brotli_2_5_0."no-stdlib" or false); + alloc_no_stdlib_1_3_0.no-stdlib = + (f.alloc_no_stdlib_1_3_0.no-stdlib or false) || + (brotli_2_5_0.no-stdlib or false) || + (f.brotli_2_5_0.no-stdlib or false); alloc_no_stdlib_1_3_0.default = true; brotli_2_5_0.default = (f.brotli_2_5_0.default or true); - brotli_decompressor_1_3_1."disable-timer" = - (f.brotli_decompressor_1_3_1."disable-timer" or false) || - (brotli_2_5_0."disable-timer" or false) || - (f.brotli_2_5_0."disable-timer" or false); - brotli_decompressor_1_3_1."no-stdlib" = - (f.brotli_decompressor_1_3_1."no-stdlib" or false) || - (brotli_2_5_0."no-stdlib" or false) || - (f.brotli_2_5_0."no-stdlib" or false); + brotli_decompressor_1_3_1.disable-timer = + (f.brotli_decompressor_1_3_1.disable-timer or false) || + (brotli_2_5_0.disable-timer or false) || + (f.brotli_2_5_0.disable-timer or false); + brotli_decompressor_1_3_1.no-stdlib = + (f.brotli_decompressor_1_3_1.no-stdlib or false) || + (brotli_2_5_0.no-stdlib or false) || + (f.brotli_2_5_0.no-stdlib or false); brotli_decompressor_1_3_1.benchmark = (f.brotli_decompressor_1_3_1.benchmark or false) || (brotli_2_5_0.benchmark or false) || @@ -81,10 +81,10 @@ rec { features = mkFeatures (features.brotli_decompressor_1_3_1 or {}); }; brotli_decompressor_1_3_1_features = f: updateFeatures f (rec { - alloc_no_stdlib_1_3_0."no-stdlib" = - (f.alloc_no_stdlib_1_3_0."no-stdlib" or false) || - (brotli_decompressor_1_3_1."no-stdlib" or false) || - (f.brotli_decompressor_1_3_1."no-stdlib" or false); + alloc_no_stdlib_1_3_0.no-stdlib = + (f.alloc_no_stdlib_1_3_0.no-stdlib or false) || + (brotli_decompressor_1_3_1.no-stdlib or false) || + (f.brotli_decompressor_1_3_1.no-stdlib or false); alloc_no_stdlib_1_3_0.default = true; alloc_no_stdlib_1_3_0.unsafe = (f.alloc_no_stdlib_1_3_0.unsafe or false) || diff --git a/pkgs/build-support/rust/crates-io.nix b/pkgs/build-support/rust/crates-io.nix index 9dd2da28ad5..66f98cd9912 100644 --- a/pkgs/build-support/rust/crates-io.nix +++ b/pkgs/build-support/rust/crates-io.nix @@ -19,7 +19,7 @@ rec { (crates."memchr"."${deps."aho_corasick"."0.6.10"."memchr"}" deps) ]); }; - features_.aho_corasick."0.6.10" = deps: f: updateFeatures f (rec { + features_.aho_corasick."0.6.10" = deps: f: updateFeatures f ({ aho_corasick."0.6.10".default = (f.aho_corasick."0.6.10".default or true); memchr."${deps.aho_corasick."0.6.10".memchr}".default = true; }) [ @@ -42,7 +42,7 @@ rec { (crates."memchr"."${deps."aho_corasick"."0.6.8"."memchr"}" deps) ]); }; - features_.aho_corasick."0.6.8" = deps: f: updateFeatures f (rec { + features_.aho_corasick."0.6.8" = deps: f: updateFeatures f ({ aho_corasick."0.6.8".default = (f.aho_corasick."0.6.8".default or true); memchr."${deps.aho_corasick."0.6.8".memchr}".default = true; }) [ @@ -62,7 +62,7 @@ rec { (crates."winapi"."${deps."ansi_term"."0.11.0"."winapi"}" deps) ]) else []); }; - features_.ansi_term."0.11.0" = deps: f: updateFeatures f (rec { + features_.ansi_term."0.11.0" = deps: f: updateFeatures f ({ ansi_term."0.11.0".default = (f.ansi_term."0.11.0".default or true); winapi = fold recursiveUpdate {} [ { "${deps.ansi_term."0.11.0".winapi}"."consoleapi" = true; } @@ -186,7 +186,7 @@ rec { (crates."winapi"."${deps."atty"."0.2.11"."winapi"}" deps) ]) else []); }; - features_.atty."0.2.11" = deps: f: updateFeatures f (rec { + features_.atty."0.2.11" = deps: f: updateFeatures f ({ atty."0.2.11".default = (f.atty."0.2.11".default or true); libc."${deps.atty."0.2.11".libc}".default = (f.libc."${deps.atty."0.2.11".libc}".default or false); termion."${deps.atty."0.2.11".termion}".default = true; @@ -215,7 +215,7 @@ rec { authors = [ "Josh Stone <cuviper@gmail.com>" ]; sha256 = "0dv81dwnp1al3j4ffz007yrjv4w1c7hw09gnf0xs3icxiw6qqfs3"; }; - features_.autocfg."0.1.2" = deps: f: updateFeatures f (rec { + features_.autocfg."0.1.2" = deps: f: updateFeatures f ({ autocfg."0.1.2".default = (f.autocfg."0.1.2".default or true); }) []; @@ -461,7 +461,7 @@ rec { (crates."cc"."${deps."backtrace_sys"."0.1.24"."cc"}" deps) ]); }; - features_.backtrace_sys."0.1.24" = deps: f: updateFeatures f (rec { + features_.backtrace_sys."0.1.24" = deps: f: updateFeatures f ({ backtrace_sys."0.1.24".default = (f.backtrace_sys."0.1.24".default or true); cc."${deps.backtrace_sys."0.1.24".cc}".default = true; libc."${deps.backtrace_sys."0.1.24".libc}".default = true; @@ -489,7 +489,7 @@ rec { (crates."cc"."${deps."backtrace_sys"."0.1.28"."cc"}" deps) ]); }; - features_.backtrace_sys."0.1.28" = deps: f: updateFeatures f (rec { + features_.backtrace_sys."0.1.28" = deps: f: updateFeatures f ({ backtrace_sys."0.1.28".default = (f.backtrace_sys."0.1.28".default or true); cc."${deps.backtrace_sys."0.1.28".cc}".default = true; libc."${deps.backtrace_sys."0.1.28".libc}".default = (f.libc."${deps.backtrace_sys."0.1.28".libc}".default or false); @@ -509,7 +509,7 @@ rec { sha256 = "1g1wmz2001qmfrd37dnd5qiss5njrw26aywmg6yhkmkbyrhjxb08"; features = mkFeatures (features."bitflags"."1.0.4" or {}); }; - features_.bitflags."1.0.4" = deps: f: updateFeatures f (rec { + features_.bitflags."1.0.4" = deps: f: updateFeatures f ({ bitflags."1.0.4".default = (f.bitflags."1.0.4".default or true); }) []; @@ -582,7 +582,7 @@ rec { (crates."url"."${deps."carnix"."0.10.0"."url"}" deps) ]); }; - features_.carnix."0.10.0" = deps: f: updateFeatures f (rec { + features_.carnix."0.10.0" = deps: f: updateFeatures f ({ carnix."0.10.0".default = (f.carnix."0.10.0".default or true); clap."${deps.carnix."0.10.0".clap}".default = true; dirs."${deps.carnix."0.10.0".dirs}".default = true; @@ -645,7 +645,7 @@ rec { (crates."toml"."${deps."carnix"."0.9.1"."toml"}" deps) ]); }; - features_.carnix."0.9.1" = deps: f: updateFeatures f (rec { + features_.carnix."0.9.1" = deps: f: updateFeatures f ({ carnix."0.9.1".default = (f.carnix."0.9.1".default or true); clap."${deps.carnix."0.9.1".clap}".default = true; dirs."${deps.carnix."0.9.1".dirs}".default = true; @@ -704,7 +704,7 @@ rec { (crates."toml"."${deps."carnix"."0.9.2"."toml"}" deps) ]); }; - features_.carnix."0.9.2" = deps: f: updateFeatures f (rec { + features_.carnix."0.9.2" = deps: f: updateFeatures f ({ carnix."0.9.2".default = (f.carnix."0.9.2".default or true); clap."${deps.carnix."0.9.2".clap}".default = true; dirs."${deps.carnix."0.9.2".dirs}".default = true; @@ -764,7 +764,7 @@ rec { (crates."url"."${deps."carnix"."0.9.8"."url"}" deps) ]); }; - features_.carnix."0.9.8" = deps: f: updateFeatures f (rec { + features_.carnix."0.9.8" = deps: f: updateFeatures f ({ carnix."0.9.8".default = (f.carnix."0.9.8".default or true); clap."${deps.carnix."0.9.8".clap}".default = true; dirs."${deps.carnix."0.9.8".dirs}".default = true; @@ -854,7 +854,7 @@ rec { authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; sha256 = "11qrix06wagkplyk908i3423ps9m9np6c4vbcq81s9fyl244xv3n"; }; - features_.cfg_if."0.1.6" = deps: f: updateFeatures f (rec { + features_.cfg_if."0.1.6" = deps: f: updateFeatures f ({ cfg_if."0.1.6".default = (f.cfg_if."0.1.6".default or true); }) []; @@ -869,7 +869,7 @@ rec { authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; sha256 = "13gvcx1dxjq4mpmpj26hpg3yc97qffkx2zi58ykr1dwr8q2biiig"; }; - features_.cfg_if."0.1.7" = deps: f: updateFeatures f (rec { + features_.cfg_if."0.1.7" = deps: f: updateFeatures f ({ cfg_if."0.1.7".default = (f.cfg_if."0.1.7".default or true); }) []; @@ -1001,7 +1001,7 @@ rec { authors = [ "Cesar Eduardo Barros <cesarb@cesarb.eti.br>" ]; sha256 = "03qri9hjf049gwqg9q527lybpg918q6y5q4g9a5lma753nff49wd"; }; - features_.constant_time_eq."0.1.3" = deps: f: updateFeatures f (rec { + features_.constant_time_eq."0.1.3" = deps: f: updateFeatures f ({ constant_time_eq."0.1.3".default = (f.constant_time_eq."0.1.3".default or true); }) []; @@ -1024,7 +1024,7 @@ rec { (crates."winapi"."${deps."dirs"."1.0.4"."winapi"}" deps) ]) else []); }; - features_.dirs."1.0.4" = deps: f: updateFeatures f (rec { + features_.dirs."1.0.4" = deps: f: updateFeatures f ({ dirs."1.0.4".default = (f.dirs."1.0.4".default or true); libc."${deps.dirs."1.0.4".libc}".default = true; redox_users."${deps.dirs."1.0.4".redox_users}".default = true; @@ -1062,7 +1062,7 @@ rec { (crates."winapi"."${deps."dirs"."1.0.5"."winapi"}" deps) ]) else []); }; - features_.dirs."1.0.5" = deps: f: updateFeatures f (rec { + features_.dirs."1.0.5" = deps: f: updateFeatures f ({ dirs."1.0.5".default = (f.dirs."1.0.5".default or true); libc."${deps.dirs."1.0.5".libc}".default = true; redox_users."${deps.dirs."1.0.5".redox_users}".default = true; @@ -1359,7 +1359,7 @@ rec { ]); features = mkFeatures (features."failure_derive"."0.1.3" or {}); }; - features_.failure_derive."0.1.3" = deps: f: updateFeatures f (rec { + features_.failure_derive."0.1.3" = deps: f: updateFeatures f ({ failure_derive."0.1.3".default = (f.failure_derive."0.1.3".default or true); proc_macro2."${deps.failure_derive."0.1.3".proc_macro2}".default = true; quote."${deps.failure_derive."0.1.3".quote}".default = true; @@ -1392,7 +1392,7 @@ rec { ]); features = mkFeatures (features."failure_derive"."0.1.5" or {}); }; - features_.failure_derive."0.1.5" = deps: f: updateFeatures f (rec { + features_.failure_derive."0.1.5" = deps: f: updateFeatures f ({ failure_derive."0.1.5".default = (f.failure_derive."0.1.5".default or true); proc_macro2."${deps.failure_derive."0.1.5".proc_macro2}".default = true; quote."${deps.failure_derive."0.1.5".quote}".default = true; @@ -1417,7 +1417,7 @@ rec { edition = "2018"; sha256 = "07apwv9dj716yjlcj29p94vkqn5zmfh7hlrqvrjx3wzshphc95h9"; }; - features_.fuchsia_cprng."0.1.1" = deps: f: updateFeatures f (rec { + features_.fuchsia_cprng."0.1.1" = deps: f: updateFeatures f ({ fuchsia_cprng."0.1.1".default = (f.fuchsia_cprng."0.1.1".default or true); }) []; @@ -1435,7 +1435,7 @@ rec { (crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps) ]); }; - features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f (rec { + features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f ({ bitflags."${deps.fuchsia_zircon."0.3.3".bitflags}".default = true; fuchsia_zircon."0.3.3".default = (f.fuchsia_zircon."0.3.3".default or true); fuchsia_zircon_sys."${deps.fuchsia_zircon."0.3.3".fuchsia_zircon_sys}".default = true; @@ -1454,7 +1454,7 @@ rec { authors = [ "Raph Levien <raph@google.com>" ]; sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; }; - features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f (rec { + features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f ({ fuchsia_zircon_sys."0.3.3".default = (f.fuchsia_zircon_sys."0.3.3".default or true); }) []; @@ -1472,7 +1472,7 @@ rec { (crates."quick_error"."${deps."humantime"."1.1.1"."quick_error"}" deps) ]); }; - features_.humantime."1.1.1" = deps: f: updateFeatures f (rec { + features_.humantime."1.1.1" = deps: f: updateFeatures f ({ humantime."1.1.1".default = (f.humantime."1.1.1".default or true); quick_error."${deps.humantime."1.1.1".quick_error}".default = true; }) [ @@ -1494,7 +1494,7 @@ rec { (crates."quick_error"."${deps."humantime"."1.2.0"."quick_error"}" deps) ]); }; - features_.humantime."1.2.0" = deps: f: updateFeatures f (rec { + features_.humantime."1.2.0" = deps: f: updateFeatures f ({ humantime."1.2.0".default = (f.humantime."1.2.0".default or true); quick_error."${deps.humantime."1.2.0".quick_error}".default = true; }) [ @@ -1516,7 +1516,7 @@ rec { (crates."unicode_normalization"."${deps."idna"."0.1.5"."unicode_normalization"}" deps) ]); }; - features_.idna."0.1.5" = deps: f: updateFeatures f (rec { + features_.idna."0.1.5" = deps: f: updateFeatures f ({ idna."0.1.5".default = (f.idna."0.1.5".default or true); matches."${deps.idna."0.1.5".matches}".default = true; unicode_bidi."${deps.idna."0.1.5".unicode_bidi}".default = true; @@ -1730,7 +1730,7 @@ rec { ]); features = mkFeatures (features."log"."0.4.5" or {}); }; - features_.log."0.4.5" = deps: f: updateFeatures f (rec { + features_.log."0.4.5" = deps: f: updateFeatures f ({ cfg_if."${deps.log."0.4.5".cfg_if}".default = true; log."0.4.5".default = (f.log."0.4.5".default or true); }) [ @@ -1752,7 +1752,7 @@ rec { ]); features = mkFeatures (features."log"."0.4.6" or {}); }; - features_.log."0.4.6" = deps: f: updateFeatures f (rec { + features_.log."0.4.6" = deps: f: updateFeatures f ({ cfg_if."${deps.log."0.4.6".cfg_if}".default = true; log."0.4.6".default = (f.log."0.4.6".default or true); }) [ @@ -1770,7 +1770,7 @@ rec { sha256 = "03hl636fg6xggy0a26200xs74amk3k9n0908rga2szn68agyz3cv"; libPath = "lib.rs"; }; - features_.matches."0.1.8" = deps: f: updateFeatures f (rec { + features_.matches."0.1.8" = deps: f: updateFeatures f ({ matches."0.1.8".default = (f.matches."0.1.8".default or true); }) []; @@ -2004,7 +2004,7 @@ rec { sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i"; libPath = "lib.rs"; }; - features_.percent_encoding."1.0.1" = deps: f: updateFeatures f (rec { + features_.percent_encoding."1.0.1" = deps: f: updateFeatures f ({ percent_encoding."1.0.1".default = (f.percent_encoding."1.0.1".default or true); }) []; @@ -2077,7 +2077,7 @@ rec { authors = [ "Paul Colomiets <paul@colomiets.name>" "Colin Kiegel <kiegel@gmx.de>" ]; sha256 = "192a3adc5phgpibgqblsdx1b421l5yg9bjbmv552qqq9f37h60k5"; }; - features_.quick_error."1.2.2" = deps: f: updateFeatures f (rec { + features_.quick_error."1.2.2" = deps: f: updateFeatures f ({ quick_error."1.2.2".default = (f.quick_error."1.2.2".default or true); }) []; @@ -2362,7 +2362,7 @@ rec { ++ (if kernel == "wasm32-unknown-unknown" then mapFeatures features ([ ]) else []); }; - features_.rand_os."0.1.3" = deps: f: updateFeatures f (rec { + features_.rand_os."0.1.3" = deps: f: updateFeatures f ({ cloudabi."${deps.rand_os."0.1.3".cloudabi}".default = true; fuchsia_cprng."${deps.rand_os."0.1.3".fuchsia_cprng}".default = true; libc."${deps.rand_os."0.1.3".libc}".default = true; @@ -2426,7 +2426,7 @@ rec { sha256 = "132rnhrq49l3z7gjrwj2zfadgw6q0355s6a7id7x7c0d7sk72611"; libName = "syscall"; }; - features_.redox_syscall."0.1.40" = deps: f: updateFeatures f (rec { + features_.redox_syscall."0.1.40" = deps: f: updateFeatures f ({ redox_syscall."0.1.40".default = (f.redox_syscall."0.1.40".default or true); }) []; @@ -2442,7 +2442,7 @@ rec { sha256 = "1a61cv7yydx64vpyvzr0z0hwzdvy4gcvcnfc6k70zpkngj5sz3ip"; libName = "syscall"; }; - features_.redox_syscall."0.1.51" = deps: f: updateFeatures f (rec { + features_.redox_syscall."0.1.51" = deps: f: updateFeatures f ({ redox_syscall."0.1.51".default = (f.redox_syscall."0.1.51".default or true); }) []; @@ -2460,7 +2460,7 @@ rec { (crates."redox_syscall"."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps) ]); }; - features_.redox_termios."0.1.1" = deps: f: updateFeatures f (rec { + features_.redox_termios."0.1.1" = deps: f: updateFeatures f ({ redox_syscall."${deps.redox_termios."0.1.1".redox_syscall}".default = true; redox_termios."0.1.1".default = (f.redox_termios."0.1.1".default or true); }) [ @@ -2483,7 +2483,7 @@ rec { (crates."redox_syscall"."${deps."redox_users"."0.2.0"."redox_syscall"}" deps) ]); }; - features_.redox_users."0.2.0" = deps: f: updateFeatures f (rec { + features_.redox_users."0.2.0" = deps: f: updateFeatures f ({ argon2rs."${deps.redox_users."0.2.0".argon2rs}".default = (f.argon2rs."${deps.redox_users."0.2.0".argon2rs}".default or false); failure."${deps.redox_users."0.2.0".failure}".default = true; rand."${deps.redox_users."0.2.0".rand}".default = true; @@ -2513,7 +2513,7 @@ rec { (crates."redox_syscall"."${deps."redox_users"."0.3.0"."redox_syscall"}" deps) ]); }; - features_.redox_users."0.3.0" = deps: f: updateFeatures f (rec { + features_.redox_users."0.3.0" = deps: f: updateFeatures f ({ argon2rs."${deps.redox_users."0.3.0".argon2rs}".default = (f.argon2rs."${deps.redox_users."0.3.0".argon2rs}".default or false); failure."${deps.redox_users."0.3.0".failure}".default = true; rand_os."${deps.redox_users."0.3.0".rand_os}".default = true; @@ -2626,7 +2626,7 @@ rec { (crates."ucd_util"."${deps."regex_syntax"."0.6.2"."ucd_util"}" deps) ]); }; - features_.regex_syntax."0.6.2" = deps: f: updateFeatures f (rec { + features_.regex_syntax."0.6.2" = deps: f: updateFeatures f ({ regex_syntax."0.6.2".default = (f.regex_syntax."0.6.2".default or true); ucd_util."${deps.regex_syntax."0.6.2".ucd_util}".default = true; }) [ @@ -2647,7 +2647,7 @@ rec { (crates."ucd_util"."${deps."regex_syntax"."0.6.5"."ucd_util"}" deps) ]); }; - features_.regex_syntax."0.6.5" = deps: f: updateFeatures f (rec { + features_.regex_syntax."0.6.5" = deps: f: updateFeatures f ({ regex_syntax."0.6.5".default = (f.regex_syntax."0.6.5".default or true); ucd_util."${deps.regex_syntax."0.6.5".ucd_util}".default = true; }) [ @@ -2667,7 +2667,7 @@ rec { (crates."winapi"."${deps."remove_dir_all"."0.5.1"."winapi"}" deps) ]) else []); }; - features_.remove_dir_all."0.5.1" = deps: f: updateFeatures f (rec { + features_.remove_dir_all."0.5.1" = deps: f: updateFeatures f ({ remove_dir_all."0.5.1".default = (f.remove_dir_all."0.5.1".default or true); winapi = fold recursiveUpdate {} [ { "${deps.remove_dir_all."0.5.1".winapi}"."errhandlingapi" = true; } @@ -2692,7 +2692,7 @@ rec { authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; sha256 = "0sr6cr02araqnlqwc5ghvnafjmkw11vzjswqaz757lvyrcl8xcy6"; }; - features_.rustc_demangle."0.1.13" = deps: f: updateFeatures f (rec { + features_.rustc_demangle."0.1.13" = deps: f: updateFeatures f ({ rustc_demangle."0.1.13".default = (f.rustc_demangle."0.1.13".default or true); }) []; @@ -2706,7 +2706,7 @@ rec { authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; sha256 = "00ma4r9haq0zv5krps617mym6y74056pfcivyld0kpci156vfaax"; }; - features_.rustc_demangle."0.1.9" = deps: f: updateFeatures f (rec { + features_.rustc_demangle."0.1.9" = deps: f: updateFeatures f ({ rustc_demangle."0.1.9".default = (f.rustc_demangle."0.1.9".default or true); }) []; @@ -2724,7 +2724,7 @@ rec { ]); features = mkFeatures (features."ryu"."0.2.6" or {}); }; - features_.ryu."0.2.6" = deps: f: updateFeatures f (rec { + features_.ryu."0.2.6" = deps: f: updateFeatures f ({ ryu."0.2.6".default = (f.ryu."0.2.6".default or true); }) []; @@ -2743,7 +2743,7 @@ rec { ]); features = mkFeatures (features."ryu"."0.2.7" or {}); }; - features_.ryu."0.2.7" = deps: f: updateFeatures f (rec { + features_.ryu."0.2.7" = deps: f: updateFeatures f ({ ryu."0.2.7".default = (f.ryu."0.2.7".default or true); }) []; @@ -2758,7 +2758,7 @@ rec { sha256 = "1arqj2skcfr46s1lcyvnlmfr5456kg5nhn8k90xyfjnxkp5yga2v"; features = mkFeatures (features."scoped_threadpool"."0.1.9" or {}); }; - features_.scoped_threadpool."0.1.9" = deps: f: updateFeatures f (rec { + features_.scoped_threadpool."0.1.9" = deps: f: updateFeatures f ({ scoped_threadpool."0.1.9".default = (f.scoped_threadpool."0.1.9".default or true); }) []; @@ -2876,7 +2876,7 @@ rec { ]); features = mkFeatures (features."serde_derive"."1.0.80" or {}); }; - features_.serde_derive."1.0.80" = deps: f: updateFeatures f (rec { + features_.serde_derive."1.0.80" = deps: f: updateFeatures f ({ proc_macro2."${deps.serde_derive."1.0.80".proc_macro2}".default = true; quote."${deps.serde_derive."1.0.80".quote}".default = true; serde_derive."1.0.80".default = (f.serde_derive."1.0.80".default or true); @@ -2908,7 +2908,7 @@ rec { ]); features = mkFeatures (features."serde_derive"."1.0.89" or {}); }; - features_.serde_derive."1.0.89" = deps: f: updateFeatures f (rec { + features_.serde_derive."1.0.89" = deps: f: updateFeatures f ({ proc_macro2."${deps.serde_derive."1.0.89".proc_macro2}".default = true; quote."${deps.serde_derive."1.0.89".quote}".default = true; serde_derive."1.0.89".default = (f.serde_derive."1.0.89".default or true); @@ -3024,7 +3024,7 @@ rec { authors = [ "Danny Guo <dannyguo91@gmail.com>" ]; sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv"; }; - features_.strsim."0.7.0" = deps: f: updateFeatures f (rec { + features_.strsim."0.7.0" = deps: f: updateFeatures f ({ strsim."0.7.0".default = (f.strsim."0.7.0".default or true); }) []; @@ -3176,7 +3176,7 @@ rec { ]); features = mkFeatures (features."synstructure"."0.10.0" or {}); }; - features_.synstructure."0.10.0" = deps: f: updateFeatures f (rec { + features_.synstructure."0.10.0" = deps: f: updateFeatures f ({ proc_macro2."${deps.synstructure."0.10.0".proc_macro2}".default = true; quote."${deps.synstructure."0.10.0".quote}".default = true; syn = fold recursiveUpdate {} [ @@ -3211,7 +3211,7 @@ rec { ]); features = mkFeatures (features."synstructure"."0.10.1" or {}); }; - features_.synstructure."0.10.1" = deps: f: updateFeatures f (rec { + features_.synstructure."0.10.1" = deps: f: updateFeatures f ({ proc_macro2."${deps.synstructure."0.10.1".proc_macro2}".default = true; quote."${deps.synstructure."0.10.1".quote}".default = true; syn = fold recursiveUpdate {} [ @@ -3242,7 +3242,7 @@ rec { (crates."remove_dir_all"."${deps."tempdir"."0.3.7"."remove_dir_all"}" deps) ]); }; - features_.tempdir."0.3.7" = deps: f: updateFeatures f (rec { + features_.tempdir."0.3.7" = deps: f: updateFeatures f ({ rand."${deps.tempdir."0.3.7".rand}".default = true; remove_dir_all."${deps.tempdir."0.3.7".remove_dir_all}".default = true; tempdir."0.3.7".default = (f.tempdir."0.3.7".default or true); @@ -3264,7 +3264,7 @@ rec { (crates."wincolor"."${deps."termcolor"."1.0.4"."wincolor"}" deps) ]) else []); }; - features_.termcolor."1.0.4" = deps: f: updateFeatures f (rec { + features_.termcolor."1.0.4" = deps: f: updateFeatures f ({ termcolor."1.0.4".default = (f.termcolor."1.0.4".default or true); wincolor."${deps.termcolor."1.0.4".wincolor}".default = true; }) [ @@ -3288,7 +3288,7 @@ rec { (crates."redox_termios"."${deps."termion"."1.5.1"."redox_termios"}" deps) ]) else []); }; - features_.termion."1.5.1" = deps: f: updateFeatures f (rec { + features_.termion."1.5.1" = deps: f: updateFeatures f ({ libc."${deps.termion."1.5.1".libc}".default = true; redox_syscall."${deps.termion."1.5.1".redox_syscall}".default = true; redox_termios."${deps.termion."1.5.1".redox_termios}".default = true; @@ -3312,7 +3312,7 @@ rec { (crates."unicode_width"."${deps."textwrap"."0.10.0"."unicode_width"}" deps) ]); }; - features_.textwrap."0.10.0" = deps: f: updateFeatures f (rec { + features_.textwrap."0.10.0" = deps: f: updateFeatures f ({ textwrap."0.10.0".default = (f.textwrap."0.10.0".default or true); unicode_width."${deps.textwrap."0.10.0".unicode_width}".default = true; }) [ @@ -3332,7 +3332,7 @@ rec { (crates."lazy_static"."${deps."thread_local"."0.3.6"."lazy_static"}" deps) ]); }; - features_.thread_local."0.3.6" = deps: f: updateFeatures f (rec { + features_.thread_local."0.3.6" = deps: f: updateFeatures f ({ lazy_static."${deps.thread_local."0.3.6".lazy_static}".default = true; thread_local."0.3.6".default = (f.thread_local."0.3.6".default or true); }) [ @@ -3352,7 +3352,7 @@ rec { (crates."serde"."${deps."toml"."0.4.10"."serde"}" deps) ]); }; - features_.toml."0.4.10" = deps: f: updateFeatures f (rec { + features_.toml."0.4.10" = deps: f: updateFeatures f ({ serde."${deps.toml."0.4.10".serde}".default = true; toml."0.4.10".default = (f.toml."0.4.10".default or true); }) [ @@ -3372,7 +3372,7 @@ rec { (crates."serde"."${deps."toml"."0.4.8"."serde"}" deps) ]); }; - features_.toml."0.4.8" = deps: f: updateFeatures f (rec { + features_.toml."0.4.8" = deps: f: updateFeatures f ({ serde."${deps.toml."0.4.8".serde}".default = true; toml."0.4.8".default = (f.toml."0.4.8".default or true); }) [ @@ -3420,7 +3420,7 @@ rec { (crates."toml"."${deps."toml2nix"."0.1.1"."toml"}" deps) ]); }; - features_.toml2nix."0.1.1" = deps: f: updateFeatures f (rec { + features_.toml2nix."0.1.1" = deps: f: updateFeatures f ({ toml."${deps.toml2nix."0.1.1".toml}".default = true; toml2nix."0.1.1".default = (f.toml2nix."0.1.1".default or true); }) [ @@ -3437,7 +3437,7 @@ rec { authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0"; }; - features_.ucd_util."0.1.1" = deps: f: updateFeatures f (rec { + features_.ucd_util."0.1.1" = deps: f: updateFeatures f ({ ucd_util."0.1.1".default = (f.ucd_util."0.1.1".default or true); }) []; @@ -3452,7 +3452,7 @@ rec { authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; sha256 = "1n1qi3jywq5syq90z9qd8qzbn58pcjgv1sx4sdmipm4jf9zanz15"; }; - features_.ucd_util."0.1.3" = deps: f: updateFeatures f (rec { + features_.ucd_util."0.1.3" = deps: f: updateFeatures f ({ ucd_util."0.1.3".default = (f.ucd_util."0.1.3".default or true); }) []; @@ -3502,7 +3502,7 @@ rec { authors = [ "kwantam <kwantam@gmail.com>" ]; sha256 = "1da2hv800pd0wilmn4idwpgv5p510hjxizjcfv6xzb40xcsjd8gs"; }; - features_.unicode_normalization."0.1.7" = deps: f: updateFeatures f (rec { + features_.unicode_normalization."0.1.7" = deps: f: updateFeatures f ({ unicode_normalization."0.1.7".default = (f.unicode_normalization."0.1.7".default or true); }) []; @@ -3520,7 +3520,7 @@ rec { (crates."smallvec"."${deps."unicode_normalization"."0.1.8"."smallvec"}" deps) ]); }; - features_.unicode_normalization."0.1.8" = deps: f: updateFeatures f (rec { + features_.unicode_normalization."0.1.8" = deps: f: updateFeatures f ({ smallvec."${deps.unicode_normalization."0.1.8".smallvec}".default = true; unicode_normalization."0.1.8".default = (f.unicode_normalization."0.1.8".default or true); }) [ @@ -3538,7 +3538,7 @@ rec { sha256 = "0886lc2aymwgy0lhavwn6s48ik3c61ykzzd3za6prgnw51j7bi4w"; features = mkFeatures (features."unicode_width"."0.1.5" or {}); }; - features_.unicode_width."0.1.5" = deps: f: updateFeatures f (rec { + features_.unicode_width."0.1.5" = deps: f: updateFeatures f ({ unicode_width."0.1.5".default = (f.unicode_width."0.1.5".default or true); }) []; @@ -3553,7 +3553,7 @@ rec { sha256 = "05wdmwlfzxhq3nhsxn6wx4q8dhxzzfb9szsz6wiw092m1rjj01zj"; features = mkFeatures (features."unicode_xid"."0.1.0" or {}); }; - features_.unicode_xid."0.1.0" = deps: f: updateFeatures f (rec { + features_.unicode_xid."0.1.0" = deps: f: updateFeatures f ({ unicode_xid."0.1.0".default = (f.unicode_xid."0.1.0".default or true); }) []; @@ -3604,7 +3604,7 @@ rec { authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; sha256 = "1s56ihd2c8ba6191078wivvv59247szaiszrh8x2rxqfsxlfrnpp"; }; - features_.utf8_ranges."1.0.1" = deps: f: updateFeatures f (rec { + features_.utf8_ranges."1.0.1" = deps: f: updateFeatures f ({ utf8_ranges."1.0.1".default = (f.utf8_ranges."1.0.1".default or true); }) []; @@ -3619,7 +3619,7 @@ rec { authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; sha256 = "1my02laqsgnd8ib4dvjgd4rilprqjad6pb9jj9vi67csi5qs2281"; }; - features_.utf8_ranges."1.0.2" = deps: f: updateFeatures f (rec { + features_.utf8_ranges."1.0.2" = deps: f: updateFeatures f ({ utf8_ranges."1.0.2".default = (f.utf8_ranges."1.0.2".default or true); }) []; @@ -3656,7 +3656,7 @@ rec { authors = [ "Sergio Benitez <sb@sergio.bz>" ]; sha256 = "1yrx9xblmwbafw2firxyqbj8f771kkzfd24n3q7xgwiqyhi0y8qd"; }; - features_.version_check."0.1.5" = deps: f: updateFeatures f (rec { + features_.version_check."0.1.5" = deps: f: updateFeatures f ({ version_check."0.1.5".default = (f.version_check."0.1.5".default or true); }) []; @@ -3678,7 +3678,7 @@ rec { ]) else []); features = mkFeatures (features."winapi"."0.3.6" or {}); }; - features_.winapi."0.3.6" = deps: f: updateFeatures f (rec { + features_.winapi."0.3.6" = deps: f: updateFeatures f ({ winapi."0.3.6".default = (f.winapi."0.3.6".default or true); winapi_i686_pc_windows_gnu."${deps.winapi."0.3.6".winapi_i686_pc_windows_gnu}".default = true; winapi_x86_64_pc_windows_gnu."${deps.winapi."0.3.6".winapi_x86_64_pc_windows_gnu}".default = true; @@ -3698,7 +3698,7 @@ rec { sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp"; build = "build.rs"; }; - features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec { + features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({ winapi_i686_pc_windows_gnu."0.4.0".default = (f.winapi_i686_pc_windows_gnu."0.4.0".default or true); }) []; @@ -3715,7 +3715,7 @@ rec { (crates."winapi"."${deps."winapi_util"."0.1.1"."winapi"}" deps) ]) else []); }; - features_.winapi_util."0.1.1" = deps: f: updateFeatures f (rec { + features_.winapi_util."0.1.1" = deps: f: updateFeatures f ({ winapi = fold recursiveUpdate {} [ { "${deps.winapi_util."0.1.1".winapi}"."consoleapi" = true; } { "${deps.winapi_util."0.1.1".winapi}"."errhandlingapi" = true; } @@ -3747,7 +3747,7 @@ rec { (crates."winapi"."${deps."winapi_util"."0.1.2"."winapi"}" deps) ]) else []); }; - features_.winapi_util."0.1.2" = deps: f: updateFeatures f (rec { + features_.winapi_util."0.1.2" = deps: f: updateFeatures f ({ winapi = fold recursiveUpdate {} [ { "${deps.winapi_util."0.1.2".winapi}"."consoleapi" = true; } { "${deps.winapi_util."0.1.2".winapi}"."errhandlingapi" = true; } @@ -3777,7 +3777,7 @@ rec { sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj"; build = "build.rs"; }; - features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec { + features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({ winapi_x86_64_pc_windows_gnu."0.4.0".default = (f.winapi_x86_64_pc_windows_gnu."0.4.0".default or true); }) []; @@ -3795,7 +3795,7 @@ rec { (crates."winapi_util"."${deps."wincolor"."1.0.1"."winapi_util"}" deps) ]); }; - features_.wincolor."1.0.1" = deps: f: updateFeatures f (rec { + features_.wincolor."1.0.1" = deps: f: updateFeatures f ({ winapi = fold recursiveUpdate {} [ { "${deps.wincolor."1.0.1".winapi}"."minwindef" = true; } { "${deps.wincolor."1.0.1".winapi}"."wincon" = true; } @@ -4104,7 +4104,7 @@ rec { dependencies = mapFeatures features ([ ]); }; - features_.bytesize."1.0.0" = deps: f: updateFeatures f (rec { + features_.bytesize."1.0.0" = deps: f: updateFeatures f ({ bytesize."1.0.0".default = (f.bytesize."1.0.0".default or true); }) []; @@ -4549,7 +4549,7 @@ rec { build = "build.rs"; features = mkFeatures (features."core_foundation_sys"."0.6.2" or {}); }; - features_.core_foundation_sys."0.6.2" = deps: f: updateFeatures f (rec { + features_.core_foundation_sys."0.6.2" = deps: f: updateFeatures f ({ core_foundation_sys."0.6.2".default = (f.core_foundation_sys."0.6.2".default or true); }) []; @@ -4576,7 +4576,7 @@ rec { (crates."url"."${deps."crates_io"."0.23.0"."url"}" deps) ]); }; - features_.crates_io."0.23.0" = deps: f: updateFeatures f (rec { + features_.crates_io."0.23.0" = deps: f: updateFeatures f ({ crates_io."0.23.0".default = (f.crates_io."0.23.0".default or true); curl."${deps.crates_io."0.23.0".curl}".default = true; failure."${deps.crates_io."0.23.0".failure}".default = true; @@ -4670,7 +4670,7 @@ rec { (crates."smallvec"."${deps."crossbeam_channel"."0.3.8"."smallvec"}" deps) ]); }; - features_.crossbeam_channel."0.3.8" = deps: f: updateFeatures f (rec { + features_.crossbeam_channel."0.3.8" = deps: f: updateFeatures f ({ crossbeam_channel."0.3.8".default = (f.crossbeam_channel."0.3.8".default or true); crossbeam_utils."${deps.crossbeam_channel."0.3.8".crossbeam_utils}".default = true; smallvec."${deps.crossbeam_channel."0.3.8".smallvec}".default = true; @@ -4737,7 +4737,7 @@ rec { (crates."winapi"."${deps."crypto_hash"."0.3.3"."winapi"}" deps) ]) else []); }; - features_.crypto_hash."0.3.3" = deps: f: updateFeatures f (rec { + features_.crypto_hash."0.3.3" = deps: f: updateFeatures f ({ commoncrypto."${deps.crypto_hash."0.3.3".commoncrypto}".default = true; crypto_hash."0.3.3".default = (f.crypto_hash."0.3.3".default or true); hex."${deps.crypto_hash."0.3.3".hex}".default = true; @@ -4929,7 +4929,7 @@ rec { (crates."strsim"."${deps."docopt"."1.1.0"."strsim"}" deps) ]); }; - features_.docopt."1.1.0" = deps: f: updateFeatures f (rec { + features_.docopt."1.1.0" = deps: f: updateFeatures f ({ docopt."1.1.0".default = (f.docopt."1.1.0".default or true); lazy_static."${deps.docopt."1.1.0".lazy_static}".default = true; regex."${deps.docopt."1.1.0".regex}".default = true; @@ -4989,7 +4989,7 @@ rec { (crates."libc"."${deps."filetime"."0.2.4"."libc"}" deps) ]) else []); }; - features_.filetime."0.2.4" = deps: f: updateFeatures f (rec { + features_.filetime."0.2.4" = deps: f: updateFeatures f ({ cfg_if."${deps.filetime."0.2.4".cfg_if}".default = true; filetime."0.2.4".default = (f.filetime."0.2.4".default or true); libc."${deps.filetime."0.2.4".libc}".default = true; @@ -5078,7 +5078,7 @@ rec { sha256 = "128mlh23y3gg6ag5h8iiqlcbl59smisdzraqy88ldrf75kbw27ip"; libPath = "lib.rs"; }; - features_.fnv."1.0.6" = deps: f: updateFeatures f (rec { + features_.fnv."1.0.6" = deps: f: updateFeatures f ({ fnv."1.0.6".default = (f.fnv."1.0.6".default or true); }) []; @@ -5096,7 +5096,7 @@ rec { (crates."foreign_types_shared"."${deps."foreign_types"."0.3.2"."foreign_types_shared"}" deps) ]); }; - features_.foreign_types."0.3.2" = deps: f: updateFeatures f (rec { + features_.foreign_types."0.3.2" = deps: f: updateFeatures f ({ foreign_types."0.3.2".default = (f.foreign_types."0.3.2".default or true); foreign_types_shared."${deps.foreign_types."0.3.2".foreign_types_shared}".default = true; }) [ @@ -5114,7 +5114,7 @@ rec { authors = [ "Steven Fackler <sfackler@gmail.com>" ]; sha256 = "0b6cnvqbflws8dxywk4589vgbz80049lz4x1g9dfy4s1ppd3g4z5"; }; - features_.foreign_types_shared."0.1.1" = deps: f: updateFeatures f (rec { + features_.foreign_types_shared."0.1.1" = deps: f: updateFeatures f ({ foreign_types_shared."0.1.1".default = (f.foreign_types_shared."0.1.1".default or true); }) []; @@ -5135,7 +5135,7 @@ rec { (crates."winapi"."${deps."fs2"."0.4.3"."winapi"}" deps) ]) else []); }; - features_.fs2."0.4.3" = deps: f: updateFeatures f (rec { + features_.fs2."0.4.3" = deps: f: updateFeatures f ({ fs2."0.4.3".default = (f.fs2."0.4.3".default or true); libc."${deps.fs2."0.4.3".libc}".default = true; winapi = fold recursiveUpdate {} [ @@ -5167,7 +5167,7 @@ rec { (crates."termcolor"."${deps."fwdansi"."1.0.1"."termcolor"}" deps) ]); }; - features_.fwdansi."1.0.1" = deps: f: updateFeatures f (rec { + features_.fwdansi."1.0.1" = deps: f: updateFeatures f ({ fwdansi."1.0.1".default = (f.fwdansi."1.0.1".default or true); memchr."${deps.fwdansi."1.0.1".memchr}".default = true; termcolor."${deps.fwdansi."1.0.1".termcolor}".default = true; @@ -5279,7 +5279,7 @@ rec { (crates."url"."${deps."git2_curl"."0.9.0"."url"}" deps) ]); }; - features_.git2_curl."0.9.0" = deps: f: updateFeatures f (rec { + features_.git2_curl."0.9.0" = deps: f: updateFeatures f ({ curl."${deps.git2_curl."0.9.0".curl}".default = true; git2."${deps.git2_curl."0.9.0".git2}".default = (f.git2."${deps.git2_curl."0.9.0".git2}".default or false); git2_curl."0.9.0".default = (f.git2_curl."0.9.0".default or true); @@ -5303,7 +5303,7 @@ rec { authors = [ "The Rust Project Developers" ]; sha256 = "104389jjxs8r2f5cc9p0axhjmndgln60ih5x4f00ccgg9d3zarlf"; }; - features_.glob."0.2.11" = deps: f: updateFeatures f (rec { + features_.glob."0.2.11" = deps: f: updateFeatures f ({ glob."0.2.11".default = (f.glob."0.2.11".default or true); }) []; @@ -5326,7 +5326,7 @@ rec { ]); features = mkFeatures (features."globset"."0.4.3" or {}); }; - features_.globset."0.4.3" = deps: f: updateFeatures f (rec { + features_.globset."0.4.3" = deps: f: updateFeatures f ({ aho_corasick."${deps.globset."0.4.3".aho_corasick}".default = true; bstr = fold recursiveUpdate {} [ { "${deps.globset."0.4.3".bstr}"."std" = true; } @@ -5360,7 +5360,7 @@ rec { ]); features = mkFeatures (features."hashbrown"."0.1.8" or {}); }; - features_.hashbrown."0.1.8" = deps: f: updateFeatures f (rec { + features_.hashbrown."0.1.8" = deps: f: updateFeatures f ({ byteorder."${deps.hashbrown."0.1.8".byteorder}".default = (f.byteorder."${deps.hashbrown."0.1.8".byteorder}".default or false); hashbrown."0.1.8".default = (f.hashbrown."0.1.8".default or true); scopeguard."${deps.hashbrown."0.1.8".scopeguard}".default = (f.scopeguard."${deps.hashbrown."0.1.8".scopeguard}".default or false); @@ -5381,7 +5381,7 @@ rec { sha256 = "0hs0xfb4x67y4ss9mmbjmibkwakbn3xf23i21m409bw2zqk9b6kz"; features = mkFeatures (features."hex"."0.3.2" or {}); }; - features_.hex."0.3.2" = deps: f: updateFeatures f (rec { + features_.hex."0.3.2" = deps: f: updateFeatures f ({ hex."0.3.2".default = (f.hex."0.3.2".default or true); }) []; @@ -5400,7 +5400,7 @@ rec { (crates."winapi"."${deps."home"."0.3.4"."winapi"}" deps) ]) else []); }; - features_.home."0.3.4" = deps: f: updateFeatures f (rec { + features_.home."0.3.4" = deps: f: updateFeatures f ({ home."0.3.4".default = (f.home."0.3.4".default or true); scopeguard."${deps.home."0.3.4".scopeguard}".default = true; winapi = fold recursiveUpdate {} [ @@ -5434,7 +5434,7 @@ rec { (crates."itoa"."${deps."http"."0.1.17"."itoa"}" deps) ]); }; - features_.http."0.1.17" = deps: f: updateFeatures f (rec { + features_.http."0.1.17" = deps: f: updateFeatures f ({ bytes."${deps.http."0.1.17".bytes}".default = true; fnv."${deps.http."0.1.17".fnv}".default = true; http."0.1.17".default = (f.http."0.1.17".default or true); @@ -5524,7 +5524,7 @@ rec { (crates."rustc_version"."${deps."im_rc"."12.3.4"."rustc_version"}" deps) ]); }; - features_.im_rc."12.3.4" = deps: f: updateFeatures f (rec { + features_.im_rc."12.3.4" = deps: f: updateFeatures f ({ im_rc."12.3.4".default = (f.im_rc."12.3.4".default or true); rustc_version."${deps.im_rc."12.3.4".rustc_version}".default = true; sized_chunks."${deps.im_rc."12.3.4".sized_chunks}".default = true; @@ -5552,7 +5552,7 @@ rec { (crates."winapi"."${deps."iovec"."0.1.2"."winapi"}" deps) ]) else []); }; - features_.iovec."0.1.2" = deps: f: updateFeatures f (rec { + features_.iovec."0.1.2" = deps: f: updateFeatures f ({ iovec."0.1.2".default = (f.iovec."0.1.2".default or true); libc."${deps.iovec."0.1.2".libc}".default = true; winapi."${deps.iovec."0.1.2".winapi}".default = true; @@ -5609,7 +5609,7 @@ rec { (crates."rand"."${deps."jobserver"."0.1.13"."rand"}" deps) ]) else []); }; - features_.jobserver."0.1.13" = deps: f: updateFeatures f (rec { + features_.jobserver."0.1.13" = deps: f: updateFeatures f ({ jobserver."0.1.13".default = (f.jobserver."0.1.13".default or true); libc."${deps.jobserver."0.1.13".libc}".default = true; log."${deps.jobserver."0.1.13".log}".default = true; @@ -5640,7 +5640,7 @@ rec { (crates."winapi_build"."${deps."kernel32_sys"."0.2.2"."winapi_build"}" deps) ]); }; - features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f (rec { + features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f ({ kernel32_sys."0.2.2".default = (f.kernel32_sys."0.2.2".default or true); winapi."${deps.kernel32_sys."0.2.2".winapi}".default = true; winapi_build."${deps.kernel32_sys."0.2.2".winapi_build}".default = true; @@ -5790,7 +5790,7 @@ rec { (crates."cc"."${deps."libnghttp2_sys"."0.1.1"."cc"}" deps) ]); }; - features_.libnghttp2_sys."0.1.1" = deps: f: updateFeatures f (rec { + features_.libnghttp2_sys."0.1.1" = deps: f: updateFeatures f ({ cc."${deps.libnghttp2_sys."0.1.1".cc}".default = true; libc."${deps.libnghttp2_sys."0.1.1".libc}".default = true; libnghttp2_sys."0.1.1".default = (f.libnghttp2_sys."0.1.1".default or true); @@ -5827,7 +5827,7 @@ rec { (crates."pkg_config"."${deps."libssh2_sys"."0.2.11"."pkg_config"}" deps) ]); }; - features_.libssh2_sys."0.2.11" = deps: f: updateFeatures f (rec { + features_.libssh2_sys."0.2.11" = deps: f: updateFeatures f ({ cc."${deps.libssh2_sys."0.2.11".cc}".default = true; libc."${deps.libssh2_sys."0.2.11".libc}".default = true; libssh2_sys."0.2.11".default = (f.libssh2_sys."0.2.11".default or true); @@ -5865,7 +5865,7 @@ rec { ]); features = mkFeatures (features."libz_sys"."1.0.25" or {}); }; - features_.libz_sys."1.0.25" = deps: f: updateFeatures f (rec { + features_.libz_sys."1.0.25" = deps: f: updateFeatures f ({ cc."${deps.libz_sys."1.0.25".cc}".default = true; libc."${deps.libz_sys."1.0.25".libc}".default = true; libz_sys."1.0.25".default = (f.libz_sys."1.0.25".default or true); @@ -5891,7 +5891,7 @@ rec { ]); features = mkFeatures (features."lock_api"."0.1.5" or {}); }; - features_.lock_api."0.1.5" = deps: f: updateFeatures f (rec { + features_.lock_api."0.1.5" = deps: f: updateFeatures f ({ lock_api."0.1.5".default = (f.lock_api."0.1.5".default or true); scopeguard."${deps.lock_api."0.1.5".scopeguard}".default = (f.scopeguard."${deps.lock_api."0.1.5".scopeguard}".default or false); }) [ @@ -5913,7 +5913,7 @@ rec { (crates."rawpointer"."${deps."matrixmultiply"."0.1.15"."rawpointer"}" deps) ]); }; - features_.matrixmultiply."0.1.15" = deps: f: updateFeatures f (rec { + features_.matrixmultiply."0.1.15" = deps: f: updateFeatures f ({ matrixmultiply."0.1.15".default = (f.matrixmultiply."0.1.15".default or true); rawpointer."${deps.matrixmultiply."0.1.15".rawpointer}".default = true; }) [ @@ -5941,7 +5941,7 @@ rec { (crates."cc"."${deps."miniz_sys"."0.1.11"."cc"}" deps) ]); }; - features_.miniz_sys."0.1.11" = deps: f: updateFeatures f (rec { + features_.miniz_sys."0.1.11" = deps: f: updateFeatures f ({ cc."${deps.miniz_sys."0.1.11".cc}".default = true; libc."${deps.miniz_sys."0.1.11".libc}".default = true; miniz_sys."0.1.11".default = (f.miniz_sys."0.1.11".default or true); @@ -5964,7 +5964,7 @@ rec { (crates."adler32"."${deps."miniz_oxide"."0.2.1"."adler32"}" deps) ]); }; - features_.miniz_oxide."0.2.1" = deps: f: updateFeatures f (rec { + features_.miniz_oxide."0.2.1" = deps: f: updateFeatures f ({ adler32."${deps.miniz_oxide."0.2.1".adler32}".default = true; miniz_oxide."0.2.1".default = (f.miniz_oxide."0.2.1".default or true); }) [ @@ -6039,7 +6039,7 @@ rec { (crates."winapi"."${deps."miow"."0.3.3"."winapi"}" deps) ]); }; - features_.miow."0.3.3" = deps: f: updateFeatures f (rec { + features_.miow."0.3.3" = deps: f: updateFeatures f ({ miow."0.3.3".default = (f.miow."0.3.3".default or true); socket2."${deps.miow."0.3.3".socket2}".default = true; winapi = fold recursiveUpdate {} [ @@ -6200,7 +6200,7 @@ rec { (crates."libc"."${deps."num_cpus"."1.10.0"."libc"}" deps) ]); }; - features_.num_cpus."1.10.0" = deps: f: updateFeatures f (rec { + features_.num_cpus."1.10.0" = deps: f: updateFeatures f ({ libc."${deps.num_cpus."1.10.0".libc}".default = true; num_cpus."1.10.0".default = (f.num_cpus."1.10.0".default or true); }) [ @@ -6253,7 +6253,7 @@ rec { (crates."winapi"."${deps."opener"."0.3.2"."winapi"}" deps) ]) else []); }; - features_.opener."0.3.2" = deps: f: updateFeatures f (rec { + features_.opener."0.3.2" = deps: f: updateFeatures f ({ failure."${deps.opener."0.3.2".failure}".default = true; failure_derive."${deps.opener."0.3.2".failure_derive}".default = true; opener."0.3.2".default = (f.opener."0.3.2".default or true); @@ -6321,7 +6321,7 @@ rec { authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; sha256 = "1a89fznx26vvaxyrxdvgf6iwai5xvs6xjvpjin68fgvrslv6n15a"; }; - features_.openssl_probe."0.1.2" = deps: f: updateFeatures f (rec { + features_.openssl_probe."0.1.2" = deps: f: updateFeatures f ({ openssl_probe."0.1.2".default = (f.openssl_probe."0.1.2".default or true); }) []; @@ -6339,7 +6339,7 @@ rec { (crates."cc"."${deps."openssl_src"."111.2.1+1.1.1b"."cc"}" deps) ]); }; - features_.openssl_src."111.2.1+1.1.1b" = deps: f: updateFeatures f (rec { + features_.openssl_src."111.2.1+1.1.1b" = deps: f: updateFeatures f ({ cc."${deps.openssl_src."111.2.1+1.1.1b".cc}".default = true; openssl_src."111.2.1+1.1.1b".default = (f.openssl_src."111.2.1+1.1.1b".default or true); }) [ @@ -6518,7 +6518,7 @@ rec { authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; sha256 = "0207fsarrm412j0dh87lfcas72n8mxar7q3mgflsbsrqnb140sv6"; }; - features_.pkg_config."0.3.14" = deps: f: updateFeatures f (rec { + features_.pkg_config."0.3.14" = deps: f: updateFeatures f ({ pkg_config."0.3.14".default = (f.pkg_config."0.3.14".default or true); }) []; @@ -6705,7 +6705,7 @@ rec { (crates."autocfg"."${deps."rand_chacha"."0.1.1"."autocfg"}" deps) ]); }; - features_.rand_chacha."0.1.1" = deps: f: updateFeatures f (rec { + features_.rand_chacha."0.1.1" = deps: f: updateFeatures f ({ autocfg."${deps.rand_chacha."0.1.1".autocfg}".default = true; rand_chacha."0.1.1".default = (f.rand_chacha."0.1.1".default or true); rand_core."${deps.rand_chacha."0.1.1".rand_core}".default = (f.rand_core."${deps.rand_chacha."0.1.1".rand_core}".default or false); @@ -6728,7 +6728,7 @@ rec { (crates."rand_core"."${deps."rand_hc"."0.1.0"."rand_core"}" deps) ]); }; - features_.rand_hc."0.1.0" = deps: f: updateFeatures f (rec { + features_.rand_hc."0.1.0" = deps: f: updateFeatures f ({ rand_core."${deps.rand_hc."0.1.0".rand_core}".default = (f.rand_core."${deps.rand_hc."0.1.0".rand_core}".default or false); rand_hc."0.1.0".default = (f.rand_hc."0.1.0".default or true); }) [ @@ -6896,7 +6896,7 @@ rec { authors = [ "bluss" ]; sha256 = "0hblv2cv310ixf5f1jw4nk9w5pb95wh4dwqyjv07g2xrshbw6j04"; }; - features_.rawpointer."0.1.0" = deps: f: updateFeatures f (rec { + features_.rawpointer."0.1.0" = deps: f: updateFeatures f ({ rawpointer."0.1.0".default = (f.rawpointer."0.1.0".default or true); }) []; @@ -6912,7 +6912,7 @@ rec { sha256 = "1ndcp7brnvii87ndcd34fk846498r07iznphkslcy0shic9cp4rr"; libName = "syscall"; }; - features_.redox_syscall."0.1.54" = deps: f: updateFeatures f (rec { + features_.redox_syscall."0.1.54" = deps: f: updateFeatures f ({ redox_syscall."0.1.54".default = (f.redox_syscall."0.1.54".default or true); }) []; @@ -6974,7 +6974,7 @@ rec { (crates."ucd_util"."${deps."regex_syntax"."0.6.6"."ucd_util"}" deps) ]); }; - features_.regex_syntax."0.6.6" = deps: f: updateFeatures f (rec { + features_.regex_syntax."0.6.6" = deps: f: updateFeatures f ({ regex_syntax."0.6.6".default = (f.regex_syntax."0.6.6".default or true); ucd_util."${deps.regex_syntax."0.6.6".ucd_util}".default = true; }) [ @@ -7020,7 +7020,7 @@ rec { authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; sha256 = "0arpdp472j4lrwxbmf4z21d8kh95rbbphnzccf605pqq2rvczv3p"; }; - features_.rustc_workspace_hack."1.0.0" = deps: f: updateFeatures f (rec { + features_.rustc_workspace_hack."1.0.0" = deps: f: updateFeatures f ({ rustc_workspace_hack."1.0.0".default = (f.rustc_workspace_hack."1.0.0".default or true); }) []; @@ -7038,7 +7038,7 @@ rec { (crates."semver"."${deps."rustc_version"."0.2.3"."semver"}" deps) ]); }; - features_.rustc_version."0.2.3" = deps: f: updateFeatures f (rec { + features_.rustc_version."0.2.3" = deps: f: updateFeatures f ({ rustc_version."0.2.3".default = (f.rustc_version."0.2.3".default or true); semver."${deps.rustc_version."0.2.3".semver}".default = true; }) [ @@ -7063,7 +7063,7 @@ rec { (crates."serde_json"."${deps."rustfix"."0.4.5"."serde_json"}" deps) ]); }; - features_.rustfix."0.4.5" = deps: f: updateFeatures f (rec { + features_.rustfix."0.4.5" = deps: f: updateFeatures f ({ failure."${deps.rustfix."0.4.5".failure}".default = true; log."${deps.rustfix."0.4.5".log}".default = true; rustfix."0.4.5".default = (f.rustfix."0.4.5".default or true); @@ -7092,7 +7092,7 @@ rec { (crates."winapi_util"."${deps."same_file"."1.0.4"."winapi_util"}" deps) ]) else []); }; - features_.same_file."1.0.4" = deps: f: updateFeatures f (rec { + features_.same_file."1.0.4" = deps: f: updateFeatures f ({ same_file."1.0.4".default = (f.same_file."1.0.4".default or true); winapi_util."${deps.same_file."1.0.4".winapi_util}".default = true; }) [ @@ -7114,7 +7114,7 @@ rec { (crates."winapi"."${deps."schannel"."0.1.15"."winapi"}" deps) ]); }; - features_.schannel."0.1.15" = deps: f: updateFeatures f (rec { + features_.schannel."0.1.15" = deps: f: updateFeatures f ({ lazy_static."${deps.schannel."0.1.15".lazy_static}".default = true; schannel."0.1.15".default = (f.schannel."0.1.15".default or true); winapi = fold recursiveUpdate {} [ @@ -7199,7 +7199,7 @@ rec { authors = [ "Steve Klabnik <steve@steveklabnik.com>" ]; sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h"; }; - features_.semver_parser."0.7.0" = deps: f: updateFeatures f (rec { + features_.semver_parser."0.7.0" = deps: f: updateFeatures f ({ semver_parser."0.7.0".default = (f.semver_parser."0.7.0".default or true); }) []; @@ -7258,7 +7258,7 @@ rec { ]); features = mkFeatures (features."serde_derive"."1.0.90" or {}); }; - features_.serde_derive."1.0.90" = deps: f: updateFeatures f (rec { + features_.serde_derive."1.0.90" = deps: f: updateFeatures f ({ proc_macro2."${deps.serde_derive."1.0.90".proc_macro2}".default = true; quote."${deps.serde_derive."1.0.90".quote}".default = true; serde_derive."1.0.90".default = (f.serde_derive."1.0.90".default or true); @@ -7286,7 +7286,7 @@ rec { (crates."serde"."${deps."serde_ignored"."0.0.4"."serde"}" deps) ]); }; - features_.serde_ignored."0.0.4" = deps: f: updateFeatures f (rec { + features_.serde_ignored."0.0.4" = deps: f: updateFeatures f ({ serde."${deps.serde_ignored."0.0.4".serde}".default = true; serde_ignored."0.0.4".default = (f.serde_ignored."0.0.4".default or true); }) [ @@ -7304,7 +7304,7 @@ rec { authors = [ "Steven Fackler <sfackler@gmail.com>" ]; sha256 = "02ik28la039b8anx0sx8mbdp2yx66m64mjrjyy6x0dgpbmfxmc24"; }; - features_.shell_escape."0.1.4" = deps: f: updateFeatures f (rec { + features_.shell_escape."0.1.4" = deps: f: updateFeatures f ({ shell_escape."0.1.4".default = (f.shell_escape."0.1.4".default or true); }) []; @@ -7323,7 +7323,7 @@ rec { (crates."typenum"."${deps."sized_chunks"."0.1.3"."typenum"}" deps) ]); }; - features_.sized_chunks."0.1.3" = deps: f: updateFeatures f (rec { + features_.sized_chunks."0.1.3" = deps: f: updateFeatures f ({ sized_chunks."0.1.3".default = (f.sized_chunks."0.1.3".default or true); typenum."${deps.sized_chunks."0.1.3".typenum}".default = true; }) [ @@ -7352,7 +7352,7 @@ rec { ]) else []); features = mkFeatures (features."socket2"."0.3.8" or {}); }; - features_.socket2."0.3.8" = deps: f: updateFeatures f (rec { + features_.socket2."0.3.8" = deps: f: updateFeatures f ({ cfg_if."${deps.socket2."0.3.8".cfg_if}".default = true; libc."${deps.socket2."0.3.8".libc}".default = true; redox_syscall."${deps.socket2."0.3.8".redox_syscall}".default = true; @@ -7383,7 +7383,7 @@ rec { authors = [ "Danny Guo <dannyguo91@gmail.com>" ]; sha256 = "0d3jsdz22wgjyxdakqnvdgmwjdvkximz50d9zfk4qlalw635qcvy"; }; - features_.strsim."0.8.0" = deps: f: updateFeatures f (rec { + features_.strsim."0.8.0" = deps: f: updateFeatures f ({ strsim."0.8.0".default = (f.strsim."0.8.0".default or true); }) []; @@ -7402,7 +7402,7 @@ rec { (crates."ndarray"."${deps."strsim"."0.9.1"."ndarray"}" deps) ]); }; - features_.strsim."0.9.1" = deps: f: updateFeatures f (rec { + features_.strsim."0.9.1" = deps: f: updateFeatures f ({ hashbrown."${deps.strsim."0.9.1".hashbrown}".default = true; ndarray."${deps.strsim."0.9.1".ndarray}".default = true; strsim."0.9.1".default = (f.strsim."0.9.1".default or true); @@ -7539,7 +7539,7 @@ rec { (crates."winapi"."${deps."tempfile"."3.0.7"."winapi"}" deps) ]) else []); }; - features_.tempfile."3.0.7" = deps: f: updateFeatures f (rec { + features_.tempfile."3.0.7" = deps: f: updateFeatures f ({ cfg_if."${deps.tempfile."3.0.7".cfg_if}".default = true; libc."${deps.tempfile."3.0.7".libc}".default = true; rand."${deps.tempfile."3.0.7".rand}".default = true; @@ -7575,7 +7575,7 @@ rec { (crates."unicode_width"."${deps."textwrap"."0.11.0"."unicode_width"}" deps) ]); }; - features_.textwrap."0.11.0" = deps: f: updateFeatures f (rec { + features_.textwrap."0.11.0" = deps: f: updateFeatures f ({ textwrap."0.11.0".default = (f.textwrap."0.11.0".default or true); unicode_width."${deps.textwrap."0.11.0".unicode_width}".default = true; }) [ @@ -7595,7 +7595,7 @@ rec { build = "build/main.rs"; features = mkFeatures (features."typenum"."1.10.0" or {}); }; - features_.typenum."1.10.0" = deps: f: updateFeatures f (rec { + features_.typenum."1.10.0" = deps: f: updateFeatures f ({ typenum."1.10.0".default = (f.typenum."1.10.0".default or true); }) []; @@ -7614,7 +7614,7 @@ rec { (crates."url"."${deps."url_serde"."0.2.0"."url"}" deps) ]); }; - features_.url_serde."0.2.0" = deps: f: updateFeatures f (rec { + features_.url_serde."0.2.0" = deps: f: updateFeatures f ({ serde."${deps.url_serde."0.2.0".serde}".default = true; url."${deps.url_serde."0.2.0".url}".default = true; url_serde."0.2.0".default = (f.url_serde."0.2.0".default or true); @@ -7634,7 +7634,7 @@ rec { authors = [ "Jim McGrath <jimmc2@gmail.com>" ]; sha256 = "1ig6jqpzzl1z9vk4qywgpfr4hfbd8ny8frqsgm3r449wkc4n1i5x"; }; - features_.vcpkg."0.2.6" = deps: f: updateFeatures f (rec { + features_.vcpkg."0.2.6" = deps: f: updateFeatures f ({ vcpkg."0.2.6".default = (f.vcpkg."0.2.6".default or true); }) []; @@ -7656,7 +7656,7 @@ rec { (crates."winapi_util"."${deps."walkdir"."2.2.7"."winapi_util"}" deps) ]) else []); }; - features_.walkdir."2.2.7" = deps: f: updateFeatures f (rec { + features_.walkdir."2.2.7" = deps: f: updateFeatures f ({ same_file."${deps.walkdir."2.2.7".same_file}".default = true; walkdir."2.2.7".default = (f.walkdir."2.2.7".default or true); winapi = fold recursiveUpdate {} [ @@ -7682,7 +7682,7 @@ rec { authors = [ "Peter Atashian <retep998@gmail.com>" ]; sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; }; - features_.winapi."0.2.8" = deps: f: updateFeatures f (rec { + features_.winapi."0.2.8" = deps: f: updateFeatures f ({ winapi."0.2.8".default = (f.winapi."0.2.8".default or true); }) []; @@ -7732,7 +7732,7 @@ rec { sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; libName = "build"; }; - features_.winapi_build."0.1.1" = deps: f: updateFeatures f (rec { + features_.winapi_build."0.1.1" = deps: f: updateFeatures f ({ winapi_build."0.1.1".default = (f.winapi_build."0.1.1".default or true); }) []; @@ -7747,7 +7747,7 @@ rec { authors = [ "Remi Rampin <remirampin@gmail.com>" ]; sha256 = "1z3mvjgw02mbqk98kizzibrca01d5wfkpazsrp3vkkv3i56pn6fb"; }; - features_.adler32."1.0.3" = deps: f: updateFeatures f (rec { + features_.adler32."1.0.3" = deps: f: updateFeatures f ({ adler32."1.0.3".default = (f.adler32."1.0.3".default or true); }) []; diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 09802d56d34..ce1bf800276 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -44,8 +44,8 @@ let hostConfig = stdenv.hostPlatform.config; rustHostConfig = { - "x86_64-pc-mingw32" = "x86_64-pc-windows-gnu"; - }."${hostConfig}" or hostConfig; + x86_64-pc-mingw32 = "x86_64-pc-windows-gnu"; + }.${hostConfig} or hostConfig; ccForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; diff --git a/pkgs/build-support/templaterpm/default.nix b/pkgs/build-support/templaterpm/default.nix index d9300188498..30465c740e5 100644 --- a/pkgs/build-support/templaterpm/default.nix +++ b/pkgs/build-support/templaterpm/default.nix @@ -1,6 +1,6 @@ {stdenv, makeWrapper, python, toposort, rpm}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nix-template-rpm"; version = "0.1"; diff --git a/pkgs/build-support/upstream-updater/attrset-to-dir.nix b/pkgs/build-support/upstream-updater/attrset-to-dir.nix index bdf44b7a5bf..24f7b735c2e 100644 --- a/pkgs/build-support/upstream-updater/attrset-to-dir.nix +++ b/pkgs/build-support/upstream-updater/attrset-to-dir.nix @@ -1,5 +1,5 @@ a : -a.stdenv.mkDerivation rec { +a.stdenv.mkDerivation { buildCommand = '' mkdir -p "$out/attributes" diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index a59da3a8745..371ab13c528 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -741,7 +741,7 @@ rec { # Note: no i386 release for Fedora >= 26 fedora26x86_64 = let version = "26"; - in rec { + in { name = "fedora-${version}-x86_64"; fullName = "Fedora ${version} (x86_64)"; packagesList = fetchurl rec { @@ -756,7 +756,7 @@ rec { fedora27x86_64 = let version = "27"; - in rec { + in { name = "fedora-${version}-x86_64"; fullName = "Fedora ${version} (x86_64)"; packagesList = fetchurl rec { @@ -816,7 +816,7 @@ rec { /* The set of supported Dpkg-based distributions. */ - debDistros = rec { + debDistros = { # Interestingly, the SHA-256 hashes provided by Ubuntu in # http://nl.archive.ubuntu.com/ubuntu/dists/{gutsy,hardy}/Release are diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix index d0d85fce366..69850303267 100644 --- a/pkgs/build-support/vm/test.nix +++ b/pkgs/build-support/vm/test.nix @@ -1,7 +1,7 @@ with import ../../.. {}; with vmTools; -rec { +{ # Run the PatchELF derivation in a VM. diff --git a/pkgs/data/documentation/bgnet/default.nix b/pkgs/data/documentation/bgnet/default.nix index a53ead29c1e..7297d18df27 100644 --- a/pkgs/data/documentation/bgnet/default.nix +++ b/pkgs/data/documentation/bgnet/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, python, zip, fop }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bgnet"; version = "3.0.21"; diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix index d90fa99dd70..b3b2b956de8 100644 --- a/pkgs/data/documentation/std-man-pages/default.nix +++ b/pkgs/data/documentation/std-man-pages/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "std-man-pages-4.4.0"; src = fetchurl { diff --git a/pkgs/data/fonts/aileron/default.nix b/pkgs/data/fonts/aileron/default.nix index ee85ee59882..4961a5e7449 100644 --- a/pkgs/data/fonts/aileron/default.nix +++ b/pkgs/data/fonts/aileron/default.nix @@ -6,7 +6,7 @@ let pname = "aileron"; in -fetchzip rec { +fetchzip { name = "${pname}-font-${majorVersion}.${minorVersion}"; url = "http://dotcolon.net/DL/font/${pname}.zip"; diff --git a/pkgs/data/fonts/ankacoder/condensed.nix b/pkgs/data/fonts/ankacoder/condensed.nix index 53f4d94b38f..0b6340d1ba9 100644 --- a/pkgs/data/fonts/ankacoder/condensed.nix +++ b/pkgs/data/fonts/ankacoder/condensed.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let version = "1.100"; in -fetchzip rec { +fetchzip { name = "ankacoder-condensed-${version}"; url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoderCondensed.${version}.zip"; diff --git a/pkgs/data/fonts/ankacoder/default.nix b/pkgs/data/fonts/ankacoder/default.nix index 52e2d4a4233..3a57d08dbc2 100644 --- a/pkgs/data/fonts/ankacoder/default.nix +++ b/pkgs/data/fonts/ankacoder/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let version = "1.100"; in -fetchzip rec { +fetchzip { name = "ankacoder-${version}"; url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoder.${version}.zip"; diff --git a/pkgs/data/fonts/behdad-fonts/default.nix b/pkgs/data/fonts/behdad-fonts/default.nix index 8b4228ec423..a0fcd5f7bbf 100644 --- a/pkgs/data/fonts/behdad-fonts/default.nix +++ b/pkgs/data/fonts/behdad-fonts/default.nix @@ -3,7 +3,7 @@ let pname = "behdad-fonts"; version = "0.0.3"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "font-store"; repo = "BehdadFont"; diff --git a/pkgs/data/fonts/caladea/default.nix b/pkgs/data/fonts/caladea/default.nix index 29bd001f808..b1f9312a7e9 100644 --- a/pkgs/data/fonts/caladea/default.nix +++ b/pkgs/data/fonts/caladea/default.nix @@ -2,7 +2,7 @@ let version = "20130214"; -in fetchzip rec { +in fetchzip { name = "caladea-${version}"; url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-${version}.tar.gz"; diff --git a/pkgs/data/fonts/carlito/default.nix b/pkgs/data/fonts/carlito/default.nix index 3c0e314579d..79913bb8398 100644 --- a/pkgs/data/fonts/carlito/default.nix +++ b/pkgs/data/fonts/carlito/default.nix @@ -2,7 +2,7 @@ let version = "20130920"; -in fetchzip rec { +in fetchzip { name = "carlito-${version}"; url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-${version}.tar.gz"; diff --git a/pkgs/data/fonts/dina-pcf/default.nix b/pkgs/data/fonts/dina-pcf/default.nix index 061bbb445fb..eff0c579a70 100644 --- a/pkgs/data/fonts/dina-pcf/default.nix +++ b/pkgs/data/fonts/dina-pcf/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, unzip, bdftopcf, mkfontdir, mkfontscale}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2.92"; pname = "dina-font-pcf"; diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix index 8638ec74f77..0d4cd286219 100644 --- a/pkgs/data/fonts/dina/default.nix +++ b/pkgs/data/fonts/dina/default.nix @@ -2,7 +2,7 @@ let version = "2.92"; -in fetchzip rec { +in fetchzip { name = "dina-font-${version}"; # `meta.homepage` has no direct download link diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix index 0e31231d05f..351a0617ddc 100644 --- a/pkgs/data/fonts/envypn-font/default.nix +++ b/pkgs/data/fonts/envypn-font/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, mkfontdir, mkfontscale }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "envypn-font-1.7.1"; src = fetchurl { diff --git a/pkgs/data/fonts/eunomia/default.nix b/pkgs/data/fonts/eunomia/default.nix index 55250156fcd..de68b17d6eb 100644 --- a/pkgs/data/fonts/eunomia/default.nix +++ b/pkgs/data/fonts/eunomia/default.nix @@ -6,7 +6,7 @@ let pname = "eunomia"; in -fetchzip rec { +fetchzip { name = "${pname}-font-${majorVersion}.${minorVersion}"; url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip"; diff --git a/pkgs/data/fonts/f5_6/default.nix b/pkgs/data/fonts/f5_6/default.nix index 28969f02364..175648198ce 100644 --- a/pkgs/data/fonts/f5_6/default.nix +++ b/pkgs/data/fonts/f5_6/default.nix @@ -6,7 +6,7 @@ let pname = "f5_6"; in -fetchzip rec { +fetchzip { name = "${pname}-font-${majorVersion}.${minorVersion}"; url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip"; diff --git a/pkgs/data/fonts/ferrum/default.nix b/pkgs/data/fonts/ferrum/default.nix index ec3f3218ea5..fe40252ab23 100644 --- a/pkgs/data/fonts/ferrum/default.nix +++ b/pkgs/data/fonts/ferrum/default.nix @@ -6,7 +6,7 @@ let pname = "ferrum"; in -fetchzip rec { +fetchzip { name = "${pname}-font-${majorVersion}.${minorVersion}"; url = "http://dotcolon.net/DL/font/${pname}.zip"; diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix index 422258f84d1..bcf02f1328e 100644 --- a/pkgs/data/fonts/font-awesome-5/default.nix +++ b/pkgs/data/fonts/font-awesome-5/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: let - font-awesome = { version, sha256, rev ? version}: fetchFromGitHub rec { + font-awesome = { version, sha256, rev ? version}: fetchFromGitHub { name = "font-awesome-${version}"; diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index 707beb41231..7c1af485a98 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "google-fonts"; version = "2019-07-14"; diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix index ef0df1ba67f..3c49bf7f565 100644 --- a/pkgs/data/fonts/hack/default.nix +++ b/pkgs/data/fonts/hack/default.nix @@ -2,7 +2,7 @@ let version = "3.003"; -in fetchzip rec { +in fetchzip { name = "hack-font-${version}"; url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version}-ttf.zip"; diff --git a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix index 759d2c2db1d..23f6fb29be0 100644 --- a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix +++ b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix @@ -2,7 +2,7 @@ let version = "2013.06.07"; # date of most recent file in distribution -in fetchzip rec { +in fetchzip { name = "helvetica-neue-lt-std-${version}"; url = "http://www.ephifonts.com/downloads/helvetica-neue-lt-std.zip"; diff --git a/pkgs/data/fonts/hyperscrypt/default.nix b/pkgs/data/fonts/hyperscrypt/default.nix index 362781c05bb..726fbab95bd 100644 --- a/pkgs/data/fonts/hyperscrypt/default.nix +++ b/pkgs/data/fonts/hyperscrypt/default.nix @@ -5,7 +5,7 @@ let pname = "HyperScrypt"; in -fetchzip rec { +fetchzip { name = "${lib.toLower pname}-font-${version}"; url = "https://gitlab.com/StudioTriple/Hyper-Scrypt/-/archive/${version}/Hyper-Scrypt-${version}.zip"; sha256 = "01pf5p2scmw02s0gxnibiwxbpzczphaaapv0v4s7svk9aw2gmc0m"; diff --git a/pkgs/data/fonts/ia-writer-duospace/default.nix b/pkgs/data/fonts/ia-writer-duospace/default.nix index a042a31f1d0..1d910ed54a4 100644 --- a/pkgs/data/fonts/ia-writer-duospace/default.nix +++ b/pkgs/data/fonts/ia-writer-duospace/default.nix @@ -2,7 +2,7 @@ let version = "20180721"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "ia-writer-duospace-${version}"; owner = "iaolo"; diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix index 7e1014da210..7401c569462 100644 --- a/pkgs/data/fonts/ibm-plex/default.nix +++ b/pkgs/data/fonts/ibm-plex/default.nix @@ -2,7 +2,7 @@ let version = "2.0.0"; -in fetchzip rec { +in fetchzip { name = "ibm-plex-${version}"; url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip"; postFetch = '' diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix index 94c43b11285..a170a0780a4 100644 --- a/pkgs/data/fonts/inconsolata/default.nix +++ b/pkgs/data/fonts/inconsolata/default.nix @@ -1,6 +1,6 @@ { stdenv, google-fonts }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "inconsolata"; inherit (google-fonts) src version; diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix index d079ae59b0d..3bc836fa4e4 100644 --- a/pkgs/data/fonts/input-fonts/default.nix +++ b/pkgs/data/fonts/input-fonts/default.nix @@ -1,6 +1,6 @@ { stdenv, requireFile, unzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "input-fonts"; version = "2017-08-10"; # date of the download and checksum diff --git a/pkgs/data/fonts/inriafonts/default.nix b/pkgs/data/fonts/inriafonts/default.nix index 52c28db639e..5a8e3476bf8 100644 --- a/pkgs/data/fonts/inriafonts/default.nix +++ b/pkgs/data/fonts/inriafonts/default.nix @@ -3,7 +3,7 @@ let pname = "inriafonts"; version = "1.200"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "BlackFoundry"; repo = "InriaFonts"; diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index dba89c473b3..962769b8144 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -2,7 +2,7 @@ let version = "2.3.0"; -in fetchzip rec { +in fetchzip { name = "iosevka-bin-${version}"; url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-iosevka-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/package-lock.nix b/pkgs/data/fonts/iosevka/package-lock.nix index 4a7be92e737..546482cc0d2 100644 --- a/pkgs/data/fonts/iosevka/package-lock.nix +++ b/pkgs/data/fonts/iosevka/package-lock.nix @@ -14,58 +14,58 @@ let 0; chars = stringToCharacters (substring 0 (len - padding) str); table = { - "A" = [0 0 0]; - "B" = [0 0 1]; - "C" = [0 0 2]; - "D" = [0 0 3]; - "E" = [0 1 0]; - "F" = [0 1 1]; - "G" = [0 1 2]; - "H" = [0 1 3]; - "I" = [0 2 0]; - "J" = [0 2 1]; - "K" = [0 2 2]; - "L" = [0 2 3]; - "M" = [0 3 0]; - "N" = [0 3 1]; - "O" = [0 3 2]; - "P" = [0 3 3]; - "Q" = [1 0 0]; - "R" = [1 0 1]; - "S" = [1 0 2]; - "T" = [1 0 3]; - "U" = [1 1 0]; - "V" = [1 1 1]; - "W" = [1 1 2]; - "X" = [1 1 3]; - "Y" = [1 2 0]; - "Z" = [1 2 1]; - "a" = [1 2 2]; - "b" = [1 2 3]; - "c" = [1 3 0]; - "d" = [1 3 1]; - "e" = [1 3 2]; - "f" = [1 3 3]; - "g" = [2 0 0]; - "h" = [2 0 1]; - "i" = [2 0 2]; - "j" = [2 0 3]; - "k" = [2 1 0]; - "l" = [2 1 1]; - "m" = [2 1 2]; - "n" = [2 1 3]; - "o" = [2 2 0]; - "p" = [2 2 1]; - "q" = [2 2 2]; - "r" = [2 2 3]; - "s" = [2 3 0]; - "t" = [2 3 1]; - "u" = [2 3 2]; - "v" = [2 3 3]; - "w" = [3 0 0]; - "x" = [3 0 1]; - "y" = [3 0 2]; - "z" = [3 0 3]; + A = [0 0 0]; + B = [0 0 1]; + C = [0 0 2]; + D = [0 0 3]; + E = [0 1 0]; + F = [0 1 1]; + G = [0 1 2]; + H = [0 1 3]; + I = [0 2 0]; + J = [0 2 1]; + K = [0 2 2]; + L = [0 2 3]; + M = [0 3 0]; + N = [0 3 1]; + O = [0 3 2]; + P = [0 3 3]; + Q = [1 0 0]; + R = [1 0 1]; + S = [1 0 2]; + T = [1 0 3]; + U = [1 1 0]; + V = [1 1 1]; + W = [1 1 2]; + X = [1 1 3]; + Y = [1 2 0]; + Z = [1 2 1]; + a = [1 2 2]; + b = [1 2 3]; + c = [1 3 0]; + d = [1 3 1]; + e = [1 3 2]; + f = [1 3 3]; + g = [2 0 0]; + h = [2 0 1]; + i = [2 0 2]; + j = [2 0 3]; + k = [2 1 0]; + l = [2 1 1]; + m = [2 1 2]; + n = [2 1 3]; + o = [2 2 0]; + p = [2 2 1]; + q = [2 2 2]; + r = [2 2 3]; + s = [2 3 0]; + t = [2 3 1]; + u = [2 3 2]; + v = [2 3 3]; + w = [3 0 0]; + x = [3 0 1]; + y = [3 0 2]; + z = [3 0 3]; "0" = [3 1 0]; "1" = [3 1 1]; "2" = [3 1 2]; diff --git a/pkgs/data/fonts/ir-standard-fonts/default.nix b/pkgs/data/fonts/ir-standard-fonts/default.nix index 1501e0fb7fa..eef3883506e 100644 --- a/pkgs/data/fonts/ir-standard-fonts/default.nix +++ b/pkgs/data/fonts/ir-standard-fonts/default.nix @@ -3,7 +3,7 @@ let pname = "ir-standard-fonts"; version = "unstable-2017-01-21"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "morealaz"; repo = pname; diff --git a/pkgs/data/fonts/joypixels/default.nix b/pkgs/data/fonts/joypixels/default.nix index f54838d5a64..fc6481e9a89 100644 --- a/pkgs/data/fonts/joypixels/default.nix +++ b/pkgs/data/fonts/joypixels/default.nix @@ -1,13 +1,7 @@ { stdenv, fetchurl }: -let - fontconfig = fetchurl { - name = "75-joypixels.conf"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/75-joypixels.conf?h=packages/ttf-joypixels&id=b2b38f8393ec56ed7338c256f5b85f3439a2dfc3"; - sha256 = "065y2fmf86zzvna1hrvcg46cnr7a76xd2mwa26nss861dsx6pnd6"; - }; -in stdenv.mkDerivation rec { - pname = "emojione"; +stdenv.mkDerivation rec { + pname = "joypixels"; version = "5.0.2"; src = fetchurl { @@ -19,7 +13,6 @@ in stdenv.mkDerivation rec { installPhase = '' install -Dm644 $src $out/share/fonts/truetype/joypixels.ttf - install -Dm644 ${fontconfig} $out/etc/fonts/conf.d/75-joypixels.conf ''; meta = with stdenv.lib; { diff --git a/pkgs/data/fonts/kawkab-mono/default.nix b/pkgs/data/fonts/kawkab-mono/default.nix index c1de2806ef1..f6a031c7faf 100644 --- a/pkgs/data/fonts/kawkab-mono/default.nix +++ b/pkgs/data/fonts/kawkab-mono/default.nix @@ -1,6 +1,6 @@ { lib, fetchzip }: -fetchzip rec { +fetchzip { name = "kawkab-mono-20151015"; url = "http://makkuk.com/kawkab-mono/downloads/kawkab-mono-0.1.zip"; diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix index 2152b960cdc..eb0a47e13d9 100644 --- a/pkgs/data/fonts/libertine/default.nix +++ b/pkgs/data/fonts/libertine/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fontforge }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "linux-libertine-5.3.0"; src = fetchurl { diff --git a/pkgs/data/fonts/luculent/default.nix b/pkgs/data/fonts/luculent/default.nix index fe733359f3a..7e5a69a2c1f 100644 --- a/pkgs/data/fonts/luculent/default.nix +++ b/pkgs/data/fonts/luculent/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let version = "2.0.0"; in -fetchzip rec { +fetchzip { name = "luculent-${version}"; url = http://www.eastfarthing.com/luculent/luculent.tar.xz; diff --git a/pkgs/data/fonts/medio/default.nix b/pkgs/data/fonts/medio/default.nix index 024e6049a38..c94046f085f 100644 --- a/pkgs/data/fonts/medio/default.nix +++ b/pkgs/data/fonts/medio/default.nix @@ -6,7 +6,7 @@ let pname = "medio"; in -fetchzip rec { +fetchzip { name = "${pname}-font-${majorVersion}.${minorVersion}"; url = "http://dotcolon.net/DL/font/${pname}.zip"; diff --git a/pkgs/data/fonts/monoid/default.nix b/pkgs/data/fonts/monoid/default.nix index c4cf4f14251..06fb7499b81 100644 --- a/pkgs/data/fonts/monoid/default.nix +++ b/pkgs/data/fonts/monoid/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python, fontforge }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "monoid"; version = "2016-07-21"; diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix index 03bc8a0db4d..75e8899e664 100644 --- a/pkgs/data/fonts/mplus-outline-fonts/default.nix +++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix @@ -2,7 +2,7 @@ let version = "063a"; -in fetchzip rec { +in fetchzip { name = "mplus-${version}"; url = "mirror://osdn/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz"; diff --git a/pkgs/data/fonts/myrica/default.nix b/pkgs/data/fonts/myrica/default.nix index f3be8857284..444d526f5ae 100644 --- a/pkgs/data/fonts/myrica/default.nix +++ b/pkgs/data/fonts/myrica/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: -fetchFromGitHub rec { +fetchFromGitHub { name = "myrica-2.011.20160403"; owner = "tomokuni"; diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/data/fonts/nafees/default.nix index b39a59d1ba7..d2aaadc4279 100644 --- a/pkgs/data/fonts/nafees/default.nix +++ b/pkgs/data/fonts/nafees/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, unzip}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "nafees"; srcs = [(fetchurl { diff --git a/pkgs/data/fonts/nanum-gothic-coding/default.nix b/pkgs/data/fonts/nanum-gothic-coding/default.nix index f6b8210290e..7d908b62cc6 100644 --- a/pkgs/data/fonts/nanum-gothic-coding/default.nix +++ b/pkgs/data/fonts/nanum-gothic-coding/default.nix @@ -4,7 +4,7 @@ let version = "VER2.5"; fullName = "NanumGothicCoding-2.5"; -in fetchzip rec { +in fetchzip { name = "nanum-gothic-coding"; url = "https://github.com/naver/nanumfont/releases/download/${version}/${fullName}.zip"; diff --git a/pkgs/data/fonts/nika-fonts/default.nix b/pkgs/data/fonts/nika-fonts/default.nix index c6bdbd40248..3f58bc5f933 100644 --- a/pkgs/data/fonts/nika-fonts/default.nix +++ b/pkgs/data/fonts/nika-fonts/default.nix @@ -3,7 +3,7 @@ let pname = "nika-fonts"; version = "1.0.0"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "font-store"; repo = "NikaFont"; diff --git a/pkgs/data/fonts/norwester/default.nix b/pkgs/data/fonts/norwester/default.nix index 0de5aa8fdf3..ae70c74c3e4 100644 --- a/pkgs/data/fonts/norwester/default.nix +++ b/pkgs/data/fonts/norwester/default.nix @@ -3,7 +3,7 @@ let version = "1.2"; pname = "norwester"; -in fetchzip rec { +in fetchzip { name = "${pname}-${version}"; url = "http://jamiewilson.io/norwester/assets/norwester.zip"; diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 0acb8e2c7be..bd0d39c7f29 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -46,7 +46,7 @@ let }; in -rec { +{ noto-fonts = mkNoto { name = "noto-fonts"; weights = "{Regular,Bold,Light,Italic,BoldItalic,LightItalic}"; diff --git a/pkgs/data/fonts/open-sans/default.nix b/pkgs/data/fonts/open-sans/default.nix index dfe1426d697..0c1293ebda3 100644 --- a/pkgs/data/fonts/open-sans/default.nix +++ b/pkgs/data/fonts/open-sans/default.nix @@ -3,7 +3,7 @@ let pname = "open-sans"; version = "1.11"; -in fetchFromGitLab rec { +in fetchFromGitLab { name = "${pname}-${version}"; domain = "salsa.debian.org"; diff --git a/pkgs/data/fonts/parastoo-fonts/default.nix b/pkgs/data/fonts/parastoo-fonts/default.nix index d02925e3a37..d297baddc4d 100644 --- a/pkgs/data/fonts/parastoo-fonts/default.nix +++ b/pkgs/data/fonts/parastoo-fonts/default.nix @@ -3,7 +3,7 @@ let pname = "parastoo-fonts"; version = "1.0.0-alpha5"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "rastikerdar"; diff --git a/pkgs/data/fonts/paratype-pt/mono.nix b/pkgs/data/fonts/paratype-pt/mono.nix index e6f0776daea..6b619d23201 100644 --- a/pkgs/data/fonts/paratype-pt/mono.nix +++ b/pkgs/data/fonts/paratype-pt/mono.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip }: -fetchzip rec { +fetchzip { name = "paratype-pt-mono"; url = [ diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/data/fonts/paratype-pt/sans.nix index 1e6610e8e44..a3692809026 100644 --- a/pkgs/data/fonts/paratype-pt/sans.nix +++ b/pkgs/data/fonts/paratype-pt/sans.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip }: -fetchzip rec { +fetchzip { name = "paratype-pt-sans"; url = [ diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/pkgs/data/fonts/paratype-pt/serif.nix index f4da6508f08..d74295571e0 100644 --- a/pkgs/data/fonts/paratype-pt/serif.nix +++ b/pkgs/data/fonts/paratype-pt/serif.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip }: -fetchzip rec { +fetchzip { name = "paratype-pt-serif"; url = [ diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix index 144ec3bab85..1fc252421de 100644 --- a/pkgs/data/fonts/pecita/default.nix +++ b/pkgs/data/fonts/pecita/default.nix @@ -4,7 +4,7 @@ let version = "5.4"; in -fetchurl rec { +fetchurl { name = "pecita-${version}"; url = "http://pecita.eu/b/Pecita.otf"; diff --git a/pkgs/data/fonts/penna/default.nix b/pkgs/data/fonts/penna/default.nix index 57395c507fe..784f9d2573e 100644 --- a/pkgs/data/fonts/penna/default.nix +++ b/pkgs/data/fonts/penna/default.nix @@ -6,7 +6,7 @@ let pname = "penna"; in -fetchzip rec { +fetchzip { name = "${pname}-font-${majorVersion}.${minorVersion}"; url = "http://dotcolon.net/DL/font/${pname}.zip"; diff --git a/pkgs/data/fonts/profont/default.nix b/pkgs/data/fonts/profont/default.nix index c28c9283a9b..89565910f7a 100644 --- a/pkgs/data/fonts/profont/default.nix +++ b/pkgs/data/fonts/profont/default.nix @@ -1,6 +1,6 @@ { lib, fetchzip }: -fetchzip rec { +fetchzip { name = "profont"; url = "http://web.archive.org/web/20160707013914/http://tobiasjung.name/downloadfile.php?file=profont-x11.zip"; diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/pkgs/data/fonts/proggyfonts/default.nix index b2207e01df1..580ea61a2df 100644 --- a/pkgs/data/fonts/proggyfonts/default.nix +++ b/pkgs/data/fonts/proggyfonts/default.nix @@ -2,7 +2,7 @@ # adapted from https://aur.archlinux.org/packages/proggyfonts/ -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "proggyfonts-0.1"; src = fetchurl { diff --git a/pkgs/data/fonts/public-sans/default.nix b/pkgs/data/fonts/public-sans/default.nix index 14c66fb39b2..46ebe4dd4b2 100644 --- a/pkgs/data/fonts/public-sans/default.nix +++ b/pkgs/data/fonts/public-sans/default.nix @@ -2,7 +2,7 @@ let version = "1.005"; -in fetchzip rec { +in fetchzip { name = "public-sans-${version}"; url = "https://github.com/uswds/public-sans/releases/download/v${version}/public-sans-v${version}.zip"; diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index 61206ca5d14..6d075424bc5 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix @@ -50,13 +50,13 @@ let }; in { - liberation_ttf_v1 = common rec { + liberation_ttf_v1 = common { repo = "liberation-1.7-fonts"; version = "1.07.5"; nativeBuildInputs = [ fontforge ]; sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v"; }; - liberation_ttf_v2 = common rec { + liberation_ttf_v2 = common { repo = "liberation-fonts"; version = "2.00.4"; nativeBuildInputs = [ fontforge fonttools ]; diff --git a/pkgs/data/fonts/redhat-official/default.nix b/pkgs/data/fonts/redhat-official/default.nix index c05b9c69aef..33321a2c7fe 100644 --- a/pkgs/data/fonts/redhat-official/default.nix +++ b/pkgs/data/fonts/redhat-official/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let version = "2.2.0"; in -fetchzip rec { +fetchzip { name = "redhat-official-${version}"; url = "https://github.com/RedHatOfficial/RedHatFont/archive/${version}.zip"; diff --git a/pkgs/data/fonts/roboto-mono/default.nix b/pkgs/data/fonts/roboto-mono/default.nix index d55e3b753dd..cfd4e3808aa 100644 --- a/pkgs/data/fonts/roboto-mono/default.nix +++ b/pkgs/data/fonts/roboto-mono/default.nix @@ -4,7 +4,7 @@ let # last commit on the directory containing the fonts in the upstream repository commit = "883939708704a19a295e0652036369d22469e8dc"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "roboto-mono"; version = "2016-01-11"; diff --git a/pkgs/data/fonts/roboto-slab/default.nix b/pkgs/data/fonts/roboto-slab/default.nix index 548414152dd..f9f6ec342e9 100644 --- a/pkgs/data/fonts/roboto-slab/default.nix +++ b/pkgs/data/fonts/roboto-slab/default.nix @@ -4,7 +4,7 @@ let # last commit on the directory containing the fonts in the upstream repository commit = "883939708704a19a295e0652036369d22469e8dc"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "roboto-slab"; version = "2016-01-11"; diff --git a/pkgs/data/fonts/roboto/default.nix b/pkgs/data/fonts/roboto/default.nix index 707d31ac531..50629c5f977 100644 --- a/pkgs/data/fonts/roboto/default.nix +++ b/pkgs/data/fonts/roboto/default.nix @@ -2,7 +2,7 @@ let version = "2.138"; -in fetchzip rec { +in fetchzip { name = "roboto-${version}"; url = "https://github.com/google/roboto/releases/download/v${version}/roboto-unhinted.zip"; diff --git a/pkgs/data/fonts/route159/default.nix b/pkgs/data/fonts/route159/default.nix index 1b8d4e60653..cbc89c550b3 100644 --- a/pkgs/data/fonts/route159/default.nix +++ b/pkgs/data/fonts/route159/default.nix @@ -6,7 +6,7 @@ let pname = "route159"; in -fetchzip rec { +fetchzip { name = "${pname}-font-${majorVersion}.${minorVersion}"; url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip"; diff --git a/pkgs/data/fonts/sahel-fonts/default.nix b/pkgs/data/fonts/sahel-fonts/default.nix index 0b90a43ca3e..029ed33611f 100644 --- a/pkgs/data/fonts/sahel-fonts/default.nix +++ b/pkgs/data/fonts/sahel-fonts/default.nix @@ -3,7 +3,7 @@ let pname = "sahel-fonts"; version = "1.0.0-alpha22"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "rastikerdar"; diff --git a/pkgs/data/fonts/samim-fonts/default.nix b/pkgs/data/fonts/samim-fonts/default.nix index dd4a01c782e..d8d3d0d3b5a 100644 --- a/pkgs/data/fonts/samim-fonts/default.nix +++ b/pkgs/data/fonts/samim-fonts/default.nix @@ -3,7 +3,7 @@ let pname = "samim-fonts"; version = "3.1.0"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "rastikerdar"; diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index f46fda0dd31..2d9fbfdae05 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -2,7 +2,7 @@ let version = "0.8.0"; -in fetchurl rec { +in fetchurl { name = "sarasa-gothic-${version}"; url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; diff --git a/pkgs/data/fonts/seshat/default.nix b/pkgs/data/fonts/seshat/default.nix index af3c5dd25ee..71483a04cbb 100644 --- a/pkgs/data/fonts/seshat/default.nix +++ b/pkgs/data/fonts/seshat/default.nix @@ -6,7 +6,7 @@ let pname = "seshat"; in -fetchzip rec { +fetchzip { name = "${pname}-font-${majorVersion}.${minorVersion}"; url = "http://dotcolon.net/DL/font/${pname}.zip"; diff --git a/pkgs/data/fonts/shabnam-fonts/default.nix b/pkgs/data/fonts/shabnam-fonts/default.nix index 89bca56a53e..5834b797eea 100644 --- a/pkgs/data/fonts/shabnam-fonts/default.nix +++ b/pkgs/data/fonts/shabnam-fonts/default.nix @@ -3,7 +3,7 @@ let pname = "shabnam-fonts"; version = "4.0.0"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "rastikerdar"; diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index 873528b8bde..2964b8692dc 100644 --- a/pkgs/data/fonts/spleen/default.nix +++ b/pkgs/data/fonts/spleen/default.nix @@ -3,7 +3,7 @@ let pname = "spleen"; version = "1.0.5"; -in fetchurl rec { +in fetchurl { name = "${pname}-${version}"; url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; diff --git a/pkgs/data/fonts/stix-otf/default.nix b/pkgs/data/fonts/stix-otf/default.nix index f5d15439079..f3ff9600f5d 100644 --- a/pkgs/data/fonts/stix-otf/default.nix +++ b/pkgs/data/fonts/stix-otf/default.nix @@ -2,7 +2,7 @@ let version = "1.1.1"; -in fetchzip rec { +in fetchzip { name = "stix-otf-${version}"; url = "http://ftp.fi.muni.cz/pub/linux/gentoo/distfiles/STIXv${version}-word.zip"; diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index adb69b6c974..359139ec9c6 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -2,7 +2,7 @@ let version = "0.40"; -in fetchzip rec { +in fetchzip { name = "sudo-font-${version}"; url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; sha256 = "1nf025sjps4yysf6zkns5fzjgls6xdpifh7bz4ray9x8h5pz0z64"; diff --git a/pkgs/data/fonts/tenderness/default.nix b/pkgs/data/fonts/tenderness/default.nix index 958af414ff0..09ea566e738 100644 --- a/pkgs/data/fonts/tenderness/default.nix +++ b/pkgs/data/fonts/tenderness/default.nix @@ -6,7 +6,7 @@ let pname = "tenderness"; in -fetchzip rec { +fetchzip { name = "${pname}-font-${majorVersion}.${minorVersion}"; url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip"; diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix index 211cc73cc9d..bdd0fd7762b 100644 --- a/pkgs/data/fonts/terminus-font-ttf/default.nix +++ b/pkgs/data/fonts/terminus-font-ttf/default.nix @@ -2,7 +2,7 @@ let version = "4.47.0"; -in fetchzip rec { +in fetchzip { name = "terminus-font-ttf-${version}"; url = "http://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip"; diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index 5f072f90f05..7c90c16d4d1 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -1,6 +1,6 @@ { lib, fetchzip }: -fetchzip rec { +fetchzip { name = "ubuntu-font-family-0.83"; url = "https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-0.83.zip"; diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix index f1545e3d5b4..0ea0363763d 100644 --- a/pkgs/data/fonts/ucs-fonts/default.nix +++ b/pkgs/data/fonts/ucs-fonts/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, mkfontdir, mkfontscale }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ucs-fonts"; version = "20090406"; diff --git a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix index 35551e929e6..f9045794fe1 100644 --- a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix +++ b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix @@ -3,7 +3,7 @@ let version = "1.0"; in -fetchzip rec { +fetchzip { name = "ultimate-oldschool-pc-font-pack-${version}"; url = "http://int10h.org/oldschool-pc-fonts/download/ultimate_oldschool_pc_font_pack_v${version}.zip"; sha256 = "0hid4dgqfy2w26734vcw2rxmpacd9vd1r2qpdr9ww1n3kgc92k9y"; diff --git a/pkgs/data/fonts/vazir-fonts/default.nix b/pkgs/data/fonts/vazir-fonts/default.nix index d004e75571b..f3986753809 100755 --- a/pkgs/data/fonts/vazir-fonts/default.nix +++ b/pkgs/data/fonts/vazir-fonts/default.nix @@ -3,7 +3,7 @@ let pname = "vazir-fonts"; version = "19.2.0"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "rastikerdar"; diff --git a/pkgs/data/fonts/vdrsymbols/default.nix b/pkgs/data/fonts/vdrsymbols/default.nix index 01a4072099a..fd74897077f 100644 --- a/pkgs/data/fonts/vdrsymbols/default.nix +++ b/pkgs/data/fonts/vdrsymbols/default.nix @@ -1,6 +1,6 @@ { lib, fetchzip }: -fetchzip rec { +fetchzip { name = "vdrsymbols-20100612"; url = http://andreas.vdr-developer.org/fonts/download/vdrsymbols-ttf-20100612.tgz; diff --git a/pkgs/data/fonts/xkcd-font/default.nix b/pkgs/data/fonts/xkcd-font/default.nix index 0e996da2fc7..e5dd11db72a 100644 --- a/pkgs/data/fonts/xkcd-font/default.nix +++ b/pkgs/data/fonts/xkcd-font/default.nix @@ -3,7 +3,7 @@ let pname = "xkcd-font"; version = "unstable-2017-08-24"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "ipython"; diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix index 49d289cac39..a623af20604 100644 --- a/pkgs/data/icons/maia-icon-theme/default.nix +++ b/pkgs/data/icons/maia-icon-theme/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, cmake, extra-cmake-modules, gtk3, kdeFrameworks, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "maia-icon-theme"; version = "2018-02-24"; diff --git a/pkgs/data/machine-learning/mnist/default.nix b/pkgs/data/machine-learning/mnist/default.nix index 26b06b4e652..fe9e83492e4 100644 --- a/pkgs/data/machine-learning/mnist/default.nix +++ b/pkgs/data/machine-learning/mnist/default.nix @@ -20,7 +20,7 @@ let }; in stdenvNoCC.mkDerivation rec { - name = "mnist-${version}"; + pname = "mnist"; version = "2018-11-16"; installPhase = '' mkdir -p $out diff --git a/pkgs/data/misc/brise/default.nix b/pkgs/data/misc/brise/default.nix index 54b54d278ff..f1e0604acf8 100644 --- a/pkgs/data/misc/brise/default.nix +++ b/pkgs/data/misc/brise/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, librime }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "brise-unstable-2017-09-16"; src = fetchFromGitHub { diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index a99df2e7bd6..99739646a8b 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -15,7 +15,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "nss-cacert-${nss.version}"; src = nss.src; diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 38662bef0af..8cbd526f3d3 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -6,7 +6,7 @@ let url = "https://geolite.maxmind.com/download/geoip/database/${src}"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "geolite-legacy"; version = "2017-12-02"; diff --git a/pkgs/data/misc/nixos-artwork/default.nix b/pkgs/data/misc/nixos-artwork/default.nix index 71fe32c1066..4814232fbfe 100644 --- a/pkgs/data/misc/nixos-artwork/default.nix +++ b/pkgs/data/misc/nixos-artwork/default.nix @@ -1,5 +1,5 @@ { callPackage }: -rec { +{ wallpapers = callPackage ./wallpapers.nix { }; } diff --git a/pkgs/data/misc/pari-galdata/default.nix b/pkgs/data/misc/pari-galdata/default.nix index 1b6b60f104e..2535e8cfc25 100644 --- a/pkgs/data/misc/pari-galdata/default.nix +++ b/pkgs/data/misc/pari-galdata/default.nix @@ -2,7 +2,7 @@ , fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "20080411"; pname = "pari-galdata"; diff --git a/pkgs/data/misc/pari-seadata-small/default.nix b/pkgs/data/misc/pari-seadata-small/default.nix index 2d3d52f697e..3470a0804f7 100644 --- a/pkgs/data/misc/pari-seadata-small/default.nix +++ b/pkgs/data/misc/pari-seadata-small/default.nix @@ -2,7 +2,7 @@ , fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "20090618"; pname = "pari-seadata-small"; diff --git a/pkgs/data/misc/publicsuffix-list/default.nix b/pkgs/data/misc/publicsuffix-list/default.nix index b5414ab18b4..ca79e251f28 100644 --- a/pkgs/data/misc/publicsuffix-list/default.nix +++ b/pkgs/data/misc/publicsuffix-list/default.nix @@ -3,7 +3,7 @@ let pname = "publicsuffix-list"; version = "2019-05-24"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "publicsuffix"; repo = "list"; diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 79924c4832f..6952d2da6ba 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -2,7 +2,7 @@ , libxml2, glib}: let version = "1.12"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "shared-mime-info"; inherit version; diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index c1f9153c585..b2363b4b549 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "tzdata"; - version = "2019a"; + version = "2019b"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; - sha256 = "0wlpqm4asvi0waaz24xj20iq40gqfypmb4nldjhkfgm09bgnsdlh"; + sha256 = "0r0clnlslwm15m1c61dinf1fi9ffgl6aipng7i7yryfwj0n0kn85"; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; - sha256 = "1x9z8fpgnhzlsnps0hamb54ymaskjab7ys9m4i4gpk9hpiig2fc7"; + sha256 = "0vbmswvv3li25s31shyllq5v24449lxnrki9hr043nipjd09sirf"; }) ]; diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index 09ca8897a21..db0b4ec6610 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "matcha"; version = "2019-06-22"; diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index 8d0fed6b3d8..2739b9a2517 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -1,5 +1,5 @@ { callPackage, pkgs }: -rec { +{ #### CORE EFL efl = callPackage ./efl.nix { openjpeg = pkgs.openjpeg_1; diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 5978fb217e8..920343a6024 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -6,7 +6,7 @@ let version = "3.32.2"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "gnome-notes"; inherit version; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index dda45a71fe2..0048b02581a 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { ]; prePatch = '' - substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas \ - --subst-var-by GDS_GSETTINGS_PATH "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}/glib-2.0/schemas" + substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} \ + --subst-var-by GDS_GSETTINGS_PATH ${glib.getSchemaPath gsettings-desktop-schemas} patches="$patches $PWD/hardcode-gsettings.patch" ''; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index 76121660012..3d37040828c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # Fixup adapted from export-zips.sh in the source. extensiondir=$out/share/gnome-shell/extensions - schemadir=$out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas/ + schemadir=${glib.makeSchemaPath "$out" "${pname}-${version}"} glib-compile-schemas $schemadir diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix index cde0b9ec00b..41527298ffb 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix +++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix @@ -58,7 +58,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-x" - "--disable-static" "--enable-shape" "--enable-sm" "--enable-startup-notification" diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix index 444c144cfab..e18f4de68d6 100644 --- a/pkgs/desktops/gnome-3/core/vino/default.nix +++ b/pkgs/desktops/gnome-3/core/vino/default.nix @@ -28,7 +28,7 @@ , telepathy-glib ? null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "vino"; version = "unstable-2019-07-08"; diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index 0d9d54167ff..cff0db665bb 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { (substituteAll { src = ./fix-paths.patch; gapplication = "${glib.bin}/bin/gapplication"; - mutter_gsettings_path = "${gnome3.mutter}/share/gsettings-schemas/${gnome3.mutter.name}/glib-2.0/schemas"; + mutter_gsettings_path = glib.getSchemaPath gnome3.mutter; }) ]; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgnome_shell_libdir=${gnome3.gnome-shell}/lib" - "-Dgsettings_schemadir=${placeholder "out"}/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas" + "-Dgsettings_schemadir=${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"}" "-Dchrome_nmhdir=${placeholder "out"}/etc/opt/chrome/native-messaging-hosts" "-Dchromium_nmhdir=${placeholder "out"}/etc/chromium/native-messaging-hosts" "-Dopenssl_path=${openssl}/bin/openssl" diff --git a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix b/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix index f09822415a6..10175719e46 100644 --- a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix +++ b/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, glib, meson, gettext, ninja, python3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gnome-shell-extensions-mediaplayer"; version = "unstable-2019-03-21"; diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix index d8a78686e49..46ca01c1a1a 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { substituteInPlace src/gnome-shell/prefs.js \ --subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0" substituteInPlace src/libgpaste/settings/gpaste-settings.c \ - --subst-var-by gschemasCompiled "${placeholder "out"}/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas" + --subst-var-by gschemasCompiled ${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"} ''; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/desktops/gnustep/make/default.nix index 5e7db35a727..64e9332a306 100644 --- a/pkgs/desktops/gnustep/make/default.nix +++ b/pkgs/desktops/gnustep/make/default.nix @@ -4,7 +4,7 @@ let version = "2.7.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gnustep-make"; inherit version; diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index ae6583c4672..0decbbc6c7a 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -10,6 +10,7 @@ , desktop-file-utils , libcanberra , gtk3 +, glib , libgee , granite , libnotify @@ -82,7 +83,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py substituteInPlace filechooser-module/FileChooserDialog.vala \ - --subst-var-by ELEMENTARY_FILES_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas + --subst-var-by ELEMENTARY_FILES_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index 7e572e2326b..a8556bd5401 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -10,6 +10,7 @@ , gtk3 , switchboard , elementary-settings-daemon +, glib }: stdenv.mkDerivation rec { @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/Views/General.vala \ - --subst-var-by GSD_GSETTINGS ${elementary-settings-daemon}/share/gsettings-schemas/${elementary-settings-daemon.name}/glib-2.0/schemas + --subst-var-by GSD_GSETTINGS ${glib.getSchemaPath elementary-settings-daemon} ''; passthru = { @@ -46,6 +47,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + glib granite gtk3 libgee diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index 6046a4d2125..35dd958483d 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala +{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, glib , libgee, granite, gexiv2, elementary-settings-daemon, gtk3, gnome-desktop , gala, wingpanel, plank, switchboard, gettext, bamf, fetchpatch }: @@ -29,9 +29,10 @@ stdenv.mkDerivation rec { buildInputs = [ bamf + elementary-settings-daemon gexiv2 + glib gnome-desktop - elementary-settings-daemon granite gtk3 libgee @@ -51,9 +52,9 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/Views/Appearance.vala \ - --subst-var-by GALA_GSETTINGS_PATH ${gala}/share/gsettings-schemas/${gala.name}/glib-2.0/schemas + --subst-var-by GALA_GSETTINGS_PATH ${glib.getSchemaPath gala} substituteInPlace src/Views/Appearance.vala \ - --subst-var-by WINGPANEL_GSETTINGS_PATH ${wingpanel}/share/gsettings-schemas/${wingpanel.name}/glib-2.0/schemas + --subst-var-by WINGPANEL_GSETTINGS_PATH ${glib.getSchemaPath wingpanel} ''; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index ea197643b95..1c90cc0e662 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -11,6 +11,7 @@ , elementary-settings-daemon , granite , gtk3 +, glib , dbus , polkit , switchboard @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ dbus + glib granite gtk3 libgee @@ -59,9 +61,9 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/MainView.vala \ - --subst-var-by DPMS_HELPER_GSETTINGS_PATH ${elementary-dpms-helper}/share/gsettings-schemas/${elementary-dpms-helper.name}/glib-2.0/schemas + --subst-var-by DPMS_HELPER_GSETTINGS_PATH ${glib.getSchemaPath elementary-dpms-helper} substituteInPlace src/MainView.vala \ - --subst-var-by GSD_GSETTINGS_PATH ${elementary-settings-daemon}/share/gsettings-schemas/${elementary-settings-daemon.name}/glib-2.0/schemas + --subst-var-by GSD_GSETTINGS_PATH ${glib.getSchemaPath elementary-settings-daemon} ''; PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index 04214054616..fd67440a43c 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -9,6 +9,7 @@ , libgee , granite , gtk3 +, glib , polkit , zeitgeist , switchboard @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + glib granite gtk3 libgee @@ -60,9 +62,9 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py substituteInPlace src/Views/LockPanel.vala \ - --subst-var-by LIGHTLOCKER_GSETTINGS_PATH ${lightlocker}/share/gsettings-schemas/${lightlocker.name}/glib-2.0/schemas + --subst-var-by LIGHTLOCKER_GSETTINGS_PATH ${glib.getSchemaPath lightlocker} substituteInPlace src/Views/FirewallPanel.vala \ - --subst-var-by SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas + --subst-var-by SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix index 76bdcf643f8..df2475ce82a 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix @@ -3,7 +3,7 @@ , pantheon }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "elementary-redacted-script"; version = "unstable-2016-06-03"; diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix index b273bbece96..9fc4418e7ca 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix @@ -33,16 +33,17 @@ with stdenv.lib; # TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this runCommand "elementary-gsettings-desktop-schemas" {} '' - mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas - cp -rf ${gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + schema_dir=$out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas - ${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") gsettingsOverridePackages} + mkdir -p $schema_dir + cp -rf ${glib.getSchemaPath gsettings-desktop-schemas}/*.xml $schema_dir + + ${concatMapStrings (pkg: "cp -rf ${glib.getSchemaPath pkg}/*.xml $schema_dir\n") gsettingsOverridePackages} chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides - cp ${elementary-default-settings}/share/glib-2.0/schemas/20-io.elementary.desktop.gschema.override \ - $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + cp ${elementary-default-settings}/share/glib-2.0/schemas/20-io.elementary.desktop.gschema.override $schema_dir - cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF + cat - > $schema_dir/nixos-defaults.gschema.override <<- EOF [org.gnome.desktop.background] picture-uri='file://${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png' primary-color='#000000' @@ -50,5 +51,5 @@ runCommand "elementary-gsettings-desktop-schemas" {} ${extraGSettingsOverrides} EOF - ${glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/ + ${glib.dev}/bin/glib-compile-schemas $schema_dir '' diff --git a/pkgs/desktops/pantheon/update.nix b/pkgs/desktops/pantheon/update.nix index 7e9aacc0c2b..3bc432c5d32 100644 --- a/pkgs/desktops/pantheon/update.nix +++ b/pkgs/desktops/pantheon/update.nix @@ -31,6 +31,6 @@ let throwFlag = throw "${versionPolicy} is not a valid versionPolicy - Options are either 'release' or 'master' (defaults to release)."; - versionFlag = { "release" = "-r"; "master" = "-m"; }.${versionPolicy} or throwFlag; + versionFlag = { release = "-r"; master = "-m"; }.${versionPolicy} or throwFlag; in [ updateScript versionFlag repoName attrPath ] diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 07c6805c689..e188e4e3fcd 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -72,7 +72,7 @@ let let inherit (args) name; sname = args.sname or name; - inherit (srcs."${sname}") src version; + inherit (srcs.${sname}) src version; outputs = args.outputs or [ "out" ]; hasBin = lib.elem "bin" outputs; diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index 32bd5f3a9f2..4183b38ba49 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -15,7 +15,7 @@ plasma-workspace, xf86inputlibinput }: -mkDerivation rec { +mkDerivation { name = "plasma-desktop"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/pkgs/desktops/xfce4-14/exo/default.nix b/pkgs/desktops/xfce4-14/exo/default.nix index b0dcec78765..59ab5823314 100644 --- a/pkgs/desktops/xfce4-14/exo/default.nix +++ b/pkgs/desktops/xfce4-14/exo/default.nix @@ -1,7 +1,7 @@ { mkXfceDerivation, docbook_xsl, glib, libxslt, perlPackages, gtk3 , libxfce4ui, libxfce4util }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "exo"; version = "0.12.8"; diff --git a/pkgs/desktops/xfce4-14/garcon/default.nix b/pkgs/desktops/xfce4-14/garcon/default.nix index d4e7e2ffc80..0d6cb8c410e 100644 --- a/pkgs/desktops/xfce4-14/garcon/default.nix +++ b/pkgs/desktops/xfce4-14/garcon/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, gtk3, libxfce4ui, libxfce4util }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "garcon"; version = "0.6.4"; diff --git a/pkgs/desktops/xfce4-14/gigolo/default.nix b/pkgs/desktops/xfce4-14/gigolo/default.nix index 6939e8859ac..5b25e474af2 100644 --- a/pkgs/desktops/xfce4-14/gigolo/default.nix +++ b/pkgs/desktops/xfce4-14/gigolo/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, exo, gtk3, gvfs, glib }: -mkXfceDerivation rec { +mkXfceDerivation { category = "apps"; pname = "gigolo"; version = "0.5.0"; diff --git a/pkgs/desktops/xfce4-14/libxfce4ui/default.nix b/pkgs/desktops/xfce4-14/libxfce4ui/default.nix index 2ea6d195d6f..79c8ec74b62 100644 --- a/pkgs/desktops/xfce4-14/libxfce4ui/default.nix +++ b/pkgs/desktops/xfce4-14/libxfce4ui/default.nix @@ -1,7 +1,7 @@ { lib, mkXfceDerivation, gobject-introspection, gtk2, gtk3, libICE, libSM , libstartup_notification, libxfce4util, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "libxfce4ui"; version = "4.14.1"; diff --git a/pkgs/desktops/xfce4-14/libxfce4util/default.nix b/pkgs/desktops/xfce4-14/libxfce4util/default.nix index 99fe59583aa..4540d235251 100644 --- a/pkgs/desktops/xfce4-14/libxfce4util/default.nix +++ b/pkgs/desktops/xfce4-14/libxfce4util/default.nix @@ -1,6 +1,6 @@ { lib, mkXfceDerivation, gobject-introspection }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "libxfce4util"; version = "4.14.0"; diff --git a/pkgs/desktops/xfce4-14/mkXfceDerivation.nix b/pkgs/desktops/xfce4-14/mkXfceDerivation.nix index cf4b5eb3cdc..b7dc8322569 100644 --- a/pkgs/desktops/xfce4-14/mkXfceDerivation.nix +++ b/pkgs/desktops/xfce4-14/mkXfceDerivation.nix @@ -12,7 +12,7 @@ let concatAttrLists = attrsets: zipAttrsWithNames (filterAttrNames isList (head attrsets)) (_: concatLists) attrsets; - template = rec { + template = { name = "${pname}-${version}"; nativeBuildInputs = [ pkgconfig xfce4-dev-tools wrapGAppsHook ]; diff --git a/pkgs/desktops/xfce4-14/mousepad/default.nix b/pkgs/desktops/xfce4-14/mousepad/default.nix index ca80fd8bf53..77559aaf329 100644 --- a/pkgs/desktops/xfce4-14/mousepad/default.nix +++ b/pkgs/desktops/xfce4-14/mousepad/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, exo, glib, gtk3, gtksourceview3, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "apps"; pname = "mousepad"; version = "0.4.2"; diff --git a/pkgs/desktops/xfce4-14/orage/default.nix b/pkgs/desktops/xfce4-14/orage/default.nix index 8c453aa96a2..7bb10c2fd94 100644 --- a/pkgs/desktops/xfce4-14/orage/default.nix +++ b/pkgs/desktops/xfce4-14/orage/default.nix @@ -7,7 +7,7 @@ let inherit (lib) optionals; in -mkXfceDerivation rec { +mkXfceDerivation { category = "apps"; pname = "orage"; version = "4.12.1"; diff --git a/pkgs/desktops/xfce4-14/parole/default.nix b/pkgs/desktops/xfce4-14/parole/default.nix index 578be8329b0..ed3979072ed 100644 --- a/pkgs/desktops/xfce4-14/parole/default.nix +++ b/pkgs/desktops/xfce4-14/parole/default.nix @@ -5,7 +5,7 @@ # Doesn't seem to find H.264 codec even though built with gst-plugins-bad. -mkXfceDerivation rec { +mkXfceDerivation { category = "apps"; pname = "parole"; version = "1.0.4"; diff --git a/pkgs/desktops/xfce4-14/ristretto/default.nix b/pkgs/desktops/xfce4-14/ristretto/default.nix index 1c09d3a0c00..4a24bf90532 100644 --- a/pkgs/desktops/xfce4-14/ristretto/default.nix +++ b/pkgs/desktops/xfce4-14/ristretto/default.nix @@ -1,7 +1,7 @@ { mkXfceDerivation, automakeAddFlags, exo, gtk3, glib, libexif , libxfce4ui, libxfce4util, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "apps"; pname = "ristretto"; version = "0.10.0"; diff --git a/pkgs/desktops/xfce4-14/thunar-volman/default.nix b/pkgs/desktops/xfce4-14/thunar-volman/default.nix index 1fa714c7ff1..11b29c64b33 100644 --- a/pkgs/desktops/xfce4-14/thunar-volman/default.nix +++ b/pkgs/desktops/xfce4-14/thunar-volman/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, exo, gtk3, libgudev, libxfce4ui, libxfce4util, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "thunar-volman"; version = "0.9.5"; diff --git a/pkgs/desktops/xfce4-14/thunar/default.nix b/pkgs/desktops/xfce4-14/thunar/default.nix index ed0be442023..12a1a62991a 100644 --- a/pkgs/desktops/xfce4-14/thunar/default.nix +++ b/pkgs/desktops/xfce4-14/thunar/default.nix @@ -1,7 +1,7 @@ { mkXfceDerivation, docbook_xsl, exo, gdk-pixbuf, gtk3, libgudev , libnotify, libX11, libxfce4ui, libxfce4util, libxslt, xfconf, gobject-introspection, gvfs }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "thunar"; version = "1.8.9"; diff --git a/pkgs/desktops/xfce4-14/tumbler/default.nix b/pkgs/desktops/xfce4-14/tumbler/default.nix index 81b00808336..ecbc62d8ffb 100644 --- a/pkgs/desktops/xfce4-14/tumbler/default.nix +++ b/pkgs/desktops/xfce4-14/tumbler/default.nix @@ -11,7 +11,7 @@ # TODO: add libopenraw -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "tumbler"; version = "0.2.7"; diff --git a/pkgs/desktops/xfce4-14/xfburn/default.nix b/pkgs/desktops/xfce4-14/xfburn/default.nix index 97d08636656..27fae12981c 100644 --- a/pkgs/desktops/xfce4-14/xfburn/default.nix +++ b/pkgs/desktops/xfce4-14/xfburn/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, docbook_xsl, exo, gtk2, libburn, libisofs, libxfce4ui, libxslt }: -mkXfceDerivation rec { +mkXfceDerivation { category = "apps"; pname = "xfburn"; version = "0.5.5"; diff --git a/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix b/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix index 312e64cdbbe..6c4af66c866 100644 --- a/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, exo, garcon, gtk3, libxfce4util, libxfce4ui, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "xfce4-appfinder"; version = "4.14.0"; diff --git a/pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix index 84cb7427699..22793963df3 100644 --- a/pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, gtk3, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-cpufreq-plugin"; version = "1.2.1"; diff --git a/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix index b18f3fd45d6..38fe82ffb01 100644 --- a/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix @@ -1,7 +1,7 @@ { mkXfceDerivation, autoreconfHook, autoconf, automake , glib, gtk-doc, intltool, libtool }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "xfce4-dev-tools"; version = "4.14.0"; diff --git a/pkgs/desktops/xfce4-14/xfce4-dict/default.nix b/pkgs/desktops/xfce4-14/xfce4-dict/default.nix index 603863264ef..66ca7affa48 100644 --- a/pkgs/desktops/xfce4-14/xfce4-dict/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-dict/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, automakeAddFlags, gtk3, libxfce4ui, libxfce4util, xfce4-panel }: -mkXfceDerivation rec { +mkXfceDerivation { category = "apps"; pname = "xfce4-dict"; version = "0.8.2"; diff --git a/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix b/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix index a99c3ecb984..e468fea637e 100644 --- a/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix @@ -1,7 +1,7 @@ { mkXfceDerivation, glib, exo, gtk3, libnotify, libxfce4ui, libxfce4util , xfce4-panel, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "apps"; pname = "xfce4-notifyd"; version = "0.4.4"; diff --git a/pkgs/desktops/xfce4-14/xfce4-panel/default.nix b/pkgs/desktops/xfce4-14/xfce4-panel/default.nix index 27acb3bee58..c571666e5c4 100644 --- a/pkgs/desktops/xfce4-14/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-panel/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, tzdata, exo, garcon, gtk2, gtk3, glib, gettext, glib-networking, libxfce4ui, libxfce4util, libwnck3, xfconf, gobject-introspection }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "xfce4-panel"; version = "4.14.0"; diff --git a/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix b/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix index 115668334c3..985146c8257 100644 --- a/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix @@ -1,7 +1,7 @@ { mkXfceDerivation, automakeAddFlags, exo, gtk3, libnotify , libxfce4ui, libxfce4util, upower, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "xfce4-power-manager"; version = "1.6.5"; diff --git a/pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix index 185494c2543..6fca6069d1e 100644 --- a/pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix @@ -1,7 +1,7 @@ { mkXfceDerivation, automakeAddFlags, dbus-glib, dbus, gtk3, libpulseaudio , libnotify, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-pulseaudio-plugin"; version = "0.4.1"; diff --git a/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix index 0f74a78e8f2..f13a8fba6d0 100644 --- a/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, exo, gtk3, libsoup, libxfce4ui, libxfce4util, xfce4-panel, glib-networking }: -mkXfceDerivation rec { +mkXfceDerivation { category = "apps"; pname = "xfce4-screenshooter"; version = "1.9.5"; diff --git a/pkgs/desktops/xfce4-14/xfce4-session/default.nix b/pkgs/desktops/xfce4-14/xfce4-session/default.nix index 3361f541dc5..d44cd8b0dd7 100644 --- a/pkgs/desktops/xfce4-14/xfce4-session/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-session/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xorg }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "xfce4-session"; version = "4.14.0"; diff --git a/pkgs/desktops/xfce4-14/xfce4-settings/default.nix b/pkgs/desktops/xfce4-14/xfce4-settings/default.nix index 21aaef5fd08..8cda66359e3 100644 --- a/pkgs/desktops/xfce4-14/xfce4-settings/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-settings/default.nix @@ -2,7 +2,7 @@ , libnotify, libxfce4ui, libxfce4util, libxklavier , upower, xfconf, xf86inputlibinput }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "xfce4-settings"; version = "4.14.0"; diff --git a/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix b/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix index e62332343ba..78e98e9ea7d 100644 --- a/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "apps"; pname = "xfce4-terminal"; version = "0.8.8"; diff --git a/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix b/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix index b1405910021..97a00e9b67f 100644 --- a/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix @@ -1,6 +1,6 @@ { lib, mkXfceDerivation, gtk3, libnotify, libpulseaudio, keybinder3, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "apps"; pname = "xfce4-volumed-pulse"; version = "0.2.3"; diff --git a/pkgs/desktops/xfce4-14/xfconf/default.nix b/pkgs/desktops/xfce4-14/xfconf/default.nix index 8e56e0f8b37..a9d6ceaf469 100644 --- a/pkgs/desktops/xfce4-14/xfconf/default.nix +++ b/pkgs/desktops/xfce4-14/xfconf/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, libxfce4util }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "xfconf"; version = "4.14.1"; diff --git a/pkgs/desktops/xfce4-14/xfdesktop/default.nix b/pkgs/desktops/xfce4-14/xfdesktop/default.nix index c4b7d738b32..afcd0d19dc3 100644 --- a/pkgs/desktops/xfce4-14/xfdesktop/default.nix +++ b/pkgs/desktops/xfce4-14/xfdesktop/default.nix @@ -1,6 +1,6 @@ { mkXfceDerivation, exo, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf, libnotify, garcon, thunar }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "xfdesktop"; version = "4.14.1"; diff --git a/pkgs/desktops/xfce4-14/xfwm4/default.nix b/pkgs/desktops/xfce4-14/xfwm4/default.nix index b84487c09ae..358e99c893f 100644 --- a/pkgs/desktops/xfce4-14/xfwm4/default.nix +++ b/pkgs/desktops/xfce4-14/xfwm4/default.nix @@ -2,7 +2,7 @@ , libstartup_notification, libxfce4ui, libxfce4util, libwnck3 , libXpresent, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "xfce"; pname = "xfwm4"; version = "4.14.0"; diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index fcdd2eb5181..02aa6567c1a 100644 --- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -12,31 +12,31 @@ let # than we do. We don't just use theirs because ours are less ambiguous and # some builds need that clarity. ndkInfoFun = { config, ... }: { - "x86_64-apple-darwin" = { + x86_64-apple-darwin = { double = "darwin-x86_64"; }; - "x86_64-unknown-linux-gnu" = { + x86_64-unknown-linux-gnu = { double = "linux-x86_64"; }; - "i686-unknown-linux-android" = { + i686-unknown-linux-android = { triple = "i686-linux-android"; arch = "x86"; toolchain = "x86"; gccVer = "4.9"; }; - "x86_64-unknown-linux-android" = { + x86_64-unknown-linux-android = { triple = "x86_64-linux-android"; arch = "x86_64"; toolchain = "x86_64"; gccVer = "4.9"; }; - "armv7a-unknown-linux-androideabi" = { + armv7a-unknown-linux-androideabi = { arch = "arm"; triple = "arm-linux-androideabi"; toolchain = "arm-linux-androideabi"; gccVer = "4.9"; }; - "aarch64-unknown-linux-android" = { + aarch64-unknown-linux-android = { arch = "arm64"; triple = "aarch64-linux-android"; toolchain = "aarch64-linux-android"; diff --git a/pkgs/development/androidndk-pkgs/default.nix b/pkgs/development/androidndk-pkgs/default.nix index e35444ed516..7bb779d1d13 100644 --- a/pkgs/development/androidndk-pkgs/default.nix +++ b/pkgs/development/androidndk-pkgs/default.nix @@ -1,7 +1,7 @@ { androidenv, buildPackages, pkgs, targetPackages }: -rec { +{ "18b" = let ndkVersion = "18.1.5063045"; diff --git a/pkgs/development/arduino/platformio/default.nix b/pkgs/development/arduino/platformio/default.nix index 45186914604..280fd496650 100644 --- a/pkgs/development/arduino/platformio/default.nix +++ b/pkgs/development/arduino/platformio/default.nix @@ -4,7 +4,7 @@ let callPackage = newScope self; - self = rec { + self = { platformio-chrootenv = callPackage ./chrootenv.nix { }; }; diff --git a/pkgs/development/beam-modules/pgsql/default.nix b/pkgs/development/beam-modules/pgsql/default.nix index 18abe1055b5..6edee5d8bc6 100644 --- a/pkgs/development/beam-modules/pgsql/default.nix +++ b/pkgs/development/beam-modules/pgsql/default.nix @@ -6,7 +6,7 @@ let buildInputs = [ drv ]; }; - pkg = self: buildRebar3 rec { + pkg = self: buildRebar3 { name = "pgsql"; version = "25+beta.2"; diff --git a/pkgs/development/beam-modules/webdriver/default.nix b/pkgs/development/beam-modules/webdriver/default.nix index 4de7e3cc01e..b6695029f34 100644 --- a/pkgs/development/beam-modules/webdriver/default.nix +++ b/pkgs/development/beam-modules/webdriver/default.nix @@ -6,7 +6,7 @@ let buildInputs = [ drv ]; }; - pkg = self: stdenv.mkDerivation rec { + pkg = self: stdenv.mkDerivation { name = "webdriver"; version = "0.0.0+build.18.7ceaf1f"; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py index 40b690048eb..22a3c9cf468 100755 --- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py +++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py @@ -6,14 +6,15 @@ import re import requests import sys -releases = ["openjdk11"] -oses = ["mac", "linux"] -types = ["jre", "jdk"] -impls = ["hotspot", "openj9"] +releases = ("openjdk8", "openjdk11") +oses = ("mac", "linux") +types = ("jre", "jdk") +impls = ("hotspot", "openj9") arch_to_nixos = { - "x64": "x86_64", - "aarch64": "aarch64", + "x64": ("x86_64",), + "aarch64": ("aarch64",), + "arm": ("armv6l", "armv7l"), } def get_sha256(url): @@ -23,7 +24,6 @@ def get_sha256(url): sys.exit(1) return resp.text.strip().split(" ")[0] -RE_RELEASE_NAME = re.compile(r'[^-]+-([0-9.]+)\+([0-9]+)') # example release name: jdk-11.0.1+13 def generate_sources(release, assets): out = {} for asset in assets: @@ -33,7 +33,8 @@ def generate_sources(release, assets): if asset["heap_size"] != "normal": continue if asset["architecture"] not in arch_to_nixos: continue - version, build = RE_RELEASE_NAME.match(asset["release_name"]).groups() + # examples: 11.0.1+13, 8.0.222+10 + version, build = asset["version_data"]["semver"].split("+") type_map = out.setdefault(asset["os"], {}) impl_map = type_map.setdefault(asset["binary_type"], {}) @@ -42,12 +43,13 @@ def generate_sources(release, assets): "vmType": asset["openjdk_impl"], }) - arch_map[arch_to_nixos[asset["architecture"]]] = { - "url": asset["binary_link"], - "sha256": get_sha256(asset["checksum_link"]), - "version": version, - "build": build, - } + for nixos_arch in arch_to_nixos[asset["architecture"]]: + arch_map[nixos_arch] = { + "url": asset["binary_link"], + "sha256": get_sha256(asset["checksum_link"]), + "version": version, + "build": build, + } return out diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix index 7b16d6ad9db..03857627952 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix @@ -6,7 +6,7 @@ sourcePerArch: }: let cpuName = stdenv.hostPlatform.parsed.cpu.name; - result = stdenv.mkDerivation rec { + result = stdenv.mkDerivation { name = if sourcePerArch.packageType == "jdk" then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}" else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}"; @@ -46,9 +46,6 @@ let cpuName = stdenv.hostPlatform.parsed.cpu.name; passthru.home = result; - # for backward compatibility - passthru.architecture = ""; - meta = with stdenv.lib; { license = licenses.gpl2Classpath; description = "AdoptOpenJDK, prebuilt OpenJDK binary"; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index a837c6f1e85..509050209fb 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -1,48 +1,17 @@ sourcePerArch: -{ swingSupport ? true -, stdenv +{ stdenv +, lib , fetchurl -, file -, xorg ? null -, glib -, libxml2 -, ffmpeg_2 -, libxslt -, libGL +, autoPatchelfHook +, alsaLib , freetype , fontconfig -, gtk2 -, pango -, cairo -, alsaLib -, atk -, gdk-pixbuf , zlib -, elfutils +, xorg }: -assert swingSupport -> xorg != null; - let - rSubPaths = [ - "lib/jli" - "lib/server" - "lib/compressedrefs" # OpenJ9 - "lib/j9vm" # OpenJ9 - "lib" - ]; - - libraries = [ - stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt libGL - xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf - atk zlib elfutils - ] ++ (stdenv.lib.optionals swingSupport [ - xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt - xorg.libXrender - stdenv.cc.cc - ]); - cpuName = stdenv.hostPlatform.parsed.cpu.name; in @@ -57,7 +26,12 @@ let result = stdenv.mkDerivation rec { inherit (sourcePerArch.${cpuName}) url sha256; }; - nativeBuildInputs = [ file ]; + buildInputs = [ + alsaLib freetype fontconfig zlib xorg.libX11 xorg.libXext xorg.libXtst + xorg.libXi xorg.libXrender + ]; + + nativeBuildInputs = [ autoPatchelfHook ]; # See: https://github.com/NixOS/patchelf/issues/10 dontStrip = 1; @@ -74,45 +48,31 @@ let result = stdenv.mkDerivation rec { # Remove embedded freetype to avoid problems like # https://github.com/NixOS/nixpkgs/issues/57733 - rm $out/lib/libfreetype.so - - # for backward compatibility - ln -s $out $out/jre + find "$out" -name 'libfreetype.so*' -delete mkdir -p $out/nix-support # Set JAVA_HOME automatically. - cat <<EOF >> $out/nix-support/setup-hook + cat <<EOF >> "$out/nix-support/setup-hook" if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi EOF ''; - postFixup = '' - rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$out/${a}") rSubPaths)}" - - # set all the dynamic linkers - find $out -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$rpath" {} \; - - find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; + preFixup = '' + find "$out" -name libfontmanager.so -exec \ + patchelf --add-needed libfontconfig.so {} \; ''; - rpath = stdenv.lib.strings.makeLibraryPath libraries; - # FIXME: use multiple outputs or return actual JRE package passthru.jre = result; passthru.home = result; - # for backward compatibility - passthru.architecture = ""; - meta = with stdenv.lib; { license = licenses.gpl2Classpath; description = "AdoptOpenJDK, prebuilt OpenJDK binary"; - platforms = stdenv.lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms - maintainers = with stdenv.lib.maintainers; [ taku0 ]; + platforms = lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms + maintainers = with lib.maintainers; [ taku0 ]; }; }; in result diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix new file mode 100644 index 00000000000..a170e0141cf --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix @@ -0,0 +1,9 @@ +let + sources = builtins.fromJSON (builtins.readFile ./sources.json); +in +{ + jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk8.mac.jdk.hotspot; + jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk8.mac.jre.hotspot; + jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk8.mac.jdk.openj9; + jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk8.mac.jre.openj9; +} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix new file mode 100644 index 00000000000..4937eace490 --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix @@ -0,0 +1,9 @@ +let + sources = builtins.fromJSON (builtins.readFile ./sources.json); +in +{ + jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk8.linux.jdk.hotspot; + jre-hotspot = import ./jdk-linux-base.nix sources.openjdk8.linux.jre.hotspot; + jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk8.linux.jdk.openj9; + jre-openj9 = import ./jdk-linux-base.nix sources.openjdk8.linux.jre.openj9; +} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json index 03febb6aa35..403bd96efb0 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -4,56 +4,68 @@ "jdk": { "hotspot": { "aarch64": { + "build": "11", + "sha256": "10e33e1862638e11a9158947b3d7b461727d8e396e378b171be1eb4dfe12f1ed", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.4_11.tar.gz", + "version": "11.0.4" + }, + "armv6l": { + "build": "7", + "sha256": "3fbe418368e6d5888d0f15c4751139eb60d9785b864158a001386537fa46f67e", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.3_7.tar.gz", + "version": "11.0.3" + }, + "armv7l": { "build": "7", - "sha256": "894a846600ddb0df474350037a2fb43e3343dc3606809a20c65e750580d8f2b9", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.3_7.tar.gz", + "sha256": "3fbe418368e6d5888d0f15c4751139eb60d9785b864158a001386537fa46f67e", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.3_7.tar.gz", "version": "11.0.3" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "23cded2b43261016f0f246c85c8948d4a9b7f2d44988f75dad69723a7a526094", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.3_7.tar.gz", - "version": "11.0.3" + "build": "11", + "sha256": "90c33cf3f2ed0bd773f648815de7347e69cfbb3416ef3bf41616ab1c4aa0f5a8", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_x64_linux_hotspot_11.0.4_11.tar.gz", + "version": "11.0.4" } }, "openj9": { "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "7", - "sha256": "7012edd56fc958070bc4747073de14ea08eb43081eb6ea19bdbf4763186e2d17", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7_openj9-0.14.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.3_7_openj9-0.14.0.tar.gz", - "version": "11.0.3" + "build": "11", + "sha256": "b1099cccc80a3f434728c9bc3b8a90395793b625f4680ca05267cf635143d64d", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11_openj9-0.15.1/OpenJDK11U-jdk_x64_linux_openj9_11.0.4_11_openj9-0.15.1.tar.gz", + "version": "11.0.4" } } }, "jre": { "hotspot": { "aarch64": { - "build": "7", - "sha256": "de31fab70640c6d5099de5fc8fa8b4d6b484a7352fa48a9fafbdc088ca708564", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.3_7.tar.gz", - "version": "11.0.3" + "build": "11", + "sha256": "5f7b5c110fc0f344a549cb11784a6d76838061a2b6f654f7841f60e0cd286c6a", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.4_11.tar.gz", + "version": "11.0.4" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "d2df8bc799b09c8375f79bf646747afac3d933bb1f65de71d6c78e7466ff8fe4", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jre_x64_linux_hotspot_11.0.3_7.tar.gz", - "version": "11.0.3" + "build": "11", + "sha256": "70d2cc675155476f1d8516a7ae6729d44681e4fad5a6fc8dfa65cab36a67b7e0", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jre_x64_linux_hotspot_11.0.4_11.tar.gz", + "version": "11.0.4" } }, "openj9": { "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "7", - "sha256": "14c660294832c7b2deb2845d96dce83df677e204b4f0f1fee0052764c4a56720", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7_openj9-0.14.0/OpenJDK11U-jre_x64_linux_openj9_11.0.3_7_openj9-0.14.0.tar.gz", - "version": "11.0.3" + "build": "11", + "sha256": "c2601e7cb22af7a910e03883280cee805074656104d6d3dcaaf30e3bbb832690", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11_openj9-0.15.1/OpenJDK11U-jre_x64_linux_openj9_11.0.4_11_openj9-0.15.1.tar.gz", + "version": "11.0.4" } } } @@ -64,20 +76,20 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "5ca2a24f1827bd7c110db99854693bf418f51ee3093c31332db5cd605278faad", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_x64_mac_hotspot_11.0.3_7.tar.gz", - "version": "11.0.3" + "build": "11", + "sha256": "a50b211f475b9497311c9b65594764d7b852b1653f249582bb20fc3c302846a5", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_x64_mac_hotspot_11.0.4_11.tar.gz", + "version": "11.0.4" } }, "openj9": { "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "7", - "sha256": "01045a99ff23bda354f82c0fd3fa6e8222e4a5acce7494e82495f47b30bc5e18", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7_openj9-0.14.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.3_7_openj9-0.14.0.tar.gz", - "version": "11.0.3" + "build": "11", + "sha256": "7c09678d9c2d9dd0366693c6ab27bed39c76a23e7ac69b8a25c794e99dcf3ba7", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11_openj9-0.15.1/OpenJDK11U-jdk_x64_mac_openj9_11.0.4_11_openj9-0.15.1.tar.gz", + "version": "11.0.4" } } }, @@ -86,20 +98,126 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "9523b97288ff5d50e404565d346ed8ea8f19dd155092951af88d4be6b8414776", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jre_x64_mac_hotspot_11.0.3_7.tar.gz", - "version": "11.0.3" + "build": "11", + "sha256": "1647fded28d25e562811f7bce2092eb9c21d30608843b04250c023b40604ff26", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jre_x64_mac_hotspot_11.0.4_11.tar.gz", + "version": "11.0.4" } }, "openj9": { "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "7", - "sha256": "150c4065a57ec368b692276e8e3320b183ee17b402b7db07e676dff5837f0c52", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7_openj9-0.14.0/OpenJDK11U-jre_x64_mac_openj9_11.0.3_7_openj9-0.14.0.tar.gz", - "version": "11.0.3" + "build": "11", + "sha256": "1a8e84bae517a848aa5f25c7b04f26ab3a3bfffaa7fdf9be24e1f83325e46766", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11_openj9-0.15.1/OpenJDK11U-jre_x64_mac_openj9_11.0.4_11_openj9-0.15.1.tar.gz", + "version": "11.0.4" + } + } + } + } + }, + "openjdk8": { + "linux": { + "jdk": { + "hotspot": { + "aarch64": { + "build": "10", + "sha256": "652776586ede124189dc218174b5922cc97feac81021ad81905900b349a352d2", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u222b10.tar.gz", + "version": "8.0.222" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "10", + "sha256": "37356281345b93feb4212e6267109b4409b55b06f107619dde4960e402bafa77", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u222b10.tar.gz", + "version": "8.0.222" + } + }, + "openj9": { + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "10", + "sha256": "20cff719c6de43f8bb58c7f59e251da7c1fa2207897c9a4768c8c669716dc819", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10_openj9-0.15.1/OpenJDK8U-jdk_x64_linux_openj9_8u222b10_openj9-0.15.1.tar.gz", + "version": "8.0.222" + } + } + }, + "jre": { + "hotspot": { + "aarch64": { + "build": "10", + "sha256": "dfaf5a121f7606c54bd6232793677a4267eddf65d29cde352b84d84edbccbb51", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_aarch64_linux_hotspot_8u222b10.tar.gz", + "version": "8.0.222" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "10", + "sha256": "a418ce895c8bf3ca2e7b2f423f038b8b093941684c9430f2e40da0982e12b52d", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_x64_linux_hotspot_8u222b10.tar.gz", + "version": "8.0.222" + } + }, + "openj9": { + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "10", + "sha256": "ae56994a7c8e8c19939c0c2ff8fe5a850eb2f23845c499aa5ede26deb3d5ad28", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10_openj9-0.15.1/OpenJDK8U-jre_x64_linux_openj9_8u222b10_openj9-0.15.1.tar.gz", + "version": "8.0.222" + } + } + } + }, + "mac": { + "jdk": { + "hotspot": { + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "10", + "sha256": "9605fd00d2960934422437f601c7a9a1c5537309b9199d5bc75f84f20cd29a76", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_x64_mac_hotspot_8u222b10.tar.gz", + "version": "8.0.222" + } + }, + "openj9": { + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "10", + "sha256": "df185e167756332163633a826b329db067f8a721f7d5d27f0b353a35fc415de0", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10_openj9-0.15.1/OpenJDK8U-jdk_x64_mac_openj9_8u222b10_openj9-0.15.1.tar.gz", + "version": "8.0.222" + } + } + }, + "jre": { + "hotspot": { + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "10", + "sha256": "b3ac2436534cea932ccf665b317dbf5ffc0ee065efca808b22b6c2d795ca1b90", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_x64_mac_hotspot_8u222b10.tar.gz", + "version": "8.0.222" + } + }, + "openj9": { + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "10", + "sha256": "d5754413d7bc3a3233aaa7f8465451fbdabaf2a0c2a91743155bf135a3047ec8", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10_openj9-0.15.1/OpenJDK8U-jre_x64_mac_openj9_8u222b10_openj9-0.15.1.tar.gz", + "version": "8.0.222" } } } diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index c0e6c4b5004..664335c3dad 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -5,7 +5,7 @@ let # Map from git revs to SHA256 hashes sha256s = { - "version_89" = "0rh1dq33ilq54szfgi1ajaiaj7rbylai02rhp9zm9vpwp0rw8mij"; + version_89 = "0rh1dq33ilq54szfgi1ajaiaj7rbylai02rhp9zm9vpwp0rw8mij"; "1.38.28" = "172s7y5f38736ic8ri3mnbdqcrkadd40a26cxcfwbscc53phl11v"; }; in diff --git a/pkgs/development/compilers/carp/default.nix b/pkgs/development/compilers/carp/default.nix index 65f0481a801..235ec409039 100644 --- a/pkgs/development/compilers/carp/default.nix +++ b/pkgs/development/compilers/carp/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, clang, haskellPackages }: -haskellPackages.mkDerivation rec { +haskellPackages.mkDerivation { pname = "carp"; version = "unstable-2018-09-15"; diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 6fac183125f..ec166352267 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -29,7 +29,7 @@ let }; armv6l-linux = armv7l-linux; }; - cfg = options."${stdenv.hostPlatform.system}" or (throw "missing source url for platform ${stdenv.hostPlatform.system}"); + cfg = options.${stdenv.hostPlatform.system} or (throw "missing source url for platform ${stdenv.hostPlatform.system}"); in stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/development/compilers/clean/default.nix index 91c163fd343..03a5cec5004 100644 --- a/pkgs/development/compilers/clean/default.nix +++ b/pkgs/development/compilers/clean/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "clean-3.0"; src = diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index dab724ea607..9a01519a881 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, runtimeShell }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "cmdstan-2.17.1"; src = fetchurl { diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 0c79b3d394f..409ac03d92f 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -13,12 +13,12 @@ let archs = { - "x86_64-linux" = "linux-x86_64"; - "i686-linux" = "linux-i686"; - "x86_64-darwin" = "darwin-x86_64"; + x86_64-linux = "linux-x86_64"; + i686-linux = "linux-i686"; + x86_64-darwin = "darwin-x86_64"; }; - arch = archs."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + arch = archs.${stdenv.system} or (throw "system ${stdenv.system} not supported"); checkInputs = [ git gmp openssl_1_0_2 readline libxml2 libyaml ]; @@ -29,7 +29,7 @@ let src = fetchurl { url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz"; - sha256 = sha256s."${stdenv.system}"; + sha256 = sha256s.${stdenv.system}; }; buildCommand = '' @@ -153,27 +153,27 @@ in rec { binaryCrystal_0_26 = genericBinary { version = "0.26.1"; sha256s = { - "x86_64-linux" = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45"; - "i686-linux" = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic"; - "x86_64-darwin" = "1mri8bfrcldl69gczxpihxpv1shn4bijx28m3qby8vnk0ii63n9s"; + x86_64-linux = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45"; + i686-linux = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic"; + x86_64-darwin = "1mri8bfrcldl69gczxpihxpv1shn4bijx28m3qby8vnk0ii63n9s"; }; }; binaryCrystal_0_27 = genericBinary { version = "0.27.2"; sha256s = { - "x86_64-linux" = "05l5x7kx2acgnv42fj3rr17z73ix06zvi05h7d7vf3kw0izxrasm"; - "i686-linux" = "1iwizkvn6pglc0azkyfhlmk9ap793krdgcnbihd1kvrvs4cz0mm9"; - "x86_64-darwin" = "14c69ac2dmfwmb5q56ps3xyxxb0mrbc91ahk9h07c8fiqfii3k9g"; + x86_64-linux = "05l5x7kx2acgnv42fj3rr17z73ix06zvi05h7d7vf3kw0izxrasm"; + i686-linux = "1iwizkvn6pglc0azkyfhlmk9ap793krdgcnbihd1kvrvs4cz0mm9"; + x86_64-darwin = "14c69ac2dmfwmb5q56ps3xyxxb0mrbc91ahk9h07c8fiqfii3k9g"; }; }; binaryCrystal_0_29 = genericBinary { version = "0.29.0"; sha256s = { - "x86_64-linux" = "1wrk29sfx35akg7hxwpdiikvl18wd40gq1kwirw7x522hnq7vlna"; - "i686-linux" = "1nx0piis2k3nn7kqiijqazzbvlaavhgvsln0l3dxmpfa4i4dz5h2"; - "x86_64-darwin" = "1fd0fbyf05abivnp3igjlrm2axf65n2wdmg4aq6nqj60ipc01rvd"; + x86_64-linux = "1wrk29sfx35akg7hxwpdiikvl18wd40gq1kwirw7x522hnq7vlna"; + i686-linux = "1nx0piis2k3nn7kqiijqazzbvlaavhgvsln0l3dxmpfa4i4dz5h2"; + x86_64-darwin = "1fd0fbyf05abivnp3igjlrm2axf65n2wdmg4aq6nqj60ipc01rvd"; }; }; diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 332ded31df6..6cae1fa073b 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -13,7 +13,7 @@ let dmdConfFile = writeTextFile { name = "dmd.conf"; text = (lib.generators.toINI {} { - "Environment" = { + Environment = { DFLAGS = ''-I@out@/include/dmd -L-L@out@/lib -fPIC ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}''; }; }); diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix index 1ffd758ac82..870ad900210 100644 --- a/pkgs/development/compilers/elm/packages/node-composition.nix +++ b/pkgs/development/compilers/elm/packages/node-composition.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 ../../../node-packages/node-env.nix { diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix index 44d784133f5..5353862424a 100644 --- a/pkgs/development/compilers/fasm/bin.nix +++ b/pkgs/development/compilers/fasm/bin.nix @@ -1,7 +1,7 @@ { stdenvNoCC, lib, fetchurl }: stdenvNoCC.mkDerivation rec { - name = "fasm-bin-${version}"; + pname = "fasm-bin"; version = "1.73.16"; diff --git a/pkgs/development/compilers/fasm/default.nix b/pkgs/development/compilers/fasm/default.nix index 4b20c4051a8..f17d18bf92a 100644 --- a/pkgs/development/compilers/fasm/default.nix +++ b/pkgs/development/compilers/fasm/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fasm-bin, isx86_64 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (fasm-bin) version src meta; pname = "fasm"; diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix index eca2cba7775..f00a8b6efc9 100644 --- a/pkgs/development/compilers/gambit/bootstrap.nix +++ b/pkgs/development/compilers/gambit/bootstrap.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, autoconf, ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gambit-bootstrap"; version = "4.9.3"; diff --git a/pkgs/development/compilers/gcl/2.6.13-pre.nix b/pkgs/development/compilers/gcl/2.6.13-pre.nix index 1c3df80645a..f4f63bc9b19 100644 --- a/pkgs/development/compilers/gcl/2.6.13-pre.nix +++ b/pkgs/development/compilers/gcl/2.6.13-pre.nix @@ -7,7 +7,7 @@ assert stdenv.cc.isGNU ; assert stdenv.cc ? libc ; assert stdenv.cc.libc != null ; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gcl"; version = "2.6.13pre50"; diff --git a/pkgs/development/compilers/ghc/8.2.2-binary.nix b/pkgs/development/compilers/ghc/8.2.2-binary.nix index 9fe3a7d9dba..d68bf7e24b5 100644 --- a/pkgs/development/compilers/ghc/8.2.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.2.2-binary.nix @@ -29,23 +29,23 @@ stdenv.mkDerivation rec { name = "ghc-${version}-binary"; src = fetchurl ({ - "i686-linux" = { + i686-linux = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb8-linux.tar.xz"; sha256 = "08w2ik55dp3n95qikmrflc91lsiq01xp53ki3jlhnbj8fqnxfrwy"; }; - "x86_64-linux" = { + x86_64-linux = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz"; sha256 = "0ahv26304pqi3dm7i78si4pxwvg5f5dc2jwsfgvcrhcx5g30bqj8"; }; - "armv7l-linux" = { + armv7l-linux = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-armv7-deb8-linux.tar.xz"; sha256 = "1jmv8qmnh5bn324fivbwdcaj55kvw7cb2zq9pafmlmv3qwwx7s46"; }; - "aarch64-linux" = { + aarch64-linux = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-deb8-linux.tar.xz"; sha256 = "1k2amylcp1ad67c75h1pqf7czf9m0zj1i7hdc45ghjklnfq9hrk7"; }; - "x86_64-darwin" = { + x86_64-darwin = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; sha256 = "09swx71gh5habzbx55shz2xykgr96xkcy09nzinnm4z0yxicy3zr"; }; diff --git a/pkgs/development/compilers/ghc/8.6.3-binary.nix b/pkgs/development/compilers/ghc/8.6.3-binary.nix index 7e845da5b64..152bd5e4874 100644 --- a/pkgs/development/compilers/ghc/8.6.3-binary.nix +++ b/pkgs/development/compilers/ghc/8.6.3-binary.nix @@ -29,15 +29,15 @@ stdenv.mkDerivation rec { name = "ghc-${version}-binary"; src = fetchurl ({ - "i686-linux" = { + i686-linux = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb8-linux.tar.xz"; sha256 = "0bw8a7fxcbskf93rb4m542ff66vrmx5i5kj77qx37cbhijx70w5m"; }; - "x86_64-linux" = { + x86_64-linux = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz"; sha256 = "1m9gaga2pzi2cx5gvasg0rx1dlvr68gmi20l67652kag6xjsa719"; }; - "x86_64-darwin" = { + x86_64-darwin = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; sha256 = "1hbzk57v45176kxcx848p5jn5p1xbp2129ramkbzsk6plyhnkl3r"; }; diff --git a/pkgs/development/compilers/ghc/8.6.4.nix b/pkgs/development/compilers/ghc/8.6.4.nix index 1534e6d1d08..18b2407a90b 100644 --- a/pkgs/development/compilers/ghc/8.6.4.nix +++ b/pkgs/development/compilers/ghc/8.6.4.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation (rec { name = "D5123.diff"; sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n"; }) - (fetchpatch rec { # https://github.com/haskell/haddock/issues/900 + (fetchpatch { # https://github.com/haskell/haddock/issues/900 url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff"; name = "loadpluginsinmodules.diff"; sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1"; diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index a350a9025e5..cdbcb8e1aed 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation (rec { name = "D5123.diff"; sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n"; }) - (fetchpatch rec { # https://github.com/haskell/haddock/issues/900 + (fetchpatch { # https://github.com/haskell/haddock/issues/900 url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff"; name = "loadpluginsinmodules.diff"; sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1"; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 804edabba0c..b78f5bc2204 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; patches = [ - (fetchpatch rec { # https://github.com/haskell/haddock/issues/900 + (fetchpatch { # https://github.com/haskell/haddock/issues/900 url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff"; name = "loadpluginsinmodules.diff"; sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1"; diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index e9c303b88b6..ba0bbb1962b 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -61,7 +61,7 @@ let inherit (bootPkgs) ghc; -in mkDerivation (rec { +in mkDerivation ({ pname = "ghcjs"; inherit version; src = ghcjsSrc; diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix index a8787639053..32847a2671c 100644 --- a/pkgs/development/compilers/go/1.11.nix +++ b/pkgs/development/compilers/go/1.11.nix @@ -17,13 +17,13 @@ let ''; goarch = platform: { - "i686" = "386"; - "x86_64" = "amd64"; - "aarch64" = "arm64"; - "arm" = "arm"; - "armv5tel" = "arm"; - "armv6l" = "arm"; - "armv7l" = "arm"; + i686 = "386"; + x86_64 = "amd64"; + aarch64 = "arm64"; + arm = "arm"; + armv5tel = "arm"; + armv6l = "arm"; + armv7l = "arm"; }.${platform.parsed.cpu.name} or (throw "Unsupported system"); in diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix index dae4c173223..817f3ab324d 100644 --- a/pkgs/development/compilers/go/1.12.nix +++ b/pkgs/development/compilers/go/1.12.nix @@ -17,13 +17,13 @@ let ''; goarch = platform: { - "i686" = "386"; - "x86_64" = "amd64"; - "aarch64" = "arm64"; - "arm" = "arm"; - "armv5tel" = "arm"; - "armv6l" = "arm"; - "armv7l" = "arm"; + i686 = "386"; + x86_64 = "amd64"; + aarch64 = "arm64"; + arm = "arm"; + armv5tel = "arm"; + armv6l = "arm"; + armv7l = "arm"; }.${platform.parsed.cpu.name} or (throw "Unsupported system"); in diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index 97c243439e8..1052f1f1ae1 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -4,7 +4,7 @@ , Security }: let - libc = if stdenv ? "cross" then libcCross else stdenv.cc.libc; + libc = if stdenv ? cross then libcCross else stdenv.cc.libc; in stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 7e11c75e07d..0ae038d4713 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -2,7 +2,7 @@ let generic = { version, sha256, prePatch }: - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "haxe"; inherit version; diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix index c0414c6259f..c706f2facec 100644 --- a/pkgs/development/compilers/julia/shared.nix +++ b/pkgs/development/compilers/julia/shared.nix @@ -129,10 +129,10 @@ stdenv.mkDerivation rec { makeFlags = let arch = head (splitString "-" stdenv.system); - march = { "x86_64" = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; "i686" = "pentium4"; }."${arch}" + march = { x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; i686 = "pentium4"; }.${arch} or (throw "unsupported architecture: ${arch}"); # Julia requires Pentium 4 (SSE2) or better - cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}" + cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; }.${arch} or (throw "unsupported architecture: ${arch}"); in [ "ARCH=${arch}" diff --git a/pkgs/development/compilers/jwasm/default.nix b/pkgs/development/compilers/jwasm/default.nix index b2db09e1c18..a9613de91eb 100644 --- a/pkgs/development/compilers/jwasm/default.nix +++ b/pkgs/development/compilers/jwasm/default.nix @@ -2,7 +2,7 @@ , cmake }: with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "jwasm"; version = "git-2017-11-22"; diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 754ab020d51..90dc20fcd3e 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -2,7 +2,7 @@ let version = "1.3.41"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit version; pname = "kotlin"; diff --git a/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/pkgs/development/compilers/llvm/3.5/libc++/default.nix index 4f766e5f9a5..44610a1b11d 100644 --- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.5/libc++/default.nix @@ -2,7 +2,7 @@ let version = "3.5.2"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libc++"; inherit version; diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index 95632a45999..fc53ad266a6 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -17,7 +17,7 @@ , enableSharedLibraries ? !stdenv.isDarwin }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "llvm"; inherit version; diff --git a/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/pkgs/development/compilers/llvm/3.8/libc++/default.nix index b66284152d4..7c965926f2e 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libc++"; inherit version; diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index 5fe681185b2..bca8e7877ac 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -16,7 +16,7 @@ , enableSharedLibraries ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "llvm"; inherit version; diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix index af65fd6388e..9d82aa23035 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libc++"; inherit version; diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index 74e9b8719d1..0213741e3e0 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libc++"; inherit version; diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index ea70382d2ac..392ef427909 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -23,7 +23,7 @@ let imap (i: _: concatStringsSep "." (take i parts)) parts; in -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ name = "llvm-${version}"; src = fetch "llvm" "0l9bf7kdwhlj0kq1hawpyxhna1062z3h7qcz2y8nfl9dz2qksy6s"; diff --git a/pkgs/development/compilers/llvm/5/compiler-rt.nix b/pkgs/development/compilers/llvm/5/compiler-rt.nix index 9660be4df11..c87b0f23596 100644 --- a/pkgs/development/compilers/llvm/5/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/5/compiler-rt.nix @@ -1,6 +1,6 @@ { stdenv, version, fetch, cmake, python, llvm, libcxxabi }: with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy"; diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index e3015ae8448..03d8a2085d0 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libc++"; inherit version; diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 23b7bf4e246..efe2022bedb 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -21,7 +21,7 @@ let imap (i: _: concatStringsSep "." (take i parts)) parts; in -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ name = "llvm-${version}"; src = fetch "llvm" "0g1bbj2n6xv4p1n6hh17vj3vpvg56wacipc81dgwga9mg2lys8nm"; diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix index da2a5cfb58a..4cf79e79569 100644 --- a/pkgs/development/compilers/llvm/6/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix @@ -1,6 +1,6 @@ { stdenv, version, fetch, cmake, python, llvm, libcxxabi }: with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl"; diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index 906baa4ae64..658068cbfaf 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libc++"; inherit version; diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index e104d051fed..2586602d737 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -25,7 +25,7 @@ let imap (i: _: concatStringsSep "." (take i parts)) parts; in -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ name = "llvm-${version}"; src = fetch "llvm" "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn"; diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix index e9cc6dfc1db..0912435327c 100644 --- a/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix @@ -1,5 +1,5 @@ { stdenv, version, fetch, cmake, python, llvm, libcxxabi }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "1n48p8gjarihkws0i2bay5w9bdwyxyxxbpwyng7ba58jb30dlyq5"; diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix index 7f99cc9ae2c..621a246225d 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -111,7 +111,7 @@ let '' + mkExtraBuildCommands cc; }; - lldClangNoCompilerRt = wrapCCWith rec { + lldClangNoCompilerRt = wrapCCWith { cc = tools.clang-unwrapped; bintools = wrapBintoolsWith { inherit (tools) bintools; diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix index fc9e3714db0..7a0716a6eb3 100644 --- a/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libc++"; inherit version; diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index a9caa88141a..cfcda02b413 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -29,7 +29,7 @@ let let parts = splitString "." release_version; in imap (i: _: concatStringsSep "." (take i parts)) parts; -in stdenv.mkDerivation (rec { +in stdenv.mkDerivation ({ name = "llvm-${version}"; src = fetch "llvm" "0r1p5didv4rkgxyvbkyz671xddg6i3dxvbpsi1xxipkla0l9pk0v"; diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix index 1f216178b55..936c877d58c 100644 --- a/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -1,5 +1,5 @@ { stdenv, version, fetch, cmake, python, llvm, libcxxabi }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi"; diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix index f864e24acfe..36d7a14142b 100644 --- a/pkgs/development/compilers/llvm/8/default.nix +++ b/pkgs/development/compilers/llvm/8/default.nix @@ -145,7 +145,7 @@ let '' + mkExtraBuildCommands cc; }; - lldClangNoCompilerRt = wrapCCWith rec { + lldClangNoCompilerRt = wrapCCWith { cc = tools.clang-unwrapped; libcxx = null; bintools = wrapBintoolsWith { diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix index e0bc9e816f5..8ec1c419748 100644 --- a/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version , enableShared ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libc++"; inherit version; diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix index 6799a3f935f..70e666ba27d 100644 --- a/pkgs/development/compilers/llvm/8/llvm.nix +++ b/pkgs/development/compilers/llvm/8/llvm.nix @@ -27,7 +27,7 @@ let shortVersion = with stdenv.lib; concatStringsSep "." (take 1 (splitString "." release_version)); -in stdenv.mkDerivation (rec { +in stdenv.mkDerivation ({ name = "llvm-${version}"; src = fetch "llvm" "1rvm5gqp5v8hfn17kqws3zhk94w4kxndal12bqa0y57p09nply24"; diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix index 1c0bdf47987..6e0716659c7 100644 --- a/pkgs/development/compilers/manticore/default.nix +++ b/pkgs/development/compilers/manticore/default.nix @@ -2,7 +2,7 @@ let rev= "47273c463fc3c5d0a0ae655cf75a4700bdb020b4"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "manticore"; version = "2018.09.29"; diff --git a/pkgs/development/compilers/mono/4.nix b/pkgs/development/compilers/mono/4.nix index 3c748e2dff7..cb6edb2a546 100644 --- a/pkgs/development/compilers/mono/4.nix +++ b/pkgs/development/compilers/mono/4.nix @@ -1,6 +1,6 @@ { callPackage, Foundation, libobjc }: -callPackage ./generic.nix (rec { +callPackage ./generic.nix ({ inherit Foundation libobjc; version = "4.8.1.0"; sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq"; diff --git a/pkgs/development/compilers/mono/5.nix b/pkgs/development/compilers/mono/5.nix index 0db13308a5a..0ecb362acb4 100644 --- a/pkgs/development/compilers/mono/5.nix +++ b/pkgs/development/compilers/mono/5.nix @@ -1,6 +1,6 @@ { callPackage, Foundation, libobjc }: -callPackage ./generic.nix (rec { +callPackage ./generic.nix ({ inherit Foundation libobjc; version = "5.20.1.27"; sha256 = "15rpwxw642ad1na93k5nj7d2lb24f21kncr924gxr00178a9x0jy"; diff --git a/pkgs/development/compilers/mono/6.nix b/pkgs/development/compilers/mono/6.nix index ec91d7e979c..0157fa7b7f6 100644 --- a/pkgs/development/compilers/mono/6.nix +++ b/pkgs/development/compilers/mono/6.nix @@ -1,6 +1,6 @@ { callPackage, Foundation, libobjc }: -callPackage ./generic.nix (rec { +callPackage ./generic.nix ({ inherit Foundation libobjc; version = "6.0.0.313"; srcArchiveSuffix = "tar.xz"; diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix index 193e45bf55e..36a457125fa 100644 --- a/pkgs/development/compilers/mono/llvm.nix +++ b/pkgs/development/compilers/mono/llvm.nix @@ -13,7 +13,7 @@ , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "llvm"; version = "3.6-mono-2017-02-15"; diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index 2067184a5b0..8eb35f1b5f7 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -8,7 +8,7 @@ let version = "2.0.0"; binaries = { - "x86_64-linux" = fetchurl { + x86_64-linux = fetchurl { url = "mirror://sourceforge/project/mozart-oz/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz"; sha256 = "0rsfrjimjxqbwprpzzlmydl3z3aiwg5qkb052jixdxjyad7gyh5z"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { preferLocalBuild = true; - src = binaries."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}"); + src = binaries.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc diff --git a/pkgs/development/compilers/ocaml/4.01.0.nix b/pkgs/development/compilers/ocaml/4.01.0.nix index aa6cf68d2c9..6362f360f7d 100644 --- a/pkgs/development/compilers/ocaml/4.01.0.nix +++ b/pkgs/development/compilers/ocaml/4.01.0.nix @@ -1,4 +1,4 @@ -import ./generic.nix rec { +import ./generic.nix { major_version = "4"; minor_version = "01"; patch_version = "0"; diff --git a/pkgs/development/compilers/ocaml/4.02.nix b/pkgs/development/compilers/ocaml/4.02.nix index 9ac53f56790..4773f9f74a5 100644 --- a/pkgs/development/compilers/ocaml/4.02.nix +++ b/pkgs/development/compilers/ocaml/4.02.nix @@ -1,4 +1,4 @@ -import ./generic.nix rec { +import ./generic.nix { major_version = "4"; minor_version = "02"; patch_version = "3"; diff --git a/pkgs/development/compilers/ocaml/4.03.nix b/pkgs/development/compilers/ocaml/4.03.nix index c9536c487d0..0bbe8233041 100644 --- a/pkgs/development/compilers/ocaml/4.03.nix +++ b/pkgs/development/compilers/ocaml/4.03.nix @@ -1,4 +1,4 @@ -import ./generic.nix rec { +import ./generic.nix { major_version = "4"; minor_version = "03"; patch_version = "0"; diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 0085739147b..9557d0a79ae 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -30,7 +30,7 @@ let x11inc = x11env + "/include"; in -stdenv.mkDerivation (args // rec { +stdenv.mkDerivation (args // { inherit name; inherit version; diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix index 881748c36ea..aa50cf225ca 100644 --- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix +++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, xlibsWrapper, ncurses }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ pname = "metaocaml"; version = "3.09-alpha-30"; diff --git a/pkgs/development/compilers/openjdk/005_enable-infinality.patch b/pkgs/development/compilers/openjdk/005_enable-infinality.patch index f8de9698996..cc34e548758 100644 --- a/pkgs/development/compilers/openjdk/005_enable-infinality.patch +++ b/pkgs/development/compilers/openjdk/005_enable-infinality.patch @@ -6,7 +6,7 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native @@ -23,6 +23,9 @@ * questions. */ - + +/* Use Infinality patches as default */ +#define INFINALITY + @@ -21,13 +21,13 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native +#include FT_LCD_FILTER_H +#include <fontconfig/fontconfig.h> +#endif - + #include "fontscaler.h" - + @@ -676,6 +683,147 @@ static void CopyFTSubpixelVToSubpixel(co } } - + +#ifdef INFINALITY +typedef struct { + FT_Render_Mode ftRenderMode; @@ -169,7 +169,7 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native + rp->ftLcdFilter = ftLcdFilter; +} +#endif - + /* * Class: sun_font_FreetypeFontScaler @@ -691,7 +839,9 @@ Java_sun_font_FreetypeFontScaler_getGlyp @@ -180,28 +180,27 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native int renderFlags = FT_LOAD_RENDER, target; +#endif FT_GlyphSlot ftglyph; - + FTScalerContext* context = -@@ -709,6 +859,11 @@ Java_sun_font_FreetypeFontScaler_getGlyp +@@ -709,5 +859,10 @@ Java_sun_font_FreetypeFontScaler_getGlyp return ptr_to_jlong(getNullGlyphImage()); } - + +#ifdef INFINALITY + RenderingProperties renderingProperties; + readFontconfig((const FcChar8 *) scalerInfo->face->family_name, + context->ptsz, context->aaType, &renderingProperties); +#else - /* if algorithmic styling is required then we do not request bitmap */ - if (context->doBold || context->doItalize) { - renderFlags = FT_LOAD_DEFAULT; + if (!context->useSbits) { + renderFlags |= FT_LOAD_NO_BITMAP; @@ -731,10 +886,17 @@ Java_sun_font_FreetypeFontScaler_getGlyp target = FT_LOAD_TARGET_LCD_V; } renderFlags |= target; +#endif - + glyph_index = FT_Get_Char_Index(scalerInfo->face, glyphCode); - + +#ifdef INFINALITY + FT_Library_SetLcdFilter(scalerInfo->library, renderingProperties.ftLcdFilter); + error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags); @@ -213,7 +212,7 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native //do not destroy scaler yet. //this can be problem of particular context (e.g. with bad transform) @@ -753,9 +915,13 @@ Java_sun_font_FreetypeFontScaler_getGlyp - + /* generate bitmap if it is not done yet e.g. if algorithmic styling is performed and style was added to outline */ +#ifdef INFINALITY @@ -223,7 +222,7 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native FT_Render_Glyph(ftglyph, FT_LOAD_TARGET_MODE(target)); } +#endif - + width = (UInt16) ftglyph->bitmap.width; height = (UInt16) ftglyph->bitmap.rows; @@ -969,7 +1135,9 @@ Java_sun_font_FreetypeFontScaler_getGlyp @@ -239,7 +238,7 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native @@ -984,11 +1152,22 @@ static FT_Outline* getFTOutline(JNIEnv* return NULL; } - + +#ifdef INFINALITY + RenderingProperties renderingProperties; + readFontconfig((const FcChar8 *) scalerInfo->face->family_name, @@ -247,9 +246,9 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native +#else renderFlags = FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP; +#endif - + glyph_index = FT_Get_Char_Index(scalerInfo->face, glyphCode); - + +#ifdef INFINALITY + error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags); +#else diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 7ccbfb6351d..57911f2d58e 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -1,42 +1,33 @@ -{ stdenv, lib, fetchurl, bash, cpio, autoconf, pkgconfig, file, which, unzip, zip, cups, freetype -, alsaLib, bootjdk, perl, fontconfig, zlib, lndir -, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr -, libjpeg, giflib +{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip +, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 +, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama +, libXcursor, libXrandr, fontconfig, openjdk11-bootstrap , setJavaClassPath -, minimal ? false -, enableJavaFX ? true, openjfx +, headless ? false +, enableJavaFX ? openjfx.meta.available, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: let - - /** - * The JDK libraries are in directories that depend on the CPU. - */ - architecture = - if stdenv.hostPlatform.system == "i686-linux" then - "i386" - else "amd64"; - major = "11"; - update = ".0.3"; + update = ".0.4"; build = "ga"; - repover = "jdk-${major}${update}-${build}"; - openjdk = stdenv.mkDerivation { - name = "openjdk-${major}${update}-${build}"; + openjdk = stdenv.mkDerivation rec { + pname = "openjdk" + lib.optionalString headless "-headless"; + version = "${major}${update}-${build}"; src = fetchurl { - url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/${repover}.tar.gz"; + url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; sha256 = "1v6pam38iidlhz46046h17hf5kki6n3kl302awjcyxzk7bmkvb8x"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoconf ]; buildInputs = [ - autoconf cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib - libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst - libXi libXinerama libXcursor libXrandr lndir fontconfig - ] ++ lib.optionals (!minimal && enableGnome2) [ + cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib + libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst + libXi libXinerama libXcursor libXrandr fontconfig openjdk11-bootstrap + ] ++ lib.optionals (!headless && enableGnome2) [ gtk3 gnome_vfs GConf glib ]; @@ -45,66 +36,60 @@ let ./read-truststore-from-env-jdk10.patch ./currency-date-range-jdk10.patch ./increase-javadoc-heap.patch - ] ++ lib.optionals (!minimal && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGnome2) [ ./swing-use-gtk-jdk10.patch ]; preConfigure = '' chmod +x configure substituteInPlace configure --replace /bin/bash "${bash}/bin/bash" - - configureFlagsArray=( - "--with-boot-jdk=${bootjdk.home}" - "--with-update-version=${major}${update}" - "--with-build-number=${build}" - "--with-milestone=fcs" - "--enable-unlimited-crypto" - "--disable-debug-symbols" - "--with-zlib=system" - "--with-giflib=system" - "--with-stdc++lib=dynamic" - - # glibc 2.24 deprecated readdir_r so we need this - # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html - "--with-extra-cflags=-Wno-error=deprecated-declarations -Wno-error=format-contains-nul -Wno-error=unused-result" - '' - + lib.optionalString (architecture == "amd64") " \"--with-jvm-features=zgc\"" - + lib.optionalString minimal " \"--enable-headless-only\"" - + lib.optionalString (!minimal && enableJavaFX) " \"--with-import-modules=${openjfx}\"" - + ");" - # https://bugzilla.redhat.com/show_bug.cgi?id=1306558 - # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 - + stdenv.lib.optionalString stdenv.cc.isGNU '' - NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error" ''; - NIX_LDFLAGS= lib.optionals (!minimal) [ + configureFlags = [ + "--with-boot-jdk=${openjdk11-bootstrap.home}" + "--enable-unlimited-crypto" + "--with-native-debug-symbols=internal" + "--with-libjpeg=system" + "--with-giflib=system" + "--with-libpng=system" + "--with-zlib=system" + "--with-lcms=system" + "--with-stdc++lib=dynamic" + ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" + ++ lib.optional headless "--enable-headless-only" + ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; + + separateDebugInfo = true; + + NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + + NIX_LDFLAGS = lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!minimal && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGnome2) [ "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" ]; buildFlags = [ "all" ]; installPhase = '' - mkdir -p $out/lib/openjdk $out/share + mkdir -p $out/lib - cp -av build/*/images/jdk/* $out/lib/openjdk + mv build/*/images/jdk $out/lib/openjdk # Remove some broken manpages. rm -rf $out/lib/openjdk/man/ja* # Mirror some stuff in top-level. - mkdir $out/include $out/share/man - ln -s $out/lib/openjdk/include/* $out/include/ - ln -s $out/lib/openjdk/man/* $out/share/man/ + mkdir -p $out/share + ln -s $out/lib/openjdk/include $out/include + ln -s $out/lib/openjdk/man $out/share/man # jni.h expects jni_md.h to be in the header search path. ln -s $out/include/linux/*_md.h $out/include/ # Remove crap from the installation. rm -rf $out/lib/openjdk/demo - ${lib.optionalString minimal '' + ${lib.optionalString headless '' rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so ''} @@ -129,11 +114,12 @@ let # Build the set of output library directories to rpath against LIBDIRS="" for output in $outputs; do + if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" done - # Add the local library paths to remove dependencies on the bootstrap for output in $outputs; do + if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo \$$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) echo "$BINLIBS" | while read i; do @@ -141,26 +127,20 @@ let patchelf --shrink-rpath "$i" || true done done - - # Test to make sure that we don't depend on the bootstrap - for output in $outputs; do - if grep -q -r '${bootjdk}' $(eval echo \$$output); then - echo "Extraneous references to ${bootjdk} detected" - exit 1 - fi - done ''; + disallowedReferences = [ openjdk11-bootstrap ]; + meta = with stdenv.lib; { homepage = http://openjdk.java.net/; license = licenses.gpl2; description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo ]; - platforms = ["i686-linux" "x86_64-linux"]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; }; passthru = { - inherit architecture; + architecture = ""; home = "${openjdk}/lib/openjdk"; }; }; diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 952c5d1bf6a..e764e9c62cb 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -1,9 +1,10 @@ { stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype -, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir +, alsaLib, cacert, perl, liberation_ttf, fontconfig, zlib , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr , libjpeg, giflib +, openjdk8-bootstrap , setJavaClassPath -, minimal ? false +, headless ? false , enableInfinality ? true # font rendering patch , enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf }: @@ -13,52 +14,71 @@ let /** * The JRE libraries are in directories that depend on the CPU. */ - architecture = - if stdenv.hostPlatform.system == "i686-linux" then - "i386" - else if stdenv.hostPlatform.system == "x86_64-linux" then - "amd64" - else - throw "openjdk requires i686-linux or x86_64 linux"; - - update = "212"; - build = "ga"; - baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; - repover = "jdk8u${update}-${build}"; + architecture = { + i686-linux = "i386"; + x86_64-linux = "amd64"; + aarch64-linux = "aarch64"; + }.${stdenv.system} or (throw "Unsupported platform"); + + update = "222"; + build = if stdenv.isAarch64 then "b10" + else "ga"; + baseurl = if stdenv.isAarch64 then "https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah" + else "https://hg.openjdk.java.net/jdk8u/jdk8u"; + repover = lib.optionalString stdenv.isAarch64 "aarch64-shenandoah-" + + "jdk8u${update}-${build}"; + jdk8 = fetchurl { + name = "jdk8-${repover}.tar.gz"; url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "00rl33h4cl4b4p3hcid765h38x2jdkb14ylh8k1zhnd0ka76crgg"; + sha256 = if stdenv.isAarch64 then "1h19zpmc76f8v4s0mfvqxmxvv8imdwq92z5dmgi19y4xnl978qq8" + else "19dyqayn8n2y08p08g34xxnf0dkm6bfjxkp7633m7dx50mjcpxnj"; }; langtools = fetchurl { + name = "langtools-${repover}.tar.gz"; url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "0va6g2dccf1ph6mpwxswbks5axp7zz258cl89qq9r8jn4ni04agw"; + sha256 = if stdenv.isAarch64 then "09phy2izw2yyp3hnw7jmb7lp559dgnp2a0rymx1k3q97anfz3bzj" + else "11nibmqnf7nap10sydk57gimgwpxqk5mn12dyg6fzg4s2fxf0y1q"; }; hotspot = fetchurl { + name = "hotspot-${repover}.tar.gz"; url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "0sgr9df10hs49pjld6c6kr374v4zwd9s52pc3drz68zrlk71ja4s"; + sha256 = if stdenv.isAarch64 then "1dqrzg2af94pjam6jg9nq8ydaibn4bsjv7ai6m7m3r2ph2fml80s" + else "1g512xrrxvnrk5szg7wqqz00x4gv53dx3yffk5im2zfcalyka2q7"; }; corba = fetchurl { + name = "corba-${repover}.tar.gz"; url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "1hq0sr4k4k4iv815kg72i9lvd7n7mn5pmw96ckk9p1rnyagn9z03"; + sha256 = if stdenv.isAarch64 then "15l1ccvk2slx8wf5gilzjvhc428hl57gg1knbma1jqgs3ymnqwpr" + else "0h8nprfzpy21mfl39fxxzfa420skwmaaji4r31j7lj3g8c1wp62r"; }; jdk = fetchurl { + name = "jdk-${repover}.tar.gz"; url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "1fc59jrbfq8l067mggzy5dnrvni7lwaqd7hahs4nqv87kyrfg545"; + sha256 = if stdenv.isAarch64 then "179ij3rs1ahl6dh3n64k4xp2prv413ckqk7sj1g5lw48rj7bjh83" + else "1sb38h0rckgkr2y0kfzav6mb74nv5whb9l8m842mv1jpavxrdv6k"; }; jaxws = fetchurl { + name = "jaxws-${repover}.tar.gz"; url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "1ka2fvyxdmpfhk814s314gx53yvdr19vpsqygx283v9nbq90l1yg"; + sha256 = if stdenv.isAarch64 then "16bayw7c4vzm9s0ixhw2dv6pan6wywyiddh9a8dss35660dnhrm0" + else "0akn5zapff5m32ibgm3f4lhgq96bsqx74g4xl38xmivvxddsd6kz"; }; jaxp = fetchurl { + name = "jaxp-${repover}.tar.gz"; url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "15vlgs5v2ax8sqwh7bg50fnlrwlpnkp0myzrvpqs1mcza8pyasp8"; + sha256 = if stdenv.isAarch64 then "176db7pi2irc7q87c273cjm5nrlj5g973fjmh24m6a1jxanrrm9x" + else "0bw4q8yhmrl8hqlimy1ijnarav4r91dj73lpr7axba77rqlr41c8"; }; nashorn = fetchurl { + name = "nashorn-${repover}.tar.gz"; url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "1jzn0yi0v6lda5y8ib07g1p6zymnbcx9yy6iz8niggpm7205y93h"; + sha256 = if stdenv.isAarch64 then "0vi3kbsqfpdjxc08ayxk2c87zycd7z0qbqw9xka1vc59iyv97n62" + else "0bfcf3iv2lr0xlp6sclxq7zz7b9ahajl008hz5rasjnrnr993qja"; }; openjdk8 = stdenv.mkDerivation { - name = "openjdk-8u${update}-${build}"; + pname = "openjdk" + lib.optionalString headless "-headless"; + version = "8u${update}-${build}"; srcs = [ jdk8 langtools hotspot corba jdk jaxws jaxp nashorn ]; sourceRoot = "."; @@ -67,15 +87,15 @@ let nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib + cpio file which unzip zip perl openjdk8-bootstrap zlib cups freetype alsaLib libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst - libXi libXinerama libXcursor libXrandr lndir fontconfig - ] ++ lib.optionals (!minimal && enableGnome2) [ + libXi libXinerama libXcursor libXrandr fontconfig + ] ++ lib.optionals (!headless && enableGnome2) [ gtk2 gnome_vfs GConf glib ]; - #move the seven other source dirs under the main jdk8u directory, - #with version suffixes removed, as the remainder of the build will expect + # move the seven other source dirs under the main jdk8u directory, + # with version suffixes removed, as the remainder of the build will expect prePatch = '' mainDir=$(find . -maxdepth 1 -name jdk8u\*); find . -maxdepth 1 -name \*jdk\* -not -name jdk8u\* | awk -F- '{print $1}' | while read p; do @@ -88,10 +108,10 @@ let ./fix-java-home-jdk8.patch ./read-truststore-from-env-jdk8.patch ./currency-date-range-jdk8.patch - ] ++ lib.optionals (!minimal && enableInfinality) [ + ] ++ lib.optionals (!headless && enableInfinality) [ ./004_add-fontconfig.patch ./005_enable-infinality.patch - ] ++ lib.optionals (!minimal && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGnome2) [ ./swing-use-gtk-jdk8.patch ]; @@ -103,33 +123,39 @@ let substituteInPlace configure --replace /bin/bash "${bash}/bin/bash" substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "${stdenv.shell}" substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path" - '' - # https://bugzilla.redhat.com/show_bug.cgi?id=1306558 - # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 - + stdenv.lib.optionalString stdenv.cc.isGNU '' - NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error" ''; configureFlags = [ - "--with-boot-jdk=${bootjdk.home}" + "--with-boot-jdk=${openjdk8-bootstrap.home}" "--with-update-version=${update}" "--with-build-number=${build}" "--with-milestone=fcs" "--enable-unlimited-crypto" - "--disable-debug-symbols" + "--with-native-debug-symbols=internal" "--disable-freetype-bundling" "--with-zlib=system" "--with-giflib=system" "--with-stdc++lib=dynamic" + ] ++ lib.optional headless "--disable-headful"; + + separateDebugInfo = true; + NIX_CFLAGS_COMPILE = [ # glibc 2.24 deprecated readdir_r so we need this # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html - "--with-extra-cflags=\"-Wno-error=deprecated-declarations\"" - ] ++ lib.optional minimal "--disable-headful"; + "-Wno-error=deprecated-declarations" + ] ++ lib.optionals stdenv.cc.isGNU [ + # https://bugzilla.redhat.com/show_bug.cgi?id=1306558 + # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 + "-fno-lifetime-dse" + "-fno-delete-null-pointer-checks" + "-std=gnu++98" + "-Wno-error" + ]; - NIX_LDFLAGS= lib.optionals (!minimal) [ + NIX_LDFLAGS= lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!minimal && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGnome2) [ "-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" ]; @@ -138,45 +164,39 @@ let doCheck = false; # fails with "No rule to make target 'y'." installPhase = '' - mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk + mkdir -p $out/lib - cp -av build/*/images/j2sdk-image/* $out/lib/openjdk + mv build/*/images/j2sdk-image $out/lib/openjdk # Remove some broken manpages. rm -rf $out/lib/openjdk/man/ja* # Mirror some stuff in top-level. - mkdir $out/include $out/share/man - ln -s $out/lib/openjdk/include/* $out/include/ - ln -s $out/lib/openjdk/man/* $out/share/man/ + mkdir -p $out/share + ln -s $out/lib/openjdk/include $out/include + ln -s $out/lib/openjdk/man $out/share/man # jni.h expects jni_md.h to be in the header search path. ln -s $out/include/linux/*_md.h $out/include/ # Remove crap from the installation. rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample - ${lib.optionalString minimal '' + ${lib.optionalString headless '' rm $out/lib/openjdk/jre/lib/${architecture}/{libjsound,libjsoundalsa,libsplashscreen,libawt*,libfontmanager}.so rm $out/lib/openjdk/jre/bin/policytool rm $out/lib/openjdk/bin/{policytool,appletviewer} ''} - # Move the JRE to a separate output and setup fallback fonts - mv $out/lib/openjdk/jre $jre/lib/openjdk/ - mkdir $out/lib/openjdk/jre - ${lib.optionalString (!minimal) '' - mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback - lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback - ''} - lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre + # Move the JRE to a separate output + mkdir -p $jre/lib/openjdk + mv $out/lib/openjdk/jre $jre/lib/openjdk/jre + ln -s $jre/lib/openjdk/jre $out/lib/openjdk/jre - rm -rf $out/lib/openjdk/jre/bina - ln -s $out/lib/openjdk/bin $out/lib/openjdk/jre/bin - - # Make sure cmm/*.pf are not symlinks: - # https://youtrack.jetbrains.com/issue/IDEA-147272 - rm -rf $out/lib/openjdk/jre/lib/cmm - ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm + # Setup fallback fonts + ${lib.optionalString (!headless) '' + mkdir -p $jre/lib/openjdk/jre/lib/fonts + ln -s ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback + ''} # Remove duplicate binaries. for i in $(cd $out/lib/openjdk/bin && echo *); do @@ -198,12 +218,7 @@ let ln -s $jre/lib/openjdk/jre $out/jre ''; - # FIXME: this is unnecessary once the multiple-outputs branch is merged. preFixup = '' - prefix=$jre stripDirs "$STRIP" "$stripDebugList" "''${stripDebugFlags:--S}" - patchELF $jre - propagatedBuildInputs+=" $jre" - # Propagate the setJavaClassPath setup hook from the JRE so that # any package that depends on the JRE has $CLASSPATH set up # properly. @@ -221,11 +236,12 @@ let # Build the set of output library directories to rpath against LIBDIRS="" for output in $outputs; do + if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" done - # Add the local library paths to remove dependencies on the bootstrap for output in $outputs; do + if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo \$$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) echo "$BINLIBS" | while read i; do @@ -233,22 +249,16 @@ let patchelf --shrink-rpath "$i" || true done done - - # Test to make sure that we don't depend on the bootstrap - for output in $outputs; do - if grep -q -r '${bootjdk}' $(eval echo \$$output); then - echo "Extraneous references to ${bootjdk} detected" - exit 1 - fi - done ''; - meta = with stdenv.lib; { + disallowedReferences = [ openjdk8-bootstrap ]; + + meta = with lib; { homepage = http://openjdk.java.net/; license = licenses.gpl2; description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo nequissimus ]; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; }; passthru = { diff --git a/pkgs/development/compilers/openjdk/darwin/11.nix b/pkgs/development/compilers/openjdk/darwin/11.nix index 61c2d57423e..4c808302b4f 100644 --- a/pkgs/development/compilers/openjdk/darwin/11.nix +++ b/pkgs/development/compilers/openjdk/darwin/11.nix @@ -52,7 +52,10 @@ let home = jdk; }; - meta.platforms = stdenv.lib.platforms.darwin; + meta = with stdenv.lib; { + license = licenses.gpl2; + platforms = platforms.darwin; + }; }; in jdk diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix index 7457ffceab1..045901b1bae 100644 --- a/pkgs/development/compilers/openjdk/darwin/8.nix +++ b/pkgs/development/compilers/openjdk/darwin/8.nix @@ -53,7 +53,10 @@ let home = jdk; }; - meta.platforms = stdenv.lib.platforms.darwin; + meta = with stdenv.lib; { + license = licenses.gpl2; + platforms = platforms.darwin; + }; }; in jdk diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix index b4e19c32e26..58e4ba99014 100644 --- a/pkgs/development/compilers/openjdk/darwin/default.nix +++ b/pkgs/development/compilers/openjdk/darwin/default.nix @@ -52,7 +52,10 @@ let home = jdk; }; - meta.platforms = stdenv.lib.platforms.darwin; + meta = with stdenv.lib; { + license = licenses.gpl2; + platforms = platforms.darwin; + }; }; in jdk diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 65c85d055cb..094bd57e6e9 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -1,42 +1,33 @@ -{ stdenv, lib, fetchurl, bash, cpio, autoconf, pkgconfig, file, which, unzip, zip, cups, freetype -, alsaLib, bootjdk, perl, liberation_ttf, fontconfig, zlib, lndir -, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr -, libjpeg, giflib +{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip +, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 +, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama +, libXcursor, libXrandr, fontconfig, openjdk11 , setJavaClassPath -, minimal ? false -, enableJavaFX ? true, openjfx +, headless ? false +, enableJavaFX ? openjfx.meta.available, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: let - - /** - * The JDK libraries are in directories that depend on the CPU. - */ - architecture = - if stdenv.hostPlatform.system == "i686-linux" then - "i386" - else "amd64"; - major = "12"; update = ".0.2"; build = "ga"; - repover = "jdk-${major}${update}-${build}"; - openjdk = stdenv.mkDerivation { - name = "openjdk-${major}${update}-${build}"; + openjdk = stdenv.mkDerivation rec { + pname = "openjdk" + lib.optionalString headless "-headless"; + version = "${major}${update}-${build}"; src = fetchurl { - url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/${repover}.tar.gz"; + url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoconf ]; buildInputs = [ - autoconf cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib - libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst - libXi libXinerama libXcursor libXrandr lndir fontconfig - ] ++ lib.optionals (!minimal && enableGnome2) [ + cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib + libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst + libXi libXinerama libXcursor libXrandr fontconfig openjdk11 + ] ++ lib.optionals (!headless && enableGnome2) [ gtk3 gnome_vfs GConf glib ]; @@ -53,62 +44,60 @@ let url = https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch; sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; }) - ] ++ lib.optionals (!minimal && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGnome2) [ ./swing-use-gtk-jdk10.patch ]; - preConfigure = '' + prePatch = '' chmod +x configure - substituteInPlace configure --replace /bin/bash "${bash}/bin/bash" - - configureFlagsArray=( - "--with-boot-jdk=${bootjdk.home}" - "--enable-unlimited-crypto" - "--with-zlib=system" - "--with-giflib=system" - "--with-stdc++lib=dynamic" - - # glibc 2.24 deprecated readdir_r so we need this - # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html - "--with-extra-cflags=-Wno-error=deprecated-declarations -Wno-error=unused-result" - '' - + lib.optionalString (architecture == "amd64") " \"--with-jvm-features=zgc\"" - + lib.optionalString minimal " \"--enable-headless-only\"" - + lib.optionalString (!minimal && enableJavaFX) " \"--with-import-modules=${openjfx}\"" - + ");" - # https://bugzilla.redhat.com/show_bug.cgi?id=1306558 - # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 - + stdenv.lib.optionalString stdenv.cc.isGNU '' - NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error" + patchShebangs --build configure ''; - NIX_LDFLAGS= lib.optionals (!minimal) [ + configureFlags = [ + "--with-boot-jdk=${openjdk11.home}" + "--enable-unlimited-crypto" + "--with-native-debug-symbols=internal" + "--with-libjpeg=system" + "--with-giflib=system" + "--with-libpng=system" + "--with-zlib=system" + "--with-lcms=system" + "--with-stdc++lib=dynamic" + ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" + ++ lib.optional headless "--enable-headless-only" + ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; + + separateDebugInfo = true; + + NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + + NIX_LDFLAGS = lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!minimal && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGnome2) [ "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" ]; buildFlags = [ "all" ]; installPhase = '' - mkdir -p $out/lib/openjdk $out/share + mkdir -p $out/lib - cp -av build/*/images/jdk/* $out/lib/openjdk + mv build/*/images/jdk $out/lib/openjdk # Remove some broken manpages. rm -rf $out/lib/openjdk/man/ja* # Mirror some stuff in top-level. - mkdir $out/include $out/share/man - ln -s $out/lib/openjdk/include/* $out/include/ - ln -s $out/lib/openjdk/man/* $out/share/man/ + mkdir -p $out/share + ln -s $out/lib/openjdk/include $out/include + ln -s $out/lib/openjdk/man $out/share/man # jni.h expects jni_md.h to be in the header search path. ln -s $out/include/linux/*_md.h $out/include/ # Remove crap from the installation. rm -rf $out/lib/openjdk/demo - ${lib.optionalString minimal '' + ${lib.optionalString headless '' rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so ''} @@ -133,11 +122,12 @@ let # Build the set of output library directories to rpath against LIBDIRS="" for output in $outputs; do + if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" done - # Add the local library paths to remove dependencies on the bootstrap for output in $outputs; do + if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo \$$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) echo "$BINLIBS" | while read i; do @@ -145,26 +135,20 @@ let patchelf --shrink-rpath "$i" || true done done - - # Test to make sure that we don't depend on the bootstrap - for output in $outputs; do - if grep -q -r '${bootjdk}' $(eval echo \$$output); then - echo "Extraneous references to ${bootjdk} detected" - exit 1 - fi - done ''; + disallowedReferences = [ openjdk11 ]; + meta = with stdenv.lib; { homepage = http://openjdk.java.net/; license = licenses.gpl2; description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo ]; - platforms = ["i686-linux" "x86_64-linux"]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; }; passthru = { - inherit architecture; + architecture = ""; home = "${openjdk}/lib/openjdk"; }; }; diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 223feb1e2a1..9e6d30efda8 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, writeText, openjdk, bootjdk, gradleGen, pkgconfig, perl, cmake, gperf -, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby }: +{ stdenv, lib, fetchurl, writeText, gradleGen, pkgconfig, perl, cmake +, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby +, openjdk11-bootstrap }: let major = "11"; @@ -7,14 +8,14 @@ let build = "1"; repover = "${major}${update}+${build}"; gradle_ = (gradleGen.override { - java = bootjdk; + java = openjdk11-bootstrap; }).gradle_4_10; makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}-${repover}"; + version = "${major}${update}-${build}"; src = fetchurl { - url = "http://hg.openjdk.java.net/openjfx/${major}/rt/archive/${repover}.tar.gz"; + url = "https://hg.openjdk.java.net/openjfx/${major}/rt/archive/${repover}.tar.gz"; sha256 = "1h7qsylr7rnwnbimqjyn3whszp9kv4h3gpicsrb3mradxc9yv194"; }; @@ -25,7 +26,7 @@ let config = writeText "gradle.properties" ('' CONF = Release - JDK_HOME = ${bootjdk}/lib/openjdk + JDK_HOME = ${openjdk11-bootstrap.home} '' + args.gradleProperties or ""); buildPhase = '' @@ -56,11 +57,11 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = - # Downloaded AWT jars differ by platform. - if stdenv.system == "x86_64-linux" then "0d4msxswdav1xsfkpr0qd3xgqkcbxzf47v1zdy5jmg5w4bs6a78a" - else if stdenv.system == "i686-linux" then "0mjlyf6jvbis7nrm5d394sjv4hjw6k3753hr1nwdxk8skwc3ry08" - else throw "Unsupported platform"; + # Downloaded AWT jars differ by platform. + outputHash = { + i686-linux = "0mjlyf6jvbis7nrm5d394sjv4hjw6k3753hr1nwdxk8skwc3ry08"; + x86_64-linux = "0d4msxswdav1xsfkpr0qd3xgqkcbxzf47v1zdy5jmg5w4bs6a78a"; + }.${stdenv.system} or (throw "Unsupported platform"); }; in makePackage { @@ -87,24 +88,20 @@ in makePackage { postFixup = '' # Remove references to bootstrap. find "$out" -name \*.so | while read lib; do - new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${bootjdk}[^:]*,,')" + new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${openjdk11-bootstrap}[^:]*,,')" patchelf --set-rpath "$new_refs" "$lib" done - - # Test to make sure that we don't depend on the bootstrap - if grep -q -r '${bootjdk}' "$out"; then - echo "Extraneous references to ${bootjdk} detected" >&2 - exit 1 - fi ''; + disallowedReferences = [ openjdk11-bootstrap ]; + passthru.deps = deps; meta = with stdenv.lib; { homepage = http://openjdk.java.net/projects/openjfx/; - license = openjdk.meta.license; + license = licenses.gpl2; description = "The next-generation Java client toolkit."; maintainers = with maintainers; [ abbradar ]; - platforms = openjdk.meta.platforms; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/development/compilers/openjdk/openjfx/12.nix b/pkgs/development/compilers/openjdk/openjfx/12.nix index 266dd7f334e..418c58ac683 100644 --- a/pkgs/development/compilers/openjdk/openjfx/12.nix +++ b/pkgs/development/compilers/openjdk/openjfx/12.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, writeText, openjdk, bootjdk, gradleGen, pkgconfig, perl, cmake, gperf -, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby }: +{ stdenv, lib, fetchurl, writeText, openjdk11_headless, gradleGen +, pkgconfig, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib +, ffmpeg, python, ruby }: let major = "12"; @@ -7,14 +8,14 @@ let build = "14"; repover = "${major}${update}+${build}"; gradle_ = (gradleGen.override { - java = bootjdk; + java = openjdk11_headless; }).gradle_4_10; makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}-${repover}"; + version = "${major}${update}-${build}"; src = fetchurl { - url = "http://hg.openjdk.java.net/openjfx/${major}-dev/rt/archive/${repover}.tar.gz"; + url = "https://hg.openjdk.java.net/openjfx/${major}/rt/archive/${repover}.tar.gz"; sha256 = "16jjfjkrg57wsj9mmm52i2kl3byz3ba1f9f8wwc8zwqm4cpjzliz"; }; @@ -25,7 +26,7 @@ let config = writeText "gradle.properties" ('' CONF = Release - JDK_HOME = ${bootjdk}/lib/openjdk + JDK_HOME = ${openjdk11_headless.home} '' + args.gradleProperties or ""); buildPhase = '' @@ -56,11 +57,11 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = - # Downloaded AWT jars differ by platform. - if stdenv.system == "x86_64-linux" then "1z5qar5l28ja4pkf5l5m48xbv3x1yrnilsv9lpf2j3vkdk9h1nci" - else if stdenv.system == "i686-linux" then "0rbygvjc7w197fi5nxldqdrm6mpiyd3n45042g3gd4s5qk08spjd" - else throw "Unsupported platform"; + # Downloaded AWT jars differ by platform. + outputHash = { + x86_64-linux = "1z5qar5l28ja4pkf5l5m48xbv3x1yrnilsv9lpf2j3vkdk9h1nci"; + i686-linux = "0rbygvjc7w197fi5nxldqdrm6mpiyd3n45042g3gd4s5qk08spjd"; + }.${stdenv.system} or (throw "Unsupported platform"); }; in makePackage { @@ -87,24 +88,20 @@ in makePackage { postFixup = '' # Remove references to bootstrap. find "$out" -name \*.so | while read lib; do - new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${bootjdk}[^:]*,,')" + new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${openjdk11_headless}[^:]*,,')" patchelf --set-rpath "$new_refs" "$lib" done - - # Test to make sure that we don't depend on the bootstrap - if grep -q -r '${bootjdk}' "$out"; then - echo "Extraneous references to ${bootjdk} detected" >&2 - exit 1 - fi ''; + disallowedReferences = [ openjdk11_headless ]; + passthru.deps = deps; meta = with stdenv.lib; { homepage = http://openjdk.java.net/projects/openjfx/; - license = openjdk.meta.license; + license = licenses.gpl2; description = "The next-generation Java client toolkit."; maintainers = with maintainers; [ abbradar ]; - platforms = openjdk.meta.platforms; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch b/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch index 4902b8e8401..08cf554a18f 100644 --- a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch +++ b/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch @@ -1,21 +1,30 @@ -diff -ur openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java ---- openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-07-17 12:12:14.000000000 +0200 -+++ openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-12-09 13:31:27.821960372 +0100 -@@ -161,6 +161,7 @@ - /* - * Try: - * javax.net.ssl.trustStore (if this variable exists, stop) -+ * system environment variable JAVAX_NET_SSL_TRUSTSTORE - * jssecacerts - * cacerts - * -@@ -169,6 +169,9 @@ - - try { - storeFileName = props.get("trustStore"); -+ if (storeFileName == null) { -+ storeFileName = System.getenv("JAVAX_NET_SSL_TRUSTSTORE"); -+ } - if (!"NONE".equals(storeFileName)) { - if (storeFileName != null) { - storeFile = new File(storeFileName); +--- a/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java 2017-06-26 21:48:25.000000000 -0400 ++++ b/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java 2017-07-05 20:45:57.491295030 -0400 +@@ -71,6 +71,7 @@ + * + * The preference of the default trusted KeyStore is: + * javax.net.ssl.trustStore ++ * system environment variable JAVAX_NET_SSL_TRUSTSTORE + * jssecacerts + * cacerts + */ +@@ -132,7 +133,8 @@ + public TrustStoreDescriptor run() { + // Get the system properties for trust store. + String storePropName = System.getProperty( +- "javax.net.ssl.trustStore", jsseDefaultStore); ++ "javax.net.ssl.trustStore", ++ System.getenv("JAVAX_NET_SSL_TRUSTSTORE")); + String storePropType = System.getProperty( + "javax.net.ssl.trustStoreType", + KeyStore.getDefaultType()); +@@ -144,6 +146,9 @@ + String temporaryName = ""; + File temporaryFile = null; + long temporaryTime = 0L; ++ if (storePropName == null) { ++ storePropName = jsseDefaultStore; ++ } + if (!"NONE".equals(storePropName)) { + String[] fileNames = + new String[] {storePropName, defaultStore}; diff --git a/pkgs/development/compilers/openspin/default.nix b/pkgs/development/compilers/openspin/default.nix index 31e3800a6c9..b1e95bb704c 100644 --- a/pkgs/development/compilers/openspin/default.nix +++ b/pkgs/development/compilers/openspin/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "openspin"; version = "unstable-2018-10-02"; diff --git a/pkgs/development/compilers/pforth/default.nix b/pkgs/development/compilers/pforth/default.nix index 7885582ad12..67d444428e9 100644 --- a/pkgs/development/compilers/pforth/default.nix +++ b/pkgs/development/compilers/pforth/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "28"; pname = "pforth"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index acccc749686..06202901563 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -18,7 +18,7 @@ let in rec { - rustc = stdenv.mkDerivation rec { + rustc = stdenv.mkDerivation { name = "rustc-${versionType}-${version}"; inherit version; @@ -64,7 +64,7 @@ rec { setupHooks = ./setup-hook.sh; }; - cargo = stdenv.mkDerivation rec { + cargo = stdenv.mkDerivation { name = "cargo-${versionType}-${version}"; inherit version; diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 5cf48715dae..43a72985dde 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -32,7 +32,7 @@ let src = fetchurl { url = "https://static.rust-lang.org/dist/rust-${version}-${platform}.tar.gz"; - sha256 = hashes."${platform}"; + sha256 = hashes.${platform}; }; in callPackage ./binary.nix diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index e000edad49b..2bf2722818b 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -3,7 +3,7 @@ , CoreFoundation, Security }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { name = "cargo-${rustc.version}"; inherit (rustc) version src; diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index 2b8fcbe0ba4..56b70f21d4c 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -1,5 +1,5 @@ { stdenv, lib, rustPlatform, rustc, Security, patchelf }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { name = "clippy-${rustc.version}"; inherit (rustc) version src; diff --git a/pkgs/development/compilers/rust/rls/default.nix b/pkgs/development/compilers/rust/rls/default.nix index 470611242e0..942e23c6170 100644 --- a/pkgs/development/compilers/rust/rls/default.nix +++ b/pkgs/development/compilers/rust/rls/default.nix @@ -2,7 +2,7 @@ , openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv , CoreFoundation, Security }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "rls"; inherit (rustPlatform.rust.rustc) src version; diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix index 537bdaf445c..9793eee1708 100644 --- a/pkgs/development/compilers/rust/rustfmt.nix +++ b/pkgs/development/compilers/rust/rustfmt.nix @@ -1,7 +1,7 @@ { stdenv, rustPlatform, Security }: rustPlatform.buildRustPackage rec { - name = "rustfmt-${version}"; + pname = "rustfmt"; inherit (rustPlatform.rust.rustc) version src; # the rust source tarball already has all the dependencies vendored, no need to fetch them again diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index 0d2a10b6a99..9c777cc7572 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -2,38 +2,38 @@ let options = rec { - x86_64-darwin = rec { + x86_64-darwin = { version = "1.2.11"; system = "x86-64-darwin"; sha256 = "0lh4gpvi8hl6g6b9321g5pwh8sk3218i7h4lx7p3vd9z0cf3lz85"; }; - x86_64-linux = rec { + x86_64-linux = { version = "1.3.16"; system = "x86-64-linux"; sha256 = "0sq2dylwwyqfwkbdvcgqwz3vay9v895zpb0fyzsiwy31d1x9pr2s"; }; - i686-linux = rec { + i686-linux = { version = "1.2.7"; system = "x86-linux"; sha256 = "07f3bz4br280qvn85i088vpzj9wcz8wmwrf665ypqx181pz2ai3j"; }; - aarch64-linux = rec { + aarch64-linux = { version = "1.3.16"; system = "arm64-linux"; sha256 = "0q1brz9c49xgdljzfx8rpxxnlwhadxkcy5kg0mcd9wnxygind1cl"; }; - armv7l-linux = rec { + armv7l-linux = { version = "1.2.14"; system = "armhf-linux"; sha256 = "0sp5445rbvms6qvzhld0kwwvydw51vq5iaf4kdqsf2d9jvaz3yx5"; }; armv6l-linux = armv7l-linux; - x86_64-freebsd = rec { + x86_64-freebsd = { version = "1.2.7"; system = "x86-64-freebsd"; sha256 = "14k42xiqd2rrim4pd5k5pjcrpkac09qnpynha8j1v4jngrvmw7y6"; }; - x86_64-solaris = rec { + x86_64-solaris = { version = "1.2.7"; system = "x86-64-solaris"; sha256 = "05c12fmac4ha72k1ckl6i780rckd7jh4g5s5hiic7fjxnf1kx8d0"; diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix index efcaf56110d..f6b732f02ae 100644 --- a/pkgs/development/compilers/seexpr/default.nix +++ b/pkgs/development/compilers/seexpr/default.nix @@ -2,7 +2,7 @@ bison, flex, libGLU, pythonPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "seexpr"; version = "2.11"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/serpent/default.nix b/pkgs/development/compilers/serpent/default.nix index c9b4f9639d0..6f1156897db 100644 --- a/pkgs/development/compilers/serpent/default.nix +++ b/pkgs/development/compilers/serpent/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "serpent"; # I can't find any version numbers, so we're just using the date diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index f21b2ae3cb8..c9698fcad9b 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -131,7 +131,7 @@ let extra_cmake_options="${stdenv.lib.concatStringsSep "," cmakeFlags}"''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "swift-${version_friendly}"; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/urn/default.nix b/pkgs/development/compilers/urn/default.nix index d5f0dcbec29..f3ff864f81b 100644 --- a/pkgs/development/compilers/urn/default.nix +++ b/pkgs/development/compilers/urn/default.nix @@ -20,7 +20,7 @@ let inherit (stdenv.lib) optionalString concatMapStringsSep; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "urn-${optionalString (extraLibraries != []) "with-libraries-"}${version}"; src = fetchFromGitLab { diff --git a/pkgs/development/compilers/wcc/default.nix b/pkgs/development/compilers/wcc/default.nix index 3196592da48..5f812e2c463 100644 --- a/pkgs/development/compilers/wcc/default.nix +++ b/pkgs/development/compilers/wcc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, capstone, libbfd, libelf, libiberty, readline }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "wcc-unstable"; version = "2018-04-05"; diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index f0e0693d12c..15ee5f403bc 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -23,7 +23,7 @@ let xorg.libXt xorg.libXrender stdenv.cc.cc ])); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit version openjdk platform hash extension; pname = "zulu"; diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index d4c4c1f0ac3..90b28d31831 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -23,7 +23,7 @@ let xorg.libXt xorg.libXrender stdenv.cc.cc ])); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit version openjdk platform hash extension; pname = "zulu"; diff --git a/pkgs/development/coq-modules/Cheerios/default.nix b/pkgs/development/coq-modules/Cheerios/default.nix index d58f6510219..4e75b9407de 100644 --- a/pkgs/development/coq-modules/Cheerios/default.nix +++ b/pkgs/development/coq-modules/Cheerios/default.nix @@ -8,7 +8,7 @@ let param = }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-Cheerios-${param.version}"; src = fetchFromGitHub { diff --git a/pkgs/development/coq-modules/InfSeqExt/default.nix b/pkgs/development/coq-modules/InfSeqExt/default.nix index 4fe86c3fae1..5df96519e7f 100644 --- a/pkgs/development/coq-modules/InfSeqExt/default.nix +++ b/pkgs/development/coq-modules/InfSeqExt/default.nix @@ -8,7 +8,7 @@ let param = }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-InfSeqExt-${param.version}"; src = fetchFromGitHub { diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 874b99f2beb..b9961289480 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -14,7 +14,7 @@ let params = sha256 = "0fri4nih40vfb0fbr82dsi631ydkw48xszinq43lyinpknf54y17"; }; - "8.8" = rec { + "8.8" = { version = "20190311"; rev = "22af9e9a223d0038f05638654422e637e863b355"; sha256 = "00rnr19lg6lg0haq1sy4ld38p7imzand6fc52fvfq27gblxkp2aq"; @@ -26,12 +26,12 @@ let params = sha256 = "1c34v1k37rk7v0xk2czv5n79mbjxjrm6nh3llg2mpfmdsqi68wf3"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in let recent = stdenv.lib.versionAtLeast coq.coq-version "8.8"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-QuickChick-${param.version}"; diff --git a/pkgs/development/coq-modules/StructTact/default.nix b/pkgs/development/coq-modules/StructTact/default.nix index e33b9427223..2e4d12478b7 100644 --- a/pkgs/development/coq-modules/StructTact/default.nix +++ b/pkgs/development/coq-modules/StructTact/default.nix @@ -8,7 +8,7 @@ let param = }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-StructTact-${param.version}"; src = fetchFromGitHub { diff --git a/pkgs/development/coq-modules/Velisarios/default.nix b/pkgs/development/coq-modules/Velisarios/default.nix index cd7ddfefb84..92c9b2569ca 100644 --- a/pkgs/development/coq-modules/Velisarios/default.nix +++ b/pkgs/development/coq-modules/Velisarios/default.nix @@ -20,10 +20,10 @@ let params = sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-Velisarios-${param.version}"; src = fetchFromGitHub { diff --git a/pkgs/development/coq-modules/Verdi/default.nix b/pkgs/development/coq-modules/Verdi/default.nix index 00d088a4a92..d2e9660a630 100644 --- a/pkgs/development/coq-modules/Verdi/default.nix +++ b/pkgs/development/coq-modules/Verdi/default.nix @@ -13,7 +13,7 @@ let param = }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-verdi-${param.version}"; src = fetchFromGitHub { diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index a074b27ff65..fb45e591ec1 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -22,10 +22,10 @@ let params = { sha256 = "1slw227idwjw9a21vj3s6kal22mrmvvlpg8r7xk590ml99bn6404"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-bignums"; diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix index 3dfa95154d3..025a67a1e70 100644 --- a/pkgs/development/coq-modules/category-theory/default.nix +++ b/pkgs/development/coq-modules/category-theory/default.nix @@ -19,10 +19,10 @@ let "8.8" = v20190414; "8.9" = v20190414; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-category-theory-${param.version}"; diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix index faf7db09ff9..91fdb8651cc 100644 --- a/pkgs/development/coq-modules/contribs/default.nix +++ b/pkgs/development/coq-modules/contribs/default.nix @@ -34,7 +34,7 @@ let mkContrib = repo: revs: param: rev = "86ac28259030649ef51460e4de2441c8a1017751"; sha256 = "09bbk2a7pn0j76mmapl583f8a20zqd3a1m9lkml8rpwml692bzi9"; }; - }."${coq.coq-version}"; + }.${coq.coq-version}; abp = mkContrib "abp" [ "8.5" "8.6" "8.7" ] { version = "v8.6.0"; @@ -219,7 +219,7 @@ let mkContrib = repo: revs: param: rev = "aa33052c1edfc5a65885942a67c2773b5d96f8cc"; sha256 = "0mjgfdr9bzsch0dlk4vq1frkaig14dqh46r54cv0l15flxapg0iw"; }; - }."${coq.coq-version}"; + }.${coq.coq-version}; continuations = mkContrib "continuations" [ ] { version = "v8.5.0-13-g6885310"; diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 04fc428b409..c689cea1a82 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -7,7 +7,7 @@ let params = { sha256 = "188avk9irwjsbs5ya4ka01mpk3vw4397kv2rmsncqrrrsa1pdddk"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index cade2bd352e..898272d402b 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -8,7 +8,7 @@ let params = "8.8" = { version = "0.9.8"; sha256 = "0z1ix855kdjl7zw5ca664h5njd1x8mmvf5wi37fck4dj9dgamwlz"; }; "8.9" = { version = "0.10.1"; sha256 = "0r1vspad8fb8bry3zliiz4hfj4w1iib1l2gm115a94m6zbiksd95"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/coq-haskell/default.nix b/pkgs/development/coq-modules/coq-haskell/default.nix index 57f31e1847c..e9263fb2be1 100644 --- a/pkgs/development/coq-modules/coq-haskell/default.nix +++ b/pkgs/development/coq-modules/coq-haskell/default.nix @@ -26,10 +26,10 @@ let params = sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-coq-haskell-${param.version}"; diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix index 28c651f9b16..83a505017fb 100644 --- a/pkgs/development/coq-modules/coqhammer/default.nix +++ b/pkgs/development/coq-modules/coqhammer/default.nix @@ -9,7 +9,7 @@ let sha256 = "0hmqwsry8ldg4g4hhwg4b84dgzibpdrg1wwsajhlyqfx3fb3n3b5"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index c67342f1a2f..6228bd4be9d 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -15,7 +15,7 @@ let params = "8.9" = v_8_8; "8.10" = v_8_8; }; - param = params."${coq.coq-version}" + param = params.${coq.coq-version} ; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index e403f7d4fb5..401cb299497 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -22,7 +22,7 @@ let params = { sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n"; }; }; -param = params."${coq.coq-version}"; +param = params.${coq.coq-version}; in stdenv.mkDerivation { diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index 5446b540fac..38444fe2b06 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -32,7 +32,7 @@ let sha256 = "1v5kx0xzxzsbs5r4w08rm1lrmjjggnd3ap0sd1my88ds17jzyasd"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/ltac2/default.nix b/pkgs/development/coq-modules/ltac2/default.nix index 30917fcb78f..80b167aaa98 100644 --- a/pkgs/development/coq-modules/ltac2/default.nix +++ b/pkgs/development/coq-modules/ltac2/default.nix @@ -17,7 +17,7 @@ let params = { sha256 = "0xby1kb26r9gcvk5511wqj05fqm9paynwfxlfqkmwkgnfmzk0x73"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index d573eca809a..6798236591c 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -30,7 +30,7 @@ let # COMPUTED using the configuration above (edit with caution) # ############################################################## default-mathcomp-version = let v = head ( - filter (mc: mathcomp-coq-versions."${mc}" coq.coq-version) + filter (mc: mathcomp-coq-versions.${mc} coq.coq-version) mathcomp-version-preference ++ ["0.0.0"]); in if v == "0.0.0" then max-mathcomp-version else v; @@ -73,7 +73,7 @@ let custom-version = if is-released then mathcomp-version else "custom"; # the base set of attributes for mathcomp - attrs = rec { + attrs = { name = "coq${coq.coq-version}-${pkgname}-${custom-version}"; # used in ssreflect @@ -126,9 +126,9 @@ let }; }; in - {"${mathcomp-pkg}" = stdenv.mkDerivation (attrs // overrides attrs);}; + {${mathcomp-pkg} = stdenv.mkDerivation (attrs // overrides attrs);}; -getAttrOr = a: n: a."${n}" or (throw a.error); +getAttrOr = a: n: a.${n} or (throw a.error); mathcompCorePkgs_1_7 = mathcompGen "1.7.0"; mathcompCorePkgs_1_8 = mathcompGen "1.8.0"; @@ -136,7 +136,7 @@ mathcompCorePkgs_1_9 = mathcompGen "1.9.0"; mathcompCorePkgs = recurseIntoAttrs (mapDerivationAttrset dontDistribute (mathcompGen default-mathcomp-version)); -in rec { +in { # mathcompGenSingle: given a version of mathcomp # generates an attribute set {single = <drv>;} with the single mathcomp derivation inherit mathcompGenSingle; diff --git a/pkgs/development/coq-modules/mathcomp/extra.nix b/pkgs/development/coq-modules/mathcomp/extra.nix index 0d9557623c3..c342c25a411 100644 --- a/pkgs/development/coq-modules/mathcomp/extra.nix +++ b/pkgs/development/coq-modules/mathcomp/extra.nix @@ -139,7 +139,7 @@ packageGen = { else compatibleCoqVersions; mc-core-deps = if builtins.isNull core-deps then [ssreflect] else core-deps; in - { "${package}" = let from = src; in + { ${package} = let from = src; in stdenv.mkDerivation rec { inherit version; @@ -149,7 +149,7 @@ packageGen = { owner = owner; repo = package; rev = version; - sha256 = version-sha256."${version}"; + sha256 = version-sha256.${version}; } else from; propagatedBuildInputs = [ coq ] ++ mc-core-deps ++ extra-deps; @@ -173,7 +173,7 @@ packageGen = { }; }; -current-versions = versions."${current-ssreflect.version}" or {}; +current-versions = versions.${current-ssreflect.version} or {}; select = x: mapAttrs (n: pkg: {package = n;} // pkg) (recursiveUpdate param x); @@ -181,14 +181,14 @@ for-version = v: suffix: (mapAttrs' (n: pkg: {name = "mathcomp_${suffix}-${n}"; value = (packageGen ({ ssreflect = coqPackages."mathcomp-ssreflect_${suffix}"; - } // pkg))."${n}";}) - (select versions."${v}")); + } // pkg)).${n};}) + (select versions.${v})); all = (for-version "1.7.0" "1_7") // (for-version "1.8.0" "1_8") // (for-version "1.9.0" "1_9") // (recurseIntoAttrs (mapDerivationAttrset dontDistribute ( - mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = (packageGen pkg)."${n}";}) + mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = (packageGen pkg).${n};}) (select current-versions)))); in { diff --git a/pkgs/development/coq-modules/paramcoq/default.nix b/pkgs/development/coq-modules/paramcoq/default.nix index 472d3aeb2d0..a8dd74dd5fb 100644 --- a/pkgs/development/coq-modules/paramcoq/default.nix +++ b/pkgs/development/coq-modules/paramcoq/default.nix @@ -15,7 +15,7 @@ let params = sha256 = "002xabhjlph394vydw3dx8ipv5ry2nq3py4440bk9a18ljx0w6ll"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in stdenv.mkDerivation rec { diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index d53337aca1a..8d93492209c 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -17,8 +17,8 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "acl2-devel"; repo = "acl2-devel"; - rev = revs."${version}"; - sha256 = hashes."${version}"; + rev = revs.${version}; + sha256 = hashes.${version}; }; buildInputs = [ sbcl diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix index 29d63f1d004..cde9146f78c 100644 --- a/pkgs/development/interpreters/ceptre/default.nix +++ b/pkgs/development/interpreters/ceptre/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, mlton }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ceptre-2016-11-27"; src = fetchgit { diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/development/interpreters/clips/default.nix index 918c577356c..c70bfd9406e 100644 --- a/pkgs/development/interpreters/clips/default.nix +++ b/pkgs/development/interpreters/clips/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "6.30"; pname = "clips"; src = fetchurl { diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix index ab8e616ac6d..0e9d81d5e95 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/default.nix +++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix @@ -126,7 +126,7 @@ let # packageJSON=./package.json; getJarPath = jarName: (lib.findFirst (p: p.name == jarName) null cljdeps.packages).path.jar; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit version; pname = "lumo"; diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix index d32f9127565..229c42d9f7b 100644 --- a/pkgs/development/interpreters/elixir/1.5.nix +++ b/pkgs/development/interpreters/elixir/1.5.nix @@ -1,6 +1,6 @@ { mkDerivation }: -mkDerivation rec { +mkDerivation { version = "1.5.3"; sha256 = "00kgqcn9g6vflc551wniz9pwv7pszyf8v6smpkqs50j3kbliihy5"; minimumOTPVersion = "18"; diff --git a/pkgs/development/interpreters/elixir/1.6.nix b/pkgs/development/interpreters/elixir/1.6.nix index 73afcbd1597..94dffd1f763 100644 --- a/pkgs/development/interpreters/elixir/1.6.nix +++ b/pkgs/development/interpreters/elixir/1.6.nix @@ -1,6 +1,6 @@ { mkDerivation }: -mkDerivation rec { +mkDerivation { version = "1.6.6"; sha256 = "1wl8rfpw0dxacq4f7xf6wjr8v2ww5691d0cfw9pzw7phd19vazgl"; minimumOTPVersion = "19"; diff --git a/pkgs/development/interpreters/elixir/1.7.nix b/pkgs/development/interpreters/elixir/1.7.nix index adbbbaff890..10ebd5438a1 100644 --- a/pkgs/development/interpreters/elixir/1.7.nix +++ b/pkgs/development/interpreters/elixir/1.7.nix @@ -1,6 +1,6 @@ { mkDerivation }: -mkDerivation rec { +mkDerivation { version = "1.7.4"; sha256 = "0f8j4pib13kffiihagdwl3xqs3a1ak19qz3z8fpyfxn9dnjiinla"; minimumOTPVersion = "19"; diff --git a/pkgs/development/interpreters/elixir/1.8.nix b/pkgs/development/interpreters/elixir/1.8.nix index e240e1907e0..931fa50b1f7 100644 --- a/pkgs/development/interpreters/elixir/1.8.nix +++ b/pkgs/development/interpreters/elixir/1.8.nix @@ -1,6 +1,6 @@ { mkDerivation }: -mkDerivation rec { +mkDerivation { version = "1.8.2"; sha256 = "1n77cpcl2b773gmj3m9s24akvj9gph9byqbmj2pvlsmby4aqwckq"; minimumOTPVersion = "20"; diff --git a/pkgs/development/interpreters/elixir/1.9.nix b/pkgs/development/interpreters/elixir/1.9.nix index 41601eeaa11..b9b2400b78b 100644 --- a/pkgs/development/interpreters/elixir/1.9.nix +++ b/pkgs/development/interpreters/elixir/1.9.nix @@ -1,6 +1,6 @@ { mkDerivation }: -mkDerivation rec { +mkDerivation { version = "1.9.1"; sha256 = "106s2a3dykc5iwfrd5icqd737yfzaz1dw4x5v1j5z2fvf46h96dx"; minimumOTPVersion = "20"; diff --git a/pkgs/development/interpreters/erlang/R16B02-basho.nix b/pkgs/development/interpreters/erlang/R16B02-basho.nix index c263551de2d..11637868ed0 100644 --- a/pkgs/development/interpreters/erlang/R16B02-basho.nix +++ b/pkgs/development/interpreters/erlang/R16B02-basho.nix @@ -1,6 +1,6 @@ { pkgs, mkDerivation }: -mkDerivation rec { +mkDerivation { baseName = "erlang"; version = "16B02.basho10"; diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix index 58b7fd71f0b..e9d9366851e 100644 --- a/pkgs/development/interpreters/erlang/R18.nix +++ b/pkgs/development/interpreters/erlang/R18.nix @@ -21,7 +21,7 @@ let sha256 = "1cj9fjhdng6yllajjm3gkk04ag9bwyb3n70hrb5nk6c292v8a45c"; }; -in mkDerivation rec { +in mkDerivation { version = "18.3.4.8"; sha256 = "16c0h25hh5yvkv436ks5jbd7qmxzb6ndvk64mr404347a20iib0g"; diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index 25a3f662565..d5f3afe5f3d 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -1,6 +1,6 @@ { mkDerivation, fetchpatch }: -mkDerivation rec { +mkDerivation { version = "19.3.6.11"; sha256 = "0b02iv8dly1vkc2xnqqi030sdj34h4gji2h4qgilllajr1f868vm"; diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix index 016e175d6b5..3a33e55767b 100644 --- a/pkgs/development/interpreters/erlang/R20.nix +++ b/pkgs/development/interpreters/erlang/R20.nix @@ -1,6 +1,6 @@ { mkDerivation }: -mkDerivation rec { +mkDerivation { version = "20.3.8.9"; sha256 = "0v2iiyzss8hiih98wvj0gi2qzdmmhh7bvc9p025wlfm4k7r1109a"; diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix index e21bf6dafbf..fdd034fc607 100644 --- a/pkgs/development/interpreters/erlang/R21.nix +++ b/pkgs/development/interpreters/erlang/R21.nix @@ -1,6 +1,6 @@ { mkDerivation }: -mkDerivation rec { +mkDerivation { version = "21.3.8.3"; sha256 = "1szybirrcpqsl2nmlmpbkxjqnm6i7l7bma87m5cpwi0kpvlxwmcw"; diff --git a/pkgs/development/interpreters/erlang/R22.nix b/pkgs/development/interpreters/erlang/R22.nix index a8c05513c5a..8b471f63247 100644 --- a/pkgs/development/interpreters/erlang/R22.nix +++ b/pkgs/development/interpreters/erlang/R22.nix @@ -1,6 +1,6 @@ { mkDerivation }: -mkDerivation rec { +mkDerivation { version = "22.0.4"; sha256 = "1aqkhd6nwdn4xp5yz02zbymd4x8ij8fjw9ji8kh860n1a513k9ai"; diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix index 744a0f76ff0..39d4918a70b 100644 --- a/pkgs/development/interpreters/falcon/default.nix +++ b/pkgs/development/interpreters/falcon/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, zlib, sqlite }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "falcon"; version = "2013-09-19"; diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index 07ce9347cf7..bba54c83f5c 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -8,7 +8,7 @@ let version = "0.10.2"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchFromBitbucket { owner = "rude"; diff --git a/pkgs/development/interpreters/love/11.1.nix b/pkgs/development/interpreters/love/11.1.nix index 7adaca7b865..1c64c417cb0 100644 --- a/pkgs/development/interpreters/love/11.1.nix +++ b/pkgs/development/interpreters/love/11.1.nix @@ -8,7 +8,7 @@ let version = "11.2"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchFromBitbucket { owner = "rude"; diff --git a/pkgs/development/interpreters/lua-5/filesystem.nix b/pkgs/development/interpreters/lua-5/filesystem.nix index 0ac1fa30e2f..64050ea95f8 100644 --- a/pkgs/development/interpreters/lua-5/filesystem.nix +++ b/pkgs/development/interpreters/lua-5/filesystem.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lua5 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "1.6.2"; pname = "lua-filesystem"; isLibrary = true; diff --git a/pkgs/development/interpreters/lua-5/setup-hook.sh b/pkgs/development/interpreters/lua-5/setup-hook.sh index 3989bedffdb..f7e56b62ac9 100644 --- a/pkgs/development/interpreters/lua-5/setup-hook.sh +++ b/pkgs/development/interpreters/lua-5/setup-hook.sh @@ -1,47 +1,47 @@ # set -e nix_print() { - if [ ${NIX_DEBUG:-0} -ge $1 ]; then - echo "$2" - fi + if [ ${NIX_DEBUG:-0} -ge $1 ]; then + echo "$2" + fi } nix_debug() { - nix_print 3 "$1" + nix_print 3 "$1" } addToLuaSearchPathWithCustomDelimiter() { - local varName="$1" - local absPattern="$2" - # delete longest match starting from the lua placeholder '?' - local topDir="${absPattern%%\?*}" + local varName="$1" + local absPattern="$2" + # delete longest match starting from the lua placeholder '?' + local topDir="${absPattern%%\?*}" - # export only if the folder exists else LUA_PATH grows too big - if [ ! -d "$topDir" ]; then return; fi + # export only if the folder exists else LUA_PATH/LUA_CPATH grow too large + if [[ ! -d "$topDir" ]]; then return; fi - export "${varName}=${!varName:+${!varName};}${absPattern}" + # export only if we haven't already got this dir in the search path + if [[ ${!varName} == *"$absPattern"* ]]; then return; fi + + export "${varName}=${!varName:+${!varName};}${absPattern}" } addToLuaPath() { - local dir="$1" - - if [[ ! -d "$dir" ]]; then - nix_debug "$dir not a directory abort" - return 0 - fi - cd "$dir" - for pattern in @luapathsearchpaths@; - do - addToLuaSearchPathWithCustomDelimiter NIX_LUA_PATH "$PWD/$pattern" - done - - # LUA_CPATH - for pattern in @luacpathsearchpaths@; - do - addToLuaSearchPathWithCustomDelimiter NIX_LUA_CPATH "$PWD/$pattern" - done - cd - >/dev/null + local dir="$1" + + if [[ ! -d "$dir" ]]; then + nix_debug "$dir not a directory abort" + return 0 + fi + cd "$dir" + for pattern in @luapathsearchpaths@; do + addToLuaSearchPathWithCustomDelimiter LUA_PATH "$PWD/$pattern" + done + + # LUA_CPATH + for pattern in @luacpathsearchpaths@; do + addToLuaSearchPathWithCustomDelimiter LUA_CPATH "$PWD/$pattern" + done + cd - >/dev/null } addEnvHooks "$hostOffset" addToLuaPath - diff --git a/pkgs/development/interpreters/lua-5/wrap.sh b/pkgs/development/interpreters/lua-5/wrap.sh index 545a0ae271c..5941ff4a6b9 100644 --- a/pkgs/development/interpreters/lua-5/wrap.sh +++ b/pkgs/development/interpreters/lua-5/wrap.sh @@ -4,73 +4,72 @@ set -e wrapLuaPrograms() { - wrapLuaProgramsIn "$out/bin" "$out $luaPath" + wrapLuaProgramsIn "$out/bin" "$out $luaPath" } # Builds environment variables like LUA_PATH and PATH walking through closure # of dependencies. buildLuaPath() { - local luaPath="$1" - local path - - # Create an empty table of paths (see doc on loadFromPropagatedInputs - # for how this is used). Build up the program_PATH and program_LUA_PATH - # variables. - declare -A luaPathsSeen=() - program_PATH= - luaPathsSeen["@lua@"]=1 - addToSearchPath program_PATH @lua@/bin - for path in $luaPath; do - addToLuaPath "$path" - done + local luaPath="$1" + local path + + # Create an empty table of paths (see doc on loadFromPropagatedInputs + # for how this is used). Build up the program_PATH and program_LUA_PATH + # variables. + declare -A luaPathsSeen=() + program_PATH= + luaPathsSeen["@lua@"]=1 + addToSearchPath program_PATH @lua@/bin + for path in $luaPath; do + addToLuaPath "$path" + done } - # with an executable shell script which will set some environment variables # and then call into the original binary (which has been given a .wrapped suffix). # luaPath is a list of directories wrapLuaProgramsIn() { - local dir="$1" - local luaPath="$2" - local f - - buildLuaPath "$luaPath" - - if [ ! -d "$dir" ]; then - nix_debug "$dir not a directory" - return + local dir="$1" + local luaPath="$2" + local f + + buildLuaPath "$luaPath" + + if [ ! -d "$dir" ]; then + nix_debug "$dir not a directory" + return + fi + + nix_debug "wrapping programs in [$dir]" + + # Find all regular files in the output directory that are executable. + find "$dir" -type f -perm -0100 -print0 | while read -d "" f; do + # Rewrite "#! .../env lua" to "#! /nix/store/.../lua". + # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which + # Lua to use besides one with this hook anyway. + if head -n1 "$f" | grep -q '#!.*/env.*\(lua\)'; then + sed -i "$f" -e "1 s^.*/env[ ]*\(lua\)[^ ]*^#! @executable@^" fi - nix_debug "wrapping programs in [$dir]" - - # Find all regular files in the output directory that are executable. - find "$dir" -type f -perm -0100 -print0 | while read -d "" f; do - # Rewrite "#! .../env lua" to "#! /nix/store/.../lua". - # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which - # Lua to use besides one with this hook anyway. - if head -n1 "$f" | grep -q '#!.*/env.*\(lua\)'; then - sed -i "$f" -e "1 s^.*/env[ ]*\(lua\)[^ ]*^#! @executable@^" - fi - - # wrapProgram creates the executable shell script described - # above. The script will set LUA_(C)PATH and PATH variables! - # (see pkgs/build-support/setup-hooks/make-wrapper.sh) - local -a wrap_args=("$f" - --prefix PATH ':' "$program_PATH" - --prefix LUA_PATH ';' "$NIX_LUA_PATH" - --prefix LUA_CPATH ';' "$NIX_LUA_CPATH" - ) - - # Add any additional arguments provided by makeWrapperArgs - # argument to buildLuaPackage. - # makeWrapperArgs - local -a user_args="($makeWrapperArgs)" - local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}") - - # see setup-hooks/make-wrapper.sh - wrapProgram "${wrapProgramArgs[@]}" - - done + # wrapProgram creates the executable shell script described + # above. The script will set LUA_(C)PATH and PATH variables! + # (see pkgs/build-support/setup-hooks/make-wrapper.sh) + local -a wrap_args=("$f" + --prefix PATH ':' "$program_PATH" + --prefix LUA_PATH ';' "$LUA_PATH" + --prefix LUA_CPATH ';' "$LUA_CPATH" + ) + + # Add any additional arguments provided by makeWrapperArgs + # argument to buildLuaPackage. + # makeWrapperArgs + local -a user_args="($makeWrapperArgs)" + local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}") + + # see setup-hooks/make-wrapper.sh + wrapProgram "${wrapProgramArgs[@]}" + + done } # Adds the lib and bin directories to the LUA_PATH and PATH variables, @@ -78,22 +77,22 @@ wrapLuaProgramsIn() { # `propagated-native-build-inputs`, while avoiding duplicating paths by # flagging the directories it has visited in `luaPathsSeen`. loadFromPropagatedInputs() { - local dir="$1" - # Stop if we've already visited here. - if [ -n "${luaPathsSeen[$dir]}" ]; then - return; - fi - luaPathsSeen[$dir]=1 - - addToLuaPath "$dir" - addToSearchPath program_PATH $dir/bin - - # Inspect the propagated inputs (if they exist) and recur on them. - local prop="$dir/nix-support/propagated-native-build-inputs" - if [ -e "$prop" ]; then - local new_path - for new_path in $(cat $prop); do - loadFromPropagatedInputs "$new_path" - done - fi + local dir="$1" + # Stop if we've already visited here. + if [ -n "${luaPathsSeen[$dir]}" ]; then + return + fi + luaPathsSeen[$dir]=1 + + addToLuaPath "$dir" + addToSearchPath program_PATH $dir/bin + + # Inspect the propagated inputs (if they exist) and recur on them. + local prop="$dir/nix-support/propagated-native-build-inputs" + if [ -e "$prop" ]; then + local new_path + for new_path in $(cat $prop); do + loadFromPropagatedInputs "$new_path" + done + fi } diff --git a/pkgs/development/interpreters/lua-5/wrapper.nix b/pkgs/development/interpreters/lua-5/wrapper.nix index 14bd4a41646..816744e61cf 100644 --- a/pkgs/development/interpreters/lua-5/wrapper.nix +++ b/pkgs/development/interpreters/lua-5/wrapper.nix @@ -43,7 +43,7 @@ let rm -f "$out/bin/$prg" if [ -x "$prg" ]; then nix_debug "Making wrapper $prg" - makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$NIX_LUA_PATH" --suffix LUA_CPATH ';' "$NIX_LUA_CPATH" ${stdenv.lib.concatStringsSep " " makeWrapperArgs} + makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$LUA_PATH" --suffix LUA_CPATH ';' "$LUA_CPATH" ${stdenv.lib.concatStringsSep " " makeWrapperArgs} fi fi done diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index afd2627d20e..e44209799a3 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -13,7 +13,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "maude"; inherit version; diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix index cd325c94948..686cfee19a6 100644 --- a/pkgs/development/interpreters/metamath/default.nix +++ b/pkgs/development/interpreters/metamath/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "metamath"; version = "0.172"; diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix index 009f9b48ea4..30a601ef8df 100644 --- a/pkgs/development/interpreters/pyrex/0.9.5.nix +++ b/pkgs/development/interpreters/pyrex/0.9.5.nix @@ -2,8 +2,9 @@ let version = "0.9.5.1.1"; in -python2Packages.buildPythonPackage rec { - name = "pyrex-${version}"; +python2Packages.buildPythonPackage { + pname = "pyrex"; + inherit version; src = fetchurl { url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz"; diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix index d79cd58c159..69a93089188 100644 --- a/pkgs/development/interpreters/pyrex/0.9.6.nix +++ b/pkgs/development/interpreters/pyrex/0.9.6.nix @@ -2,8 +2,9 @@ let version = "0.9.6.4"; in -python2Packages.buildPythonPackage rec { - name = "pyrex-${version}"; +python2Packages.buildPythonPackage { + pname = "pyrex"; + inherit version; src = fetchurl { url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz"; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 60d067c1bf2..1de1c401c37 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -142,6 +142,8 @@ in with passthru; stdenv.mkDerivation { "--without-ensurepip" "--with-system-expat" "--with-system-ffi" + ] ++ optionals (sqlite != null && isPy3k) [ + "--enable-loadable-sqlite-extensions" ] ++ optionals (openssl != null) [ "--with-openssl=${openssl.dev}" ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix index 73d1e0ea9fd..e27959c05e8 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "python27-docs-html-2.7.16"; src = fetchurl { url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-html.tar.bz2; diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix index 54c0954ae5d..0226f7cd880 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "python27-docs-pdf-a4-2.7.16"; src = fetchurl { url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-a4.tar.bz2; diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix index 059908029c0..88d1a693166 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "python27-docs-pdf-letter-2.7.16"; src = fetchurl { url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-letter.tar.bz2; diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix index 53c5aa3b629..ea35e9fb6a3 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "python27-docs-text-2.7.16"; src = fetchurl { url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-text.tar.bz2; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix index 5a6dcc63225..45783eb8263 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "python37-docs-html-3.7.2"; src = fetchurl { url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-html.tar.bz2; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix index a122d7519f5..998af644c71 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "python37-docs-pdf-a4-3.7.2"; src = fetchurl { url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-a4.tar.bz2; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix index 4473f2e351c..1c6aea5ee3c 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "python37-docs-pdf-letter-3.7.2"; src = fetchurl { url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-letter.tar.bz2; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix index d9d21bfe3a5..32388780f6f 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "python37-docs-text-3.7.2"; src = fetchurl { url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-text.tar.bz2; diff --git a/pkgs/development/interpreters/python/cpython/docs/template.nix b/pkgs/development/interpreters/python/cpython/docs/template.nix index 4a0c84fb272..3cc0c2a9ee8 100644 --- a/pkgs/development/interpreters/python/cpython/docs/template.nix +++ b/pkgs/development/interpreters/python/cpython/docs/template.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "pythonMAJORMINOR-docs-TYPE-VERSION"; src = fetchurl { url = URL; diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 3e86ddef4ed..8154a87f667 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -17,7 +17,7 @@ with stdenv.lib; let isPy3k = substring 0 1 pythonVersion == "3"; - passthru = passthruFun rec { + passthru = passthruFun { inherit self sourceVersion pythonVersion packageOverrides; implementation = "pypy"; libPrefix = "pypy${pythonVersion}"; diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index ca37c65c794..7ac8037293f 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -27,7 +27,7 @@ with stdenv.lib; let isPy3k = majorVersion == "3"; - passthru = passthruFun rec { + passthru = passthruFun { inherit self sourceVersion pythonVersion packageOverrides; implementation = "pypy"; libPrefix = "pypy${pythonVersion}"; diff --git a/pkgs/development/interpreters/qnial/default.nix b/pkgs/development/interpreters/qnial/default.nix index 3b41e14be85..d49886da8f5 100644 --- a/pkgs/development/interpreters/qnial/default.nix +++ b/pkgs/development/interpreters/qnial/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qnial"; version = "6.3"; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 35bd1729866..f13adc21d9e 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { version = "7.3"; # always change at once with ./minimal.nix src = (stdenv.lib.makeOverridable ({ name, sha256 }: - fetchurl rec { + fetchurl { url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; inherit sha256; } diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index cfe76a2caa1..9ddd2028d91 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -30,11 +30,13 @@ let baseruby = self.override { useRailsExpress = false; docSupport = false; + rubygemsSupport = false; }; self = lib.makeOverridable ( { stdenv, buildPackages, lib , fetchurl, fetchFromSavannah, fetchFromGitHub , useRailsExpress ? true + , rubygemsSupport ? true , zlib, zlibSupport ? true , openssl, opensslSupport ? true , gdbm, gdbmSupport ? true @@ -90,10 +92,12 @@ let (import ./patchsets.nix { inherit patchSet useRailsExpress ops; patchLevel = ver.patchLevel; - })."${ver.majMinTiny}"; + }).${ver.majMinTiny}; - postUnpack = '' - cp -r ${rubygems} $sourceRoot/rubygems + postUnpack = opString rubygemsSupport '' + rm -rf $sourceRoot/{lib,test}/rubygems* + cp -r ${rubygems}/lib/rubygems* $sourceRoot/lib + cp -r ${rubygems}/test/rubygems $sourceRoot/test ''; postPatch = if atLeast25 then '' @@ -138,12 +142,6 @@ let installFlags = stdenv.lib.optionalString docSupport "install-doc"; # Bundler tries to create this directory postInstall = '' - # Update rubygems - pushd rubygems - chmod +w bundler/bundler.gemspec - ${buildRuby} setup.rb --destdir $GEM_HOME - popd - # Remove unnecessary groff reference from runtime closure, since it's big sed -i '/NROFF/d' $out/lib/ruby/*/*/rbconfig.rb diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 5bf59a96f74..62d8f53b3d3 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -1,6 +1,6 @@ { patchSet, useRailsExpress, ops, patchLevel }: -rec { +{ "2.3.8" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index b9548284355..1042caa41ac 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "rubygems"; - version = "3.0.3"; + version = "3.0.6"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - sha256 = "0b6b9ads8522804xv8b8498gqwsv4qawv13f81kyc7g966y7lfmy"; + sha256 = "1ca1i4xmggizr59m6p28gprlvshczsbx30q8iyzxb2vj4jn8arzx"; }; patches = [ diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix index c6c8caa7cf3..43f5758e4c4 100644 --- a/pkgs/development/interpreters/self/default.nix +++ b/pkgs/development/interpreters/self/default.nix @@ -1,6 +1,6 @@ { fetchgit, stdenv, xorg, makeWrapper, ncurses, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self # so that it can be written to when using the Self transposer. Running 'Self' # after installation runs without an image. You can then build a Self image with: diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index e00af621347..8f9477c4c4a 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -1,6 +1,6 @@ { stdenv, lib, autoconf213, fetchurl, fetchpatch, pkgconfig, nspr, perl, python2, zip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "spidermonkey"; version = "1.8.5"; diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix index 1e1ea10ef6d..238afd4bd04 100644 --- a/pkgs/development/interpreters/spidermonkey/52.nix +++ b/pkgs/development/interpreters/spidermonkey/52.nix @@ -2,7 +2,7 @@ let version = "52.9.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "spidermonkey"; inherit version; diff --git a/pkgs/development/interpreters/spidermonkey/60.nix b/pkgs/development/interpreters/spidermonkey/60.nix index 175b2f2e767..f62638dd838 100644 --- a/pkgs/development/interpreters/spidermonkey/60.nix +++ b/pkgs/development/interpreters/spidermonkey/60.nix @@ -5,7 +5,7 @@ with stdenv.lib; let version = "60.4.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "spidermonkey"; inherit version; diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index d4ec1677bfb..3c585c3f07f 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -5,7 +5,7 @@ , ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tcl"; inherit version; diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix index 30ea124cf4b..bb4a2d01499 100644 --- a/pkgs/development/interpreters/unicon-lang/default.nix +++ b/pkgs/development/interpreters/unicon-lang/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip, libX11, libXt }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "unicon-lang"; version = "11.7"; src = fetchurl { diff --git a/pkgs/development/interpreters/wasm-gc/default.nix b/pkgs/development/interpreters/wasm-gc/default.nix index ac291668e2d..44ac11be540 100644 --- a/pkgs/development/interpreters/wasm-gc/default.nix +++ b/pkgs/development/interpreters/wasm-gc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "wasm-gc-${version}"; + pname = "wasm-gc"; version = "0.1.6"; src = fetchFromGitHub { diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 90fc38afa06..b53b3ed9dbf 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -1,6 +1,6 @@ { rustPlatform, fetchFromGitHub, lib, python, cmake, llvmPackages, clang }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "wasmtime"; version = "20190521"; diff --git a/pkgs/development/java-modules/apache/ant-launcher.nix b/pkgs/development/java-modules/apache/ant-launcher.nix index e6a2b0cae99..e5f4d5f6ee0 100644 --- a/pkgs/development/java-modules/apache/ant-launcher.nix +++ b/pkgs/development/java-modules/apache/ant-launcher.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ antLauncher_1_8_2 = map (obj: fetchMaven { version = "1.8.2"; artifactId = "ant-launcher"; diff --git a/pkgs/development/java-modules/apache/ant.nix b/pkgs/development/java-modules/apache/ant.nix index b4a6aa68f44..5de82b1703b 100644 --- a/pkgs/development/java-modules/apache/ant.nix +++ b/pkgs/development/java-modules/apache/ant.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ ant_1_8_2 = map (obj: fetchMaven { version = "1.8.2"; artifactId = "ant"; diff --git a/pkgs/development/java-modules/apache/commons-cli.nix b/pkgs/development/java-modules/apache/commons-cli.nix index 050d511b0a1..5cb25a0f379 100644 --- a/pkgs/development/java-modules/apache/commons-cli.nix +++ b/pkgs/development/java-modules/apache/commons-cli.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ commonsCli_1_0 = map (obj: fetchMaven { version = "1.0"; artifactId = "commons-cli"; diff --git a/pkgs/development/java-modules/apache/commons-io.nix b/pkgs/development/java-modules/apache/commons-io.nix index 70ce940ccf1..28bb9d381f9 100644 --- a/pkgs/development/java-modules/apache/commons-io.nix +++ b/pkgs/development/java-modules/apache/commons-io.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ commonsIo_2_1 = map (obj: fetchMaven { version = "2.1"; artifactId = "commons-io"; diff --git a/pkgs/development/java-modules/apache/commons-lang.nix b/pkgs/development/java-modules/apache/commons-lang.nix index a2d71e9db0c..501da6d204d 100644 --- a/pkgs/development/java-modules/apache/commons-lang.nix +++ b/pkgs/development/java-modules/apache/commons-lang.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ commonsLang_2_1 = map (obj: fetchMaven { version = "2.1"; artifactId = "commons-lang"; diff --git a/pkgs/development/java-modules/apache/commons-lang3.nix b/pkgs/development/java-modules/apache/commons-lang3.nix index 63f68b92543..3bbbe9d2e39 100644 --- a/pkgs/development/java-modules/apache/commons-lang3.nix +++ b/pkgs/development/java-modules/apache/commons-lang3.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ commonsLang3_3_1 = map (obj: fetchMaven { version = "3.1"; artifactId = "commons-lang3"; diff --git a/pkgs/development/java-modules/apache/commons-logging-api.nix b/pkgs/development/java-modules/apache/commons-logging-api.nix index 47750abe462..befb2003d01 100644 --- a/pkgs/development/java-modules/apache/commons-logging-api.nix +++ b/pkgs/development/java-modules/apache/commons-logging-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ commonsLoggingApi_1_1 = map (obj: fetchMaven { version = "1.1"; artifactId = "commons-logging-api"; diff --git a/pkgs/development/java-modules/apache/xbean-reflect.nix b/pkgs/development/java-modules/apache/xbean-reflect.nix index f0614ec99e3..8f7c35b716f 100644 --- a/pkgs/development/java-modules/apache/xbean-reflect.nix +++ b/pkgs/development/java-modules/apache/xbean-reflect.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ xbeanReflect_3_4 = map (obj: fetchMaven { version = "3.4"; artifactId = "xbean-reflect"; diff --git a/pkgs/development/java-modules/beanshell/bsh.nix b/pkgs/development/java-modules/beanshell/bsh.nix index 41756bb80d5..783fdc8679c 100644 --- a/pkgs/development/java-modules/beanshell/bsh.nix +++ b/pkgs/development/java-modules/beanshell/bsh.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ bsh_2_0_b4 = map (obj: fetchMaven { version = "2.0b4"; artifactId = "bsh"; diff --git a/pkgs/development/java-modules/classworlds/classworlds.nix b/pkgs/development/java-modules/classworlds/classworlds.nix index f8bbc07f102..3561c0b6e5e 100644 --- a/pkgs/development/java-modules/classworlds/classworlds.nix +++ b/pkgs/development/java-modules/classworlds/classworlds.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ classworlds_1_1_alpha2 = map (obj: fetchMaven { version = "1.1-alpha-2"; artifactId = "classworlds"; diff --git a/pkgs/development/java-modules/collections.nix b/pkgs/development/java-modules/collections.nix index 39b274b5030..83f7a95af81 100644 --- a/pkgs/development/java-modules/collections.nix +++ b/pkgs/development/java-modules/collections.nix @@ -2,7 +2,7 @@ with pkgs.javaPackages; -rec { +{ mavenLibs_2_0_1 = [ mavenArtifact_2_0_1 mavenArtifactManager_2_0_1 diff --git a/pkgs/development/java-modules/eclipse/aether-util.nix b/pkgs/development/java-modules/eclipse/aether-util.nix index 60aac560b9b..6ebca58c44e 100644 --- a/pkgs/development/java-modules/eclipse/aether-util.nix +++ b/pkgs/development/java-modules/eclipse/aether-util.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ aetherUtil_0_9_0_M2 = map (obj: fetchMaven { version = "0.9.0.M2"; artifactId = "aether-util"; diff --git a/pkgs/development/java-modules/findbugs/jsr305.nix b/pkgs/development/java-modules/findbugs/jsr305.nix index 2e842410aaf..7816ab49d61 100644 --- a/pkgs/development/java-modules/findbugs/jsr305.nix +++ b/pkgs/development/java-modules/findbugs/jsr305.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ findbugsJsr305_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "jsr305"; diff --git a/pkgs/development/java-modules/google/collections.nix b/pkgs/development/java-modules/google/collections.nix index ec874c73e36..b5b4551dd97 100644 --- a/pkgs/development/java-modules/google/collections.nix +++ b/pkgs/development/java-modules/google/collections.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ googleCollections_1_0 = map (obj: fetchMaven { version = "1.0"; artifactId = "google-collections"; diff --git a/pkgs/development/java-modules/hamcrest/all.nix b/pkgs/development/java-modules/hamcrest/all.nix index bab9e1b115d..73c27c4af8b 100644 --- a/pkgs/development/java-modules/hamcrest/all.nix +++ b/pkgs/development/java-modules/hamcrest/all.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ hamcrestAll_1_3 = map (obj: fetchMaven { version = "1.3"; artifactId = "hamcrest-all"; diff --git a/pkgs/development/java-modules/hamcrest/core.nix b/pkgs/development/java-modules/hamcrest/core.nix index 3842b8c5afa..4145191fdd9 100644 --- a/pkgs/development/java-modules/hamcrest/core.nix +++ b/pkgs/development/java-modules/hamcrest/core.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ hamcrestCore_1_3 = map (obj: fetchMaven { version = "1.3"; artifactId = "hamcrest-core"; diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix index abb549110a8..d179fb53178 100644 --- a/pkgs/development/java-modules/jogl/default.nix +++ b/pkgs/development/java-modules/jogl/default.nix @@ -15,7 +15,7 @@ in sha256 = "00hybisjwqs88p24dds652bzrwbbmhn2dpx56kp4j6xpadkp33d0"; fetchSubmodules = true; }; - in stdenv.mkDerivation rec { + in stdenv.mkDerivation { pname = "jogl"; inherit version; diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix index a7bfa545908..6f86cede512 100644 --- a/pkgs/development/java-modules/junit/default.nix +++ b/pkgs/development/java-modules/junit/default.nix @@ -6,7 +6,7 @@ let poms = import (../poms.nix) { inherit fetchMaven; }; collections = import (../collections.nix) { inherit pkgs; }; in rec { - junitGen = { mavenDeps, sha512, version }: mavenbuild rec { + junitGen = { mavenDeps, sha512, version }: mavenbuild { inherit mavenDeps sha512 version; name = "junit-${version}"; diff --git a/pkgs/development/java-modules/log4j/default.nix b/pkgs/development/java-modules/log4j/default.nix index a8b1ea9f021..e95c0847aac 100644 --- a/pkgs/development/java-modules/log4j/default.nix +++ b/pkgs/development/java-modules/log4j/default.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ log4j_1_2_12 = map (obj: fetchMaven { version = "1.2.12"; artifactId = "log4j"; diff --git a/pkgs/development/java-modules/m2install.nix b/pkgs/development/java-modules/m2install.nix index 7ebe655580e..3a289c9c9c4 100644 --- a/pkgs/development/java-modules/m2install.nix +++ b/pkgs/development/java-modules/m2install.nix @@ -5,11 +5,11 @@ let name = "${artifactId}-${version}"; m2Path = "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}/${version}"; m2File = "${name}${suffix}.${type}"; - src = fetchurl rec { + src = fetchurl { inherit sha512; url = "mirror://maven/${m2Path}/${m2File}"; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit name m2Path m2File src; installPhase = '' diff --git a/pkgs/development/java-modules/maven-hello/default.nix b/pkgs/development/java-modules/maven-hello/default.nix index f3d5fb3e934..b8e128ac728 100644 --- a/pkgs/development/java-modules/maven-hello/default.nix +++ b/pkgs/development/java-modules/maven-hello/default.nix @@ -5,7 +5,7 @@ with pkgs.javaPackages; let poms = import ../poms.nix { inherit fetchMaven; }; in rec { - mavenHelloRec = { mavenDeps, sha512, version, skipTests ? true, quiet ? true }: mavenbuild rec { + mavenHelloRec = { mavenDeps, sha512, version, skipTests ? true, quiet ? true }: mavenbuild { inherit mavenDeps sha512 version skipTests quiet; name = "maven-hello-${version}"; diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix index f63c91cd360..c1fab1e9bc9 100644 --- a/pkgs/development/java-modules/maven-minimal.nix +++ b/pkgs/development/java-modules/maven-minimal.nix @@ -8,7 +8,7 @@ let fetchMaven = pkgs.callPackage ./m2install.nix { }; plugins = import ./mavenPlugins.nix { inherit pkgs; }; poms = import ./poms.nix { inherit fetchMaven; }; -in rec { +in { # Maven needs all of these to function mavenMinimal = flatten collections.mavenLibs_2_0_6 diff --git a/pkgs/development/java-modules/maven/archiver.nix b/pkgs/development/java-modules/maven/archiver.nix index 14c5a99d42f..9965f86f72b 100644 --- a/pkgs/development/java-modules/maven/archiver.nix +++ b/pkgs/development/java-modules/maven/archiver.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenArchiver_2_5 = map (obj: fetchMaven { version = "2.5"; artifactId = "maven-archiver"; diff --git a/pkgs/development/java-modules/maven/artifact-manager.nix b/pkgs/development/java-modules/maven/artifact-manager.nix index 0796d066510..5bf3ef01bc6 100644 --- a/pkgs/development/java-modules/maven/artifact-manager.nix +++ b/pkgs/development/java-modules/maven/artifact-manager.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenArtifactManager_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-artifact-manager"; diff --git a/pkgs/development/java-modules/maven/artifact.nix b/pkgs/development/java-modules/maven/artifact.nix index bb0e578d5d6..80e3392abd2 100644 --- a/pkgs/development/java-modules/maven/artifact.nix +++ b/pkgs/development/java-modules/maven/artifact.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenArtifact_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-artifact"; diff --git a/pkgs/development/java-modules/maven/common-artifact-filters.nix b/pkgs/development/java-modules/maven/common-artifact-filters.nix index 948dbc3baf6..8c388667991 100644 --- a/pkgs/development/java-modules/maven/common-artifact-filters.nix +++ b/pkgs/development/java-modules/maven/common-artifact-filters.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenCommonArtifactFilters_1_2 = map (obj: fetchMaven { version = "1.2"; artifactId = "maven-common-artifact-filters"; diff --git a/pkgs/development/java-modules/maven/core.nix b/pkgs/development/java-modules/maven/core.nix index 5b45f89e9d5..a1ea9292a51 100644 --- a/pkgs/development/java-modules/maven/core.nix +++ b/pkgs/development/java-modules/maven/core.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenCore_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-core"; diff --git a/pkgs/development/java-modules/maven/dependency-tree.nix b/pkgs/development/java-modules/maven/dependency-tree.nix index 00d089ea249..aa3a93849c2 100644 --- a/pkgs/development/java-modules/maven/dependency-tree.nix +++ b/pkgs/development/java-modules/maven/dependency-tree.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenDependencyTree_2_1 = map (obj: fetchMaven { version = "2.1"; artifactId = "maven-dependency-tree"; diff --git a/pkgs/development/java-modules/maven/doxia-sink-api.nix b/pkgs/development/java-modules/maven/doxia-sink-api.nix index 9fa1051cd80..8314abe4924 100644 --- a/pkgs/development/java-modules/maven/doxia-sink-api.nix +++ b/pkgs/development/java-modules/maven/doxia-sink-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenDoxiaSinkApi_1_0_alpha6 = map (obj: fetchMaven { version = "1.0-alpha-6"; artifactId = "doxia-sink-api"; diff --git a/pkgs/development/java-modules/maven/enforcer.nix b/pkgs/development/java-modules/maven/enforcer.nix index 014f678bc14..c7a1d212e0e 100644 --- a/pkgs/development/java-modules/maven/enforcer.nix +++ b/pkgs/development/java-modules/maven/enforcer.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenEnforcerApi_1_3_1 = map (obj: fetchMaven { version = "1.3.1"; artifactId = "enforcer-api"; diff --git a/pkgs/development/java-modules/maven/error-diagnostics.nix b/pkgs/development/java-modules/maven/error-diagnostics.nix index 80cbf993a60..f16f10462ff 100644 --- a/pkgs/development/java-modules/maven/error-diagnostics.nix +++ b/pkgs/development/java-modules/maven/error-diagnostics.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenErrorDiagnostics_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-error-diagnostics"; diff --git a/pkgs/development/java-modules/maven/filtering.nix b/pkgs/development/java-modules/maven/filtering.nix index 963d6c6b646..f1e2e551cee 100644 --- a/pkgs/development/java-modules/maven/filtering.nix +++ b/pkgs/development/java-modules/maven/filtering.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenFiltering_1_1 = map (obj: fetchMaven { version = "1.1"; artifactId = "maven-filtering"; diff --git a/pkgs/development/java-modules/maven/model.nix b/pkgs/development/java-modules/maven/model.nix index 2ae3bfe6034..147b15b6e40 100644 --- a/pkgs/development/java-modules/maven/model.nix +++ b/pkgs/development/java-modules/maven/model.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenModel_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-model"; diff --git a/pkgs/development/java-modules/maven/monitor.nix b/pkgs/development/java-modules/maven/monitor.nix index ce6c7c17694..609745e9422 100644 --- a/pkgs/development/java-modules/maven/monitor.nix +++ b/pkgs/development/java-modules/maven/monitor.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenMonitor_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-monitor"; diff --git a/pkgs/development/java-modules/maven/plugin-annotations.nix b/pkgs/development/java-modules/maven/plugin-annotations.nix index f852cc957a5..bf8d608488e 100644 --- a/pkgs/development/java-modules/maven/plugin-annotations.nix +++ b/pkgs/development/java-modules/maven/plugin-annotations.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenPluginAnnotations_3_1 = map (obj: fetchMaven { version = "3.1"; artifactId = "maven-plugin-annotations"; diff --git a/pkgs/development/java-modules/maven/plugin-api.nix b/pkgs/development/java-modules/maven/plugin-api.nix index be9642b0e20..55fb0d2c5dd 100644 --- a/pkgs/development/java-modules/maven/plugin-api.nix +++ b/pkgs/development/java-modules/maven/plugin-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenPluginApi_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-plugin-api"; diff --git a/pkgs/development/java-modules/maven/plugin-descriptor.nix b/pkgs/development/java-modules/maven/plugin-descriptor.nix index dbdc09a4673..7f5c22fe3b3 100644 --- a/pkgs/development/java-modules/maven/plugin-descriptor.nix +++ b/pkgs/development/java-modules/maven/plugin-descriptor.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenPluginDescriptor_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-plugin-descriptor"; diff --git a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix index 9e11c0f4082..4ff07574dc9 100644 --- a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix +++ b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenPluginParameterDocumenter_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-plugin-parameter-documenter"; diff --git a/pkgs/development/java-modules/maven/plugin-registry.nix b/pkgs/development/java-modules/maven/plugin-registry.nix index f0074ef816e..a7bb92e645d 100644 --- a/pkgs/development/java-modules/maven/plugin-registry.nix +++ b/pkgs/development/java-modules/maven/plugin-registry.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenPluginRegistry_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-plugin-registry"; diff --git a/pkgs/development/java-modules/maven/plugin-testing-harness.nix b/pkgs/development/java-modules/maven/plugin-testing-harness.nix index a65f1962048..4cd32d508f3 100644 --- a/pkgs/development/java-modules/maven/plugin-testing-harness.nix +++ b/pkgs/development/java-modules/maven/plugin-testing-harness.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenPluginTestingHarness_1_1 = map (obj: fetchMaven { version = "1.1"; artifactId = "maven-plugin-testing-harness"; diff --git a/pkgs/development/java-modules/maven/profile.nix b/pkgs/development/java-modules/maven/profile.nix index 6940fafae82..c40f87f1c45 100644 --- a/pkgs/development/java-modules/maven/profile.nix +++ b/pkgs/development/java-modules/maven/profile.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenProfile_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-profile"; diff --git a/pkgs/development/java-modules/maven/project.nix b/pkgs/development/java-modules/maven/project.nix index 0b07d8b8679..fad53a0250b 100644 --- a/pkgs/development/java-modules/maven/project.nix +++ b/pkgs/development/java-modules/maven/project.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenProject_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-project"; diff --git a/pkgs/development/java-modules/maven/reporting-api.nix b/pkgs/development/java-modules/maven/reporting-api.nix index 8a508cf1505..87999d452fc 100644 --- a/pkgs/development/java-modules/maven/reporting-api.nix +++ b/pkgs/development/java-modules/maven/reporting-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenReportingApi_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-reporting-api"; diff --git a/pkgs/development/java-modules/maven/repository-metadata.nix b/pkgs/development/java-modules/maven/repository-metadata.nix index 443a1acd451..0d8f55737b7 100644 --- a/pkgs/development/java-modules/maven/repository-metadata.nix +++ b/pkgs/development/java-modules/maven/repository-metadata.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenRepositoryMetadata_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-repository-metadata"; diff --git a/pkgs/development/java-modules/maven/settings.nix b/pkgs/development/java-modules/maven/settings.nix index 6b42082cfd8..09e0170945d 100644 --- a/pkgs/development/java-modules/maven/settings.nix +++ b/pkgs/development/java-modules/maven/settings.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSettings_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-settings"; diff --git a/pkgs/development/java-modules/maven/shared-incremental.nix b/pkgs/development/java-modules/maven/shared-incremental.nix index 67c44986d0a..9fa74f8bfe7 100644 --- a/pkgs/development/java-modules/maven/shared-incremental.nix +++ b/pkgs/development/java-modules/maven/shared-incremental.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSharedIncremental_1_1 = map (obj: fetchMaven { version = "1.1"; artifactId = "maven-shared-incremental"; diff --git a/pkgs/development/java-modules/maven/shared-utils.nix b/pkgs/development/java-modules/maven/shared-utils.nix index b3cfc928091..38addcfe8aa 100644 --- a/pkgs/development/java-modules/maven/shared-utils.nix +++ b/pkgs/development/java-modules/maven/shared-utils.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSharedUtils_0_1 = map (obj: fetchMaven { version = "0.1"; artifactId = "maven-shared-utils"; diff --git a/pkgs/development/java-modules/maven/surefire-api.nix b/pkgs/development/java-modules/maven/surefire-api.nix index c1f7fcc3f76..9ad284365d9 100644 --- a/pkgs/development/java-modules/maven/surefire-api.nix +++ b/pkgs/development/java-modules/maven/surefire-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSurefireApi_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; artifactId = "surefire-api"; diff --git a/pkgs/development/java-modules/maven/surefire-booter.nix b/pkgs/development/java-modules/maven/surefire-booter.nix index b62aa86bf45..41f9848d5cd 100644 --- a/pkgs/development/java-modules/maven/surefire-booter.nix +++ b/pkgs/development/java-modules/maven/surefire-booter.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSurefireBooter_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; artifactId = "surefire-booter"; diff --git a/pkgs/development/java-modules/maven/surefire-common.nix b/pkgs/development/java-modules/maven/surefire-common.nix index bc0573f6b70..2f4617eff8c 100644 --- a/pkgs/development/java-modules/maven/surefire-common.nix +++ b/pkgs/development/java-modules/maven/surefire-common.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSurefireCommon_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; artifactId = "maven-surefire-common"; diff --git a/pkgs/development/java-modules/maven/surefire-junit4.nix b/pkgs/development/java-modules/maven/surefire-junit4.nix index 1374080d087..d67177d80d2 100644 --- a/pkgs/development/java-modules/maven/surefire-junit4.nix +++ b/pkgs/development/java-modules/maven/surefire-junit4.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSurefireJunit4_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; artifactId = "surefire-junit4"; diff --git a/pkgs/development/java-modules/maven/toolchain.nix b/pkgs/development/java-modules/maven/toolchain.nix index 864d3b98f7b..91f8fdb77a4 100644 --- a/pkgs/development/java-modules/maven/toolchain.nix +++ b/pkgs/development/java-modules/maven/toolchain.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenToolchain_1_0 = map (obj: fetchMaven { version = "1.0"; artifactId = "maven-toolchain"; diff --git a/pkgs/development/java-modules/mavenPlugins.nix b/pkgs/development/java-modules/mavenPlugins.nix index 8cc79dc1d22..e481f5d250a 100644 --- a/pkgs/development/java-modules/mavenPlugins.nix +++ b/pkgs/development/java-modules/mavenPlugins.nix @@ -5,7 +5,7 @@ with pkgs.javaPackages; let fetchMaven = pkgs.callPackage ./m2install.nix { }; -in rec { +in { inherit fetchMaven; animalSniffer_1_11 = map (obj: fetchMaven { @@ -19,7 +19,7 @@ in rec { { type = "jar"; sha512 = "24dih4wp7p1rddvxcznlz42yxhqlln5ljdbvwnp75rsyf3ng25zv881ixk5qx8canr1lxx4kh22kwkaahz3qnw54fqn7w5z58m5768n"; } ]; - mavenClean_2_5 = map (obj: fetchMaven rec { + mavenClean_2_5 = map (obj: fetchMaven { version = "2.5"; artifactId = "maven-clean-plugin"; groupId = "org.apache.maven.plugins"; @@ -30,7 +30,7 @@ in rec { { type = "jar"; sha512 = "2fprppwpmzyvaynadm6slk382khlpf5s8sbi5x249qcaw2vkg5n77q79lgq981v9kjlr5wighjzpjqv8gdig45m2p37mcfwsy3jsv89"; } ]; - mavenCompiler_3_1 = map (obj: fetchMaven rec { + mavenCompiler_3_1 = map (obj: fetchMaven { version = "3.1"; artifactId = "maven-compiler-plugin"; groupId = "org.apache.maven.plugins"; @@ -41,7 +41,7 @@ in rec { { type = "jar"; sha512 = "1dvq13yc8yacxr66pkvwwd4cvx0jln8dv9fh5gmd5vir05h8l5j4y324r1bklnzpx0ancs5ad8z944zgmpaq3w195kfsarmndp0gv2y"; } ]; - mavenEnforcer_1_3_1 = map (obj: fetchMaven rec { + mavenEnforcer_1_3_1 = map (obj: fetchMaven { version = "1.3.1"; artifactId = "maven-enforcer-plugin"; groupId = "org.apache.maven.plugins"; @@ -52,7 +52,7 @@ in rec { { type = "jar"; sha512 = "15sb9qmxgbq82nzc9x66152va121vf33nn0ah2g4z169cv6jnjq05gk1472k59imypvwsh9hd3hqi9q6g8d0sawgk5l1ax900cx7n25"; } ]; - mavenInstall_2_4 = map (obj: fetchMaven rec { + mavenInstall_2_4 = map (obj: fetchMaven { version = "2.4"; artifactId = "maven-install-plugin"; groupId = "org.apache.maven.plugins"; @@ -63,7 +63,7 @@ in rec { { type = "jar"; sha512 = "35hbj5hbz085y1dxfmza6m207kn68q2g1k5a9mc75i9pj8fww7xm7xzcdv81xyxjm3r4qbqf1izlg16l99b93rfii9rg8kqz8mxqmb6"; } ]; - mavenJar_2_4 = map (obj: fetchMaven rec { + mavenJar_2_4 = map (obj: fetchMaven { version = "2.4"; artifactId = "maven-jar-plugin"; groupId = "org.apache.maven.plugins"; @@ -74,7 +74,7 @@ in rec { { type = "jar"; sha512 = "0frbikq8jm5pynlmv51k349kiaipd9jsrh6970313s0g6n4i0ws9vi232wc1mjrc3d27k63xqmb97jzgbbc6q337ypv5vil1ql9wh0d"; } ]; - mavenReplacer_1_5_3 = map (obj: fetchMaven rec { + mavenReplacer_1_5_3 = map (obj: fetchMaven { version = "1.5.3"; artifactId = "replacer"; groupId = "com.google.code.maven-replacer-plugin"; @@ -85,7 +85,7 @@ in rec { { type = "jar"; sha512 = "0f2rngcxpll0iigv115132fld5n6shjfn7m981sg7mdzlj75q2h5knd4x1ip33w60cm1j0rmqaxp1y6qn76ykvhprdyy9smiy667l9x"; } ]; - mavenResources_2_6 = map (obj: fetchMaven rec { + mavenResources_2_6 = map (obj: fetchMaven { version = "2.6"; artifactId = "maven-resources-plugin"; groupId = "org.apache.maven.plugins"; @@ -96,7 +96,7 @@ in rec { { type = "jar"; sha512 = "3j8smsx6wk085iic5qhknrszixxna6szmvk2rn9zkn75ffjr7ham72hw9cmxf5160j73n8f2cmcbw1x462fqy12fqqpmzx08i1sbwcv"; } ]; - mavenSurefire_2_12_4 = map (obj: fetchMaven rec { + mavenSurefire_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; artifactId = "maven-surefire-plugin"; groupId = "org.apache.maven.plugins"; @@ -107,7 +107,7 @@ in rec { { type = "jar"; sha512 = "2sjq2l8i97h3ay8wwrsi75cfs9d1im5ar2sn2zv4q6xsv4v3hh5y481l9xwc5dnbcfdjs38ald0z60pxpcyiqrng6h69s2ws8fhb0mm"; } ]; - mavenSurefire_2_17 = map (obj: fetchMaven rec { + mavenSurefire_2_17 = map (obj: fetchMaven { version = "2.17"; artifactId = "maven-surefire-plugin"; groupId = "org.apache.maven.plugins"; diff --git a/pkgs/development/java-modules/mojo/animal-sniffer.nix b/pkgs/development/java-modules/mojo/animal-sniffer.nix index dd9b1d1b0aa..221e59f766b 100644 --- a/pkgs/development/java-modules/mojo/animal-sniffer.nix +++ b/pkgs/development/java-modules/mojo/animal-sniffer.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mojoAnimalSniffer_1_11 = map (obj: fetchMaven { version = "1.11"; artifactId = "animal-sniffer"; diff --git a/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix b/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix index 245daa5fdb9..f6f7e490c7c 100644 --- a/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix +++ b/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mojoJavaBootClasspathDetector_1_11 = map (obj: fetchMaven { version = "1.11"; artifactId = "java-boot-classpath-detector"; diff --git a/pkgs/development/java-modules/ow2/asm-all.nix b/pkgs/development/java-modules/ow2/asm-all.nix index 08d18745ed7..92418d8c619 100644 --- a/pkgs/development/java-modules/ow2/asm-all.nix +++ b/pkgs/development/java-modules/ow2/asm-all.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ ow2AsmAll_4_0 = map (obj: fetchMaven { version = "4.0"; artifactId = "asm-all"; diff --git a/pkgs/development/java-modules/plexus/archiver.nix b/pkgs/development/java-modules/plexus/archiver.nix index 384b9285976..41a334007e8 100644 --- a/pkgs/development/java-modules/plexus/archiver.nix +++ b/pkgs/development/java-modules/plexus/archiver.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusArchiver_1_0_alpha7 = map (obj: fetchMaven { version = "1.0-alpha-7"; artifactId = "plexus-archiver"; diff --git a/pkgs/development/java-modules/plexus/build-api.nix b/pkgs/development/java-modules/plexus/build-api.nix index c417c955b69..b362f905091 100644 --- a/pkgs/development/java-modules/plexus/build-api.nix +++ b/pkgs/development/java-modules/plexus/build-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusBuildApi_0_0_4 = map (obj: fetchMaven { version = "0.0.4"; artifactId = "plexus-build-api"; diff --git a/pkgs/development/java-modules/plexus/classworlds.nix b/pkgs/development/java-modules/plexus/classworlds.nix index 6ff1755e8f5..7cb6c3dbf55 100644 --- a/pkgs/development/java-modules/plexus/classworlds.nix +++ b/pkgs/development/java-modules/plexus/classworlds.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusClassworlds_2_2_2 = map (obj: fetchMaven { version = "2.2.2"; artifactId = "plexus-classworlds"; diff --git a/pkgs/development/java-modules/plexus/compiler-api.nix b/pkgs/development/java-modules/plexus/compiler-api.nix index 11baab0950d..a1c6556a769 100644 --- a/pkgs/development/java-modules/plexus/compiler-api.nix +++ b/pkgs/development/java-modules/plexus/compiler-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusCompilerApi_2_2 = map (obj: fetchMaven { version = "2.2"; artifactId = "plexus-compiler-api"; diff --git a/pkgs/development/java-modules/plexus/compiler-javac.nix b/pkgs/development/java-modules/plexus/compiler-javac.nix index a42064a0e9e..d86240b6d45 100644 --- a/pkgs/development/java-modules/plexus/compiler-javac.nix +++ b/pkgs/development/java-modules/plexus/compiler-javac.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusCompilerJavac_2_2 = map (obj: fetchMaven { version = "2.2"; artifactId = "plexus-compiler-javac"; diff --git a/pkgs/development/java-modules/plexus/compiler-manager.nix b/pkgs/development/java-modules/plexus/compiler-manager.nix index f7221a96627..3f27981b154 100644 --- a/pkgs/development/java-modules/plexus/compiler-manager.nix +++ b/pkgs/development/java-modules/plexus/compiler-manager.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusCompilerManager_2_2 = map (obj: fetchMaven { version = "2.2"; artifactId = "plexus-compiler-manager"; diff --git a/pkgs/development/java-modules/plexus/component-annotations.nix b/pkgs/development/java-modules/plexus/component-annotations.nix index fd3fc80e7e0..89ae778e762 100644 --- a/pkgs/development/java-modules/plexus/component-annotations.nix +++ b/pkgs/development/java-modules/plexus/component-annotations.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusComponentAnnotations_1_5_5 = map (obj: fetchMaven { version = "1.5.5"; artifactId = "plexus-component-annotations"; diff --git a/pkgs/development/java-modules/plexus/container-default.nix b/pkgs/development/java-modules/plexus/container-default.nix index 375a1913afc..79d8ac1087b 100644 --- a/pkgs/development/java-modules/plexus/container-default.nix +++ b/pkgs/development/java-modules/plexus/container-default.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusContainerDefault_1_0_alpha9 = map (obj: fetchMaven { version = "1.0-alpha-9"; artifactId = "plexus-container-default"; diff --git a/pkgs/development/java-modules/plexus/digest.nix b/pkgs/development/java-modules/plexus/digest.nix index be2013a2676..a9c80c146c9 100644 --- a/pkgs/development/java-modules/plexus/digest.nix +++ b/pkgs/development/java-modules/plexus/digest.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusDigest_1_0 = map (obj: fetchMaven { version = "1.0"; artifactId = "plexus-digest"; diff --git a/pkgs/development/java-modules/plexus/i18n.nix b/pkgs/development/java-modules/plexus/i18n.nix index 5b34cde0503..0b016a7bd49 100644 --- a/pkgs/development/java-modules/plexus/i18n.nix +++ b/pkgs/development/java-modules/plexus/i18n.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusI18n_1_0_beta6 = map (obj: fetchMaven { version = "1.0-beta-6"; artifactId = "plexus-i18n"; diff --git a/pkgs/development/java-modules/plexus/interactivity-api.nix b/pkgs/development/java-modules/plexus/interactivity-api.nix index 8ada106f48f..378fa76d8c6 100644 --- a/pkgs/development/java-modules/plexus/interactivity-api.nix +++ b/pkgs/development/java-modules/plexus/interactivity-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusInteractivityApi_1_0_alpha4 = map (obj: fetchMaven { version = "1.0-alpha-4"; artifactId = "plexus-interactivity-api"; diff --git a/pkgs/development/java-modules/plexus/interpolation.nix b/pkgs/development/java-modules/plexus/interpolation.nix index 90ff3de6a3f..f2813e103f5 100644 --- a/pkgs/development/java-modules/plexus/interpolation.nix +++ b/pkgs/development/java-modules/plexus/interpolation.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusInterpolation_1_11 = map (obj: fetchMaven { version = "1.11"; artifactId = "plexus-interpolation"; diff --git a/pkgs/development/java-modules/plexus/io.nix b/pkgs/development/java-modules/plexus/io.nix index eee41f5ed2f..e2cfd4b5882 100644 --- a/pkgs/development/java-modules/plexus/io.nix +++ b/pkgs/development/java-modules/plexus/io.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusIo_2_0_2 = map (obj: fetchMaven { version = "2.0.2"; artifactId = "plexus-io"; diff --git a/pkgs/development/java-modules/plexus/utils.nix b/pkgs/development/java-modules/plexus/utils.nix index ce0537cea7d..c52425342b0 100644 --- a/pkgs/development/java-modules/plexus/utils.nix +++ b/pkgs/development/java-modules/plexus/utils.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusUtils_1_0_4 = map (obj: fetchMaven { version = "1.0.4"; artifactId = "plexus-utils"; diff --git a/pkgs/development/java-modules/poms.nix b/pkgs/development/java-modules/poms.nix index 610f98a7e46..d93edb7aa4f 100644 --- a/pkgs/development/java-modules/poms.nix +++ b/pkgs/development/java-modules/poms.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ aether_0_9_0_M2 = fetchMaven { version = "0.9.0.M2"; artifactId = "aether"; diff --git a/pkgs/development/java-modules/sisu/guice.nix b/pkgs/development/java-modules/sisu/guice.nix index 51a004ed545..e4d0e1f98d4 100644 --- a/pkgs/development/java-modules/sisu/guice.nix +++ b/pkgs/development/java-modules/sisu/guice.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ sisuGuice_2_9_4 = map (obj: fetchMaven { version = "2.9.4"; artifactId = "sisu-guice"; diff --git a/pkgs/development/java-modules/sisu/inject-bean.nix b/pkgs/development/java-modules/sisu/inject-bean.nix index bca16ccd114..22d3582608a 100644 --- a/pkgs/development/java-modules/sisu/inject-bean.nix +++ b/pkgs/development/java-modules/sisu/inject-bean.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ sisuInjectBean_2_1_1 = map (obj: fetchMaven { version = "2.1.1"; artifactId = "sisu-inject-bean"; diff --git a/pkgs/development/java-modules/sisu/inject-plexus.nix b/pkgs/development/java-modules/sisu/inject-plexus.nix index 0a181dc1a1e..aee624c551c 100644 --- a/pkgs/development/java-modules/sisu/inject-plexus.nix +++ b/pkgs/development/java-modules/sisu/inject-plexus.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ sisuInjectPlexus_2_1_1 = map (obj: fetchMaven { version = "2.1.1"; artifactId = "sisu-inject-plexus"; diff --git a/pkgs/development/java-modules/xerces/impl.nix b/pkgs/development/java-modules/xerces/impl.nix index 11295b3128f..2ea05581d0d 100644 --- a/pkgs/development/java-modules/xerces/impl.nix +++ b/pkgs/development/java-modules/xerces/impl.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ xercesImpl_2_8_0 = map (obj: fetchMaven { version = "2.8.0"; artifactId = "xercesImpl"; diff --git a/pkgs/development/java-modules/xml-apis/default.nix b/pkgs/development/java-modules/xml-apis/default.nix index a96e3670b40..871629dbf3c 100644 --- a/pkgs/development/java-modules/xml-apis/default.nix +++ b/pkgs/development/java-modules/xml-apis/default.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ xmlApis_1_3_03 = map (obj: fetchMaven { version = "1.3.03"; artifactId = "xml-apis"; diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/development/libraries/AntTweakBar/default.nix index fcb708c829b..94b36b855f2 100644 --- a/pkgs/development/libraries/AntTweakBar/default.nix +++ b/pkgs/development/libraries/AntTweakBar/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip, xorg, libGLU_combined }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "AntTweakBar-1.16"; buildInputs = [ unzip xorg.libX11 libGLU_combined ]; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index d538a0969b0..37e38e03b8c 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -24,11 +24,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "SDL2"; - version = "2.0.9"; + version = "2.0.10"; src = fetchurl { url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; - sha256 = "1c94ndagzkdfqaa838yqg589p1nnqln8mv0hpwfhrkbfczf8cl95"; + sha256 = "0mqxp6w5jhbq6y1j690g9r3gpzwjxh4czaglw8x05l7hl49nqrdl"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/SDL2/find-headers.patch b/pkgs/development/libraries/SDL2/find-headers.patch index a6114901055..a6b10ddb7ed 100644 --- a/pkgs/development/libraries/SDL2/find-headers.patch +++ b/pkgs/development/libraries/SDL2/find-headers.patch @@ -1,12 +1,13 @@ diff -ru3 SDL2-2.0.4/sdl2-config.cmake.in SDL2-2.0.4-new/sdl2-config.cmake.in --- SDL2-2.0.4/sdl2-config.cmake.in 2016-01-02 22:56:31.000000000 +0300 +++ SDL2-2.0.4-new/sdl2-config.cmake.in 2016-08-22 05:26:42.420397323 +0300 -@@ -6,5 +6,5 @@ +@@ -6,5 +6,6 @@ set(SDL2_PREFIX "@prefix@") set(SDL2_EXEC_PREFIX "@prefix@") set(SDL2_LIBDIR "@libdir@") -set(SDL2_INCLUDE_DIRS "@includedir@/SDL2") +set(SDL2_INCLUDE_DIRS "@includedir@/SDL2" $ENV{SDL2_PATH}) ++separate_arguments(SDL2_INCLUDE_DIRS) set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@") diff -ru3 SDL2-2.0.4/sdl2-config.in SDL2-2.0.4-new/sdl2-config.in --- SDL2-2.0.4/sdl2-config.in 2016-01-02 22:56:31.000000000 +0300 diff --git a/pkgs/development/libraries/SDL_gpu/default.nix b/pkgs/development/libraries/SDL_gpu/default.nix index dc88b7b12ef..f15009c2f5d 100644 --- a/pkgs/development/libraries/SDL_gpu/default.nix +++ b/pkgs/development/libraries/SDL_gpu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, SDL2, libGLU }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "SDL_gpu-unstable"; version = "2019-01-24"; diff --git a/pkgs/development/libraries/SDL_sixel/default.nix b/pkgs/development/libraries/SDL_sixel/default.nix index 7b8fb67a30f..66fa8888fd1 100644 --- a/pkgs/development/libraries/SDL_sixel/default.nix +++ b/pkgs/development/libraries/SDL_sixel/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, libsixel }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "SDL_sixel"; version = "1.2-nightly"; diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix index 307f57d20cf..22f1566ad0a 100644 --- a/pkgs/development/libraries/appstream/qt.nix +++ b/pkgs/development/libraries/appstream/qt.nix @@ -2,7 +2,7 @@ # TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "appstream-qt"; inherit (appstream) version src prePatch; diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/pkgs/development/libraries/argp-standalone/default.nix index 4b8093f7403..17093deae00 100644 --- a/pkgs/development/libraries/argp-standalone/default.nix +++ b/pkgs/development/libraries/argp-standalone/default.nix @@ -19,7 +19,7 @@ let sha256 = "1xx2zdc187a1m2x6c1qs62vcrycbycw7n0q3ks2zkxpaqzx2dgkw"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "argp-standalone-1.3"; src = fetchurl { diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 992119faf65..fa9a45f1ed3 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -160,7 +160,7 @@ in rec { ### Languages - af = buildOfficialDict rec { + af = buildOfficialDict { language = "af"; version = "0.50-0"; fullName = "Afrikaans"; @@ -168,7 +168,7 @@ in rec { sha256 = "00p6k2ndi0gzfr5fkbvx4hkcpj223pidjvmxg0r384arrap00q4x"; }; - am = buildOfficialDict rec { + am = buildOfficialDict { language = "am"; version = "0.03-1"; fullName = "Amharic"; @@ -176,7 +176,7 @@ in rec { sha256 = "11ylp7gjq94wfacyawvp391lsq26rl1b84f268rjn7l7z0hxs9xz"; }; - ar = buildOfficialDict rec { + ar = buildOfficialDict { language = "ar"; version = "1.2-0"; fullName = "Arabic"; @@ -184,7 +184,7 @@ in rec { sha256 = "1avw40bp8yi5bnkq64ihm2rldgw34lk89yz281q9bmndh95a47h4"; }; - ast = buildOfficialDict rec { + ast = buildOfficialDict { language = "ast"; version = "0.01"; fullName = "Asturian"; @@ -192,7 +192,7 @@ in rec { sha256 = "14hg85mxcyvdigf96yvslk7f3v9ngdsxn85qpgwkg31k3k83xwj3"; }; - az = buildOfficialDict rec { + az = buildOfficialDict { language = "az"; version = "0.02-0"; fullName = "Azerbaijani"; @@ -200,7 +200,7 @@ in rec { sha256 = "1hs4h1jscpxf9f9iyk6mvjqsnhkf0yslkbjhjkasqqcx8pn7cc86"; }; - be = buildOfficialDict rec { + be = buildOfficialDict { language = "be"; version = "0.01"; fullName = "Belarusian"; @@ -208,7 +208,7 @@ in rec { sha256 = "1svls9p7rsfi3hs0afh0cssj006qb4v1ik2yzqgj8hm10c6as2sm"; }; - bg = buildOfficialDict rec { + bg = buildOfficialDict { language = "bg"; version = "4.1-0"; fullName = "Bulgarian"; @@ -216,7 +216,7 @@ in rec { sha256 = "1alacmgpfk0yrgq83y23d16fhav1bxmb98kg8d2a5r9bvh2h0mvl"; }; - bn = buildOfficialDict rec { + bn = buildOfficialDict { language = "bn"; version = "0.01.1-1"; fullName = "Bengali"; @@ -224,7 +224,7 @@ in rec { sha256 = "1nc02jd67iggirwxnhdvlvaqm0xfyks35c4psszzj3dhzv29qgxh"; }; - br = buildOfficialDict rec { + br = buildOfficialDict { language = "br"; version = "0.50-2"; fullName = "Breton"; @@ -232,7 +232,7 @@ in rec { sha256 = "0fradnm8424bkq9a9zhpl2132dk7y95xmw45sy1c0lx6rinjl4n2"; }; - ca = buildOfficialDict rec { + ca = buildOfficialDict { language = "ca"; version = "2.1.5-1"; fullName = "Catalan"; @@ -240,7 +240,7 @@ in rec { sha256 = "1fb5y5kgvk25nlsfvc8cai978hg66x3pbp9py56pldc7vxzf9npb"; }; - cs = buildOfficialDict rec { + cs = buildOfficialDict { language = "cs"; version = "20040614-1"; fullName = "Czech"; @@ -248,7 +248,7 @@ in rec { sha256 = "0rihj4hsw96pd9casvmpvw3r8040pfa28p1h73x4vyn20zwr3h01"; }; - csb = buildOfficialDict rec { + csb = buildOfficialDict { language = "csb"; version = "0.02-0"; fullName = "Kashubian"; @@ -256,7 +256,7 @@ in rec { sha256 = "1612ypkm684wjvc7n081i87mlrrzif9simc7kyn177hfsl3ssrn1"; }; - cy = buildOfficialDict rec { + cy = buildOfficialDict { language = "cy"; version = "0.50-3"; fullName = "Welsh"; @@ -264,7 +264,7 @@ in rec { sha256 = "15vq601lzz1gi311xym4bv9lv1k21xcfn50jmzamw7h6f36rsffm"; }; - da = buildOfficialDict rec { + da = buildOfficialDict { language = "da"; version = "1.4.42-1"; fullName = "Danish"; @@ -272,7 +272,7 @@ in rec { sha256 = "1hfkmiyhgrx5lgrb2mffjbdn1hivrm73wcg7x0iid74p2yb0fjpp"; }; - de = buildOfficialDict rec { + de = buildOfficialDict { language = "de"; version = "20030222-1"; fullName = "German"; @@ -280,7 +280,7 @@ in rec { sha256 = "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s"; }; - de-alt = buildOfficialDict rec { + de-alt = buildOfficialDict { language = "de-alt"; version = "2.1-1"; fullName = "German - Old Spelling"; @@ -288,7 +288,7 @@ in rec { sha256 = "0wwc2l29svv3fv041fh6vfa5m3hi9q9pkbxibzq1ysrsfin3rl9n"; }; - el = buildOfficialDict rec { + el = buildOfficialDict { language = "el"; version = "0.08-0"; fullName = "Greek"; @@ -296,7 +296,7 @@ in rec { sha256 = "1ljcc30zg2v2h3w5h5jr5im41mw8jbsgvvhdd2cii2yzi8d0zxja"; }; - en = buildOfficialDict rec { + en = buildOfficialDict { language = "en"; version = "2018.04.16-0"; fullName = "English"; @@ -304,7 +304,7 @@ in rec { sha256 = "0bxxdzkk9g27plg22y9qzsx9cfjw3aa29w5bmzs561qc9gkp247i"; }; - eo = buildOfficialDict rec { + eo = buildOfficialDict { language = "eo"; version = "2.1.20000225a-2"; fullName = "Esperanto"; @@ -312,7 +312,7 @@ in rec { sha256 = "09vf0mbiicbmyb4bwb7v7lgpabnylg0wy7m3hlhl5rjdda6x3lj1"; }; - es = buildOfficialDict rec { + es = buildOfficialDict { language = "es"; version = "1.11-2"; fullName = "Spanish"; @@ -320,7 +320,7 @@ in rec { sha256 = "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd"; }; - et = buildOfficialDict rec { + et = buildOfficialDict { language = "et"; version = "0.1.21-1"; fullName = "Estonian"; @@ -328,7 +328,7 @@ in rec { sha256 = "0jdjfa2fskirhnb70fy86xryp9r6gkl729ib8qcjmsma7nm5gs5i"; }; - fa = buildOfficialDict rec { + fa = buildOfficialDict { language = "fa"; version = "0.11-0"; fullName = "Persian"; @@ -336,7 +336,7 @@ in rec { sha256 = "0nz1ybwv56q7nl9ip12hfmdch1vyyq2j55bkjcns13lshzm2cba8"; }; - fi = buildOfficialDict rec { + fi = buildOfficialDict { language = "fi"; version = "0.7-0"; fullName = "Finnish"; @@ -344,7 +344,7 @@ in rec { sha256 = "07d5s08ba4dd89cmwy9icc01i6fjdykxlb9ravmhdrhi8mxz1mzq"; }; - fo = buildOfficialDict rec { + fo = buildOfficialDict { language = "fo"; version = "0.2.16-1"; fullName = "Faroese"; @@ -352,7 +352,7 @@ in rec { sha256 = "022yz5lll20xrzizcyb7wksm3fgwklnvgnir5la5qkxv770dvq7p"; }; - fr = buildOfficialDict rec { + fr = buildOfficialDict { language = "fr"; version = "0.50-3"; fullName = "French"; @@ -360,7 +360,7 @@ in rec { sha256 = "14ffy9mn5jqqpp437kannc3559bfdrpk7r36ljkzjalxa53i0hpr"; }; - fy = buildOfficialDict rec { + fy = buildOfficialDict { language = "fy"; version = "0.12-0"; fullName = "Frisian"; @@ -368,7 +368,7 @@ in rec { sha256 = "1almi6n4ni91d0rzrk8ig0473m9ypbwqmg56hchz76j51slwyirl"; }; - ga = buildOfficialDict rec { + ga = buildOfficialDict { language = "ga"; version = "4.5-0"; fullName = "Irish"; @@ -376,7 +376,7 @@ in rec { sha256 = "0y869mmvfb3bzadfgajwa2rfb0xfhi6m9ydwgxkb9v2claydnps5"; }; - gd = buildOfficialDict rec { + gd = buildOfficialDict { language = "gd"; version = "0.1.1-1"; fullName = "Scottish Gaelic"; @@ -384,7 +384,7 @@ in rec { sha256 = "0a89irv5d65j5m9sb0k36851x5rs0wij12gb2m6hv2nsfn5a05p3"; }; - gl = buildOfficialDict rec { + gl = buildOfficialDict { language = "gl"; version = "0.5a-2"; fullName = "Galician"; @@ -392,7 +392,7 @@ in rec { sha256 = "12pwghmy18fcdvf9hvhb4q6shi339hb1kwxpkz0bhw0yjxjwzkdk"; }; - grc = buildOfficialDict rec { + grc = buildOfficialDict { language = "grc"; version = "0.02-0"; fullName = "Ancient Greek"; @@ -400,7 +400,7 @@ in rec { sha256 = "1zxr8958v37v260fkqd4pg37ns5h5kyqm54hn1hg70wq5cz8h512"; }; - gu = buildOfficialDict rec { + gu = buildOfficialDict { language = "gu"; version = "0.03-0"; fullName = "Gujarati"; @@ -408,7 +408,7 @@ in rec { sha256 = "04c38jnl74lpj2jhjz4zpqbs2623vwc71m6wc5h4b1karid14b23"; }; - gv = buildOfficialDict rec { + gv = buildOfficialDict { language = "gv"; version = "0.50-0"; fullName = "Manx Gaelic"; @@ -416,7 +416,7 @@ in rec { sha256 = "1rknf4yaw9s29c77sdzg98nhnmjwpicdb69igmz1n768npz2drmv"; }; - he = buildOfficialDict rec { + he = buildOfficialDict { language = "he"; version = "1.0-0"; fullName = "Hebrew"; @@ -424,7 +424,7 @@ in rec { sha256 = "13bhbghx5b8g0119g3wxd4n8mlf707y41vlf59irxjj0kynankfn"; }; - hi = buildOfficialDict rec { + hi = buildOfficialDict { language = "hi"; version = "0.02-0"; fullName = "Hindi"; @@ -432,7 +432,7 @@ in rec { sha256 = "0drs374qz4419zx1lf2k281ydxf2750jk5ailafj1x0ncz27h1ys"; }; - hil = buildOfficialDict rec { + hil = buildOfficialDict { language = "hil"; version = "0.11-0"; fullName = "Hiligaynon"; @@ -440,7 +440,7 @@ in rec { sha256 = "1s482fsfhzic9qa80al4418q3ni3gfn2bkwkd2y46ydrs17kf2jp"; }; - hr = buildOfficialDict rec { + hr = buildOfficialDict { language = "hr"; version = "0.51-0"; fullName = "Croatian"; @@ -448,7 +448,7 @@ in rec { sha256 = "09aafyf1vqhaxvcf3jfzf365k394b5pf0iivsr2ix5npah1h7i1a"; }; - hsb = buildOfficialDict rec { + hsb = buildOfficialDict { language = "hsb"; version = "0.02-0"; fullName = "Upper Sorbian"; @@ -456,7 +456,7 @@ in rec { sha256 = "0bi2vhz7n1vmg43wbbh935pmzihv80iyz9z65j94lxf753j2m7wd"; }; - hu = buildOfficialDict rec { + hu = buildOfficialDict { language = "hu"; version = "0.99.4.2-0"; fullName = "Hungarian"; @@ -464,7 +464,7 @@ in rec { sha256 = "1d9nybip2k1dz69zly3iv0npbi3yxgfznh1py364nxzrbjsafd9k"; }; - hus = buildOfficialDict rec { + hus = buildOfficialDict { language = "hus"; version = "0.03-1"; fullName = "Huastec"; @@ -472,7 +472,7 @@ in rec { sha256 = "09glipfpkz9xch17z11zw1yn2z7jx1f2svfmjn9l6wm1s5qz6a3d"; }; - hy = buildOfficialDict rec { + hy = buildOfficialDict { language = "hy"; version = "0.10.0-0"; fullName = "Armenian"; @@ -480,7 +480,7 @@ in rec { sha256 = "1w5wq8lfl2xp1nid30b1j5qmya4vjyidq0vpr4y3gf53jc08vsid"; }; - ia = buildOfficialDict rec { + ia = buildOfficialDict { language = "ia"; version = "0.50-1"; fullName = "Interlingua"; @@ -488,7 +488,7 @@ in rec { sha256 = "0bqcpgsa72pga24fv4fkw38b4qqdvqsw97jvzvw7q03dc1cwp5sp"; }; - id = buildOfficialDict rec { + id = buildOfficialDict { language = "id"; version = "1.2-0"; fullName = "Indonesian"; @@ -496,7 +496,7 @@ in rec { sha256 = "023knfg0q03f7y5w6xnwa1kspnrcvcnky8xvdms93n2850414faj"; }; - is = buildOfficialDict rec { + is = buildOfficialDict { language = "is"; version = "0.51.1-0"; fullName = "Icelandic"; @@ -504,7 +504,7 @@ in rec { sha256 = "1mp3248lhbr13cj7iq9zs7h5ix0dcwlprp5cwrkcwafrv8lvsd9h"; }; - it = buildOfficialDict rec { + it = buildOfficialDict { language = "it"; version = "2.2_20050523-0"; fullName = "Italian"; @@ -512,7 +512,7 @@ in rec { sha256 = "1gdf7bc1a0kmxsmphdqq8pl01h667mjsj6hihy6kqy14k5qdq69v"; }; - kn = buildOfficialDict rec { + kn = buildOfficialDict { language = "kn"; version = "0.01-1"; fullName = "Kannada"; @@ -520,7 +520,7 @@ in rec { sha256 = "10sk0wx4x4ds1403kf9dqxv9yjvh06w8qqf4agx57y0jlws0n0fb"; }; - ku = buildOfficialDict rec { + ku = buildOfficialDict { language = "ku"; version = "0.20-1"; fullName = "Kurdi"; @@ -528,7 +528,7 @@ in rec { sha256 = "09va98krfbgdaxl101nmd85j3ysqgg88qgfcl42c07crii0pd3wn"; }; - ky = buildOfficialDict rec { + ky = buildOfficialDict { language = "ky"; version = "0.01-0"; fullName = "Kirghiz"; @@ -536,7 +536,7 @@ in rec { sha256 = "0kzv2syjnnn6pnwx0d578n46hg2l0j62977al47y6wabnhjjy3z1"; }; - la = buildOfficialDict rec { + la = buildOfficialDict { language = "la"; version = "20020503-0"; fullName = "Latin"; @@ -544,7 +544,7 @@ in rec { sha256 = "1199inwi16dznzl087v4skn66fl7h555hi2palx6s1f3s54b11nl"; }; - lt = buildOfficialDict rec { + lt = buildOfficialDict { language = "lt"; version = "1.2.1-0"; fullName = "Lithuanian"; @@ -552,7 +552,7 @@ in rec { sha256 = "1asjck911l96q26zj36lmz0jp4b6pivvrf3h38zgc8lc85p3pxgn"; }; - lv = buildOfficialDict rec { + lv = buildOfficialDict { language = "lv"; version = "0.5.5-1"; fullName = "Latvian"; @@ -560,7 +560,7 @@ in rec { sha256 = "12pvs584a6437ijndggdqpp5s7d0w607cimpkxsjwasnx83f4c1w"; }; - mg = buildOfficialDict rec { + mg = buildOfficialDict { language = "mg"; version = "0.03-0"; fullName = "Malagasy"; @@ -568,7 +568,7 @@ in rec { sha256 = "0hdhbk9b5immjp8l5h4cy82gwgsqzcqbb0qsf7syw333w4rgi0ji"; }; - mi = buildOfficialDict rec { + mi = buildOfficialDict { language = "mi"; version = "0.50-0"; fullName = "Maori"; @@ -576,7 +576,7 @@ in rec { sha256 = "12bxplpd348yx8d2q8qvahi9dlp7qf28qmanzhziwc7np8rixvmy"; }; - mk = buildOfficialDict rec { + mk = buildOfficialDict { language = "mk"; version = "0.50-0"; fullName = "Macedonian"; @@ -584,7 +584,7 @@ in rec { sha256 = "0wcr9n882xi5b7a7ln1hnhq4vfqd5gpqqp87v01j0gb7zf027z0m"; }; - ml = buildOfficialDict rec { + ml = buildOfficialDict { language = "ml"; version = "0.03-1"; fullName = "Malayalam"; @@ -592,7 +592,7 @@ in rec { sha256 = "1zcn4114gwia085fkz77qk13z29xrbp53q2qvgj2cvcbalg5bkg4"; }; - mn = buildOfficialDict rec { + mn = buildOfficialDict { language = "mn"; version = "0.06-2"; fullName = "Mongolian"; @@ -600,7 +600,7 @@ in rec { sha256 = "150j9y5c9pw80fwp5rzl5q31q9vjbxixaqljkfwxjb5q93fnw6rg"; }; - mr = buildOfficialDict rec { + mr = buildOfficialDict { language = "mr"; version = "0.10-0"; fullName = "Marathi"; @@ -608,7 +608,7 @@ in rec { sha256 = "0cvgb2l40sppqbi842ivpznsh2xzp1d4hxc371dll8z0pr05m8yk"; }; - ms = buildOfficialDict rec { + ms = buildOfficialDict { language = "ms"; version = "0.50-0"; fullName = "Malay"; @@ -616,7 +616,7 @@ in rec { sha256 = "0vr4vhipcfhsxqfs8dim2ph7iiixn22gmlmlb375bx5hgd9y7i1w"; }; - mt = buildOfficialDict rec { + mt = buildOfficialDict { language = "mt"; version = "0.50-0"; fullName = "Maltese"; @@ -624,7 +624,7 @@ in rec { sha256 = "1d2rl1nlfjq6rfywblvx8m88cyy2x0mzc0mshzbgw359c2nwl3z0"; }; - nb = buildOfficialDict rec { + nb = buildOfficialDict { language = "nb"; version = "0.50.1-0"; fullName = "Norwegian Bokmal"; @@ -632,7 +632,7 @@ in rec { sha256 = "12i2bmgdnlkzfinb20j2a0j4a20q91a9j8qpq5vgabbvc65nwx77"; }; - nds = buildOfficialDict rec { + nds = buildOfficialDict { language = "nds"; version = "0.01-0"; fullName = "Low Saxon"; @@ -640,7 +640,7 @@ in rec { sha256 = "1nkjhwzn45dizi89d19q4bqyd87cim8xyrgr655fampgkn31wf6f"; }; - nl = buildOfficialDict rec { + nl = buildOfficialDict { language = "nl"; version = "0.50-2"; fullName = "Dutch"; @@ -652,7 +652,7 @@ in rec { ''; }; - nn = buildOfficialDict rec { + nn = buildOfficialDict { language = "nn"; version = "0.50.1-1"; fullName = "Norwegian Nynorsk"; @@ -660,7 +660,7 @@ in rec { sha256 = "0w2k5l5rbqpliripgqwiqixz5ghnjf7i9ggbrc4ly4vy1ia10rmc"; }; - ny = buildOfficialDict rec { + ny = buildOfficialDict { language = "ny"; version = "0.01-0"; fullName = "Chichewa"; @@ -668,7 +668,7 @@ in rec { sha256 = "0gjb92vcg60sfgvrm2f6i89sfkgb179ahvwlgs649fx3dc7rfvqp"; }; - or = buildOfficialDict rec { + or = buildOfficialDict { language = "or"; version = "0.03-1"; fullName = "Oriya"; @@ -676,7 +676,7 @@ in rec { sha256 = "0kzj9q225z0ccrlbkijsrafy005pbjy14qcnxb6p93ciz1ls7zyn"; }; - pa = buildOfficialDict rec { + pa = buildOfficialDict { language = "pa"; version = "0.01-1"; fullName = "Punjabi"; @@ -684,7 +684,7 @@ in rec { sha256 = "0if93zk10pyrs38wwj3vpcdm01h51m5z9gm85h3jxrpgqnqspwy7"; }; - pl = buildOfficialDict rec { + pl = buildOfficialDict { language = "pl"; version = "6.0_20061121-0"; fullName = "Polish"; @@ -692,7 +692,7 @@ in rec { sha256 = "0kap4kh6bqbb22ypja1m5z3krc06vv4n0hakiiqmv20anzy42xq1"; }; - pt_BR = buildOfficialDict rec { + pt_BR = buildOfficialDict { language = "pt_BR"; version = "20090702-0"; fullName = "Brazilian Portuguese"; @@ -700,7 +700,7 @@ in rec { sha256 = "1y09lx9zf2rnp55r16b2vgj953l3538z1vaqgflg9mdvm555bz3p"; }; - pt_PT = buildOfficialDict rec { + pt_PT = buildOfficialDict { language = "pt_PT"; version = "20070510-0"; fullName = "Portuguese"; @@ -708,7 +708,7 @@ in rec { sha256 = "1mnr994cwlag6shy8865ky99lymysiln07mbldcncahg90dagdxq"; }; - qu = buildOfficialDict rec { + qu = buildOfficialDict { language = "qu"; version = "0.02-0"; fullName = "Quechua"; @@ -716,7 +716,7 @@ in rec { sha256 = "009z0zsvzq7r3z3m30clyibs94v77b92h5lmzmzxlns2p0lpd5w0"; }; - ro = buildOfficialDict rec { + ro = buildOfficialDict { language = "ro"; version = "3.3-2"; fullName = "Romanian"; @@ -724,7 +724,7 @@ in rec { sha256 = "0gb8j9iy1acdl11jq76idgc2lbc1rq3w04favn8cyh55d1v8phsk"; }; - ru = buildOfficialDict rec { + ru = buildOfficialDict { language = "ru"; version = "0.99f7-1"; fullName = "Russian"; @@ -732,7 +732,7 @@ in rec { sha256 = "0ip6nq43hcr7vvzbv4lwwmlwgfa60hrhsldh9xy3zg2prv6bcaaw"; }; - rw = buildOfficialDict rec { + rw = buildOfficialDict { language = "rw"; version = "0.50-0"; fullName = "Kinyarwanda"; @@ -740,7 +740,7 @@ in rec { sha256 = "10gh8g747jbrvfk2fn3pjxy1nhcfdpwgmnvkmrp4nd1k1qp101il"; }; - sc = buildOfficialDict rec { + sc = buildOfficialDict { language = "sc"; version = "1.0"; fullName = "Sardinian"; @@ -748,7 +748,7 @@ in rec { sha256 = "0hl7prh5rccsyljwrv3m1hjcsphyrrywk2qvnj122irbf4py46jr"; }; - sk = buildOfficialDict rec { + sk = buildOfficialDict { language = "sk"; version = "2.01-2"; fullName = "Slovak"; @@ -756,7 +756,7 @@ in rec { sha256 = "19k0m1v5pcf7xr4lxgjkzqkdlks8nyb13bvi1n7521f3i4lhma66"; }; - sl = buildOfficialDict rec { + sl = buildOfficialDict { language = "sl"; version = "0.50-0"; fullName = "Slovenian"; @@ -764,7 +764,7 @@ in rec { sha256 = "1l9kc5g35flq8kw9jhn2n0bjb4sipjs4qkqzgggs438kywkx2rp5"; }; - sr = buildOfficialDict rec { + sr = buildOfficialDict { language = "sr"; version = "0.02"; fullName = "Serbian"; @@ -772,7 +772,7 @@ in rec { sha256 = "12cj01p4nj80cpf7m3s4jsaf0rsfng7s295j9jfchcq677xmhpkh"; }; - sv = buildOfficialDict rec { + sv = buildOfficialDict { language = "sv"; version = "0.51-0"; fullName = "Swedish"; @@ -780,7 +780,7 @@ in rec { sha256 = "02jwkjhr32kvyibnyzgx3smbnm576jwdzg3avdf6zxwckhy5fw4v"; }; - sw = buildOfficialDict rec { + sw = buildOfficialDict { language = "sw"; version = "0.50-0"; fullName = "Swahili"; @@ -788,7 +788,7 @@ in rec { sha256 = "15zjh7hdj2b4dgm5bc12w1ims9q357p1q3gjalspnyn5gl81zmby"; }; - ta = buildOfficialDict rec { + ta = buildOfficialDict { language = "ta"; version = "20040424-1"; fullName = "Tamil"; @@ -796,7 +796,7 @@ in rec { sha256 = "0sj8ygjsyvnr93cs6324y7az7k2vyw7rjxdc9vnm7z60lbqm5xaj"; }; - te = buildOfficialDict rec { + te = buildOfficialDict { language = "te"; version = "0.01-2"; fullName = "Telugu"; @@ -804,7 +804,7 @@ in rec { sha256 = "0pgcgxz7dz34zxp9sb85jjzbg3ky6il5wmhffz6ayrbsfn5670in"; }; - tet = buildOfficialDict rec { + tet = buildOfficialDict { language = "tet"; version = "0.1.1"; fullName = "Tetum"; @@ -812,7 +812,7 @@ in rec { sha256 = "17n0y4fhjak47j9qnqf4m4z6zra6dn72rwhp7ig0hhlgqk4ldmcx"; }; - tk = buildOfficialDict rec { + tk = buildOfficialDict { language = "tk"; version = "0.01-0"; fullName = "Turkmen"; @@ -820,7 +820,7 @@ in rec { sha256 = "02vad4jqhr0xpzqi5q5z7z0xxqccbn8j0c5dhpnm86mnr84l5wl6"; }; - tl = buildOfficialDict rec { + tl = buildOfficialDict { language = "tl"; version = "0.02-1"; fullName = "Tagalog"; @@ -828,7 +828,7 @@ in rec { sha256 = "1kca6k7qnpfvvwjnq5r1n242payqsjy96skmw78m7ww6d0n5vdj8"; }; - tn = buildOfficialDict rec { + tn = buildOfficialDict { language = "tn"; version = "1.0.1-0"; fullName = "Setswana"; @@ -836,7 +836,7 @@ in rec { sha256 = "0q5x7c6z88cn0kkpk7q1craq34g4g03v8x3xcj5a5jia3l7c5821"; }; - tr = buildOfficialDict rec { + tr = buildOfficialDict { language = "tr"; version = "0.50-0"; fullName = "Turkish"; @@ -844,7 +844,7 @@ in rec { sha256 = "0jpvpm96ga7s7rmsm6rbyrrr22b2dicxv2hy7ysv5y7bbq757ihb"; }; - uk = buildOfficialDict rec { + uk = buildOfficialDict { language = "uk"; version = "1.4.0-0"; fullName = "Ukrainian"; @@ -852,7 +852,7 @@ in rec { sha256 = "137i4njvnslab6l4s291s11xijr5jsy75lbdph32f9y183lagy9m"; }; - uz = buildOfficialDict rec { + uz = buildOfficialDict { language = "uz"; version = "0.6-0"; fullName = "Uzbek"; @@ -860,7 +860,7 @@ in rec { sha256 = "0sg3wlyply1idpq5ypyj7kgnaadaiskci1sqs811yhg2gzyc3092"; }; - vi = buildOfficialDict rec { + vi = buildOfficialDict { language = "vi"; version = "0.01.1-1"; fullName = "Vietnamese"; @@ -868,7 +868,7 @@ in rec { sha256 = "05vwgvf1cj45azhflywx69javqdvqd1f20swrc2d3c32pd9mvn1w"; }; - wa = buildOfficialDict rec { + wa = buildOfficialDict { language = "wa"; version = "0.50-0"; fullName = "Walloon"; @@ -876,7 +876,7 @@ in rec { sha256 = "1r1zwz7xkx40dga9vf5wc9ja3jwk1dkpcr1kaa7wryvslf5al5ss"; }; - yi = buildOfficialDict rec { + yi = buildOfficialDict { language = "yi"; version = "0.01.1-1"; fullName = "Yiddish"; @@ -884,7 +884,7 @@ in rec { sha256 = "0mi842l4038bx3ll2wx9nz44nqrg1x46h5b02zigi1hbbddd6ycq"; }; - zu = buildOfficialDict rec { + zu = buildOfficialDict { language = "zu"; version = "0.50-0"; fullName = "Zulu"; @@ -894,7 +894,7 @@ in rec { ### Jargons - en-computers = buildTxtDict rec { + en-computers = buildTxtDict { shortName = "en-computers"; fullName = "English Computer Jargon"; @@ -913,7 +913,7 @@ in rec { }; }; - en-science = buildTxtDict rec { + en-science = buildTxtDict { shortName = "en-science"; fullName = "English Scientific Jargon"; diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 7adc84f4786..e7cea235ceb 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -5,6 +5,8 @@ , ninja , pkgconfig , gobject-introspection +, gsettings-desktop-schemas +, makeWrapper , dbus , glib @@ -27,19 +29,32 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ] + nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection makeWrapper ] # Fixup rpaths because of meson, remove with meson-0.47 ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ dbus glib libX11 libXtst libXi ]; doCheck = false; # fails with "AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?" + # Provide dbus-daemon fallback when it is not already running when + # at-spi2-bus-launcher is executed. This allows us to avoid + # including the entire dbus closure in libraries linked with + # the at-spi2-core libraries. + mesonFlags = [ "-Ddbus_daemon=/run/current-system/sw/bin/dbus-daemon" ]; + passthru = { updateScript = gnome3.updateScript { packageName = pname; }; }; + postFixup = '' + # Cannot use wrapGAppsHook'due to a dependency cycle + wrapProgram $out/libexec/at-spi-bus-launcher \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \ + --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} + ''; + meta = with stdenv.lib; { description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus"; homepage = https://gitlab.gnome.org/GNOME/at-spi2-core; diff --git a/pkgs/development/libraries/audio/lv2/unstable.nix b/pkgs/development/libraries/audio/lv2/unstable.nix index 978376eb4fa..6f10283b07b 100644 --- a/pkgs/development/libraries/audio/lv2/unstable.nix +++ b/pkgs/development/libraries/audio/lv2/unstable.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python, wafHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lv2-unstable"; version = "2017-07-08"; diff --git a/pkgs/development/libraries/audio/vamp/default.nix b/pkgs/development/libraries/audio/vamp/default.nix index f8b1006d2eb..2ac3115af2a 100644 --- a/pkgs/development/libraries/audio/vamp/default.nix +++ b/pkgs/development/libraries/audio/vamp/default.nix @@ -3,7 +3,7 @@ { stdenv, fetchFromGitHub, pkgconfig, libsndfile }: -rec { +{ vampSDK = stdenv.mkDerivation { name = "vamp-sdk-2.7.1"; diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index 9582e54ffac..f66d9369c20 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -2,7 +2,7 @@ let version = "1.9.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "avro-c"; inherit version; diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix index 05203d6c233..af0053519e3 100644 --- a/pkgs/development/libraries/beignet/default.nix +++ b/pkgs/development/libraries/beignet/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { python3 ]; - passthru.utests = stdenv.mkDerivation rec { + passthru.utests = stdenv.mkDerivation { pname = "beignet-utests"; inherit version src; diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix index 503e4b0fa43..fd0da496fa4 100644 --- a/pkgs/development/libraries/blitz/default.nix +++ b/pkgs/development/libraries/blitz/default.nix @@ -22,7 +22,7 @@ let inherit (stdenv.lib) optional optionals; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "blitz++-0.10"; src = fetchurl { url = mirror://sourceforge/blitz/blitz-0.10.tar.gz; @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" - "--disable-static" "--enable-fortran" "--enable-optimize" "--with-pic=yes" diff --git a/pkgs/development/libraries/boost/1.55.nix b/pkgs/development/libraries/boost/1.55.nix index 0a38f35af75..bcb452ea4f8 100644 --- a/pkgs/development/libraries/boost/1.55.nix +++ b/pkgs/development/libraries/boost/1.55.nix @@ -1,6 +1,6 @@ { callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.55.0"; patches = [ ./clang-math.patch ./clang-math-2.patch ./gcc-5.patch ]; diff --git a/pkgs/development/libraries/boost/1.59.nix b/pkgs/development/libraries/boost/1.59.nix index f4931dfe547..fb65e49c500 100644 --- a/pkgs/development/libraries/boost/1.59.nix +++ b/pkgs/development/libraries/boost/1.59.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.59.0"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.60.nix b/pkgs/development/libraries/boost/1.60.nix index b6d74234f79..646f4652f77 100644 --- a/pkgs/development/libraries/boost/1.60.nix +++ b/pkgs/development/libraries/boost/1.60.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.60.0"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.62.nix b/pkgs/development/libraries/boost/1.62.nix index 871ef392c1a..a1b3c51d0e6 100644 --- a/pkgs/development/libraries/boost/1.62.nix +++ b/pkgs/development/libraries/boost/1.62.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.62.0"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.63.nix b/pkgs/development/libraries/boost/1.63.nix index c4749bc3ee4..a8b459f4b12 100644 --- a/pkgs/development/libraries/boost/1.63.nix +++ b/pkgs/development/libraries/boost/1.63.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.63.0"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.64.nix b/pkgs/development/libraries/boost/1.64.nix index 1cf9bfa51f4..32632f79d22 100644 --- a/pkgs/development/libraries/boost/1.64.nix +++ b/pkgs/development/libraries/boost/1.64.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.64.0"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.65.nix b/pkgs/development/libraries/boost/1.65.nix index 9837e1c6919..922c09ba7fe 100644 --- a/pkgs/development/libraries/boost/1.65.nix +++ b/pkgs/development/libraries/boost/1.65.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.65.1"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.66.nix b/pkgs/development/libraries/boost/1.66.nix index b44c1a3823a..0a99717a799 100644 --- a/pkgs/development/libraries/boost/1.66.nix +++ b/pkgs/development/libraries/boost/1.66.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.66.0"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.67.nix b/pkgs/development/libraries/boost/1.67.nix index 406e63b9622..a2fe9447c12 100644 --- a/pkgs/development/libraries/boost/1.67.nix +++ b/pkgs/development/libraries/boost/1.67.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.67.0"; patches = [ diff --git a/pkgs/development/libraries/boost/1.68.nix b/pkgs/development/libraries/boost/1.68.nix index cd980439b71..4d98172c6d0 100644 --- a/pkgs/development/libraries/boost/1.68.nix +++ b/pkgs/development/libraries/boost/1.68.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.68.0"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.69.nix b/pkgs/development/libraries/boost/1.69.nix index 959fa851fe2..95c4aa854a4 100644 --- a/pkgs/development/libraries/boost/1.69.nix +++ b/pkgs/development/libraries/boost/1.69.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.69.0"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.70.nix b/pkgs/development/libraries/boost/1.70.nix index 5f7b39c1189..45a8bdb9318 100644 --- a/pkgs/development/libraries/boost/1.70.nix +++ b/pkgs/development/libraries/boost/1.70.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.70.0"; src = fetchurl { diff --git a/pkgs/development/libraries/bootil/default.nix b/pkgs/development/libraries/bootil/default.nix index 3c27281571a..9283f37a8c4 100644 --- a/pkgs/development/libraries/bootil/default.nix +++ b/pkgs/development/libraries/bootil/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch, premake4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "bootil-unstable-2015-12-17"; meta = { diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index 7db73f5ad47..67e2794c8a2 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, cmake, perl, go }: # reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "boringssl"; version = "2017-02-23"; diff --git a/pkgs/development/libraries/brigand/default.nix b/pkgs/development/libraries/brigand/default.nix index ba7b51bb0e4..7710747d800 100644 --- a/pkgs/development/libraries/brigand/default.nix +++ b/pkgs/development/libraries/brigand/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "brigand"; version = "1.3.0"; diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/development/libraries/bullet/roboschool-fork.nix index 97fe7e51299..8b0901832d1 100644 --- a/pkgs/development/libraries/bullet/roboschool-fork.nix +++ b/pkgs/development/libraries/bullet/roboschool-fork.nix @@ -2,7 +2,7 @@ , Cocoa, OpenGL }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bullet"; version = "2019-03-27"; diff --git a/pkgs/development/libraries/celt/generic.nix b/pkgs/development/libraries/celt/generic.nix index d9e69b8e751..3b7e870b4fe 100644 --- a/pkgs/development/libraries/celt/generic.nix +++ b/pkgs/development/libraries/celt/generic.nix @@ -6,7 +6,7 @@ # The celt codec has been deprecated and is now a part of the opus codec -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "celt"; inherit version; diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix index 80b6480323b..74fd12ffea2 100644 --- a/pkgs/development/libraries/coin3d/default.nix +++ b/pkgs/development/libraries/coin3d/default.nix @@ -1,6 +1,6 @@ { fetchFromBitbucket, stdenv, boost, cmake, libGLU_combined }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "coin"; version = "unstable-2019-06-12"; diff --git a/pkgs/development/libraries/cpp-ipfs-api/default.nix b/pkgs/development/libraries/cpp-ipfs-api/default.nix index 2585a7abaed..dfebccc88e3 100644 --- a/pkgs/development/libraries/cpp-ipfs-api/default.nix +++ b/pkgs/development/libraries/cpp-ipfs-api/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cpp-ipfs-api"; version = "2017-01-04"; diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix index aa0708daaa7..9b6407715df 100644 --- a/pkgs/development/libraries/cxxtest/default.nix +++ b/pkgs/development/libraries/cxxtest/default.nix @@ -3,7 +3,7 @@ let pname = "cxxtest"; version = "4.4"; -in python2Packages.buildPythonApplication rec { +in python2Packages.buildPythonApplication { name = "${pname}-${version}"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix index 76e30e921ba..dc668a233b0 100644 --- a/pkgs/development/libraries/db/db-4.8.nix +++ b/pkgs/development/libraries/db/db-4.8.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ... } @ args: -import ./generic.nix (args // rec { +import ./generic.nix (args // { version = "4.8.30"; sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; extraPatches = [ ./clang-4.8.patch ./CVE-2017-10140-4.8-cwd-db_config.patch ]; diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix index 7894e4c7326..1223cb897e8 100644 --- a/pkgs/development/libraries/db/db-5.3.nix +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ... } @ args: -import ./generic.nix (args // rec { +import ./generic.nix (args // { version = "5.3.28"; sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; extraPatches = [ ./clang-5.3.patch ./CVE-2017-10140-cwd-db_config.patch ]; diff --git a/pkgs/development/libraries/db/db-6.0.nix b/pkgs/development/libraries/db/db-6.0.nix index bafca3bd52d..642054b5a01 100644 --- a/pkgs/development/libraries/db/db-6.0.nix +++ b/pkgs/development/libraries/db/db-6.0.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ... } @ args: -import ./generic.nix (args // rec { +import ./generic.nix (args // { version = "6.0.20"; sha256 = "00r2aaglq625y8r9xd5vw2y070plp88f1mb2gbq3kqsl7128lsl0"; license = stdenv.lib.licenses.agpl3; diff --git a/pkgs/development/libraries/db/db-6.2.nix b/pkgs/development/libraries/db/db-6.2.nix index 96f7668aa90..dee07a9637e 100644 --- a/pkgs/development/libraries/db/db-6.2.nix +++ b/pkgs/development/libraries/db/db-6.2.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ... } @ args: -import ./generic.nix (args // rec { +import ./generic.nix (args // { version = "6.2.23"; sha256 = "1isxx4jfmnh913jzhp8hhfngbk6dsg46f4kjpvvc56maj64jqqa7"; license = stdenv.lib.licenses.agpl3; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index abc32b90c6b..616ad869d57 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -1,92 +1,105 @@ -{ stdenv, lib, fetchurl, pkgconfig, expat, systemd -, libX11 ? null, libICE ? null, libSM ? null, x11Support ? (stdenv.isLinux || stdenv.isDarwin) }: +{ stdenv +, lib +, fetchurl +, pkgconfig +, expat +, systemd +, libX11 ? null +, libICE ? null +, libSM ? null +, x11Support ? (stdenv.isLinux || stdenv.isDarwin) +, dbus +}: + +assert + x11Support -> + libX11 != null && libICE != null && libSM != null; + +stdenv.mkDerivation rec { + pname = "dbus"; + version = "1.12.16"; -assert x11Support -> libX11 != null - && libICE != null - && libSM != null; + src = fetchurl { + url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; + sha256 = "107ckxaff1cv4q6kmfdi2fb1nlsv03312a7kf6lb4biglhpjv8jl"; + }; -let - version = "1.12.16"; - sha256 = "107ckxaff1cv4q6kmfdi2fb1nlsv03312a7kf6lb4biglhpjv8jl"; - -self = stdenv.mkDerivation { - name = "dbus-${version}"; - inherit version; - - src = fetchurl { - url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; - inherit sha256; - }; - - patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; - postPatch = '' - substituteInPlace tools/Makefile.in \ - --replace 'install-localstatelibDATA:' 'disabled:' \ - --replace 'install-data-local:' 'disabled:' \ - --replace 'installcheck-local:' 'disabled:' - substituteInPlace bus/Makefile.in \ - --replace '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus' ':' - '' + /* cleanup of runtime references */ '' - substituteInPlace ./dbus/dbus-sysdeps-unix.c \ - --replace 'DBUS_BINDIR "/dbus-launch"' "\"$lib/bin/dbus-launch\"" - substituteInPlace ./tools/dbus-launch.c \ - --replace 'DBUS_DAEMONDIR"/dbus-daemon"' '"/run/current-system/sw/bin/dbus-daemon"' - ''; - - outputs = [ "out" "dev" "lib" "doc" ]; - - nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ expat ]; - buildInputs = lib.optional stdenv.isLinux systemd - ++ lib.optionals x11Support [ libX11 libICE libSM ]; - # ToDo: optional selinux? - - configureFlags = [ - "--localstatedir=/var" - "--sysconfdir=/etc" - "--with-session-socket-dir=/tmp" - "--with-system-pid-file=/run/dbus/pid" - "--with-system-socket=/run/dbus/system_bus_socket" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - "--with-systemduserunitdir=$(out)/etc/systemd/user" - "--enable-user-session" - "--datadir=/etc" - "--libexecdir=$(out)/libexec" - ] ++ lib.optional (!x11Support) "--without-x"; - - # Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11 - # (it just execs dbus-launch in dbus.tools), contrary to what the configure script demands. - # problems building without x11Support so disabled in that case for now - NIX_CFLAGS_COMPILE = lib.optionalString x11Support "-DDBUS_ENABLE_X11_AUTOLAUNCH=1"; - NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed"; - - enableParallelBuilding = true; - - doCheck = true; - - installFlags = [ "sysconfdir=$(out)/etc" "datadir=$(out)/share" ]; - - postInstall = '' - mkdir -p "$out/share/xml/dbus" - cp doc/*.dtd "$out/share/xml/dbus" - ''; - - # it's executed from $lib by absolute path - postFixup = '' - moveToOutput bin/dbus-launch "$lib" - ln -s "$lib/bin/dbus-launch" "$out/bin/" - ''; - - passthru = { - dbus-launch = "${self.lib}/bin/dbus-launch"; - daemon = self.out; - }; - - meta = with stdenv.lib; { - description = "Simple interprocess messaging system"; - homepage = http://www.freedesktop.org/wiki/Software/dbus/; - license = licenses.gpl2Plus; # most is also under AFL-2.1 - platforms = platforms.unix; - }; + patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; + + postPatch = '' + substituteInPlace tools/Makefile.in \ + --replace 'install-localstatelibDATA:' 'disabled:' \ + --replace 'install-data-local:' 'disabled:' \ + --replace 'installcheck-local:' 'disabled:' + substituteInPlace bus/Makefile.in \ + --replace '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus' ':' + '' + /* cleanup of runtime references */ '' + substituteInPlace ./dbus/dbus-sysdeps-unix.c \ + --replace 'DBUS_BINDIR "/dbus-launch"' "\"$lib/bin/dbus-launch\"" + substituteInPlace ./tools/dbus-launch.c \ + --replace 'DBUS_DAEMONDIR"/dbus-daemon"' '"/run/current-system/sw/bin/dbus-daemon"' + ''; + + outputs = [ "out" "dev" "lib" "doc" ]; + + nativeBuildInputs = [ + pkgconfig + ]; + + propagatedBuildInputs = [ + expat + ]; + + buildInputs = lib.optionals x11Support [ + libX11 + libICE + libSM + ] ++ lib.optional stdenv.isLinux systemd; + # ToDo: optional selinux? + + configureFlags = [ + "--enable-user-session" + "--libexecdir=${placeholder ''out''}/libexec" + "--localstatedir=/var" + "--runstatedir=/run" + "--sysconfdir=/etc" + "--with-session-socket-dir=/tmp" + "--with-system-pid-file=/run/dbus/pid" + "--with-system-socket=/run/dbus/system_bus_socket" + "--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system" + "--with-systemduserunitdir=${placeholder ''out''}/etc/systemd/user" + ] ++ lib.optional (!x11Support) "--without-x"; + + # Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11 + # (it just execs dbus-launch in dbus.tools), contrary to what the configure script demands. + # problems building without x11Support so disabled in that case for now + NIX_CFLAGS_COMPILE = lib.optionalString x11Support "-DDBUS_ENABLE_X11_AUTOLAUNCH=1"; + NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed"; + + enableParallelBuilding = true; + + doCheck = true; + + installFlags = [ + "sysconfdir=${placeholder ''out''}/etc" + "datadir=${placeholder ''out''}/share" + ]; + + # it's executed from $lib by absolute path + postFixup = '' + moveToOutput bin/dbus-launch "$lib" + ln -s "$lib/bin/dbus-launch" "$out/bin/" + ''; + + passthru = { + dbus-launch = "${dbus.lib}/bin/dbus-launch"; + daemon = dbus.out; + }; + + meta = with stdenv.lib; { + description = "Simple interprocess messaging system"; + homepage = http://www.freedesktop.org/wiki/Software/dbus/; + license = licenses.gpl2Plus; # most is also under AFL-2.1 + platforms = platforms.unix; }; -in self +} diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/development/libraries/dbus/make-dbus-conf.nix index 5d441c5d133..e714b96b7e9 100644 --- a/pkgs/development/libraries/dbus/make-dbus-conf.nix +++ b/pkgs/development/libraries/dbus/make-dbus-conf.nix @@ -22,7 +22,7 @@ runCommand "dbus-1" <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> <rewriteSystem systemIdStartString="http://www.freedesktop.org/standards/dbus/1.0/" - rewritePrefix="file://${dbus}/share/xml/dbus/"/> + rewritePrefix="file://${dbus}/share/xml/dbus-1/"/> </catalog> ''; nativeBuildInputs = [ libxslt.bin ]; diff --git a/pkgs/development/libraries/dbus/make-session-conf.xsl b/pkgs/development/libraries/dbus/make-session-conf.xsl index 9544aa13db5..6a19ee14a22 100644 --- a/pkgs/development/libraries/dbus/make-session-conf.xsl +++ b/pkgs/development/libraries/dbus/make-session-conf.xsl @@ -24,6 +24,7 @@ <xsl:for-each select="str:tokenize($serviceDirectories)"> <servicedir><xsl:value-of select="." />/share/dbus-1/services</servicedir> <includedir><xsl:value-of select="." />/etc/dbus-1/session.d</includedir> + <includedir><xsl:value-of select="." />/share/dbus-1/session.d</includedir> </xsl:for-each> </busconfig> </xsl:template> diff --git a/pkgs/development/libraries/dbus/systemd.patch b/pkgs/development/libraries/dbus/systemd.patch deleted file mode 100644 index 7e6cb1f87d0..00000000000 --- a/pkgs/development/libraries/dbus/systemd.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 24fcc9e..98e0459 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1167,7 +1167,8 @@ else - PKG_CHECK_MODULES(SYSTEMD, - [libsystemd-login >= 32, libsystemd-daemon >= 32], - have_systemd=yes, -- have_systemd=no) -+ have_systemd=yes) -+ AC_MSG_NOTICE([NixOS: do not care whether we found systemd or not]) - fi - - if test x$have_systemd = xyes; then diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix index a6ff37bee97..cfc95de1555 100644 --- a/pkgs/development/libraries/dyncall/default.nix +++ b/pkgs/development/libraries/dyncall/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "dyncall"; version = "1.0"; diff --git a/pkgs/development/libraries/elementary-cmake-modules/default.nix b/pkgs/development/libraries/elementary-cmake-modules/default.nix index 566f8bfd8d1..13617d67bf5 100644 --- a/pkgs/development/libraries/elementary-cmake-modules/default.nix +++ b/pkgs/development/libraries/elementary-cmake-modules/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "elementary-cmake-modules"; version = "0.1.0"; diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix index 4fc85aee69f..e968e09459a 100644 --- a/pkgs/development/libraries/embree/2.x.nix +++ b/pkgs/development/libraries/embree/2.x.nix @@ -2,7 +2,7 @@ openimageio, libjpeg, libpng, libpthreadstubs, libX11 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "embree"; version = "2.17.4"; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index ec6f07f0953..21f63e07335 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "exiv2"; version = "0.27.2"; - src = fetchFromGitHub rec { + src = fetchFromGitHub { owner = "exiv2"; repo = "exiv2"; rev = "v${version}"; diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index 2f2e22de12c..a2b048ebd19 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -30,14 +30,14 @@ stdenv.mkDerivation rec { "--with-lapack-libs=-l${blas.linkName}" ] ++ stdenv.lib.optionals stdenv.isx86_64 { # disable SIMD instructions (which are enabled *when available* by default) - "default" = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "westmere" = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "sandybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "ivybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "haswell" = [ "--disable-fma4" ]; - "broadwell" = [ "--disable-fma4" ]; - "skylake" = [ "--disable-fma4" ]; - "skylake-avx512" = [ "--disable-fma4" ]; + default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + haswell = [ "--disable-fma4" ]; + broadwell = [ "--disable-fma4" ]; + skylake = [ "--disable-fma4" ]; + skylake-avx512 = [ "--disable-fma4" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"}; doCheck = true; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 3b1aeeebaab..45a4f48fd33 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -272,7 +272,7 @@ stdenv.mkDerivation rec { * Build flags */ # On some ARM platforms --enable-thumb - "--enable-shared --disable-static" + "--enable-shared" (enableFeature true "pic") (if stdenv.cc.isClang then "--cc=clang" else null) (enableFeature smallBuild "small") diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix index 439342a50b8..f5ef8e850dd 100644 --- a/pkgs/development/libraries/ffmpeg-sixel/default.nix +++ b/pkgs/development/libraries/ffmpeg-sixel/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, libsixel, yasm }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ffmpeg-sixel"; version = "nightly-2.3.x"; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 84260f3f57c..4c0ca0210cc 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr -, x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers +, x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d , openglSupport ? false, libGLU_combined ? null # Build options , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime @@ -89,7 +89,6 @@ stdenv.mkDerivation rec { "--enable-version3" # Build flags "--enable-shared" - "--disable-static" (ifMinVer "0.6" "--enable-pic") (enableFeature runtimeCpuDetectBuild "runtime-cpudetect") "--enable-hardcoded-tables" @@ -145,6 +144,7 @@ stdenv.mkDerivation rec { (ifMinVer "2.8" "--enable-libopus") "--enable-libspeex" (ifMinVer "2.8" "--enable-libx265") + (ifMinVer "4.2" (enableFeature (dav1d != null) "libdav1d")) # Developer flags (enableFeature debugDeveloper "debug") (enableFeature optimizationsDeveloper "optimizations") @@ -170,7 +170,8 @@ stdenv.mkDerivation rec { ++ optional isLinux alsaLib ++ optionals isDarwin darwinFrameworks ++ optional vdpauSupport libvdpau - ++ optional sdlSupport (if reqMin "3.2" then SDL2 else SDL); + ++ optional sdlSupport (if reqMin "3.2" then SDL2 else SDL) + ++ optional (reqMin "4.2") dav1d; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index bc5de5f9730..c9577436c30 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -9,7 +9,7 @@ let withDoc = stdenv.cc.isGNU; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "fftw-${precision}-${version}"; src = fetchurl { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { outputBin = "dev"; # fftw-wisdom configureFlags = - [ "--enable-shared" "--disable-static" + [ "--enable-shared" "--enable-threads" ] ++ optional (precision != "double") "--enable-${precision}" diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix index 0b4172cdc76..4ac8150274c 100644 --- a/pkgs/development/libraries/flite/default.nix +++ b/pkgs/development/libraries/flite/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, alsaLib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "flite-2.1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 186560ae101..5c9a0ecc71b 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -30,6 +30,9 @@ stdenv.mkDerivation rec { src = ./config-compat.patch; inherit configVersion; }) + + # https://gitlab.freedesktop.org/fontconfig/fontconfig/merge_requests/67 + ./fix-joypixels.patch ]; outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config diff --git a/pkgs/development/libraries/fontconfig/fix-joypixels.patch b/pkgs/development/libraries/fontconfig/fix-joypixels.patch new file mode 100644 index 00000000000..d5654063fe8 --- /dev/null +++ b/pkgs/development/libraries/fontconfig/fix-joypixels.patch @@ -0,0 +1,23 @@ +--- a/conf.d/45-generic.conf ++++ b/conf.d/45-generic.conf +@@ -5,6 +5,10 @@ + + <!-- Emoji --> + ++ <alias binding="same"> ++ <family>JoyPixels</family> ++ <default><family>emoji</family></default> ++ </alias> + <alias binding="same"> + <family>Emoji Two</family> + <default><family>emoji</family></default> +--- a/conf.d/60-generic.conf ++++ b/conf.d/60-generic.conf +@@ -29,6 +29,7 @@ + <alias binding="same"> + <family>emoji</family> + <prefer> ++ <family>JoyPixels</family> + <family>Emoji Two</family> + <family>Emoji One</family> + <!-- System fonts --> diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix index 2ee0af8cfc1..5b98d6523b9 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix @@ -1,7 +1,7 @@ { runCommand, lib, fontconfig, fontDirectories }: runCommand "fc-cache" - rec { + { buildInputs = [ fontconfig.bin ]; preferLocalBuild = true; allowSubstitutes = false; diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index eb26a241d1c..6eaf1bbcc2f 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" "--enable-freetype-config" ]; + configureFlags = [ "--bindir=$(dev)/bin" "--enable-freetype-config" ]; # native compiler to generate building tool CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc"; diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix index 100c00eea49..04903cc5e9e 100644 --- a/pkgs/development/libraries/funambol/default.nix +++ b/pkgs/development/libraries/funambol/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, zlib, curl, autoreconfHook, unzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "funambol-client-cpp-9.0.0"; src = fetchurl { diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix index 909c504870f..21975766e74 100644 --- a/pkgs/development/libraries/g2o/default.nix +++ b/pkgs/development/libraries/g2o/default.nix @@ -25,14 +25,14 @@ stdenv.mkDerivation rec { "-DQGLVIEWER_INCLUDE_DIR=${libsForQt5.libqglviewer}/include/QGLViewer" "-DG2O_BUILD_EXAMPLES=OFF" ] ++ lib.optionals stdenv.isx86_64 ([ "-DDO_SSE_AUTODETECT=OFF" ] ++ { - "default" = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ]; - "westmere" = [ "-DDISABLE_SSE4_A=ON" ]; - "sandybridge" = [ "-DDISABLE_SSE4_A=ON" ]; - "ivybridge" = [ "-DDISABLE_SSE4_A=ON" ]; - "haswell" = [ "-DDISABLE_SSE4_A=ON" ]; - "broadwell" = [ "-DDISABLE_SSE4_A=ON" ]; - "skylake" = [ "-DDISABLE_SSE4_A=ON" ]; - "skylake-avx512" = [ "-DDISABLE_SSE4_A=ON" ]; + default = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ]; + westmere = [ "-DDISABLE_SSE4_A=ON" ]; + sandybridge = [ "-DDISABLE_SSE4_A=ON" ]; + ivybridge = [ "-DDISABLE_SSE4_A=ON" ]; + haswell = [ "-DDISABLE_SSE4_A=ON" ]; + broadwell = [ "-DDISABLE_SSE4_A=ON" ]; + skylake = [ "-DDISABLE_SSE4_A=ON" ]; + skylake-avx512 = [ "-DDISABLE_SSE4_A=ON" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"}); postInstall = '' diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix index b7043b61c8a..1a3447f6674 100644 --- a/pkgs/development/libraries/gdata-sharp/default.nix +++ b/pkgs/development/libraries/gdata-sharp/default.nix @@ -2,7 +2,7 @@ let newtonsoft-json = dotnetPackages.NewtonsoftJson; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "gdata-sharp"; version = "2.2.0.0"; diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index 79fb7a8d738..4c1e538dcd6 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { "--disable-optimization" ] ++ stdenv.lib.optionals stdenv.isx86_64 { # disable SIMD instructions (which are enabled *when available* by default) - "default" = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "westmere" = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "sandybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "ivybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "haswell" = [ "--disable-fma4" ]; - "broadwell" = [ "--disable-fma4" ]; - "skylake" = [ "--disable-fma4" ]; - "skylake-avx512" = [ "--disable-fma4" ]; + default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + haswell = [ "--disable-fma4" ]; + broadwell = [ "--disable-fma4" ]; + skylake = [ "--disable-fma4" ]; + skylake-avx512 = [ "--disable-fma4" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"}; # On darwin, tests are linked to dylib in the nix store, so we need to make diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 48e65cc063b..29360585b7e 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -174,8 +174,10 @@ stdenv.mkDerivation rec { inherit doCheck; - passthru = { + passthru = rec { gioModuleDir = "lib/gio/modules"; + makeSchemaPath = dir: name: "${dir}/share/gsettings-schemas/${name}/glib-2.0/schemas"; + getSchemaPath = pkg: makeSchemaPath pkg pkg.name; inherit flattenInclude; updateScript = gnome3.updateScript { packageName = "glib"; }; }; diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index d44bcdda9ae..51e981a2a33 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -13,7 +13,7 @@ with stdenv.lib; let version = "1.0.22"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gloox"; inherit version; diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix index e914f9d78ee..638d483b60e 100644 --- a/pkgs/development/libraries/gnu-config/default.nix +++ b/pkgs/development/libraries/gnu-config/default.nix @@ -13,7 +13,7 @@ let sha256 = "0i699axqfkxk9mgv1hlms5r44pf0s642yz75ajjjpwzhw4d5pnv4"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gnu-config"; version = "2019-04-15"; diff --git a/pkgs/development/libraries/gnutls-kdh/3.5.nix b/pkgs/development/libraries/gnutls-kdh/3.5.nix index e245496c63a..015163b3293 100644 --- a/pkgs/development/libraries/gnutls-kdh/3.5.nix +++ b/pkgs/development/libraries/gnutls-kdh/3.5.nix @@ -1,6 +1,6 @@ { callPackage, fetchFromGitHub, autoreconfHook, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix index 812128fb12f..8b118fe9483 100644 --- a/pkgs/development/libraries/gsettings-qt/default.nix +++ b/pkgs/development/libraries/gsettings-qt/default.nix @@ -3,7 +3,7 @@ , glib, gobject-introspection }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gsettings-qt"; version = "0.1.20170824"; diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix index 0ba3bf35423..ebaf694f04e 100644 --- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix +++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gsignond-plugin-lastfm"; version = "2018-05-07"; diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix index d9afecc6d0c..a140859b693 100644 --- a/pkgs/development/libraries/gsignond/plugins/oauth.nix +++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -2,7 +2,7 @@ , json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45 , docbook_xsl, glibcLocales, gobject-introspection }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gsignond-plugin-oauth"; version = "2018-10-15"; diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix index b9eecaf0946..af57950ac65 100644 --- a/pkgs/development/libraries/gsignond/plugins/sasl.nix +++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, gsignond, gsasl, check , gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobject-introspection }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gsignond-plugin-sasl"; version = "2018-10-15"; diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index c8846509d00..1fd086ca23c 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "gsl-2.5"; + name = "gsl-2.6"; src = fetchurl { url = "mirror://gnu/gsl/${name}.tar.gz"; - sha256 = "1395y9hlhqadn5g9j8q22224fds5sd92jxi9czfavjj24myasq04"; + sha256 = "1a460zj9xmbgvcymkdhqh313c4l29mn9cffbi5vf33x3qygk70mp"; }; # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index fb1d627d7b1..81d91458132 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -6,6 +6,7 @@ , libjpeg , libvisual , tremor # provides 'virbisidec' +, libGL , gtk-doc, docbook_xsl, docbook_xml_dtd_412 , enableX11 ? stdenv.isLinux, libXv , enableWayland ? stdenv.isLinux, wayland @@ -75,7 +76,7 @@ stdenv.mkDerivation rec { ++ lib.optional (!enableCdparanoia) "-Dcdparanoia=disabled" ; - buildInputs = [ orc libtheora libintl libopus isocodes libjpeg tremor ] + buildInputs = [ orc libtheora libintl libopus isocodes libjpeg tremor libGL ] ++ lib.optional (!stdenv.isDarwin) libvisual ++ lib.optional enableAlsa alsaLib ++ lib.optionals enableX11 [ libXv pango ] diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix index 8acaefcedf4..27036ad86ed 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix @@ -4,7 +4,7 @@ let ver_maj = "0.10"; ver_min = "11"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "gstreamermm-${ver_maj}.${ver_min}"; src = fetchurl { diff --git a/pkgs/development/libraries/gthree/default.nix b/pkgs/development/libraries/gthree/default.nix index 6588b8ab440..1af62e14d8d 100644 --- a/pkgs/development/libraries/gthree/default.nix +++ b/pkgs/development/libraries/gthree/default.nix @@ -15,7 +15,7 @@ , json-glib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gthree"; version = "unstable-2019-08-21"; diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix index daaf0399cbc..2281055c62b 100644 --- a/pkgs/development/libraries/gtk-mac-integration/default.nix +++ b/pkgs/development/libraries/gtk-mac-integration/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk-doc, gtk, gobject-introspection }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "gtk-mac-integration-2.0.8"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 26a3428f679..87453a09e7f 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -8,7 +8,7 @@ }: let - version = "2.5.3"; + version = "2.6.0"; inherit (stdenv.lib) optional optionals optionalString; in @@ -17,7 +17,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.xz"; - sha256 = "0p45xk5bblsw8lfs7y7z80b4rvda9f2hlpr28flkrfmpjz3hvl7y"; + sha256 = "0rn9fvnrxds7f4812yx68myy3x7szb4z9ql4m1fgjrc2ahbx3xww"; }; postPatch = '' diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index e81ba6c3572..3e1799d82cd 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -6,7 +6,7 @@ let mkDict = { name, readmeFile, dictFileName, ... }@args: - stdenv.mkDerivation (rec { + stdenv.mkDerivation ({ inherit name; installPhase = '' # hunspell dicts @@ -601,7 +601,7 @@ in rec { /* ITALIAN */ it_IT = it-it; - it-it = mkDictFromLinguistico rec { + it-it = mkDictFromLinguistico { shortName = "it-it"; dictFileName = "it_IT"; shortDescription = "Hunspell dictionary for 'Italian (Italy)' from Linguistico"; @@ -657,7 +657,7 @@ in rec { /* SWEDISH */ sv_SE = sv-se; - sv-se = mkDictFromDSSO rec { + sv-se = mkDictFromDSSO { shortName = "sv-se"; dictFileName = "sv_SE"; shortDescription = "Swedish (Sweden)"; @@ -665,7 +665,7 @@ in rec { # Finlandian Swedish (hello Linus Torvalds) sv_FI = sv-fi; - sv-fi = mkDictFromDSSO rec { + sv-fi = mkDictFromDSSO { shortName = "sv-fi"; dictFileName = "sv_FI"; shortDescription = "Swedish (Finland)"; diff --git a/pkgs/development/libraries/ignition-math/default.nix b/pkgs/development/libraries/ignition-math/default.nix index 297365be874..3a642c8837a 100644 --- a/pkgs/development/libraries/ignition-math/default.nix +++ b/pkgs/development/libraries/ignition-math/default.nix @@ -3,7 +3,7 @@ let version = "2.6.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ign-math2"; inherit version; diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix index 31b9a4b0e9f..0e7603db585 100644 --- a/pkgs/development/libraries/ignition-transport/generic.nix +++ b/pkgs/development/libraries/ignition-transport/generic.nix @@ -5,7 +5,7 @@ , ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ign-transport"; inherit version; inherit src; diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix index a5b226ee9c7..98a34477e4f 100644 --- a/pkgs/development/libraries/ijs/default.nix +++ b/pkgs/development/libraries/ijs/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; - configureFlags = [ "--disable-static" "--enable-shared" ]; + configureFlags = [ "--enable-shared" ]; meta = with stdenv.lib; { homepage = https://www.openprinting.org/download/ijs/; diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix index 2beff09d0b4..f74477eab38 100644 --- a/pkgs/development/libraries/incrtcl/default.nix +++ b/pkgs/development/libraries/incrtcl/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, tcl}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "incrtcl"; version = "4.0.4"; diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix index 20a60f1a102..13c71dc8f70 100644 --- a/pkgs/development/libraries/isl/0.11.1.nix +++ b/pkgs/development/libraries/isl/0.11.1.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gmp }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "isl-0.11.1"; # CLooG 0.16.3 fails to build with ISL 0.08. src = fetchurl { diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 599e8dcc597..37d6c0643c7 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iso-codes"; - version = "3.79"; + version = "4.3"; src = fetchurl { - url = "https://salsa.debian.org/iso-codes-team/iso-codes/uploads/ef8de8bc12e0512d26ed73436a477871/${pname}-${version}.tar.xz"; - sha256 = "08i8hjy0qjlw9kd9i87jx967ihwh45l2xi55q1aa5265sind7byb"; + url = "https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/${pname}-${version}/${pname}-${pname}-${version}.tar.bz2"; + sha256 = "11n3sccwapfr7npxad8m3xmc7w8i11kk70ffbz25gj82bn8rylvb"; }; patchPhase = '' diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix index 68e2a737791..1f2aeda80cf 100644 --- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix +++ b/pkgs/development/libraries/java/hydra-ant-logger/default.nix @@ -1,6 +1,6 @@ { fetchgit, stdenv, ant, jdk }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "hydra-ant-logger"; version = "2010.2"; diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index 591de48d319..a93d7774291 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -5,13 +5,13 @@ let platformMap = { - "x86_64-linux" = + x86_64-linux = { platform = "gtk-linux-x86_64"; sha256 = "1qq0pjll6030v4ml0hifcaaik7sx3fl7ghybfdw95vsvxafwp2ff"; }; - "i686-linux" = + i686-linux = { platform = "gtk-linux-x86"; sha256 = "03mhzraikcs4fsz7d3h5af9pw1bbcfd6dglsvbk2ciwimy9zj30q"; }; - "x86_64-darwin" = + x86_64-darwin = { platform = "cocoa-macosx-x86_64"; sha256 = "00k1mfbncvyh8klgmk0891w8jwnd5niqb16j1j8yacrm2smmlb05"; }; }; diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index e8a7aa7322f..ef1171b1760 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -64,7 +64,7 @@ let let inherit (args) name; - inherit (srcs."${name}") src version; + inherit (srcs.${name}) src version; outputs = args.outputs or [ "bin" "dev" "out" ]; hasSeparateDev = lib.elem "dev" outputs; diff --git a/pkgs/development/libraries/kinetic-cpp-client/default.nix b/pkgs/development/libraries/kinetic-cpp-client/default.nix index 1ebf2c2e21e..21e3c4d3424 100644 --- a/pkgs/development/libraries/kinetic-cpp-client/default.nix +++ b/pkgs/development/libraries/kinetic-cpp-client/default.nix @@ -8,7 +8,7 @@ let sha256 = "0406pp0sdf0rg6s5g18r2d8si2rin7p6qbzp7c6pma5hyzsygz48"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "kinetic-cpp-client-2015-04-14"; src = fetchgit { diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index 3f84706bffb..71e88559dee 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libdrm, python }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "kmsxx"; version = "2018-10-23"; diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix index a8ddab2978d..48fb0f1153e 100644 --- a/pkgs/development/libraries/libagar/default.nix +++ b/pkgs/development/libraries/libagar/default.nix @@ -4,7 +4,7 @@ }: let srcs = import ./srcs.nix { inherit fetchurl; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libagar"; inherit (srcs) version src; diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/pkgs/development/libraries/libagar/libagar_test.nix index 43d66b8251c..4295971d5a0 100644 --- a/pkgs/development/libraries/libagar/libagar_test.nix +++ b/pkgs/development/libraries/libagar/libagar_test.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bsdbuild, libagar, perl, libjpeg, libpng, openssl }: let srcs = import ./srcs.nix { inherit fetchurl; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libagar-test"; inherit (srcs) version src; diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix index b20850e88ff..9aedde923f0 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/development/libraries/libbap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, bap, ocaml, findlib, ctypes, autoreconfHook, which }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libbap"; version = "master-2019-04-05"; diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix index 5af8acb5ed7..89ca984767b 100644 --- a/pkgs/development/libraries/libbfd/default.nix +++ b/pkgs/development/libraries/libbfd/default.nix @@ -3,7 +3,7 @@ , libiberty, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libbfd"; inherit (binutils-unwrapped) version src; diff --git a/pkgs/development/libraries/libcredis/default.nix b/pkgs/development/libraries/libcredis/default.nix index 10a4c276ebd..bfc7fe1d949 100644 --- a/pkgs/development/libraries/libcredis/default.nix +++ b/pkgs/development/libraries/libcredis/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libcredis-0.2.3"; src = fetchurl { diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 29d59659f90..11fb21fe52e 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess, valgrind-light }: +{ stdenv, lib, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess +, withValgrind ? valgrind-light.meta.available, valgrind-light +}: stdenv.mkDerivation rec { pname = "libdrm"; @@ -12,7 +14,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "bin" ]; nativeBuildInputs = [ pkgconfig meson ninja ]; - buildInputs = [ libpthreadstubs libpciaccess valgrind-light ]; + buildInputs = [ libpthreadstubs libpciaccess ] + ++ lib.optional withValgrind valgrind-light; patches = [ ./cross-build-nm-path.patch ]; @@ -22,14 +25,14 @@ stdenv.mkDerivation rec { done ''; - mesonFlags = - [ - "-Dnm-path=${stdenv.cc.targetPrefix}nm" - "-Dinstall-test-programs=true" ] - ++ stdenv.lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) - [ "-Dtegra=true" "-Detnaviv=true" ] - ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-Dintel=false" - ; + mesonFlags = [ + "-Dnm-path=${stdenv.cc.targetPrefix}nm" + "-Dinstall-test-programs=true" + "-Domap=true" + ] ++ lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) [ + "-Dtegra=true" + "-Detnaviv=true" + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-Dintel=false"; enableParallelBuilding = true; @@ -37,6 +40,6 @@ stdenv.mkDerivation rec { homepage = https://dri.freedesktop.org/libdrm/; description = "Library for accessing the kernel's Direct Rendering Manager"; license = "bsd"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 3fd2a328558..352d2b17406 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -16,7 +16,7 @@ let }; in rec { - libdwarf = stdenv.mkDerivation rec { + libdwarf = stdenv.mkDerivation { pname = "libdwarf"; inherit version; @@ -37,7 +37,7 @@ in rec { inherit meta src; }; - dwarfdump = stdenv.mkDerivation rec { + dwarfdump = stdenv.mkDerivation { pname = "dwarfdump"; inherit version; diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix index 8555449f28b..9650f540fcf 100644 --- a/pkgs/development/libraries/libesmtp/default.nix +++ b/pkgs/development/libraries/libesmtp/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libESMTP"; version = "1.0.6"; diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index 5fb46bff075..a94b6d1dc2a 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -6,11 +6,11 @@ assert sslSupport -> openssl != null; stdenv.mkDerivation rec { pname = "libevent"; - version = "2.1.10"; + version = "2.1.11"; src = fetchurl { url = "https://github.com/libevent/libevent/releases/download/release-${version}-stable/libevent-${version}-stable.tar.gz"; - sha256 = "1c25928gdv495clxk2v1d4gkr5py7ack4gx2n7d13frnld0syr78"; + sha256 = "0g988zqm45sj1hlhhz4il5z4dpi5dl74hzjwzl4md37a09iaqnx6"; }; # libevent_openssl is moved into its own output, so that openssl isn't present diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index 0c8a7084e09..e007ab2f95a 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -2,7 +2,7 @@ zlib, libpng, boost, qt5, guile }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libfive"; version = "2018-07-01"; diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix index c0595ac93d1..8ddce0aa98c 100644 --- a/pkgs/development/libraries/libfreefare/default.nix +++ b/pkgs/development/libraries/libfreefare/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libnfc, openssl , libobjc ? null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libfreefare"; version = "0.4.0"; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 36a1b7d3720..75d8e6710e0 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -6,11 +6,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "libgcrypt"; - version = "1.8.4"; + version = "1.8.5"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2"; - sha256 = "09r27ywj9zplq6n9qw3mn7zmvf6y2jdmwx5d1kg8yqkj0qx18f7n"; + sha256 = "1hvsazms1bfd769q0ngl0r9g5i4m9mpz9jmvvrdzyzk3rfa2ljiv"; }; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index ba9eab43202..9ba3cdbd09a 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -2,7 +2,7 @@ , libtiff, giflib, libjpeg, libpng , libXrender, libexif, autoreconfHook, fetchpatch }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libgdiplus-5.6.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index 260c3a3d97b..b9e1d668cd3 100644 --- a/pkgs/development/libraries/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgee"; - version = "0.20.1"; + version = "0.20.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v"; + sha256 = "0g1mhl7nidg82v4cikkk8dakzc18hg7wv0dsf2pbyijzfm5mq0wy"; }; doCheck = true; diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index ed6139d48f6..2b64d5b7220 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -43,10 +43,11 @@ stdenv.mkDerivation rec { }); outputs = [ "out" "dev" ]; - # Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found. - # See the explanation in addOpenGLRunpath. + # Set RUNPATH so that libGLX can find driver libraries in /run/opengl-driver(-32)/lib. + # Note that libEGL does not need it because it uses driver config files which should + # contain absolute paths to libraries. postFixup = '' - addOpenGLRunpath $out/lib/libGLX.so $out/lib/libEGL.so + addOpenGLRunpath $out/lib/libGLX.so ''; passthru = { inherit (addOpenGLRunpath) driverLink; }; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index f3e1b8b0f99..d7fb35897dc 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPackages, fetchurl, gettext +{ stdenv, lib, buildPackages, fetchurl, gettext, fetchpatch , genPosixLockObjOnly ? false }: let genPosixLockObjOnlyAttrs = lib.optionalAttrs genPosixLockObjOnly { @@ -24,7 +24,18 @@ in stdenv.mkDerivation (rec { sha256 = "0z696dmhfxm2n6pmr8b857wwljq9h633yi99bhbn7h88f91rigds"; }; + # Remove gawk buildfix on > 1.36 + patches = [ + (fetchpatch { + url = "https://dev.gnupg.org/rE7865041c77f4f7005282f10f9b6666b19072fbdf?diff=1"; + sha256 = "0hs4rpwqq2afpsbqliq451jjaysq2iyzxvd9sx3992b4vnllgqqq"; + }) + ]; + postPatch = '' + # Remove on > 1.36 release: gawk upgrade fix didn't include Makefile regeneration + sed 's/-v namespace=errnos_/-v pkg_namespace=errnos_/' -i src/Makefile.in + sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) '' ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabihf.h diff --git a/pkgs/development/libraries/libgumath/default.nix b/pkgs/development/libraries/libgumath/default.nix index b82c547fb33..f1483c38c15 100644 --- a/pkgs/development/libraries/libgumath/default.nix +++ b/pkgs/development/libraries/libgumath/default.nix @@ -4,7 +4,7 @@ , libxnd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libgumath"; version = "unstable-2018-11-27"; diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index e5b6c4e068c..c4f353fb6d5 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -5,11 +5,9 @@ , hicolor-icon-theme }: -let +stdenv.mkDerivation rec { pname = "libhandy"; version = "0.0.11"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; outputs = [ "out" "dev" "devdoc" "glade" ]; outputBin = "dev"; diff --git a/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch b/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch deleted file mode 100644 index 2ea1b124ce7..00000000000 --- a/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch +++ /dev/null @@ -1,15 +0,0 @@ -Adapted from upstream commit 995a4283d8ed2d0d2c1ceb1a577b993df2f0e014 ---- a/libheif/heif_context.cc -+++ b/libheif/heif_context.cc -@@ -571,6 +571,11 @@ - image->set_is_alpha_channel_of(refs[0]); - - auto master_iter = m_all_images.find(refs[0]); -+ if (master_iter == m_all_images.end()) { -+ return Error(heif_error_Invalid_input, -+ heif_suberror_Nonexisting_item_referenced, -+ "Non-existing alpha image referenced"); -+ } - master_iter->second->set_alpha_channel(image); - } - diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index 7e1bb2daa9e..02c4dd33481 100644 --- a/pkgs/development/libraries/libheif/default.nix +++ b/pkgs/development/libraries/libheif/default.nix @@ -1,18 +1,16 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libde265, x265, libpng, libjpeg }: stdenv.mkDerivation rec { - version = "1.4.0"; pname = "libheif"; + version = "1.5.0"; src = fetchFromGitHub { owner = "strukturag"; repo = "libheif"; rev = "v${version}"; - sha256 = "0vbjknkb2ccmw3xh2j8ljz5sj9i8wv92iw7zghcc5wn64sk1xkk2"; + sha256 = "1nvfjmnha06689imm8v24nlc011814gc9xq3x54cnmqvh5gn98ah"; }; - patches = [ ./1.4.0-CVE-2019-11471.patch ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libde265 x265 libpng libjpeg ]; diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix index ab1858c51a6..08a88bfee45 100644 --- a/pkgs/development/libraries/libiberty/default.nix +++ b/pkgs/development/libraries/libiberty/default.nix @@ -2,7 +2,7 @@ let inherit (buildPackages.buildPackages) gcc; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libiberty-${gcc.cc.version}"; inherit (gcc.cc) src; diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index d8881b929a0..050cba5460d 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -1,34 +1,64 @@ -{ stdenv, fetchFromGitHub, perl, pkgconfig, cmake, ninja, vala, gobject-introspection -, python3, tzdata, glib, libxml2, icu }: +{ stdenv +, fetchFromGitHub +, cmake +, glib +, gobject-introspection +, icu +, libxml2 +, ninja +, perl +, pkgconfig +, python3 +, tzdata +, vala +}: stdenv.mkDerivation rec { pname = "libical"; - version = "3.0.4"; + version = "3.0.5"; - outputs = [ "out" "dev" ]; #"devdoc" ]; + outputs = [ "out" "dev" ]; # "devdoc" ]; src = fetchFromGitHub { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "1qgpbdjd6jsivw87v5w52268kqp0rv780kli8cgb3ndlv592wlbm"; + sha256 = "03kjc4s1svmzkmzkr0irgczq37aslhj4bxnvjqav0jwa2zrynhra"; }; nativeBuildInputs = [ - perl pkgconfig cmake ninja vala gobject-introspection - (python3.withPackages (pkgs: with pkgs; [ pygobject3 ])) # running libical-glib tests -# Docs building fails: https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489 -# gtk-doc docbook_xsl docbook_xml_dtd_43 # docs + cmake + gobject-introspection + ninja + perl + pkgconfig + vala + # Docs building fails: + # https://github.com/NixOS/nixpkgs/pull/67204 + # previously with https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489 + # gtk-doc docbook_xsl docbook_xml_dtd_43 # for docs + ]; + installCheckInputs = [ + # running libical-glib tests + (python3.withPackages (pkgs: with pkgs; [ + pygobject3 + ])) + ]; + + buildInputs = [ + glib + libxml2 + icu ]; - buildInputs = [ glib libxml2 icu ]; cmakeFlags = [ "-DGOBJECT_INTROSPECTION=True" + "-DENABLE_GTK_DOC=False" "-DICAL_GLIB_VAPI=True" ]; patches = [ - # TODO: upstream this patch + # Will appear in 3.1.0 # https://github.com/libical/libical/issues/350 ./respect-env-tzdir.patch ]; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index c1ee68a2470..044ef2dd6a7 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { pname = "libinput"; - version = "1.13.4"; + version = "1.14.1"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz"; - sha256 = "07a0w7rak7rvnh6g4j0akwjxwinxfszc1xi9mrx12fv82k3mgsyk"; + sha256 = "0w7fas37mp2k06f12i3lnj717lw73asziknj6z51kh1m50ja6cz3"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/development/libraries/libipfix/default.nix b/pkgs/development/libraries/libipfix/default.nix index c4dca659d36..fccf4b3d50f 100644 --- a/pkgs/development/libraries/libipfix/default.nix +++ b/pkgs/development/libraries/libipfix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libipfix"; version = "110209"; src = fetchurl { diff --git a/pkgs/development/libraries/libjpeg-drop/default.nix b/pkgs/development/libraries/libjpeg-drop/default.nix index 0f2c9dce28a..4e9c165e71f 100644 --- a/pkgs/development/libraries/libjpeg-drop/default.nix +++ b/pkgs/development/libraries/libjpeg-drop/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libjpeg-drop-9b"; srcs = [ diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix index ba92bdd5165..b62f0f116a0 100644 --- a/pkgs/development/libraries/libjson/default.nix +++ b/pkgs/development/libraries/libjson/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip }: let version = "7.6.1"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "libjson"; inherit version; src = fetchurl { diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/development/libraries/libksi/default.nix index 92e7d26f5af..b4e9f2bdf88 100644 --- a/pkgs/development/libraries/libksi/default.nix +++ b/pkgs/development/libraries/libksi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, openssl, curl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libksi-2015-07-03"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix index d9f460d44e8..c51cb9baead 100644 --- a/pkgs/development/libraries/liblastfmSF/default.nix +++ b/pkgs/development/libraries/liblastfmSF/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, curl, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "liblastfm-SF-0.5"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index a61c21ffec5..6dfb95d1fb8 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -4,7 +4,7 @@ let version = "3.10.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "liblouis"; inherit version; diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/development/libraries/libmcrypt/default.nix index 2ce11b998a1..4a4074e2f22 100644 --- a/pkgs/development/libraries/libmcrypt/default.nix +++ b/pkgs/development/libraries/libmcrypt/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libmcrypt-2.5.8"; src = fetchurl { diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index d2fba5cddd8..57053103417 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libmemcached-1.0.18"; src = fetchurl { diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 719053e7ecf..f8f4439a3df 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmicrohttpd"; - version = "0.9.64"; + version = "0.9.66"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/${pname}-${version}.tar.gz"; - sha256 = "03imzkd1hl2mkkpi84vg5xq9x6b58gwsv86ym85km0lhb7nxi4p7"; + sha256 = "06xblz77bnn29y7sl43avxbcrjbw486x3416plpr3x3l2pdx8rjf"; }; outputs = [ "out" "dev" "devdoc" "info" ]; diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix index e4010280f4b..9ffbc95b1fd 100644 --- a/pkgs/development/libraries/libmpc/default.nix +++ b/pkgs/development/libraries/libmpc/default.nix @@ -5,7 +5,7 @@ let version = "1.1.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libmpc"; inherit version; # to avoid clash with the MPD client diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix index 6c4fc798f33..a522c72fc76 100644 --- a/pkgs/development/libraries/libndtypes/default.nix +++ b/pkgs/development/libraries/libndtypes/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libndtypes"; version = "unstable-2018-11-27"; diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix index 695ddadb5f3..3d069d7a168 100644 --- a/pkgs/development/libraries/libnfc/default.nix +++ b/pkgs/development/libraries/libnfc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libusb, readline }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libnfc"; version = "1.7.1"; diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index ad51ac8d6db..815ed3a6bd4 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - version = "1.1.3"; + version = "1.1.4"; pname = "libnftnl"; src = fetchurl { url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2"; - sha256 = "03xszkcpqk3s1rqc6vh7g5j13kh3d3yjnvjhk5scds3an39rgp92"; + sha256 = "087dfc2n4saf2k68hyi4byvgz5grwpw5kfjvmkpn3wmd8y1riiy8"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix index c0c66bc1a4a..4049a18145c 100644 --- a/pkgs/development/libraries/libnih/default.nix +++ b/pkgs/development/libraries/libnih/default.nix @@ -2,7 +2,7 @@ let version = "1.0.3"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libnih"; inherit version; diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix index c42cd3206b4..aa307f68ca0 100644 --- a/pkgs/development/libraries/libopcodes/default.nix +++ b/pkgs/development/libraries/libopcodes/default.nix @@ -3,7 +3,7 @@ , libiberty, libbfd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libopcodes"; inherit (binutils-unwrapped) version src; diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 752be52963c..01da76749ba 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -4,7 +4,7 @@ let version = "1.3.1"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libopus"; inherit version; diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/development/libraries/libopusenc/default.nix index e1d70bee6c4..9b91e32f228 100644 --- a/pkgs/development/libraries/libopusenc/default.nix +++ b/pkgs/development/libraries/libopusenc/default.nix @@ -3,7 +3,7 @@ let version = "0.2.1"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libopusenc"; inherit version; diff --git a/pkgs/development/libraries/libosmpbf/default.nix b/pkgs/development/libraries/libosmpbf/default.nix index 54ee86f0a39..4be744e7ba9 100644 --- a/pkgs/development/libraries/libosmpbf/default.nix +++ b/pkgs/development/libraries/libosmpbf/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, protobuf}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libosmpbf-1.3.3"; src = fetchurl { diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 7e2443d31e9..15aa7c9e22d 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--disable-static" # "--enable-gtk-doc" "--enable-man" "--enable-valgrind-tests" diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index f1c7874e313..41a2a1b669d 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -2,7 +2,7 @@ , qtbase, qtmultimedia }: let - generic = version: sha256: prefix: stdenv.mkDerivation rec { + generic = version: sha256: prefix: stdenv.mkDerivation { pname = "libqmatrixclient"; inherit version; diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix index f11a7eb1fe5..43f80076328 100644 --- a/pkgs/development/libraries/librep/default.nix +++ b/pkgs/development/libraries/librep/default.nix @@ -19,10 +19,6 @@ stdenv.mkDerivation rec { buildInputs = [ readline texinfo ]; propagatedBuildInputs = [ gdbm gmp libffi ]; - configureFlags = [ - "--disable-static" - ]; - setupHook = ./setup-hook.sh; meta = { diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index bdca44dc7d0..d85c9e94ebd 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -2,7 +2,7 @@ let version = "1.8.5"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libspatialindex"; inherit version; diff --git a/pkgs/development/libraries/libstemmer/default.nix b/pkgs/development/libraries/libstemmer/default.nix index 67d6d8d42ea..2f6b2835c4e 100644 --- a/pkgs/development/libraries/libstemmer/default.nix +++ b/pkgs/development/libraries/libstemmer/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libstemmer-2017-03-02"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 30240038843..004d2ef0dd5 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, texinfo }: stdenv.mkDerivation rec { - name = "libtasn1-4.13"; + name = "libtasn1-4.14"; src = fetchurl { url = "mirror://gnu/libtasn1/${name}.tar.gz"; - sha256 = "1jlc1iahj8k3haz28j55nzg7sgni5h41vqy461i1bpbx6668wlky"; + sha256 = "025sqnlzji78ss2fi78dajc0v0h5fi02wp39hws41sn8qnjlnq4y"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix index 7a25980a38b..6d95d81e5d9 100644 --- a/pkgs/development/libraries/libtcod/default.nix +++ b/pkgs/development/libraries/libtcod/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromBitbucket, cmake, SDL, libGLU_combined, upx, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libtcod"; version = "1.5.1"; diff --git a/pkgs/development/libraries/libtelnet/default.nix b/pkgs/development/libraries/libtelnet/default.nix index 139de830972..043acee0cfe 100644 --- a/pkgs/development/libraries/libtelnet/default.nix +++ b/pkgs/development/libraries/libtelnet/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libtelnet"; version = "0.21+45f2d5c"; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 9bccff49b54..e9267df5047 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -3,7 +3,7 @@ let generic = { version, sha256 }: - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "libtoxcore"; inherit version; @@ -42,7 +42,7 @@ let }; }; -in rec { +in { libtoxcore_0_1 = generic { version = "0.1.11"; sha256 = "1fya5gfiwlpk6fxhalv95n945ymvp2iidiyksrjw1xw95fzsp1ij"; diff --git a/pkgs/development/libraries/libtoxcore/new-api.nix b/pkgs/development/libraries/libtoxcore/new-api.nix index c3981f5c58e..6cd5f9122a4 100644 --- a/pkgs/development/libraries/libtoxcore/new-api.nix +++ b/pkgs/development/libraries/libtoxcore/new-api.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus , libvpx, check, libconfig, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "tox-core-new-20160727"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix index 9a3671c3258..4959674f0ad 100644 --- a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix @@ -2,7 +2,7 @@ let version = "1.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libtxc_dxtn_s2tc"; inherit version; diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index 446d30c609e..e333e73de3f 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -6,7 +6,7 @@ let backend = if stdenv.isDarwin then "darwin" else "unix"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${shortName}-${version}"; src = fetchgit { url = "https://github.com/andlabs/libui.git"; diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix index 501bf9a3dc9..2baaa14b88e 100644 --- a/pkgs/development/libraries/libunity/default.nix +++ b/pkgs/development/libraries/libunity/default.nix @@ -12,7 +12,7 @@ , autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libunity"; version = "unstable-2019-03-19"; @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--disable-static" "--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" ]; diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index ee36365c03f..d80fe6a998c 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { (if isDarwin || isCygwin then "--enable-static --disable-shared" else - "--disable-static --enable-shared") + "--enable-shared") (enableFeature smallSupport "small") (enableFeature postprocVisualizerSupport "postproc-visualizer") (enableFeature unitTestsSupport "unit-tests") diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix index 75e935d18d9..48dbc5f395c 100644 --- a/pkgs/development/libraries/libvterm-neovim/default.nix +++ b/pkgs/development/libraries/libvterm-neovim/default.nix @@ -4,7 +4,7 @@ , libtool }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libvterm-neovim"; version = "2018-11-26"; diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix index 9eb891544b5..eb031eb2a9d 100644 --- a/pkgs/development/libraries/libxnd/default.nix +++ b/pkgs/development/libraries/libxnd/default.nix @@ -4,7 +4,7 @@ , libndtypes }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libxnd"; version = "unstable-2018-11-27"; diff --git a/pkgs/development/libraries/libykclient/default.nix b/pkgs/development/libraries/libykclient/default.nix index 9aa189586f0..e1bf4fca7b5 100644 --- a/pkgs/development/libraries/libykclient/default.nix +++ b/pkgs/development/libraries/libykclient/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, curl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libykclient"; version = "unstable-2019-03-18"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index f5cb197dfe5..8635b8c412f 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -37,14 +37,14 @@ stdenv.mkDerivation rec { "--disable-optimization" ] ++ stdenv.lib.optionals stdenv.isx86_64 { # disable SIMD instructions (which are enabled *when available* by default) - "default" = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "westmere" = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "sandybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "ivybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "haswell" = [ "--disable-fma4" ]; - "broadwell" = [ "--disable-fma4" ]; - "skylake" = [ "--disable-fma4" ]; - "skylake-avx512" = [ "--disable-fma4" ]; + default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + haswell = [ "--disable-fma4" ]; + broadwell = [ "--disable-fma4" ]; + skylake = [ "--disable-fma4" ]; + skylake-avx512 = [ "--disable-fma4" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"} ++ stdenv.lib.optionals withSage [ "--enable-sage" diff --git a/pkgs/development/libraries/linenoise/default.nix b/pkgs/development/libraries/linenoise/default.nix index 857f5247cd5..0098116563a 100644 --- a/pkgs/development/libraries/linenoise/default.nix +++ b/pkgs/development/libraries/linenoise/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "linenoise"; version = "1.0.10"; # Its version 1.0 plus 10 commits diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix index 8b0aecdab16..8c691f77591 100644 --- a/pkgs/development/libraries/liquid-dsp/default.nix +++ b/pkgs/development/libraries/liquid-dsp/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "liquid-dsp"; version = "20170307"; diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix index 9c1815f840b..2df7ef94cf3 100644 --- a/pkgs/development/libraries/liquidfun/default.nix +++ b/pkgs/development/libraries/liquidfun/default.nix @@ -8,7 +8,7 @@ let hash="5011a000eacd6202a47317c489e44aa753a833fb562d970e7b8c0da9de01df86"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { src = requireFile { url = sourceInfo.url; sha256 = sourceInfo.hash; diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix index ab8c2c9385f..ccf246c044e 100644 --- a/pkgs/development/libraries/log4shib/default.nix +++ b/pkgs/development/libraries/log4shib/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "log4shib"; version = "1.0.9"; diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix index 50baad6a7a0..7ca7456f789 100644 --- a/pkgs/development/libraries/luabind/default.nix +++ b/pkgs/development/libraries/luabind/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, boost-build, lua, boost}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "luabind-0.9.1"; src = fetchurl { diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index ebd68134ba5..38261bd1e53 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -2,7 +2,7 @@ , fetchgit, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mediastreamer-openh264"; version = "0.0pre20160801"; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 7610b15296e..cf1bdaf6432 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; let - version = "19.1.3"; + version = "19.1.5"; branch = head (splitString "." version); in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mesa"; inherit version; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "1q5p4mw7zrklwx1is09knnb762zzk33xwhwp99fw25ax4ar60m44"; + sha256 = "1d3frncljickn5yi2ch1w2phwxhxpi6diyac3cbin9f76m7f2m3v"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/miniball/default.nix b/pkgs/development/libraries/miniball/default.nix index 3493bc5d967..287241a75c9 100644 --- a/pkgs/development/libraries/miniball/default.nix +++ b/pkgs/development/libraries/miniball/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "miniball"; version = "3.0"; diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix index 04f84d49f84..c8ea3315f8b 100644 --- a/pkgs/development/libraries/msgpack/generic.nix +++ b/pkgs/development/libraries/msgpack/generic.nix @@ -3,7 +3,7 @@ , ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "msgpack"; inherit version; diff --git a/pkgs/development/libraries/mumlib/default.nix b/pkgs/development/libraries/mumlib/default.nix index 7117599d15e..f936fc8b3df 100644 --- a/pkgs/development/libraries/mumlib/default.nix +++ b/pkgs/development/libraries/mumlib/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig , boost, openssl, log4cpp, libopus, protobuf }: -with lib; stdenv.mkDerivation rec { +with lib; stdenv.mkDerivation { pname = "mumlib"; version = "unstable-2018-12-12"; diff --git a/pkgs/development/libraries/mutest/default.nix b/pkgs/development/libraries/mutest/default.nix index 423a93b69a8..37bfb05c4ee 100644 --- a/pkgs/development/libraries/mutest/default.nix +++ b/pkgs/development/libraries/mutest/default.nix @@ -4,7 +4,7 @@ , ninja }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mutest"; version = "unstable-2019-08-26"; diff --git a/pkgs/development/libraries/mypaint-brushes/default.nix b/pkgs/development/libraries/mypaint-brushes/default.nix index 140dbcc937b..3dac7c93e84 100644 --- a/pkgs/development/libraries/mypaint-brushes/default.nix +++ b/pkgs/development/libraries/mypaint-brushes/default.nix @@ -3,7 +3,7 @@ let pname = "mypaint-brushes"; version = "1.3.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix index 6ec288f985b..8164f4ec972 100644 --- a/pkgs/development/libraries/mysocketw/default.nix +++ b/pkgs/development/libraries/mysocketw/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "mysocketw-031026"; src = fetchurl { url = http://www.digitalfanatics.org/cal/socketw/files/SocketW031026.tar.gz; diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index 83d01f85d0a..2e29ab395d6 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -2,7 +2,7 @@ let version = "2.8"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ndpi"; inherit version; diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix index 65679c7e282..a79c42a1c8f 100644 --- a/pkgs/development/libraries/neardal/default.nix +++ b/pkgs/development/libraries/neardal/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, glib, readline, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "neardal-0.7-post-git-20150930"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix index d78a31d65cd..064ef344398 100644 --- a/pkgs/development/libraries/nettle/generic.nix +++ b/pkgs/development/libraries/nettle/generic.nix @@ -4,7 +4,7 @@ , version, src , ...}: -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ name = "nettle-${version}"; inherit src; diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index d6fcfb41149..d02247196b1 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -18,11 +18,11 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.39.1"; + version = "1.39.2"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "1vzmkh3pky3l3w6iaffhikh7hslp8zp0jsdqpd6knbflsmzp511a"; + sha256 = "1l51q8xqg7d7y9413z8l0scxgbbl1qkwgq4f09jqb31j492kx8lj"; }; outputs = [ "bin" "out" "dev" "lib" ]; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index b7b4ea45d8b..b6b1d406eac 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -5,7 +5,7 @@ let url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.44.1"; + version = "3.46"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "1y0jvva4s3j7cjz22kqw2lsml0an1295bgpc2raf7kc9r60cpr7w"; + sha256 = "1vqcl6wxn2nsm2fmlwzmxyagrsj1p1y9bc54b2i2nq45s94rcsbb"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/libraries/nvidia-video-sdk/default.nix b/pkgs/development/libraries/nvidia-video-sdk/default.nix index 798f9d3a396..b7d46cd5537 100644 --- a/pkgs/development/libraries/nvidia-video-sdk/default.nix +++ b/pkgs/development/libraries/nvidia-video-sdk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "nvidia-video-sdk-6.0.1"; src = fetchurl { diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index 6cab843a22b..84205253554 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0f14gpa13sdm0kzqv5yycp4pschbmi6n5fj7wl4ilspzsrqcgqr2"; }; - nativeBuildInputs = [ ruby addOpenGLRunpath ]; + nativeBuildInputs = [ ruby ]; buildInputs = [ opencl-headers ]; @@ -17,12 +17,6 @@ stdenv.mkDerivation rec { sed -i 's,"/etc/OpenCL/vendors","${addOpenGLRunpath.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c ''; - # Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found. - # See the explanation in addOpenGLRunpath. - postFixup = '' - addOpenGLRunpath $out/lib/libOpenCL.so - ''; - meta = with stdenv.lib; { description = "OpenCL ICD Loader for ${opencl-headers.name}"; homepage = https://forge.imag.fr/projects/ocl-icd/; diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix index 5aeb07de923..4d4505c3e70 100644 --- a/pkgs/development/libraries/openbr/default.nix +++ b/pkgs/development/libraries/openbr/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, opencv, qtbase, qtsvg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.5"; pname = "openbr"; diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix index 9ce8bb618bf..d0cc6396b8d 100644 --- a/pkgs/development/libraries/opencl-headers/default.nix +++ b/pkgs/development/libraries/opencl-headers/default.nix @@ -2,7 +2,7 @@ , version # "12" for "1.2", "22" for "2.2" and so on }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "opencl-headers-${version}-2017-07-18"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index d3efb022a0e..d8946dae095 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -140,7 +140,7 @@ let printEnabled = enabled : if enabled then "ON" else "OFF"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "opencv"; inherit version src; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 205a87d78e8..aa4c7afa4db 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -153,7 +153,7 @@ let printEnabled = enabled : if enabled then "ON" else "OFF"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "opencv"; inherit version src; diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix index 5d26063adb6..b8a3c4a81e0 100644 --- a/pkgs/development/libraries/openexrid-unstable/default.nix +++ b/pkgs/development/libraries/openexrid-unstable/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU_combined, openexr }: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation { pname = "openexrid-unstable"; version = "2017-09-17"; diff --git a/pkgs/development/libraries/openfx/default.nix b/pkgs/development/libraries/openfx/default.nix index abc60f026e5..4a7927bfcb2 100644 --- a/pkgs/development/libraries/openfx/default.nix +++ b/pkgs/development/libraries/openfx/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, unzip }: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation { pname = "openfx"; version = "1.4"; diff --git a/pkgs/development/libraries/openjpeg/1.x.nix b/pkgs/development/libraries/openjpeg/1.x.nix index 2a625f32e7f..beb151f0d2d 100644 --- a/pkgs/development/libraries/openjpeg/1.x.nix +++ b/pkgs/development/libraries/openjpeg/1.x.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.5.2"; branch = "1.5"; revision = "version.1.5.2"; diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index 55d003d2d92..64ed6cb58f0 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -23,7 +23,7 @@ let mkFlag = optSet: flag: "-D${flag}=${if optSet then "ON" else "OFF"}"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "openjpeg"; inherit version; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 04988debb72..fbc9de11e8f 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }: stdenv.mkDerivation rec { - name = "openldap-2.4.47"; + name = "openldap-2.4.48"; src = fetchurl { url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz"; - sha256 = "02sj0p1pq12hqq29b22m3f5zs2rykgvc0q3wlynxjcsjhrvmhk7m"; + sha256 = "0k87qra4kirb6xgja4q1jyw6piwb9v8b8g6gkxq4plawmgy3ylnr"; }; # TODO: separate "out" and "bin" diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix index 46028d3a7ea..e2f64114716 100644 --- a/pkgs/development/libraries/openssl/chacha.nix +++ b/pkgs/development/libraries/openssl/chacha.nix @@ -3,7 +3,7 @@ }: with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "openssl-chacha"; version = "2016-08-22"; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index bd4802b8775..03082eab091 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -44,10 +44,10 @@ let # TODO(@Ericson2314): Improve with mass rebuild configurePlatforms = []; configureScript = { - "x86_64-darwin" = "./Configure darwin64-x86_64-cc"; - "x86_64-solaris" = "./Configure solaris64-x86_64-gcc"; - "armv6l-linux" = "./Configure linux-armv4 -march=armv6"; - "armv7l-linux" = "./Configure linux-armv4 -march=armv7-a"; + x86_64-darwin = "./Configure darwin64-x86_64-cc"; + x86_64-solaris = "./Configure solaris64-x86_64-gcc"; + armv6l-linux = "./Configure linux-armv4 -march=armv6"; + armv7l-linux = "./Configure linux-armv4 -march=armv7-a"; }.${stdenv.hostPlatform.system} or ( if stdenv.hostPlatform == stdenv.buildPlatform then "./config" @@ -73,7 +73,14 @@ let ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2" ++ stdenv.lib.optional (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng"; - makeFlags = [ "MANDIR=$(man)/share/man" ]; + makeFlags = [ + "MANDIR=$(man)/share/man" + # This avoids conflicts between man pages of openssl subcommands (for + # example 'ts' and 'err') man pages and their equivalent top-level + # command in other packages (respectively man-pages and moreutils). + # This is done in ubuntu and archlinux, and possiibly many other distros. + "MANSUFFIX=ssl" + ]; enableParallelBuilding = true; @@ -114,7 +121,6 @@ let license = licenses.openssl; platforms = platforms.all; maintainers = [ maintainers.peti ]; - priority = 10; # resolves collision with ‘man-pages’ }; }; diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix index c3407289f02..3d5988f8114 100644 --- a/pkgs/development/libraries/openzwave/default.nix +++ b/pkgs/development/libraries/openzwave/default.nix @@ -5,7 +5,7 @@ let version = "2018-11-13"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "openzwave"; inherit version; diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index 06b9e360d1a..ea4ee44eb2d 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -51,9 +51,9 @@ let # convert platform to oracle architecture names arch = { - "x86_64-linux" = "linux.x64"; - "x86_64-darwin" = "macos.x64"; - }."${stdenv.hostPlatform.system}" or throwSystem; + x86_64-linux = "linux.x64"; + x86_64-darwin = "macos.x64"; + }.${stdenv.hostPlatform.system} or throwSystem; # calculate the filename of a single zip file srcFilename = component: arch: version: rel: diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index e57b192e40a..0f84b382f4d 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cairo, harfbuzz +{ stdenv, fetchurl, fetchpatch, pkgconfig, cairo, harfbuzz , libintl, gobject-introspection, darwin, fribidi, gnome3 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf , meson, ninja, glib @@ -37,10 +37,10 @@ in stdenv.mkDerivation rec { optional x11Support libXft; patches = [ - (fetchurl { + (fetchpatch { # Add gobject-2 to .pc file url = "https://gitlab.gnome.org/GNOME/pango/commit/546f4c242d6f4fe312de3b7c918a848e5172e18d.patch"; - sha256 = "034na38cq98vk8gggn3yfr65jmv3jgig8d25zg89wydrandp14yr"; + sha256 = "1cqhy4xbwx3ad7z5d1ks7smf038b9as8c6qy84rml44h0fgiq4m2"; }) ]; diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 44293d52da4..d788f1eff34 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -3,7 +3,7 @@ , Carbon ? null, Cocoa ? null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pangolin"; version = "2017-08-02"; diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index d90a27ed545..b08936dd34d 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU_combined, zlib, swig, python, doxygen, xorg }: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation { pname = "partio"; version = "2018-03-01"; diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index 32fc27f9ab4..5a02229cb0e 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -3,7 +3,7 @@ , portaudio, alsaLib , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pcaudiolib"; version = "2016-07-19"; diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 6d2896ac339..2e111240758 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -13,7 +13,7 @@ let else if (variant == "cpp") then "pcre-cpp" else variant; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index 67f343d6038..ef7633dadaf 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -14,7 +14,7 @@ in assert withQt5 -> qtbase != null; assert withQt5 -> qtx11extras != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index 829ecdb86e0..98c6be85672 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -15,7 +15,7 @@ assert withQt4 -> qt4 != null; assert !withQt4 -> qtbase != null; assert !withQt4 -> qtx11extras != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${if withQt4 then "qt4" else "qt5"}-${v}"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 2dd0cc10c94..dc32c4ebfb0 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -15,7 +15,7 @@ in assert withQt5 -> qtbase != null; assert withQt5 -> qttools != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "phonon-${if withQt5 then "qt5" else "qt4"}-${v}"; meta = { diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index fb108dd7c25..4ec11777785 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -35,7 +35,7 @@ , libXmu }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "10.4.1"; pname = "geant4"; diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix index dd39fbbc84b..3d6891c48e2 100644 --- a/pkgs/development/libraries/physics/geant4/g4py/default.nix +++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix @@ -14,7 +14,7 @@ let boost_python = boost.override { enablePython = true; inherit python; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (geant4_nomt) version src; pname = "g4py"; diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 89248597f5d..92b56467aee 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, alsaLib, pkgconfig, libjack2 , AudioUnit, AudioToolbox, CoreAudio, CoreServices, Carbon }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "portaudio-190600-20161030"; src = fetchurl { diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix index ffe7f46b77d..37958038601 100644 --- a/pkgs/development/libraries/portmidi/default.nix +++ b/pkgs/development/libraries/portmidi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; # XXX: This is to deactivate Java support. - patches = stdenv.lib.singleton (fetchurl rec { + patches = stdenv.lib.singleton (fetchurl { url = "https://raw.github.com/Rogentos/argent-gentoo/master/media-libs/" + "portmidi/files/portmidi-217-cmake-libdir-java-opts.patch"; sha256 = "1jbjwan61iqq9fqfpq2a4fd30k3clg7a6j0gfgsw87r8c76kqf6h"; diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index 8f6adaf03d9..7839547ee92 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -2,7 +2,7 @@ let version = "1.2"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ppl"; inherit version; diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 957b59a6f66..01f74bc48eb 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -6,7 +6,7 @@ }: let -mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec { +mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation { pname = "protobuf"; inherit version; diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 773e3139175..3c08537db0b 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -3,7 +3,7 @@ , ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "protobuf"; inherit version; diff --git a/pkgs/development/libraries/protobufc/1.3.nix b/pkgs/development/libraries/protobufc/1.3.nix index c3a815c45ac..304f9d61f39 100644 --- a/pkgs/development/libraries/protobufc/1.3.nix +++ b/pkgs/development/libraries/protobufc/1.3.nix @@ -1,6 +1,6 @@ { callPackage, fetchFromGitHub, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.3.1"; src = fetchFromGitHub { owner = "protobuf-c"; diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/generic.nix index 91c0ae5624e..838fa7de826 100644 --- a/pkgs/development/libraries/protobufc/generic.nix +++ b/pkgs/development/libraries/protobufc/generic.nix @@ -3,7 +3,7 @@ , ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "protobuf-c"; inherit version; diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix index 596dc543e33..92f927ee398 100644 --- a/pkgs/development/libraries/qhull/default.nix +++ b/pkgs/development/libraries/qhull/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "qhull-2016.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/qmlbox2d/default.nix b/pkgs/development/libraries/qmlbox2d/default.nix index 083e0a51b81..03247f9d695 100644 --- a/pkgs/development/libraries/qmlbox2d/default.nix +++ b/pkgs/development/libraries/qmlbox2d/default.nix @@ -1,5 +1,5 @@ {stdenv, qtdeclarative, fetchFromGitHub, qmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "qml-box2d-2018-04-06"; src = fetchFromGitHub { owner = "qml-box2d"; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index d3f4a8e88e2..b156a1cbf99 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2018-11-24"; pname = "qmltermwidget-unstable"; diff --git a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh index e7d7d132617..eb6e7715385 100644 --- a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh @@ -82,7 +82,7 @@ wrapQtAppsHook() { find "$targetDir" -executable -print0 | while IFS= read -r -d '' file do - isELF "$file" || continue + isELFExec "$file" || continue if [ -f "$file" ] then diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 8250e42a1b6..e2c71a77062 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -255,14 +255,14 @@ stdenv.mkDerivation { if (!stdenv.hostPlatform.isx86_64) then [ "-no-sse2" ] else lib.optionals (compareVersion "5.9.0" >= 0) { - "default" = [ "-sse2" "-no-sse3" "-no-ssse3" "-no-sse4.1" "-no-sse4.2" "-no-avx" "-no-avx2" ]; - "westmere" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-no-avx" "-no-avx2" ]; - "sandybridge" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; - "ivybridge" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; - "haswell" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; - "broadwell" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; - "skylake" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; - "skylake-avx512" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; + default = [ "-sse2" "-no-sse3" "-no-ssse3" "-no-sse4.1" "-no-sse4.2" "-no-avx" "-no-avx2" ]; + westmere = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-no-avx" "-no-avx2" ]; + sandybridge = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; + ivybridge = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; + haswell = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; + broadwell = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; + skylake = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; + skylake-avx512 = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"} ) ++ [ diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index 84a9d30918b..5003205ef37 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -8,14 +8,14 @@ args: let inherit (args) name; - version = args.version or srcs."${name}".version; - src = args.src or srcs."${name}".src; + version = args.version or srcs.${name}.version; + src = args.src or srcs.${name}.src; in mkDerivation (args // { name = "${name}-${version}"; inherit src; - patches = args.patches or patches."${name}" or []; + patches = args.patches or patches.${name} or []; nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake ]; propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix index 123af4fa3fa..50a1e90588c 100644 --- a/pkgs/development/libraries/qtstyleplugins/default.nix +++ b/pkgs/development/libraries/qtstyleplugins/default.nix @@ -1,6 +1,6 @@ { stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, gtk2 }: -mkDerivation rec { +mkDerivation { name = "qtstyleplugins-2017-03-11"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix index 96a2347c50f..afb4e0daeb6 100644 --- a/pkgs/development/libraries/rabbitmq-java-client/default.nix +++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, ant, jdk, jre, python, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "rabbitmq-java-client-3.3.4"; src = fetchurl { diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index e36b6f9488a..2b60c3cbf54 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "re2"; version = "20190401"; diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix index f9a20a535cb..73ed823d2be 100644 --- a/pkgs/development/libraries/readline/6.3.nix +++ b/pkgs/development/libraries/readline/6.3.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "readline-6.3p08"; src = fetchurl { diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/development/libraries/science/benchmark/papi/default.nix index 75beddcd22c..53d30019f28 100644 --- a/pkgs/development/libraries/science/benchmark/papi/default.nix +++ b/pkgs/development/libraries/science/benchmark/papi/default.nix @@ -2,7 +2,7 @@ , fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "5.6.0"; pname = "papi"; diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix index d22858d64d0..26ec1237601 100644 --- a/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/pkgs/development/libraries/science/math/caffe2/default.nix @@ -38,7 +38,7 @@ let ''; cub = { - src = fetchFromGitHub rec { + src = fetchFromGitHub { owner = "NVlabs"; repo = "cub"; rev = "v1.7.4"; diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index 3c448abeccf..f0f5829ce46 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -10,7 +10,7 @@ , addOpenGLRunpath }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "cudatoolkit-${cudatoolkit.majorVersion}-cudnn-${version}"; inherit version; diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 2e5bb5e371f..5a62578481c 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -11,7 +11,7 @@ let version = "3.8.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "liblapack"; inherit version; src = fetchurl { diff --git a/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix b/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix index 892dfa2a609..76f0c5eea7f 100644 --- a/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix +++ b/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix @@ -1,14 +1,14 @@ { version = "1.14.0"; -"cpu-linux-x86_64" = { +cpu-linux-x86_64 = { url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz"; sha256 = "04bi3ijq4sbb8c5vk964zlv0j9mrjnzzxd9q9knq3h273nc1a36k"; }; -"gpu-linux-x86_64" = { +gpu-linux-x86_64 = { url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-1.14.0.tar.gz"; sha256 = "1ffnpyj9jjgwxpjfiyjvq4dm3n6nwiksim5jld9zw7fdswh215x6"; }; -"cpu-darwin-x86_64" = { +cpu-darwin-x86_64 = { url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-1.14.0.tar.gz"; sha256 = "0zsd5ils1a17j6jzh0c7q1z56fw46gkzybbnms7h2rgg8al0rh92"; }; diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix index c9c26ca0d66..ff29ae82c5c 100644 --- a/pkgs/development/libraries/scmccid/default.nix +++ b/pkgs/development/libraries/scmccid/default.nix @@ -2,7 +2,7 @@ assert stdenv ? cc && stdenv.cc.libc != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "scmccid-5.0.11"; src = if stdenv.hostPlatform.system == "i686-linux" then (fetchurl { diff --git a/pkgs/development/libraries/sdformat/3.nix b/pkgs/development/libraries/sdformat/3.nix index 116f248b3b4..b78f1d5624c 100644 --- a/pkgs/development/libraries/sdformat/3.nix +++ b/pkgs/development/libraries/sdformat/3.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, callPackage, ... } @ args: -callPackage ./default.nix (args // rec { +callPackage ./default.nix (args // { version = "3.7.0"; srchash-sha256 = "07kn8bgvj9mwwinsp2cbmz11z7zw2lgnj61mi1gi1pjg7q9in98q"; }) diff --git a/pkgs/development/libraries/sdformat/default.nix b/pkgs/development/libraries/sdformat/default.nix index f81eb9b259e..66ad311387f 100644 --- a/pkgs/development/libraries/sdformat/default.nix +++ b/pkgs/development/libraries/sdformat/default.nix @@ -5,7 +5,7 @@ , ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { src = fetchurl { url = "http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${name}.tar.bz2"; sha256 = srchash-sha256; diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index cf73e205830..4726221a40d 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -7,7 +7,7 @@ let version = "2.5.1"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sfml"; inherit version; diff --git a/pkgs/development/libraries/soil/default.nix b/pkgs/development/libraries/soil/default.nix index 2f3ec44a08c..d9fcea767d5 100644 --- a/pkgs/development/libraries/soil/default.nix +++ b/pkgs/development/libraries/soil/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip, mesa, libX11 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "soil"; src = fetchurl { diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/development/libraries/sonic/default.nix index edcb3549c31..4a744c08ae3 100644 --- a/pkgs/development/libraries/sonic/default.nix +++ b/pkgs/development/libraries/sonic/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sonic"; version = "2016-03-01"; diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index 98226ce20f4..79084ceda1c 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -1,6 +1,6 @@ { fetchhg, stdenv, coin3d, qt5, cmake, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "soqt"; version = "1.6.0a"; diff --git a/pkgs/development/libraries/soxt/default.nix b/pkgs/development/libraries/soxt/default.nix index 50ba9c944ab..11ba48c5971 100644 --- a/pkgs/development/libraries/soxt/default.nix +++ b/pkgs/development/libraries/soxt/default.nix @@ -1,6 +1,6 @@ { fetchhg, stdenv, cmake, coin3d, motif, xlibsWrapper, libXmu, libGLU_combined }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "soxt"; version = "unstable-2019-06-14"; diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/pkgs/development/libraries/sqlite/sqlar.nix index e4c1f8eb5f6..739dfc3bc5b 100644 --- a/pkgs/development/libraries/sqlite/sqlar.nix +++ b/pkgs/development/libraries/sqlite/sqlar.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fuse, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sqlar"; version = "2018-01-07"; diff --git a/pkgs/development/libraries/stb/default.nix b/pkgs/development/libraries/stb/default.nix index 440f0c22ea6..c2353c7b706 100644 --- a/pkgs/development/libraries/stb/default.nix +++ b/pkgs/development/libraries/stb/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "stb"; version = "20180211"; diff --git a/pkgs/development/libraries/taglib/1.9.nix b/pkgs/development/libraries/taglib/1.9.nix index 8992c7e75c0..401c2562167 100644 --- a/pkgs/development/libraries/taglib/1.9.nix +++ b/pkgs/development/libraries/taglib/1.9.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, zlib, cmake}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "taglib-1.9.1"; src = fetchurl { diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix index 61d9c710801..507f2fb275b 100644 --- a/pkgs/development/libraries/tix/default.nix +++ b/pkgs/development/libraries/tix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, tcl, tk, fetchpatch } : -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "8.4.3"; pname = "tix"; src = fetchurl { diff --git a/pkgs/development/libraries/tk/8.5.nix b/pkgs/development/libraries/tk/8.5.nix index 141f6da14ce..3058af46ab5 100644 --- a/pkgs/development/libraries/tk/8.5.nix +++ b/pkgs/development/libraries/tk/8.5.nix @@ -1,6 +1,6 @@ { callPackage, fetchurl, tcl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { src = fetchurl { url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz"; diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix index 5013db64bba..c30f9a81947 100644 --- a/pkgs/development/libraries/tk/8.6.nix +++ b/pkgs/development/libraries/tk/8.6.nix @@ -1,6 +1,6 @@ { callPackage, fetchurl, tcl, stdenv, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { src = fetchurl { url = "mirror://sourceforge/tcl/tk${tcl.version}.1-src.tar.gz"; # TODO: remove '.1' for v8.6.10 or v8.7.x diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix index d7162067deb..13e8f783915 100644 --- a/pkgs/development/libraries/tnt/default.nix +++ b/pkgs/development/libraries/tnt/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, unzip}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tnt"; version = "3.0.12"; diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix index 5609f1d67d1..29133607689 100644 --- a/pkgs/development/libraries/tremor/default.nix +++ b/pkgs/development/libraries/tremor/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, autoreconfHook, pkgconfig, libogg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "tremor-unstable-2018-03-16"; src = fetchgit { diff --git a/pkgs/development/libraries/twolame/default.nix b/pkgs/development/libraries/twolame/default.nix index 46b65a08eaa..e1284c39aa3 100644 --- a/pkgs/development/libraries/twolame/default.nix +++ b/pkgs/development/libraries/twolame/default.nix @@ -2,7 +2,7 @@ , autoreconfHook, pkgconfig , libsndfile }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "twolame"; version = "2017-09-27"; diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix index e1f3c0bd39c..e6cd0827639 100644 --- a/pkgs/development/libraries/uthash/default.nix +++ b/pkgs/development/libraries/uthash/default.nix @@ -3,7 +3,7 @@ let version = "2.1.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "uthash"; inherit version; diff --git a/pkgs/development/libraries/v8/3.14.nix b/pkgs/development/libraries/v8/3.14.nix index 7f9e8508a65..d62a8524644 100644 --- a/pkgs/development/libraries/v8/3.14.nix +++ b/pkgs/development/libraries/v8/3.14.nix @@ -11,7 +11,7 @@ let arch = if stdenv.is64bit then "x64" else "ia32"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "v8"; inherit version; diff --git a/pkgs/development/libraries/v8/5_x.nix b/pkgs/development/libraries/v8/5_x.nix index cb53765e394..050abe9e81b 100644 --- a/pkgs/development/libraries/v8/5_x.nix +++ b/pkgs/development/libraries/v8/5_x.nix @@ -17,7 +17,7 @@ let sharedFlag = if static then "static_library" else "shared_library"; deps = { - "build" = fetchgit { + build = fetchgit { url = "${git_url}/chromium/src/build.git"; rev = "2c67d4d74b6b3673228fab191918500a582ef3b0"; sha256 = "0jc7hci5yh792pw0ahjfxrk5xzllnlrv9llmwlgcgn2x8x6bn34q"; @@ -32,7 +32,7 @@ let rev = "b5ecbb29a26532f72ef482569b223d5a51fd50bf"; sha256 = "0ld47wdnk8grcba221z67l3pnphv9zwifk4y44f5b946w3iwmpns"; }; - "buildtools" = fetchgit { + buildtools = fetchgit { url = "${git_url}/chromium/buildtools.git"; rev = "60f7f9a8b421ebf9a46041dfa2ff11c0fe59c582"; sha256 = "0i10bw7yhslklqwcx5krs3k05sicb73cpwd0mkaz96yxsvmkvjq0"; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 2d9c5d4b92a..e367d8242de 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -14,7 +14,7 @@ let rev = "936ba8a963284a6b3737cf2f0474a7131073abee"; sha256 = "14nr22fqdpxma1kzjflj6a865vr3hfnnm2gs4vcixyq4kmfzfcy2"; }; - "build" = fetchgit { + build = fetchgit { url = "${git_url}/chromium/src/build.git"; rev = "325e95d6dae64f35b160b3dc7d73218cee5ec079"; sha256 = "0dddyxa76p2xpjhmxif05v63i5ar6h5v684fdl667sg84f5bhhxf"; diff --git a/pkgs/development/libraries/v8/plv8_6_x.nix b/pkgs/development/libraries/v8/plv8_6_x.nix index a72c9473d4a..782d324c8be 100644 --- a/pkgs/development/libraries/v8/plv8_6_x.nix +++ b/pkgs/development/libraries/v8/plv8_6_x.nix @@ -26,12 +26,12 @@ let rev = "0e9a47d74970bee1bbfc063c47215406f8918699"; sha256 = "07rbzrlscp8adh4z86yl5jxdnvgkc3xs950xldpk318wf9i3bh6c"; }; - "build" = fetchgit { + build = fetchgit { url = "${git_url}/chromium/src/build.git"; rev = "9338ce52d0b9bcef34c38285fbd5023b62739fac"; sha256 = "1s2sa8dy3waidsirjylc82ggb18l1108bczjc8z0v4ywyj4k0cvh"; }; - "buildtools" = fetchgit { + buildtools = fetchgit { url = "${git_url}/chromium/buildtools.git"; rev = "505de88083136eefd056e5ee4ca0f01fe9b33de8"; sha256 = "0vj216nhb803bggsl0hnyagj8njrm96pn8sim6xcnqb7nhz1vabw"; diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 53d70f4d369..0d96829b6ba 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { ++ optional imwriSupport imagemagick7; configureFlags = [ - "--disable-static" (optionalString (!ocrSupport) "--disable-ocr") (optionalString (!imwriSupport) "--disable-imwri") ]; diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index 77cd3be0cbd..2b0a807bfa7 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -6,7 +6,7 @@ let version = "0.3.11"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "volume_key"; inherit version; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 5631665a691..3cdf8f08651 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -6,7 +6,7 @@ let in assert version == vulkan-headers.version; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "vulkan-loader"; inherit version; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "08nibkbjf3g32qyp5bpdvj7i0zdv5ds1n5y52z8pvyzkpiz7s6ww"; }; - nativeBuildInputs = [ pkgconfig addOpenGLRunpath ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; @@ -28,12 +28,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - # Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found. - # See the explanation in addOpenGLRunpath. - postFixup = '' - addOpenGLRunpath $out/lib/libvulkan.so - ''; - meta = with stdenv.lib; { description = "LunarG Vulkan loader"; homepage = https://www.lunarg.com; diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index f3f87b3ba60..cd0b8bdb29d 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -69,6 +69,16 @@ stdenv.mkDerivation rec { name = "CVE-2019-1010319.patch"; sha256 = "011sqdgpykilaj2c4ns298z7aad03yprpva0dqr39nx88ji6jnrb"; }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/36a24c7881427d2e1e4dc1cef58f19eee0d13aec.patch"; + name = "CVE-2018-7253.patch"; + sha256 = "130kvmlpaj6x1pm6qzdzrmf4xzhp0pj29qrardb76zcfinx5pk2n"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/8e3fe45a7bac31d9a3b558ae0079e2d92a04799e.patch"; + name = "CVE-2018-7254.patch"; + sha256 = "06fdzw2cbdj8ajf171z1g53cl6bf1cdh2czswqldrqqvv3jkzk77"; + }) ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index d2af8b084e6..0b367f4a930 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "wayland-protocols"; - version = "1.17"; + version = "1.18"; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0bw1sqixqk2a7mqw630cs4dlgcp5yib90vyikzm3lr05jz7ij4yz"; + sha256 = "1cvl93h83ymbfhb567jv5gzyq08181w7c46rsw4xqqqpcvkvfwrx"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 60f91176599..958257ffe76 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -6,7 +6,7 @@ let generic = { version, sha256 }: - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "wt"; inherit version; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 362f704a05d..9d317fe00d2 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -2,7 +2,7 @@ , libuuid, zlib }: let - generic = version: sha256: stdenv.mkDerivation rec { + generic = version: sha256: stdenv.mkDerivation { pname = "xapian"; inherit version; passthru = { inherit version; }; diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index 705bd6b87fc..4764c1bdb93 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoconf, automake, libtool, pkgconfig , xorg, gnum4, libxcb, gperf }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xcb-util-cursor-0.1.1-3-unstable"; version = "2017-04-05"; diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix index e6ececf8513..74846c8306d 100644 --- a/pkgs/development/libraries/xml-security-c/default.nix +++ b/pkgs/development/libraries/xml-security-c/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { "--with-openssl" "--with-xerces" "--with-xalan" - "--disable-static" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 3e54944a377..25c5bf45888 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -4,7 +4,7 @@ let version = "1.2.28"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xmlsec"; inherit version; diff --git a/pkgs/development/libraries/xsd/default.nix b/pkgs/development/libraries/xsd/default.nix index 5a267bbfe76..bd87d306b96 100644 --- a/pkgs/development/libraries/xsd/default.nix +++ b/pkgs/development/libraries/xsd/default.nix @@ -3,7 +3,7 @@ let fixed_paths = ''LDFLAGS="-L${xercesc}/lib" CPPFLAGS="-I${xercesc}/include"''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xsd"; version = "4.0.0"; diff --git a/pkgs/development/libraries/yojimbo/default.nix b/pkgs/development/libraries/yojimbo/default.nix index 6305b6c03a4..d3df30e03e1 100644 --- a/pkgs/development/libraries/yojimbo/default.nix +++ b/pkgs/development/libraries/yojimbo/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "yojimbo"; version = "1.1"; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 592abea4ea0..b0f8ae503ea 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -96,6 +96,9 @@ stdenv.mkDerivation (rec { "LIBRARY_PATH=$(out)/lib" ]; + enableParallelBuilding = true; + doCheck = true; + makeFlags = [ "PREFIX=${stdenv.cc.targetPrefix}" ] ++ stdenv.lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [ diff --git a/pkgs/development/libraries/zookeeper_mt/default.nix b/pkgs/development/libraries/zookeeper_mt/default.nix index 58e1940a3ef..bb5b602b64a 100644 --- a/pkgs/development/libraries/zookeeper_mt/default.nix +++ b/pkgs/development/libraries/zookeeper_mt/default.nix @@ -1,6 +1,6 @@ { stdenv, zookeeper, bash }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "zookeeper_mt-${stdenv.lib.getVersion zookeeper}"; src = zookeeper.src; diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 46d417fd2aa..d9478c60db8 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -36,7 +36,7 @@ let lispPackages = rec { }; }; - quicklisp-to-nix-system-info = stdenv.mkDerivation rec { + quicklisp-to-nix-system-info = stdenv.mkDerivation { pname = "quicklisp-to-nix-system-info"; version = "1.0.0"; src = ./quicklisp-to-nix; @@ -57,7 +57,7 @@ let lispPackages = rec { dontStrip = true; }; - quicklisp-to-nix = stdenv.mkDerivation rec { + quicklisp-to-nix = stdenv.mkDerivation { pname = "quicklisp-to-nix"; version = "1.0.0"; src = ./quicklisp-to-nix; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix index a5fddd417fa..729f5937117 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''_3bmd''; version = ''20171019-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix index a657159a41f..cbfcb6f4361 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''abnf''; version = ''cl-20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix index 48dd57aac54..586502945ba 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''alexandria''; version = ''20181210-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix index 61a07c61ca0..5921b5f49b1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''anaphora''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix index 40d5aed4991..1d64784a0a6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''array-utils''; version = ''20181018-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix index 68c8a7e087b..482752f2c7f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: -rec { +{ baseName = ''asdf-finalizers''; version = ''20170403-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix index 65df45d95a5..1d1ef41f2d1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''asdf-system-connections''; version = ''20170124-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix index 4f438eb734a..5251cbc920f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''babel-streams''; version = ''babel-20171227-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix index 4cba3e86e06..d8a12f6edbe 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''babel''; version = ''20171227-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix index a660882f36b..d7cebabb0ad 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''blackbird''; version = ''20160531-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix index c5305587a02..530a3b76d30 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''bordeaux-threads''; version = ''v0.8.6''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix index 5d7f3f2dd10..71a7a1894a2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''buildnode-xhtml''; version = ''buildnode-20170403-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix index 0a2e56a9c9b..26d907c2524 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''buildnode''; version = ''20170403-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix index 6cf81070734..d159ce49581 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''caveman''; version = ''20181210-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix index a7d22ac129b..c4e3b9b5734 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cffi-grovel''; version = ''cffi_0.20.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix index 3d246380607..db85c50a5c1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cffi-toolchain''; version = ''cffi_0.20.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix index b83b1461197..08115ea3a3a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cffi''; version = ''cffi_0.20.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix index c30c68e53c8..c9700a9d009 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''chipz''; version = ''20190202-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix index 4a533220caf..3209735adb5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''chunga''; version = ''20180131-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix index 2e387d29833..ea812b38c95 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''circular-streams''; version = ''20161204-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix index 531d429df24..9ffc4c0d39e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-aa''; version = ''cl-vectors-20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix index 5f93167a114..5dab19a5531 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-annot''; version = ''20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix index a413743eb8d..8459e32fd04 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-anonfun''; version = ''20111203-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix index 9b053c920e3..1e61d4e48e7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-ansi-text''; version = ''20150804-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix index d84233c4342..e366dc551d6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-async-repl''; version = ''cl-async-20190307-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix index c13b8b70647..d18c95153ff 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-async-ssl''; version = ''cl-async-20190307-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix index 363227534a8..876a24055c2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-async''; version = ''20190307-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix index a4a9a9261fd..8aa43a81f19 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-base64''; version = ''20150923-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix index 36641b73b75..aed744e0433 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-cli''; version = ''20151218-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix index 0d0337a65ce..9b69bf886c0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-colors''; version = ''20180328-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix index ebff2928c3e..9b558402ce6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-containers''; version = ''20170403-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix index a3aacd0aa8b..62f895b2027 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-cookie''; version = ''20150804-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix index 56ccab7b5cd..82b63ca088d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-csv''; version = ''20180831-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix index bdc5fe920cf..7a1b7d9f863 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-dbi''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix index 1510495a4cb..d6fb845aa38 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-emb''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix index d032b4768dd..f92d9c464cf 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-fad''; version = ''20180430-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix index 6a40d0fa8c9..399abebe6e7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-fuse-meta-fs''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix index de71e2e299a..b0e6159e626 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-fuse''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix index 61a35f2b58c..365360ba896 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-html-parse''; version = ''20161031-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix index dde2cc31dd0..7f20a171734 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-html5-parser''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix index b0be8c775a3..feefecf75bb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-interpol''; version = ''20180711-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix index 713aff0ea40..66fb98ee0de 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-jpeg''; version = ''20170630-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix index d8bc535f355..9faf2b1b388 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-json''; version = ''20141217-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix index dfabda0428f..0c276740f90 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-l10n-cldr''; version = ''20120909-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix index f37e653bc56..1a13df67928 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-l10n''; version = ''20161204-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix index 36d15673427..cbbc8ccb0b2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-libuv''; version = ''20190107-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix index d506acf876e..9c623c2278e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: -rec { +{ baseName = ''cl-log''; version = ''cl-log.1.0.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix index f52952af3e1..0f3d0c126ff 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-markdown''; version = ''20101006-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix index b1916c27bfd..7b5b7fb3e1a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-markup''; version = ''20131003-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix index 1590f2536e3..c8460177a24 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-mysql''; version = ''20171019-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix index cfca59e3b50..c096c4d2728 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-paths-ttf''; version = ''cl-vectors-20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix index e8034b11c23..0f0a22c97e0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-paths''; version = ''cl-vectors-20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix index babdf04e3ec..d54c37c2de1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-pdf''; version = ''20170830-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix index 2fad295c7ee..952a4394ae7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-postgres''; version = ''postmodern-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix index 4c97f03870f..c10a1500563 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-ppcre-template''; version = ''cl-unification-20190107-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix index 27887f12497..20433b51f87 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-ppcre-unicode''; version = ''cl-ppcre-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix index 8bb8fb2478d..cfea494fc4b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-ppcre''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix index 496a0bd4e56..1e13378b38c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-project''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix index 046f910a866..81f1455714d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-protobufs''; version = ''20180328-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix index 916af5b2972..c16486754db 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-reexport''; version = ''20150709-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix index 0d58e11b4d2..16cc2309e64 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-smtp''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix index 2aff988dfd2..b639681fd30 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-store''; version = ''20180328-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix index add200b09a1..4639a66da78 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-syntax-annot''; version = ''cl-syntax-20150407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix index c19a47df6c2..cea65514d4b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-syntax-anonfun''; version = ''cl-syntax-20150407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix index cded8dc2d06..fa08d3b114c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-syntax-markup''; version = ''cl-syntax-20150407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix index 353c8210885..2715cfdf8da 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-syntax''; version = ''20150407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix index 968f2972abf..b04a6cd8344 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-test-more''; version = ''prove-20171130-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix index 358666877a6..38237f6f3b7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-typesetting''; version = ''20170830-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix index 7849acb57c0..77e2ba0036c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-unicode''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix index dbdd53a9346..bb8a05b0d6d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-unification''; version = ''20190107-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix index 750da99d5d6..4999da6d0b6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-utilities''; version = ''1.2.4''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix index f44bd0f22e0..dbdd6d6b617 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-vectors''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix index 3be45384d41..19af99826fc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-who''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix index f344dbfa2fe..5294613b978 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl_plus_ssl''; version = ''cl+ssl-20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix index 6cfd7842409..4b0a4cd176d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clack-handler-hunchentoot''; version = ''clack-20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix index 1ac6ccc329c..5f4a96dbcc4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clack-socket''; version = ''clack-20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix index 1792d79f1d8..d8c8acf83aa 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clack-test''; version = ''clack-20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix index 749fce006e4..0234f764498 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clack-v1-compat''; version = ''clack-20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix index 1813844e85f..ab615e5dc83 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clack''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix index ca03207fabd..abbefea70b4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''closer-mop''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix index c1b36b6b653..3448f70f5ad 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''closure-common''; version = ''20181018-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix index f55ccecadc6..2746ccff6c9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''closure-html''; version = ''20180711-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix index 9f4abb8e475..8f6760b9624 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clsql-postgresql-socket''; version = ''clsql-20160208-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix index add3a15d27c..e90cda0f6d9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clsql-postgresql''; version = ''clsql-20160208-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix index 653adb3d12b..254a22fbafa 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clsql-sqlite3''; version = ''clsql-20160208-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix index 8243a337585..c664c23dd1c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clsql-uffi''; version = ''clsql-20160208-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix index 74b8442c0c9..e37eecabbca 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clsql''; version = ''20160208-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix index 2f07706a912..458cb51e6ad 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clss''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix index 303d43a964e..ba45b353057 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clx-truetype''; version = ''20160825-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix index 6b99f99b7ab..0fe6e115f3f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clx''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix index 7375b8dd709..0a4a40b0684 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''collectors''; version = ''20161204-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix index 1d81acba2dc..25eaf1fa6fa 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''command-line-arguments''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix index f4941aa80cd..0dd93c46fb2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''css-lite''; version = ''20120407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix index 98c565648dc..a0a6d2d7c2e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''css-selectors-simple-tree''; version = ''css-selectors-20160628-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix index fcdb69f3c35..1aff3a5826c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''css-selectors-stp''; version = ''css-selectors-20160628-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix index aa523d6f838..268eea723dd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''css-selectors''; version = ''20160628-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix index ebae32962f1..9bef7fb990c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cxml-stp''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix index 68a019fa027..667cf93d44f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cxml''; version = ''20181018-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix index 7c69878900c..1f0b4f9f71b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: -rec { +{ baseName = ''db3''; version = ''cl-20150302-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix index 173a31e9f31..9d0f2549f50 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''dbd-mysql''; version = ''cl-dbi-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix index 6668cd4f762..9f3046eb51f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''dbd-postgres''; version = ''cl-dbi-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix index 9b6fde0ea94..7bc556eaff2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''dbd-sqlite3''; version = ''cl-dbi-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix index 26c5306c06a..2e4006dbf3f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''dbi''; version = ''cl-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix index 4d5bc0a2217..5a84a62ee83 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''dexador''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix index 3dbacdf0f81..2896ec154ec 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''do-urlencode''; version = ''20181018-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix index 7c25ed9a037..a4196b2d394 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''documentation-utils''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix index aa97f8f7cbe..a3d063ec9bd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''drakma''; version = ''v2.0.5''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix index a4a58fd0d0b..8c318204572 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''dynamic-classes''; version = ''20130128-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix index 91b8db69a36..aa2b01e6bcd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: -rec { +{ baseName = ''eos''; version = ''20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix index d68fd839bd1..e94ed40f9e1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''esrap-peg''; version = ''20170403-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix index a024ad3907a..3ab6e03ab65 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''esrap''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix index 0e7f5b79160..b247ea27298 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''external-program''; version = ''20190307-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix index 82c8603d4a4..8d43fa3362c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''fast-http''; version = ''20180831-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix index 89bed83acd5..ea006556876 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''fast-io''; version = ''20171023-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix index 39f2af5430f..8b5fe1f7de6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''fiasco''; version = ''20190307-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix index be9648a0da4..8ebd9f60381 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''fiveam''; version = ''v1.4.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix index d9b25bebddc..4d5524d9d18 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''flexi-streams''; version = ''20190107-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix index 90ce8b83dde..a5fe52ec027 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''form-fiddle''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix index d901df215a6..893cec1c72a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''fset''; version = ''20171019-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix index 76e2a55620c..e961aecf854 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: -rec { +{ baseName = ''garbage-pools''; version = ''20130720-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix index 3754829ac37..775e30e711a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''http-body''; version = ''20181210-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix index 1f2700608e3..6fc92c08882 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''hu_dot_dwim_dot_asdf''; version = ''20190521-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix index 51f4a2d0698..98a77dad63c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''hu_dot_dwim_dot_stefil''; version = ''20170403-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix index 611ef77256f..11d0831c96f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''hunchentoot''; version = ''v1.2.38''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix index 1b948bcf325..9dfeb3f1206 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''idna''; version = ''20120107-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix index 4211dfbc919..675521dcde9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''ieee-floats''; version = ''20170830-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix index c4ae44cd676..bd0e896e143 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''iolib''; version = ''v0.8.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix index 195b52c08c4..d5e072e5f6a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''iolib_dot_asdf''; version = ''iolib-v0.8.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix index aa650edde02..445da3b1b17 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''iolib_dot_base''; version = ''iolib-v0.8.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix index c0ec72d4869..415e7a59820 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''iolib_dot_common-lisp''; version = ''iolib-v0.8.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix index 4ba0cfa1ce2..58fd95012e8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''iolib_dot_conf''; version = ''iolib-v0.8.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix index 7a1a12243fe..009e0e27866 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''iolib_dot_grovel''; version = ''iolib-v0.8.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix index 2c56b5964f9..727be89bf44 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''ironclad''; version = ''v0.46''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix index f276ec72736..9a91033bb8b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''iterate''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix index 9a468189481..9d219f4c193 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''ixf''; version = ''cl-20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix index 702eb2d05b5..790638f5954 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''jonathan''; version = ''20190202-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix index e44004a9cf7..88ededf0e73 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''kmrcl''; version = ''20150923-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix index 96a831147bb..cdac924b439 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lack-component''; version = ''lack-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix index 610633e9af2..68604485c77 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lack-middleware-backtrace''; version = ''lack-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix index 3607cbedf44..cda7716151a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lack-util''; version = ''lack-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix index 08095979989..7740e73c0e5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lack''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix index 1f6a0709b0f..91e28f402b2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''let-plus''; version = ''20171130-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix index 9dd6baad1bd..8d52d518e11 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lev''; version = ''20150505-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix index 10977c16f83..6ff0fdb4c82 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lfarm-client''; version = ''lfarm-20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix index 4a5fe87982a..4be971bef06 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lfarm-common''; version = ''lfarm-20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix index 354d6c31507..44c8cc01c95 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lfarm-server''; version = ''lfarm-20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix index 348c71fe966..3d917ff2817 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lfarm-ssl''; version = ''lfarm-20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix index 1edb65596a6..84f0ca863ec 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lift''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix index 7f88beb974b..802b9eb2b7a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lisp-namespace''; version = ''20171130-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix index 8d21f88cbf8..c623d368a04 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lisp-unit2''; version = ''20180131-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix index 7189a09e20c..4eb30ef013b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''list-of''; version = ''asdf-finalizers-20170403-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix index 5ffa27fcca5..4695c3dfe0e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''local-time''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix index 1a6f217a2f9..a4011b78d4f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lparallel''; version = ''20160825-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix index f64e9ee6a33..5dbd186e62e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lquery''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix index 8187c99f94a..c6445010f54 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''map-set''; version = ''20190307-hg''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix index 4f6842606b4..531cc1adc1a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''marshal''; version = ''cl-20180328-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix index 953dd0a58a4..b34fdd83ca3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''md5''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix index d72e0839d1e..cf2c3a1c777 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''metabang-bind''; version = ''20171130-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix index 6bbdf5f911e..c45a3eff384 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: -rec { +{ baseName = ''metatilities-base''; version = ''20170403-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix index 6334804c4f7..ef0da68cfe4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''misc-extensions''; version = ''20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix index 1f2dd20ee4b..adb1ad27c45 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''moptilities''; version = ''20170403-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix index 470d2fed738..974a63c1a73 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''mssql''; version = ''cl-20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix index a8cfc070bf9..f1fe0e3c279 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''mt19937''; version = ''1.1.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix index 068d0eba69d..16b1f22ceeb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''myway''; version = ''20181018-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix index 82d06b1c93b..c5f1379f421 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''named-readtables''; version = ''20180131-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix index 4e7c84566a0..dcc49aa7993 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''net_dot_didierverna_dot_asdf-flv''; version = ''asdf-flv-version-2.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix index ea6adac9e9f..0a3dba6b824 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''nibbles''; version = ''20180831-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix index 07b86f58fe7..b5b6ace2ae9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''optima''; version = ''20150709-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix index bf6216dcadd..2bf30650785 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''parenscript''; version = ''Parenscript-2.7.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix index e636df0805e..72bef6f60bf 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''parse-number''; version = ''v1.7''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix index fe9ccae2886..0c34654b1ae 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''pcall-queue''; version = ''pcall-0.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix index 025d160f460..60385ab5939 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''pcall''; version = ''0.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix index a913cdbe521..f0b5fb23d66 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''pgloader''; version = ''v3.4.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix index 38fb942c331..e4fd9f0c4df 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''plump-dom''; version = ''plump-20170725-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix index cd0db041c5b..16cd9d5f062 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: -rec { +{ baseName = ''plump-lexer''; version = ''plump-20170725-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix index a9d07b48a9d..cb06b039abd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''plump-parser''; version = ''plump-20170725-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix index 8757c704c8f..53af356f05a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''plump''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix index ba7bef260c0..ed09e3805c0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''postmodern''; version = ''20180430-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix index 8ffcbc784ff..3afcbf98d50 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''proc-parse''; version = ''20160318-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix index a1542dc13cf..9bbc47275f8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''prove''; version = ''20171130-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix index ffa2e595c26..b4957d68e88 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''ptester''; version = ''20160929-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix index 4f694678393..84b252f93a5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''puri''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix index 0eb4c0f5b9e..741929484d8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''py-configparser''; version = ''20170830-svn''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix index de24a598496..03d96005935 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''qmynd''; version = ''20180131-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix index 3666dda9bf8..dbeb5f1d08e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''query-fs''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix index f6022cb2a1f..fed62457891 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''quri''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix index 25d535176a6..e6c1477298d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''rfc2388''; version = ''20180831-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix index d5be4be7daf..14b327a9736 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''rt''; version = ''20101006-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix index c283abd479e..92fa5779452 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''s-sql''; version = ''postmodern-20180430-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix index 9056cfbdcca..26c616ec392 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''salza2''; version = ''2.0.9''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix index 33847198bdd..f3c1dade821 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''simple-date''; version = ''postmodern-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix index 63adab55741..a6fc781c369 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''smart-buffer''; version = ''20160628-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix index a22076facd3..be9f5998642 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''split-sequence''; version = ''v2.0.0''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix index 57dec7c93ca..cd018a4b997 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''sqlite''; version = ''cl-20130615-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix index 1cd4e4c4402..0386a674916 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''static-vectors''; version = ''v1.8.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix index df63a5c9836..7c769e614c1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''stefil''; version = ''20181210-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix index 17a56c09b7e..2b38115aabd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''string-case''; version = ''20180711-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix index e89eb1971d6..fa0a2ab7944 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''stumpwm''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix index 50b815425dc..ec14ffffcba 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''swank''; version = ''slime-v2.24''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix index f0df3b84f15..89003686df3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''swap-bytes''; version = ''v1.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix index 4bae3cc1cee..9ec472fa08a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''symbol-munger''; version = ''20150407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix index 683f87357f5..d10b68b2d2e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''trivial-backtrace''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix index 82d0e4513ab..8db7c603ec8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''trivial-features''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix index c629bb3548d..4d26aa43519 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''trivial-garbage''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix index 2aee236ac0c..7826a937992 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''trivial-gray-streams''; version = ''20181018-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix index 33eedbaa818..002c75e1021 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''trivial-indent''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix index f02d9e0dc2c..960778dc17c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''trivial-mimes''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix index 8cc04c2c64a..6bfaac06f2d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''trivial-types''; version = ''20120407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix index c925382d81d..0ac57089e50 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''trivial-utf-8''; version = ''20111001-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix index 1986f7c88f7..f5e8677f508 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''uffi''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix index 18f1b74edbd..ae9c1c6d5ac 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''uiop''; version = ''3.3.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix index 6c456496732..6a877e5a964 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''unit-test''; version = ''20120520-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix index c3928cf0e4c..fccce79eb84 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''usocket''; version = ''0.8.2''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix index 0886b1082a8..bfd84514622 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''uuid''; version = ''20130813-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix index 6a4751f799e..2fb1cdacfac 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''vom''; version = ''20160825-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix index 59a41a7cf9a..7825678c77c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''woo''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix index f717441068b..93bcb2072a7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''wookie''; version = ''20181018-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix index 9854567fd5b..db03e57a663 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''xembed''; version = ''clx-20190307-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix index 4bfc0678f0f..71cd9cfbde6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''xkeyboard''; version = ''clx-20120811-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix index 0fd076509c2..ea08214cb6f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''xmls''; version = ''3.0.2''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix index 3e14a5ba9f0..e2a5494c5b4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''xpath''; version = ''plexippus-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix index b9ab71744c3..92f661f8531 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''xsubseq''; version = ''20170830-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix index c7031f4aa3f..cf8f3a8ac0f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''yacc''; version = ''cl-20101006-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix index e14a540a178..ca74dd0e500 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''yason''; version = ''v0.7.6''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix index 74e5d7e97e9..3aa695caed6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''zpb-ttf''; version = ''1.0.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 2e4ceda31c8..052bfb11949 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -39,7 +39,7 @@ in }; }; hunchentoot = addNativeLibs [pkgs.openssl]; - iolib = x: rec { + iolib = x: { propagatedBuildInputs = (x.propagatedBuildInputs or []) ++ (with pkgs; [libfixposix gcc]) ; diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix index 3dae32b5e15..71e1f7c05e6 100644 --- a/pkgs/development/lua-modules/generic/default.nix +++ b/pkgs/development/lua-modules/generic/default.nix @@ -1,6 +1,6 @@ { lua, writeText, toLuaModule }: -{ buildInputs ? [], disabled ? false, ... } @ attrs: +{ disabled ? false, ... } @ attrs: if disabled then throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}" @@ -18,37 +18,8 @@ else // { name = "lua${lua.luaversion}-" + attrs.name; - buildInputs = buildInputs ++ [ lua ]; - - setupHook = writeText "setup-hook.sh" '' - # check for lua/clua modules and don't add duplicates - - addLuaLibPath() { - local package_path="$1/share/lua/${lua.luaversion}" - if [[ ! -d $package_path ]]; then return; fi - if [[ $LUA_PATH = *"$package_path"* ]]; then return; fi - - if [[ -z $LUA_PATH ]]; then - export LUA_PATH="$package_path/?.lua;$package_path/?/init.lua" - else - export LUA_PATH="$LUA_PATH;$package_path/?.lua;$package_path/?/init.lua" - fi - } - - addLuaLibCPath() { - local package_cpath="$1/lib/lua/${lua.luaversion}" - if [[ ! -d $package_cpath ]]; then return; fi - if [[ $LUA_CPATH = *"$package_cpath"* ]]; then return; fi - - if [[ -z $LUA_CPATH ]]; then - export LUA_CPATH="$package_cpath/?.so" - else - export LUA_CPATH="$LUA_CPATH;$package_cpath/?.so" - fi - } - - addEnvHooks "$hostOffset" addLuaLibPath - addEnvHooks "$hostOffset" addLuaLibCPath - ''; + propagatedBuildInputs = [ + lua # propagate it for its setup-hook + ]; } ) ) diff --git a/pkgs/development/misc/amdadl-sdk/default.nix b/pkgs/development/misc/amdadl-sdk/default.nix index d16f63152b8..e93f904b895 100644 --- a/pkgs/development/misc/amdadl-sdk/default.nix +++ b/pkgs/development/misc/amdadl-sdk/default.nix @@ -1,6 +1,6 @@ { requireFile, stdenv, unzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "6.0"; pname = "amdadl-sdk"; diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix index ba6d5559f26..4169b9e4d35 100644 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ b/pkgs/development/misc/amdapp-sdk/default.nix @@ -35,7 +35,7 @@ let }; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "amdapp-sdk"; inherit version; diff --git a/pkgs/development/misc/google-clasp/default.nix b/pkgs/development/misc/google-clasp/default.nix index 105104ebd72..db6ade1c85a 100644 --- a/pkgs/development/misc/google-clasp/default.nix +++ b/pkgs/development/misc/google-clasp/default.nix @@ -5,7 +5,7 @@ in (import ./google-clasp.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; -})."@google/clasp-${version}".override rec { +})."@google/clasp-${version}".override { preRebuild = '' patch -p1 <<<"${builtins.readFile ./dotf.patch}" ''; diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index ad1d0e396a9..557d6f17609 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -4,7 +4,7 @@ with rustPlatform; buildRustPackage rec { version = "0.4.1"; - name = "loc-${version}"; + pname = "loc"; src = fetchFromGitHub { owner = "cgag"; diff --git a/pkgs/development/mobile/adb-sync/default.nix b/pkgs/development/mobile/adb-sync/default.nix index 8578e51e939..ebba63353da 100644 --- a/pkgs/development/mobile/adb-sync/default.nix +++ b/pkgs/development/mobile/adb-sync/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, python3, platform-tools, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "adb-sync"; version = "2016-08-31"; diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index 6e6a349cccc..a7473662006 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -101,14 +101,14 @@ rec { platforms = map (version: deployAndroidPackage { inherit os; - package = packages.platforms."${version}"; + package = packages.platforms.${version}; } ) platformVersions; sources = map (version: deployAndroidPackage { inherit os; - package = packages.sources."${version}"; + package = packages.sources.${version}; } ) platformVersions; @@ -151,14 +151,14 @@ rec { google-apis = map (version: deployAndroidPackage { inherit os; - package = addons.addons."${version}".google_apis; + package = addons.addons.${version}.google_apis; } ) (builtins.filter (platformVersion: platformVersion < "26") platformVersions); # API level 26 and higher include Google APIs by default google-tv-addons = map (version: deployAndroidPackage { inherit os; - package = addons.addons."${version}".google_tv_addon; + package = addons.addons.${version}.google_tv_addon; } ) platformVersions; @@ -225,10 +225,10 @@ rec { # Link extras ${lib.concatMapStrings (identifier: let - path = addons.extras."${identifier}".path; + path = addons.extras.${identifier}.path; addon = deployAndroidPackage { inherit os; - package = addons.extras."${identifier}"; + package = addons.extras.${identifier}; }; in '' diff --git a/pkgs/development/mobile/androidenv/tools.nix b/pkgs/development/mobile/androidenv/tools.nix index 9957168f7af..92f53e5a7c2 100644 --- a/pkgs/development/mobile/androidenv/tools.nix +++ b/pkgs/development/mobile/androidenv/tools.nix @@ -19,8 +19,8 @@ if toolsVersion == "26.0.1" then import ./tools/26.nix { }; } else if toolsVersion == "26.1.1" then import ./tools/26.nix { inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall; - package = packages.tools."${toolsVersion}"; + package = packages.tools.${toolsVersion}; } else import ./tools/25.nix { inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall; - package = packages.tools."${toolsVersion}"; + package = packages.tools.${toolsVersion}; } diff --git a/pkgs/development/mobile/cocoapods/default.nix b/pkgs/development/mobile/cocoapods/default.nix index 0b9bb7c5b5f..c235b9e9a12 100644 --- a/pkgs/development/mobile/cocoapods/default.nix +++ b/pkgs/development/mobile/cocoapods/default.nix @@ -1,7 +1,7 @@ { lib, bundlerApp, ruby , beta ? false }: -bundlerApp rec { +bundlerApp { inherit ruby; pname = "cocoapods"; gemfile = if beta then ./Gemfile-beta else ./Gemfile; diff --git a/pkgs/development/node-packages/composition-v10.nix b/pkgs/development/node-packages/composition-v10.nix index 9f723a6da47..9e2521717ef 100644 --- a/pkgs/development/node-packages/composition-v10.nix +++ b/pkgs/development/node-packages/composition-v10.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 ./node-env.nix { diff --git a/pkgs/development/node-packages/composition-v12.nix b/pkgs/development/node-packages/composition-v12.nix index 4f05009f3ef..4ed0336ec5c 100644 --- a/pkgs/development/node-packages/composition-v12.nix +++ b/pkgs/development/node-packages/composition-v12.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-6_x}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix index 38673fb9ddc..6a98267d89a 100644 --- a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix +++ b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix @@ -1,6 +1,6 @@ { buildDunePackage, bisect_ppx, ocamlbuild }: -buildDunePackage rec { +buildDunePackage { minimumOCamlVersion = "4.02"; inherit (bisect_ppx) version src meta; pname = "bisect_ppx-ocamlbuild"; diff --git a/pkgs/development/ocaml-modules/camomile/0.8.5.nix b/pkgs/development/ocaml-modules/camomile/0.8.5.nix index a30b574f19b..eb9cdb78562 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.5.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.5.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, fetchpatch, ocaml, findlib, camlp4}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "camomile"; version = "0.8.5"; diff --git a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix index 64a8f2416ad..588ba6711cb 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix @@ -7,7 +7,7 @@ if !stdenv.lib.versionAtLeast cohttp-lwt.version "0.99" then cohttp-lwt else -buildDunePackage rec { +buildDunePackage { pname = "cohttp-lwt-unix"; inherit (cohttp-lwt) version src meta; diff --git a/pkgs/development/ocaml-modules/cohttp/lwt.nix b/pkgs/development/ocaml-modules/cohttp/lwt.nix index 93ba084703e..748b970477e 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt.nix @@ -4,7 +4,7 @@ if !stdenv.lib.versionAtLeast cohttp.version "0.99" then cohttp else -buildDunePackage rec { +buildDunePackage { pname = "cohttp-lwt"; inherit (cohttp) version src meta; diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix index b6d2e24ec55..51fb369e66f 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix @@ -6,7 +6,7 @@ if !stdenv.lib.versionAtLeast conduit-lwt.version "1.0" then conduit-lwt else -buildDunePackage rec { +buildDunePackage { pname = "conduit-lwt-unix"; inherit (conduit-lwt) version src meta; diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/pkgs/development/ocaml-modules/conduit/lwt.nix index 560600e2fee..2eb225d88b6 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt.nix @@ -4,7 +4,7 @@ if !stdenv.lib.versionAtLeast conduit.version "1.0" then conduit else -buildDunePackage rec { +buildDunePackage { pname = "conduit-lwt"; inherit (conduit) version src meta; diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix index 17da11708c6..8d395798979 100644 --- a/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -4,7 +4,7 @@ if stdenv.lib.versionAtLeast ocaml.version "4.06" then throw "cryptgps is not available for OCaml ${ocaml.version}" else -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ocaml-cryptgps"; version = "0.2.1"; diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 1811e21cf58..8180373a3dd 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -17,7 +17,7 @@ let param = }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cryptokit"; inherit (param) version; diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index 0ddf3cb5995..567defea7d2 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -1,6 +1,6 @@ { stdenv, buildOcaml, fetchzip, libffi, pkgconfig, ncurses, integers }: -buildOcaml rec { +buildOcaml { name = "ctypes"; version = "0.13.1"; diff --git a/pkgs/development/ocaml-modules/gg/default.nix b/pkgs/development/ocaml-modules/gg/default.nix index bff993a4d19..5fb9131ef09 100644 --- a/pkgs/development/ocaml-modules/gg/default.nix +++ b/pkgs/development/ocaml-modules/gg/default.nix @@ -10,7 +10,7 @@ in assert versionAtLeast (getVersion ocaml) "4.01.0"; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ocaml-${pname}-${version}"; diff --git a/pkgs/development/ocaml-modules/git-http/default.nix b/pkgs/development/ocaml-modules/git-http/default.nix index 0869ae659cc..89a1803b520 100644 --- a/pkgs/development/ocaml-modules/git-http/default.nix +++ b/pkgs/development/ocaml-modules/git-http/default.nix @@ -1,6 +1,6 @@ { buildDunePackage, git, cohttp-lwt, alcotest, mtime, nocrypto }: -buildDunePackage rec { +buildDunePackage { pname = "git-http"; inherit (git) version src; diff --git a/pkgs/development/ocaml-modules/git-unix/default.nix b/pkgs/development/ocaml-modules/git-unix/default.nix index 9c8a7c48255..50e6f1d3bce 100644 --- a/pkgs/development/ocaml-modules/git-unix/default.nix +++ b/pkgs/development/ocaml-modules/git-unix/default.nix @@ -1,6 +1,6 @@ { buildDunePackage, git-http, cohttp-lwt-unix, tls, cmdliner, mtime }: -buildDunePackage rec { +buildDunePackage { pname = "git-unix"; inherit (git-http) version src; diff --git a/pkgs/development/ocaml-modules/janestreet/async-extra.nix b/pkgs/development/ocaml-modules/janestreet/async-extra.nix index 19eef7cf182..ff923bbd467 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-extra.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-extra.nix @@ -2,7 +2,7 @@ bin_prot, core, ppx_custom_printf, fieldslib, herelib, pipebang, sexplib, async_rpc_kernel}: -buildOcamlJane rec { +buildOcamlJane { name = "async_extra"; hash = "1xdwab19fycr4cdm3dh9vmx42f8lvf9s4f9pjgdydxfrm7yzyrfh"; propagatedBuildInputs = [ async_kernel async_unix core bin_prot ppx_custom_printf diff --git a/pkgs/development/ocaml-modules/janestreet/async-kernel.nix b/pkgs/development/ocaml-modules/janestreet/async-kernel.nix index 938f5ccf447..49f38136c4f 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-kernel.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-kernel.nix @@ -2,7 +2,7 @@ bin_prot, fieldslib, sexplib, herelib}: -buildOcamlJane rec { +buildOcamlJane { name = "async_kernel"; hash = "1n6ifbrq6q6hq8bxh6b9vhg11mv9r6jgp1b7vfw7mh5s2nrd4b60"; propagatedBuildInputs = [ core_kernel bin_prot fieldslib herelib sexplib ]; diff --git a/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix b/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix index 1f5ff6b9646..83a7e13a5d0 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix @@ -2,7 +2,7 @@ fieldslib, ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, sexplib, typerep, variantslib}: -buildOcamlJane rec { +buildOcamlJane { name = "async_rpc_kernel"; hash = "0pvys7giqix1nfidw1f4i3r94cf03ba1mvhadpm2zpdir3av91sw"; propagatedBuildInputs = [ async_kernel bin_prot core_kernel fieldslib diff --git a/pkgs/development/ocaml-modules/janestreet/async-unix.nix b/pkgs/development/ocaml-modules/janestreet/async-unix.nix index 7db7cae2709..0d0f26134f2 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-unix.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-unix.nix @@ -2,7 +2,7 @@ bin_prot, comparelib, core, fieldslib, herelib, pipebang, sexplib}: -buildOcamlJane rec { +buildOcamlJane { name = "async_unix"; hash = "03ng7f0s22wwzspakiqj442vs1a7yf834109jcj9r3g1awwfhcy7"; propagatedBuildInputs = [ async_kernel core bin_prot comparelib diff --git a/pkgs/development/ocaml-modules/janestreet/async.nix b/pkgs/development/ocaml-modules/janestreet/async.nix index 4cd67e1af86..fe01e47426d 100644 --- a/pkgs/development/ocaml-modules/janestreet/async.nix +++ b/pkgs/development/ocaml-modules/janestreet/async.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, async_kernel, async_unix, async_extra}: -buildOcamlJane rec { +buildOcamlJane { name = "async"; version = "113.33.03"; hash = "0wyspkp8k833fh03r3h016nbfn6kjfhvb2bg42cly6agcak59fmr"; diff --git a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix index 63156215976..e8f42ef71d1 100644 --- a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix +++ b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix @@ -2,7 +2,7 @@ , openssl, fieldslib, herelib, pipebang, sexplib, ocaml_oasis }: -buildOcamlJane rec { +buildOcamlJane { name = "async_ssl"; version = "113.33.07"; hash = "0bhzpnmlx6dy4fli3i7ipjwqbsdi7fq171jrila5dr3ciy3841xs"; diff --git a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix index 11e6189e6c1..c47fcd2fea6 100644 --- a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix +++ b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix @@ -1,6 +1,6 @@ {stdenv, buildOcamlJane, type_conv}: -buildOcamlJane rec { +buildOcamlJane { name = "bin_prot"; version = "113.33.03"; minimumSupportedOcamlVersion = "4.02"; diff --git a/pkgs/development/ocaml-modules/janestreet/core-extended.nix b/pkgs/development/ocaml-modules/janestreet/core-extended.nix index 5410167e0a2..c7c69beedb7 100644 --- a/pkgs/development/ocaml-modules/janestreet/core-extended.nix +++ b/pkgs/development/ocaml-modules/janestreet/core-extended.nix @@ -4,7 +4,7 @@ ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, re2, textutils}: -buildOcamlJane rec { +buildOcamlJane { name = "core_extended"; hash = "1j4ipcn741j8w3h4gpv5sygjzg6b5g6gc2jcrr4n0jyn5dq8b0p5"; propagatedBuildInputs = diff --git a/pkgs/development/ocaml-modules/janestreet/core.nix b/pkgs/development/ocaml-modules/janestreet/core.nix index c2f97badda9..f6a7ba5b0db 100644 --- a/pkgs/development/ocaml-modules/janestreet/core.nix +++ b/pkgs/development/ocaml-modules/janestreet/core.nix @@ -3,7 +3,7 @@ bin_prot, fieldslib, sexplib, typerep, variantslib, ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}: -buildOcamlJane rec { +buildOcamlJane { name = "core"; hash = "0nz6d5glgymbpchvcpw77yis9jgi2bll32knzy9vx99wn83zdrmd"; propagatedBuildInputs = diff --git a/pkgs/development/ocaml-modules/janestreet/core_bench.nix b/pkgs/development/ocaml-modules/janestreet/core_bench.nix index 83e6100f059..b279318dd93 100644 --- a/pkgs/development/ocaml-modules/janestreet/core_bench.nix +++ b/pkgs/development/ocaml-modules/janestreet/core_bench.nix @@ -5,7 +5,7 @@ , textutils }: -buildOcamlJane rec { +buildOcamlJane { name = "core_bench"; hash = "1d1ainpakgsf5rg8dvar12ksgilqcc4465jr8gf7fz5mmn0mlifj"; propagatedBuildInputs = diff --git a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix index e5bbb780052..53e92a95c23 100644 --- a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix +++ b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix @@ -2,7 +2,7 @@ bin_prot, fieldslib, sexplib, typerep, variantslib, ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}: -buildOcamlJane rec { +buildOcamlJane { name = "core_kernel"; hash = "13gamj056nlib04l7yh80lqpdx0pnswzlb52fkqa01awwp5nf3z6"; propagatedBuildInputs = diff --git a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix index 8823a0c8054..8ce1ca6c505 100644 --- a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix +++ b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix @@ -1,6 +1,6 @@ { stdenv, type_conv, buildOcamlJane }: -buildOcamlJane rec { +buildOcamlJane { name = "fieldslib"; version = "113.33.03"; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix b/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix index b61874d3a7e..3ed7106e7b6 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_compare, ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools, ppx_type_conv, sexplib}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_assert"; hash = "0n7fa1j79ykbkhp8xz0ksg5096asri5d0msshsaqhw5fz18chvz4"; propagatedBuildInputs = diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix b/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix index 56a124c5b69..9e5df431e04 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver, ppx_inline_test, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_bench"; minimumSupportedOcamlVersion = "4.02"; hash = "1l5jlwy1d1fqz70wa2fkf7izngp6nx3g4s9bmnd6ca4dx1x5bksk"; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix b/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix index 9dffbed6960..d7f333d4cf4 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv, bin_prot}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_bin_prot"; hash = "0kwmrrrybdkmphqczsr3lg3imsxcjb8iy41syvn44s3kcjfyyzbz"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv bin_prot ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix b/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix index d70fe6ddd55..0bfdd7bd540 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver, ppx_tools, ppx_type_conv}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_compare"; hash = "05cnwxfxm8201lpfmcqkcqfy6plh5c2151jbj4qsnxhlvvjli459"; propagatedBuildInputs = diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-core.nix b/pkgs/development/ocaml-modules/janestreet/ppx-core.nix index 4f5bb87b767..c5789ee9cfb 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-core.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-core.nix @@ -1,6 +1,6 @@ {stdenv, buildOcamlJane, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_core"; hash = "0df7vyai488lfkyh8szw2hvn22jsyrkfvq1b91j1s0g0y27nnfax"; propagatedBuildInputs = diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix b/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix index 3fe78e3e7e2..c652afa5fbf 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver, ppx_sexp_conv, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_custom_printf"; hash = "06y85m6ky376byja4w7gdwd339di5ag0xrf0czkylzjsnylhdr85"; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix b/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix index 7844756c7bf..b4fb9ec7602 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_optcomp}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_driver"; hash = "19cpfdn1n36vl5l9d6h7c61ffn0wmiipprn5by0354i5aywj8gpn"; propagatedBuildInputs = diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix b/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix index 8dbf34ed232..2fdfede0f23 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_enumerate"; hash = "0m11921q2pjzkwckf21fynd2qfy83n9jjsgks23yagdai8a7ym16"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix b/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix index 7e688a1dc1c..f78f93ee120 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix @@ -3,7 +3,7 @@ ppx_fields_conv, ppx_here, ppx_inline_test, ppx_sexp_conv, ppx_tools, ppx_variants_conv, re, sexplib, variantslib, fieldslib}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_expect"; hash = "0cwagb4cj3x1vsr19kyfa9pxlvaz9a5v863cahi5glinsh4mzgdx"; propagatedBuildInputs = diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix b/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix index 187d5db1999..4f55a6c4eac 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver, ppx_here, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_fail"; hash = "1ms5axpc0zg469zj4799nz3wwxi6rmmyvqj52dy03crmpj71s18l"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_tools ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix index a05cf149b26..551738573b3 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_fields_conv"; hash = "11w9wfjgkv7yxv3rwlwi6m193zan6rhmi45q7n3ddi2s8ls3gra7"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-here.nix b/pkgs/development/ocaml-modules/janestreet/ppx-here.nix index 3aa157a68c5..ea3ac5e8e5a 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-here.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-here.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_here"; hash = "1mzdgn8k171zkwmbizf1a48l525ny0w3363c7gknpnifcinxniiw"; propagatedBuildInputs = [ ppx_core ppx_driver ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix b/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix index cd16d7c3286..d0e4c84158c 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_inline_test"; hash = "0ygapa54i0wwcj3jcqwiimrc6z0b7aafgjhbk37h6vvclnm5n7f6"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix b/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix index 86394f228e9..1086059b19f 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix @@ -5,7 +5,7 @@ ppx_inline_test, ppx_let, ppx_pipebang, ppx_sexp_conv, ppx_sexp_message, ppx_sexp_value, ppx_typerep_conv, ppx_variants_conv}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_jane"; hash = "1la0rp8fhzfglwb15gqh1pl1ld8ls4cnidaw9mjc5q1hb0yj1qd9"; propagatedBuildInputs = diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-let.nix b/pkgs/development/ocaml-modules/janestreet/ppx-let.nix index 3498affeb09..8c8b87d7112 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-let.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-let.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_let"; hash = "0whnfq4rgkq4apfqnvc100wlk25pmqdyvy6s21dsn3fcm9hff467"; propagatedBuildInputs = [ ppx_core ppx_driver ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix b/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix index 5dcfc97bfa3..61fa66b77cc 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_optcomp"; hash = "09m2x2a5ics4bz1j29n5slhh1rlyhcwdfmf44v1jfxcby3f0riwd"; propagatedBuildInputs = diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix b/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix index f3f4bcdead5..209638f97b7 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_pipebang"; hash = "0k25bhj9ziiw89xvs4svz7cgazbbmprba9wbic2llffg55fp7acc"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix index bf4a7b214de..00361ee81eb 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv, sexplib}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_sexp_conv"; hash = "1kgbmlc11w5jhbhmy5n0f734l44zwyry48342dm5qydi9sfzcgq2"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix index e83aaa2c272..2a8bf44bfab 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_sexp_message"; hash = "0inbff25qii868p141jb1y8n3vjfyz66jpnsl9nma6nkkyjkp05j"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix index a1a1080d73d..64fbe4bd9bb 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_sexp_value"; hash = "04602ppqfwx33ghjywam00hlqqzsz4d99r60k9q0v1mynk9pjhj0"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix index fc6d9ca0345..bf36dfab5cb 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_deriving, ppx_driver, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_type_conv"; hash = "0gv0mqwn97dwrfm6rj442565y8dz7kiq8s8vadnhywrl7j4znqyq"; propagatedBuildInputs = diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix index e6d23e0dbdd..472ec19b558 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv, typerep}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_typerep_conv"; hash = "0dldlx73r07j6w0i7h4hxly0v678naa79na5rafsk2974gs5ih9g"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv typerep ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix index 9bc1cbb59e4..1d01b0bc321 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv, sexplib, variantslib}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_variants_conv"; hash = "0kgal8b9yh7wrd75hllb9fyl6zbksfnr9k7pykpzdm3js98dirhn"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib variantslib ]; diff --git a/pkgs/development/ocaml-modules/janestreet/re2.nix b/pkgs/development/ocaml-modules/janestreet/re2.nix index 6604a8d012c..9153d336b22 100644 --- a/pkgs/development/ocaml-modules/janestreet/re2.nix +++ b/pkgs/development/ocaml-modules/janestreet/re2.nix @@ -3,7 +3,7 @@ ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, rsync}: -buildOcamlJane rec { +buildOcamlJane { name = "re2"; hash = "0fw5jscb1i17aw8v4l965zw20kyimhfnmf4w83wqaaxkqy3l6fqw"; buildInputs = [ rsync ]; diff --git a/pkgs/development/ocaml-modules/janestreet/sexplib.nix b/pkgs/development/ocaml-modules/janestreet/sexplib.nix index 4a785d199c8..f4a86f80b04 100644 --- a/pkgs/development/ocaml-modules/janestreet/sexplib.nix +++ b/pkgs/development/ocaml-modules/janestreet/sexplib.nix @@ -1,6 +1,6 @@ {stdenv, buildOcamlJane, type_conv}: -buildOcamlJane rec { +buildOcamlJane { minimumSupportedOcamlVersion = "4.02"; name = "sexplib"; version = "113.33.03"; diff --git a/pkgs/development/ocaml-modules/janestreet/textutils.nix b/pkgs/development/ocaml-modules/janestreet/textutils.nix index 459743f055a..6b3dba5aac8 100644 --- a/pkgs/development/ocaml-modules/janestreet/textutils.nix +++ b/pkgs/development/ocaml-modules/janestreet/textutils.nix @@ -2,7 +2,7 @@ bin_prot, core, fieldslib, sexplib, typerep, variantslib, ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}: -buildOcamlJane rec { +buildOcamlJane { name = "textutils"; hash = "0mkjm9b3k7db7zzrq4403v8qbkgqgkjlz120vcbqh6z7d7ql65vb"; propagatedBuildInputs = diff --git a/pkgs/development/ocaml-modules/janestreet/typerep.nix b/pkgs/development/ocaml-modules/janestreet/typerep.nix index 81e6c4be9cb..2e8fcde1d0d 100644 --- a/pkgs/development/ocaml-modules/janestreet/typerep.nix +++ b/pkgs/development/ocaml-modules/janestreet/typerep.nix @@ -1,6 +1,6 @@ {stdenv, buildOcamlJane, type_conv}: -buildOcamlJane rec { +buildOcamlJane { name = "typerep"; version = "113.33.03"; diff --git a/pkgs/development/ocaml-modules/janestreet/variantslib.nix b/pkgs/development/ocaml-modules/janestreet/variantslib.nix index d9acadbb615..7b3af8a080e 100644 --- a/pkgs/development/ocaml-modules/janestreet/variantslib.nix +++ b/pkgs/development/ocaml-modules/janestreet/variantslib.nix @@ -1,6 +1,6 @@ {stdenv, buildOcamlJane, type_conv}: -buildOcamlJane rec { +buildOcamlJane { name = "variantslib"; version = "113.33.03"; diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index df6f4609a69..1b1869f991e 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -13,7 +13,7 @@ let param = } else throw "lablgtk is not available for OCaml ${ocaml.version}"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lablgtk"; inherit (param) version; diff --git a/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix b/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix index 7e898be7490..be57c7e7146 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix @@ -1,6 +1,6 @@ { buildDunePackage, gtkspell3, lablgtk3 }: -buildDunePackage rec { +buildDunePackage { pname = "lablgtk3-gtkspell3"; buildInputs = [ gtkspell3 ] ++ lablgtk3.buildInputs; propagatedBuildInputs = [ lablgtk3 ]; diff --git a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix index a266e57dd85..0e8ba3ef3ff 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix @@ -1,6 +1,6 @@ { buildDunePackage, gtksourceview, lablgtk3 }: -buildDunePackage rec { +buildDunePackage { pname = "lablgtk3-sourceview3"; buildInputs = lablgtk3.buildInputs ++ [ gtksourceview ]; propagatedBuildInputs = [ lablgtk3 ]; diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix index b4a4e012560..d92cf543f80 100644 --- a/pkgs/development/ocaml-modules/labltk/default.nix +++ b/pkgs/development/ocaml-modules/labltk/default.nix @@ -25,7 +25,7 @@ let param = { key = "1764"; sha256 = "0wgx65y1wkgf22ihpqmspqfp95fqbj3pldhp1p3b1mi8rmc37zwj"; }; -}."${builtins.substring 0 4 ocaml.version}"; +}.${builtins.substring 0 4 ocaml.version}; in stdenv.mkDerivation rec { diff --git a/pkgs/development/ocaml-modules/lwt/legacy.nix b/pkgs/development/ocaml-modules/lwt/legacy.nix index cd40a5051be..e6ef82a9008 100644 --- a/pkgs/development/ocaml-modules/lwt/legacy.nix +++ b/pkgs/development/ocaml-modules/lwt/legacy.nix @@ -14,11 +14,11 @@ let sha256 = { "3.0.0" = "0wwhnl9hppixcsdisinj1wmffx0nv6hkpm01z9qvkngkrazi3i88"; "2.7.1" = "0w7f59havrl2fsnvs84lm7wlqpsrldg80gy5afpnpr21zkw22g8w"; "2.6.0" = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w"; -}."${version}"; in +}.${version}; in let optionals = stdenv.lib.optionals (!stdenv.lib.versionAtLeast version "3"); in -buildOcaml rec { +buildOcaml { name = "lwt"; inherit version; diff --git a/pkgs/development/ocaml-modules/opium/default.nix b/pkgs/development/ocaml-modules/opium/default.nix index 06784b445e3..cbd3a14541f 100644 --- a/pkgs/development/ocaml-modules/opium/default.nix +++ b/pkgs/development/ocaml-modules/opium/default.nix @@ -13,7 +13,7 @@ , alcotest }: -buildDunePackage rec { +buildDunePackage { pname = "opium"; inherit (opium_kernel) version src meta minimumOCamlVersion; diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix index e80b322ffba..c78adce0ac1 100644 --- a/pkgs/development/ocaml-modules/otfm/default.nix +++ b/pkgs/development/ocaml-modules/otfm/default.nix @@ -8,7 +8,7 @@ in assert stdenv.lib.versionAtLeast ocaml.version "4.01.0"; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ocaml-${pname}-${version}"; diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix index 94120f2f8b9..31408ebe6a4 100644 --- a/pkgs/development/ocaml-modules/sawja/default.nix +++ b/pkgs/development/ocaml-modules/sawja/default.nix @@ -7,7 +7,7 @@ let version = "1.5.6"; webpage = "http://sawja.inria.fr/"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ocaml${ocaml.version}-${pname}-${version}"; diff --git a/pkgs/development/ocaml-modules/secp256k1/default.nix b/pkgs/development/ocaml-modules/secp256k1/default.nix index 69b276db90e..64f05b26dd8 100644 --- a/pkgs/development/ocaml-modules/secp256k1/default.nix +++ b/pkgs/development/ocaml-modules/secp256k1/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildDunePackage, base, stdio, configurator, secp256k1 }: -buildDunePackage rec { +buildDunePackage { pname = "secp256k1"; version = "0.4.0"; diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index 9980b3f1083..dec0af5a9c1 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -19,7 +19,7 @@ if !versionAtLeast ocaml.version "4.03" then throw "vg is not available for OCaml ${ocaml.version}" else -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ocaml${ocaml.version}-${pname}-${version}"; diff --git a/pkgs/development/ocaml-modules/zmq/lwt.nix b/pkgs/development/ocaml-modules/zmq/lwt.nix index 378bcf3acec..f8fc06791b1 100644 --- a/pkgs/development/ocaml-modules/zmq/lwt.nix +++ b/pkgs/development/ocaml-modules/zmq/lwt.nix @@ -1,6 +1,6 @@ { buildDunePackage, zmq, ocaml_lwt }: -buildDunePackage rec { +buildDunePackage { pname = "zmq-lwt"; inherit (zmq) version src meta; diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix index 54df32f3eb2..6eed57c4e7c 100644 --- a/pkgs/development/perl-modules/DBD-mysql/default.nix +++ b/pkgs/development/perl-modules/DBD-mysql/default.nix @@ -1,6 +1,6 @@ { fetchurl, buildPerlPackage, DBI, DevelChecklib, mysql }: -buildPerlPackage rec { +buildPerlPackage { pname = "DBD-mysql"; version = "4.050"; diff --git a/pkgs/development/pharo/vm/vms.nix b/pkgs/development/pharo/vm/vms.nix index 0e65a9b990e..91cf0184709 100644 --- a/pkgs/development/pharo/vm/vms.nix +++ b/pkgs/development/pharo/vm/vms.nix @@ -27,7 +27,7 @@ in let suffix = if stdenv.is64bit then "64" else "32"; in -rec { +{ # Build the latest VM spur = pharo-vm-build rec { name = "pharo-spur${suffix}"; diff --git a/pkgs/development/python-modules/PyLD/default.nix b/pkgs/development/python-modules/PyLD/default.nix index 48878995bb4..0862fa63072 100644 --- a/pkgs/development/python-modules/PyLD/default.nix +++ b/pkgs/development/python-modules/PyLD/default.nix @@ -18,7 +18,7 @@ let in -buildPythonPackage rec { +buildPythonPackage { pname = "PyLD"; version = "0.7.2"; diff --git a/pkgs/development/python-modules/adb-homeassistant/default.nix b/pkgs/development/python-modules/adb-homeassistant/default.nix index 83dab71e221..4e37d18a9f3 100644 --- a/pkgs/development/python-modules/adb-homeassistant/default.nix +++ b/pkgs/development/python-modules/adb-homeassistant/default.nix @@ -7,7 +7,7 @@ , pytest , mock }: -buildPythonPackage rec { +buildPythonPackage { pname = "adb-homeassistant"; version = "1.3.1"; diff --git a/pkgs/development/python-modules/azure-mgmt-billing/default.nix b/pkgs/development/python-modules/azure-mgmt-billing/default.nix index c79f9a5a73e..73ce99eb752 100644 --- a/pkgs/development/python-modules/azure-mgmt-billing/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-billing/default.nix @@ -8,7 +8,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { pname = "azure-mgmt-billing"; version = "0.2.0"; #pypi's 0.2.0 doesn't build ootb diff --git a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix index 86e323be168..ed0cb18aff3 100644 --- a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix @@ -8,7 +8,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { pname = "azure-mgmt-commerce"; version = "1.0.1"; diff --git a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix index 6a0c04c58cc..51e1c08e63d 100644 --- a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix +++ b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix @@ -5,7 +5,7 @@ , requests }: -buildPythonPackage rec { +buildPythonPackage { version = "0.20.7"; pname = "azure-servicemanagement-legacy"; diff --git a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix index 3cd37617a39..14365747971 100644 --- a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix +++ b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix @@ -5,7 +5,7 @@ , pythonOlder }: -if !(pythonOlder "3.3") then null else buildPythonPackage rec { +if !(pythonOlder "3.3") then null else buildPythonPackage { pname = "backports.shutil_get_terminal_size"; version = "unstable-2016-02-21"; diff --git a/pkgs/development/python-modules/baselines/default.nix b/pkgs/development/python-modules/baselines/default.nix index a210b5b44aa..56a60de5979 100644 --- a/pkgs/development/python-modules/baselines/default.nix +++ b/pkgs/development/python-modules/baselines/default.nix @@ -15,7 +15,7 @@ , mpi4py }: -buildPythonPackage rec { +buildPythonPackage { pname = "baselines"; version = "0.1.6"; # remember to manually adjust the rev diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index bd19b8eb33e..88ef71cabdf 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -15,7 +15,7 @@ let visualizationSupport = (pyqtgraph != null); in -buildPythonPackage rec { +buildPythonPackage { pname = "binwalk"; version = "2.1.1"; diff --git a/pkgs/development/python-modules/bt-proximity/default.nix b/pkgs/development/python-modules/bt-proximity/default.nix index dfd4d8f0cbf..f998ebca06d 100644 --- a/pkgs/development/python-modules/bt-proximity/default.nix +++ b/pkgs/development/python-modules/bt-proximity/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonPackage, fetchFromGitHub , pybluez }: -buildPythonPackage rec { +buildPythonPackage { pname = "bt-proximity"; version = "0.0.20180217"; diff --git a/pkgs/development/python-modules/bugz/default.nix b/pkgs/development/python-modules/bugz/default.nix index 4af8b247fcf..57ec3728574 100644 --- a/pkgs/development/python-modules/bugz/default.nix +++ b/pkgs/development/python-modules/bugz/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -buildPythonPackage rec { +buildPythonPackage { pname = "bugz-0.9.3"; version = "0.13"; diff --git a/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix b/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix index 7f4857a9531..a12a12547e9 100644 --- a/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix +++ b/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix @@ -4,7 +4,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { version = "asynkdev"; pname = "caldavclientlibrary-asynk"; diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix index 1afe2341633..a76e05332f1 100644 --- a/pkgs/development/python-modules/canopen/default.nix +++ b/pkgs/development/python-modules/canopen/default.nix @@ -5,7 +5,7 @@ , can , canmatrix }: -buildPythonPackage rec { +buildPythonPackage { pname = "canopen"; version = "0.5.1"; diff --git a/pkgs/development/python-modules/chevron/default.nix b/pkgs/development/python-modules/chevron/default.nix index c6338fce56b..7fa3a2b471d 100644 --- a/pkgs/development/python-modules/chevron/default.nix +++ b/pkgs/development/python-modules/chevron/default.nix @@ -4,7 +4,7 @@ , python }: -buildPythonPackage rec { +buildPythonPackage { pname = "chevron"; version = "0.13.1"; diff --git a/pkgs/development/python-modules/cliapp/default.nix b/pkgs/development/python-modules/cliapp/default.nix index 3aece4020e6..c3e6a120ae7 100644 --- a/pkgs/development/python-modules/cliapp/default.nix +++ b/pkgs/development/python-modules/cliapp/default.nix @@ -5,7 +5,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { pname = "cliapp"; version = "1.20150305"; disabled = isPy3k; diff --git a/pkgs/development/python-modules/closure-linter/default.nix b/pkgs/development/python-modules/closure-linter/default.nix index f6c94ace1fa..b814455da3f 100644 --- a/pkgs/development/python-modules/closure-linter/default.nix +++ b/pkgs/development/python-modules/closure-linter/default.nix @@ -8,7 +8,7 @@ /* There is a project called "closure-linter" on PyPI that is the same as this, but it does not appear to be owned by Google. So we're pulling from Google's GitHub repo instead. */ -buildPythonPackage rec { +buildPythonPackage { pname = "closure-linter"; version = "2.3.19"; diff --git a/pkgs/development/python-modules/cntk/default.nix b/pkgs/development/python-modules/cntk/default.nix index 43a7b7646da..ce388bb1d5d 100644 --- a/pkgs/development/python-modules/cntk/default.nix +++ b/pkgs/development/python-modules/cntk/default.nix @@ -14,7 +14,7 @@ let cntk = pkgs.cntk; in -buildPythonPackage rec { +buildPythonPackage { inherit (cntk) name version src; nativeBuildInputs = [ swig openmpi ]; diff --git a/pkgs/development/python-modules/contextlib2/default.nix b/pkgs/development/python-modules/contextlib2/default.nix index 4722b049edf..46fcc378be9 100644 --- a/pkgs/development/python-modules/contextlib2/default.nix +++ b/pkgs/development/python-modules/contextlib2/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "contextlib2"; version = "0.5.5"; - src = fetchPypi rec { + src = fetchPypi { inherit pname version; sha256 = "509f9419ee91cdd00ba34443217d5ca51f5a364a404e1dce9e8979cea969ca48"; }; diff --git a/pkgs/development/python-modules/deskcon/default.nix b/pkgs/development/python-modules/deskcon/default.nix index 05fa3aa835a..2e205ce6955 100644 --- a/pkgs/development/python-modules/deskcon/default.nix +++ b/pkgs/development/python-modules/deskcon/default.nix @@ -6,7 +6,7 @@ , python }: -buildPythonPackage rec { +buildPythonPackage { name = "deskcon-0.3"; disabled = isPy3k; diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix index 8a51227da0e..4ce61680f03 100644 --- a/pkgs/development/python-modules/dm-sonnet/default.nix +++ b/pkgs/development/python-modules/dm-sonnet/default.nix @@ -18,7 +18,7 @@ let version = "1.33"; # first build all binaries and generate setup.py using bazel - bazel-build = buildBazelPackage rec { + bazel-build = buildBazelPackage { name = "dm-sonnet-bazel-${version}"; src = fetchFromGitHub { @@ -60,7 +60,7 @@ let }; # now use pip to install the package prepared by bazel -in buildPythonPackage rec { +in buildPythonPackage { pname = "dm-sonnet"; inherit version; diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix index deeb8ce0642..a12a63c46f1 100644 --- a/pkgs/development/python-modules/dogtail/default.nix +++ b/pkgs/development/python-modules/dogtail/default.nix @@ -15,7 +15,7 @@ # , fetchPypi }: -buildPythonPackage rec { +buildPythonPackage { pname = "dogtail"; version = "0.9.10"; diff --git a/pkgs/development/python-modules/dopy/default.nix b/pkgs/development/python-modules/dopy/default.nix index beaca075750..538a861c9f4 100644 --- a/pkgs/development/python-modules/dopy/default.nix +++ b/pkgs/development/python-modules/dopy/default.nix @@ -4,7 +4,7 @@ , six }: -buildPythonPackage rec { +buildPythonPackage { version = "2016-01-04"; pname = "dopy"; diff --git a/pkgs/development/python-modules/filemagic/default.nix b/pkgs/development/python-modules/filemagic/default.nix index 731b83294a8..cbb5ca56fed 100644 --- a/pkgs/development/python-modules/filemagic/default.nix +++ b/pkgs/development/python-modules/filemagic/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, buildPythonPackage, fetchFromGitHub, file , isPy3k, mock, unittest2 }: -buildPythonPackage rec { +buildPythonPackage { pname = "filemagic"; version = "1.6"; diff --git a/pkgs/development/python-modules/flask-silk/default.nix b/pkgs/development/python-modules/flask-silk/default.nix index edc873458a1..653e39b1740 100644 --- a/pkgs/development/python-modules/flask-silk/default.nix +++ b/pkgs/development/python-modules/flask-silk/default.nix @@ -4,7 +4,7 @@ , flask }: -buildPythonPackage rec { +buildPythonPackage { pname = "Flask-Silk"; version = "2018-06-28"; diff --git a/pkgs/development/python-modules/gateone/default.nix b/pkgs/development/python-modules/gateone/default.nix index e0b6b3e49fa..f9ad118673a 100644 --- a/pkgs/development/python-modules/gateone/default.nix +++ b/pkgs/development/python-modules/gateone/default.nix @@ -7,7 +7,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { name = "gateone-1.2-0d57c3"; disabled = isPy3k; diff --git a/pkgs/development/python-modules/geeknote/default.nix b/pkgs/development/python-modules/geeknote/default.nix index d352d6def24..c8ff60b318b 100644 --- a/pkgs/development/python-modules/geeknote/default.nix +++ b/pkgs/development/python-modules/geeknote/default.nix @@ -10,7 +10,7 @@ , evernote }: -buildPythonPackage rec { +buildPythonPackage { version = "2015-05-11"; pname = "geeknote"; disabled = ! isPy27; diff --git a/pkgs/development/python-modules/google_cloud_testutils/default.nix b/pkgs/development/python-modules/google_cloud_testutils/default.nix index 9c8d6ca93e0..311815ef331 100644 --- a/pkgs/development/python-modules/google_cloud_testutils/default.nix +++ b/pkgs/development/python-modules/google_cloud_testutils/default.nix @@ -5,7 +5,7 @@ , google_auth }: -buildPythonPackage rec { +buildPythonPackage { pname = "google-cloud-testutils"; version = "unstable-36ffa923c7037e8b4fdcaa76272cb6267e908a9d"; diff --git a/pkgs/development/python-modules/greatfet/default.nix b/pkgs/development/python-modules/greatfet/default.nix index b0e418913b7..c6fddd1554c 100644 --- a/pkgs/development/python-modules/greatfet/default.nix +++ b/pkgs/development/python-modules/greatfet/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, buildPythonPackage, isPy3k, future, pyusb, ipython, pygreat }: -buildPythonPackage rec { +buildPythonPackage { pname = "GreatFET"; version = "2019.5.1.dev0"; diff --git a/pkgs/development/python-modules/gyp/default.nix b/pkgs/development/python-modules/gyp/default.nix index 46b0dde636a..3cd89a7d0e1 100644 --- a/pkgs/development/python-modules/gyp/default.nix +++ b/pkgs/development/python-modules/gyp/default.nix @@ -4,7 +4,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { pname = "gyp"; version = "2015-06-11"; disabled = isPy3k; diff --git a/pkgs/development/python-modules/ipfsapi/default.nix b/pkgs/development/python-modules/ipfsapi/default.nix index 377ed8549cf..1778e5a81af 100644 --- a/pkgs/development/python-modules/ipfsapi/default.nix +++ b/pkgs/development/python-modules/ipfsapi/default.nix @@ -6,7 +6,7 @@ , requests }: -buildPythonPackage rec { +buildPythonPackage { pname = "ipfsapi"; version = "0.4.2.post1"; disabled = isPy27; diff --git a/pkgs/development/python-modules/iso3166/default.nix b/pkgs/development/python-modules/iso3166/default.nix index c65c5f21e56..54d9aff280f 100644 --- a/pkgs/development/python-modules/iso3166/default.nix +++ b/pkgs/development/python-modules/iso3166/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildPythonPackage, pytest }: -buildPythonPackage rec { +buildPythonPackage { pname = "iso3166"; version = "0.8"; diff --git a/pkgs/development/python-modules/jsonwatch/default.nix b/pkgs/development/python-modules/jsonwatch/default.nix index 177b0d4cfee..1b859e21e90 100644 --- a/pkgs/development/python-modules/jsonwatch/default.nix +++ b/pkgs/development/python-modules/jsonwatch/default.nix @@ -5,7 +5,7 @@ , isPyPy }: -buildPythonPackage rec { +buildPythonPackage { pname = "jsonwatch"; version = "0.2.0"; disabled = isPyPy; # doesn't find setuptools diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix index c456d67ac49..e89b606879b 100644 --- a/pkgs/development/python-modules/libsoundtouch/default.nix +++ b/pkgs/development/python-modules/libsoundtouch/default.nix @@ -7,7 +7,7 @@ , enum34 }: -buildPythonPackage rec { +buildPythonPackage { pname = "libsoundtouch"; version = "0.4.0"; diff --git a/pkgs/development/python-modules/lpod/default.nix b/pkgs/development/python-modules/lpod/default.nix index dd40ac85186..9b262007706 100644 --- a/pkgs/development/python-modules/lpod/default.nix +++ b/pkgs/development/python-modules/lpod/default.nix @@ -7,7 +7,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { version = "1.1.7"; pname = "python-lpod"; # lpod library currently does not support Python 3.x diff --git a/pkgs/development/python-modules/lxc/default.nix b/pkgs/development/python-modules/lxc/default.nix index a078d33a889..26be7020c66 100644 --- a/pkgs/development/python-modules/lxc/default.nix +++ b/pkgs/development/python-modules/lxc/default.nix @@ -5,7 +5,7 @@ , pkgs }: -buildPythonPackage rec { +buildPythonPackage { pname = "python-lxc-unstable"; version = "2016-08-25"; disabled = isPy3k; diff --git a/pkgs/development/python-modules/magic/default.nix b/pkgs/development/python-modules/magic/default.nix index 41c932ed111..3022eb52f50 100644 --- a/pkgs/development/python-modules/magic/default.nix +++ b/pkgs/development/python-modules/magic/default.nix @@ -3,7 +3,7 @@ , pkgs }: -buildPythonPackage rec { +buildPythonPackage { name = "${pkgs.file.name}"; src = pkgs.file.src; diff --git a/pkgs/development/python-modules/mutag/default.nix b/pkgs/development/python-modules/mutag/default.nix index 3fbb36a3718..0d5d8d75a36 100644 --- a/pkgs/development/python-modules/mutag/default.nix +++ b/pkgs/development/python-modules/mutag/default.nix @@ -5,7 +5,7 @@ , pyparsing }: -buildPythonPackage rec { +buildPythonPackage { name = "mutag-0.0.2-2ffa0258ca"; disabled = ! isPy3k; diff --git a/pkgs/development/python-modules/muttils/default.nix b/pkgs/development/python-modules/muttils/default.nix index 904284e5b33..868700b6223 100644 --- a/pkgs/development/python-modules/muttils/default.nix +++ b/pkgs/development/python-modules/muttils/default.nix @@ -4,7 +4,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { pname = "muttils"; version = "1.3"; disabled = isPy3k; diff --git a/pkgs/development/python-modules/mxnet/default.nix b/pkgs/development/python-modules/mxnet/default.nix index f2e38a0e9b3..65eb2d44ffc 100644 --- a/pkgs/development/python-modules/mxnet/default.nix +++ b/pkgs/development/python-modules/mxnet/default.nix @@ -8,7 +8,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { inherit (pkgs.mxnet) name version src meta; buildInputs = [ pkgs.mxnet ]; diff --git a/pkgs/development/python-modules/nanomsg-python/default.nix b/pkgs/development/python-modules/nanomsg-python/default.nix index b6e323ff9c6..31662cd3941 100644 --- a/pkgs/development/python-modules/nanomsg-python/default.nix +++ b/pkgs/development/python-modules/nanomsg-python/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub, nanomsg }: -buildPythonPackage rec { +buildPythonPackage { pname = "nanomsg-python"; version = "1.0.20190114"; diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 0b0220d3246..0f84486674e 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -4,7 +4,7 @@ let pname = "nbxmpp"; version = "0.6.10"; name = "${pname}-${version}"; -in buildPythonPackage rec { +in buildPythonPackage { inherit pname version; # Tests aren't included in PyPI tarball. src = fetchzip { diff --git a/pkgs/development/python-modules/notify/default.nix b/pkgs/development/python-modules/notify/default.nix index 6aadd7f4533..f3a1d6514eb 100644 --- a/pkgs/development/python-modules/notify/default.nix +++ b/pkgs/development/python-modules/notify/default.nix @@ -6,7 +6,7 @@ , pkgs }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "python-notify"; version = "0.1.1"; diff --git a/pkgs/development/python-modules/notmuch/default.nix b/pkgs/development/python-modules/notmuch/default.nix index ec641420f65..567977a84f5 100644 --- a/pkgs/development/python-modules/notmuch/default.nix +++ b/pkgs/development/python-modules/notmuch/default.nix @@ -4,7 +4,7 @@ , python }: -buildPythonPackage rec { +buildPythonPackage { name = "python-${pkgs.notmuch.name}"; src = pkgs.notmuch.src; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 10a1df8876c..c6e5c2c648f 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -5,7 +5,7 @@ let cfg = writeTextFile { name = "site.cfg"; text = (lib.generators.toINI {} { - "${blasImplementation}" = { + ${blasImplementation} = { include_dirs = "${blas}/include"; library_dirs = "${blas}/lib"; } // lib.optionalAttrs (blasImplementation == "mkl") { @@ -16,12 +16,12 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.17.0"; + version = "1.17.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "951fefe2fb73f84c620bec4e001e80a80ddaa1b84dce244ded7f1e0cbe0ed34a"; + sha256 = "f11331530f0eff69a758d62c2461cd98cdc2eae0147279d8fc86e0464eb7e8ca"; }; nativeBuildInputs = [ gfortran pytest ]; diff --git a/pkgs/development/python-modules/nxt-python/default.nix b/pkgs/development/python-modules/nxt-python/default.nix index c28f22aa5ec..8e294f290cb 100644 --- a/pkgs/development/python-modules/nxt-python/default.nix +++ b/pkgs/development/python-modules/nxt-python/default.nix @@ -8,7 +8,7 @@ , git }: -buildPythonPackage rec { +buildPythonPackage { version = "unstable-20160819"; pname = "nxt-python"; disabled = isPy3k; diff --git a/pkgs/development/python-modules/openant/default.nix b/pkgs/development/python-modules/openant/default.nix index 116ba717add..a9598825dd0 100644 --- a/pkgs/development/python-modules/openant/default.nix +++ b/pkgs/development/python-modules/openant/default.nix @@ -4,7 +4,7 @@ , pyusb }: -buildPythonPackage rec { +buildPythonPackage { pname = "openant-unstable"; version = "2017-02-11"; diff --git a/pkgs/development/python-modules/ovito/default.nix b/pkgs/development/python-modules/ovito/default.nix index 4c0d4346ee7..694b87581cd 100644 --- a/pkgs/development/python-modules/ovito/default.nix +++ b/pkgs/development/python-modules/ovito/default.nix @@ -4,7 +4,7 @@ , pythonPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { # compilation error in 2.9.0 https://gitlab.com/stuko/ovito/issues/40 # This is not the "released" 3.0.0 just a commit version = "3.0.0"; diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 69dce2723eb..fcd3d997dcd 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; -buildPythonPackage rec { +buildPythonPackage { inherit (protobuf) name src version; inherit disabled doCheck; diff --git a/pkgs/development/python-modules/ptable/default.nix b/pkgs/development/python-modules/ptable/default.nix index 02429f589cf..f1118325610 100644 --- a/pkgs/development/python-modules/ptable/default.nix +++ b/pkgs/development/python-modules/ptable/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub, nose }: -buildPythonPackage rec { +buildPythonPackage { pname = "ptable"; version = "unstable-2019-06-14"; diff --git a/pkgs/development/python-modules/purepng/default.nix b/pkgs/development/python-modules/purepng/default.nix index ece89387493..fbaa1cfad71 100644 --- a/pkgs/development/python-modules/purepng/default.nix +++ b/pkgs/development/python-modules/purepng/default.nix @@ -7,7 +7,7 @@ , numpy ? null }: -buildPythonPackage rec { +buildPythonPackage { pname = "purepng"; version = "0.2.0"; diff --git a/pkgs/development/python-modules/pybfd/default.nix b/pkgs/development/python-modules/pybfd/default.nix index 8f074943dd3..f9737b93583 100644 --- a/pkgs/development/python-modules/pybfd/default.nix +++ b/pkgs/development/python-modules/pybfd/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, buildPythonPackage, isPyPy, isPy3k, libbfd, libopcodes }: -buildPythonPackage rec { +buildPythonPackage { pname = "pybfd"; version = "-0.1.1.2017-12-31"; diff --git a/pkgs/development/python-modules/pyblock/default.nix b/pkgs/development/python-modules/pyblock/default.nix index 1cd95c83fa2..4dcc3434025 100644 --- a/pkgs/development/python-modules/pyblock/default.nix +++ b/pkgs/development/python-modules/pyblock/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "0.53"; md5_path = "f6d33a8362dee358517d0a9e2ebdd044"; - src = pkgs.fetchurl rec { + src = pkgs.fetchurl { url = "https://src.fedoraproject.org/repo/pkgs/python-pyblock/" + "${pname}-${version}.tar.bz2/${md5_path}/${pname}-${version}.tar.bz2"; sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815"; diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix index 163477a2725..b3e31a9bc78 100644 --- a/pkgs/development/python-modules/pycangjie/default.nix +++ b/pkgs/development/python-modules/pycangjie/default.nix @@ -4,7 +4,7 @@ let rev = "361bb413203fd43bab624d98edf6f7d20ce6bfd3"; -in buildPythonPackage rec { +in buildPythonPackage { pname = "pycangjie"; version = "1.3_rev_${rev}"; format = "other"; diff --git a/pkgs/development/python-modules/pycuda/compyte.nix b/pkgs/development/python-modules/pycuda/compyte.nix index c441cea5f45..cfa685c1ac9 100644 --- a/pkgs/development/python-modules/pycuda/compyte.nix +++ b/pkgs/development/python-modules/pycuda/compyte.nix @@ -2,7 +2,7 @@ , fetchFromGitHub }: -mkDerivation rec { +mkDerivation { pname = "compyte"; version = "git-20150817"; diff --git a/pkgs/development/python-modules/pycurl2/default.nix b/pkgs/development/python-modules/pycurl2/default.nix index 9b04f2b6fcb..01428d41b7d 100644 --- a/pkgs/development/python-modules/pycurl2/default.nix +++ b/pkgs/development/python-modules/pycurl2/default.nix @@ -8,7 +8,7 @@ , pkgs }: -buildPythonPackage rec { +buildPythonPackage { pname = "pycurl2"; version = "7.20.0"; disabled = isPy3k; diff --git a/pkgs/development/python-modules/pyext/default.nix b/pkgs/development/python-modules/pyext/default.nix index 31a188ed172..2e4c639465b 100644 --- a/pkgs/development/python-modules/pyext/default.nix +++ b/pkgs/development/python-modules/pyext/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub }: -buildPythonPackage rec { +buildPythonPackage { pname = "pyext"; version = "0.8"; diff --git a/pkgs/development/python-modules/pyfantom/default.nix b/pkgs/development/python-modules/pyfantom/default.nix index 1abf0407988..b9e15d376b5 100644 --- a/pkgs/development/python-modules/pyfantom/default.nix +++ b/pkgs/development/python-modules/pyfantom/default.nix @@ -3,7 +3,7 @@ , fetchgit }: -buildPythonPackage rec { +buildPythonPackage { pname = "pyfantom"; version = "unstable-2013-12-18"; diff --git a/pkgs/development/python-modules/pygmo/default.nix b/pkgs/development/python-modules/pygmo/default.nix index 507310b4c51..c7dfdef4be4 100644 --- a/pkgs/development/python-modules/pygmo/default.nix +++ b/pkgs/development/python-modules/pygmo/default.nix @@ -27,7 +27,7 @@ let ''; }); -in buildPythonPackage rec { +in buildPythonPackage { pname = "pygmo"; version = pagmo2WithPython.version; diff --git a/pkgs/development/python-modules/pygreat/default.nix b/pkgs/development/python-modules/pygreat/default.nix index 97401f2eb16..103e215f047 100644 --- a/pkgs/development/python-modules/pygreat/default.nix +++ b/pkgs/development/python-modules/pygreat/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, future, pyusb }: -buildPythonPackage rec { +buildPythonPackage { pname = "pygreat"; version = "2019.5.1.dev0"; diff --git a/pkgs/development/python-modules/pyinputevent/default.nix b/pkgs/development/python-modules/pyinputevent/default.nix index 153b5701b26..90d13ae0787 100644 --- a/pkgs/development/python-modules/pyinputevent/default.nix +++ b/pkgs/development/python-modules/pyinputevent/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -buildPythonPackage rec { +buildPythonPackage { pname = "pyinputevent"; version = "2016-10-18"; diff --git a/pkgs/development/python-modules/pykde4/default.nix b/pkgs/development/python-modules/pykde4/default.nix index 4a5a5c5e1f9..913453962eb 100644 --- a/pkgs/development/python-modules/pykde4/default.nix +++ b/pkgs/development/python-modules/pykde4/default.nix @@ -11,7 +11,7 @@ let sha256 = "0x2bghbprwl3az1ni3p87i0bq8r99694la93kg65vi0cz12gh3bl"; }; }); - pyqt4_fixed = pyqt4.overrideAttrs (oldAttrs: rec { + pyqt4_fixed = pyqt4.overrideAttrs (oldAttrs: { propagatedBuildInputs = [ sip4_19_3 ]; }); in stdenv.mkDerivation rec { diff --git a/pkgs/development/python-modules/pykickstart/default.nix b/pkgs/development/python-modules/pykickstart/default.nix index bc06a10f973..27827270fa1 100644 --- a/pkgs/development/python-modules/pykickstart/default.nix +++ b/pkgs/development/python-modules/pykickstart/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { version = "1.99.39"; md5_path = "d249f60aa89b1b4facd63f776925116d"; - src = fetchurl rec { + src = fetchurl { url = "https://src.fedoraproject.org/repo/pkgs/pykickstart/" + "${pname}-${version}.tar.gz/${md5_path}/${pname}-${version}.tar.gz"; sha256 = "e0d0f98ac4c5607e6a48d5c1fba2d50cc804de1081043f9da68cbfc69cad957a"; diff --git a/pkgs/development/python-modules/pylev/default.nix b/pkgs/development/python-modules/pylev/default.nix index 895171ff713..f198d214172 100644 --- a/pkgs/development/python-modules/pylev/default.nix +++ b/pkgs/development/python-modules/pylev/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub }: -buildPythonPackage rec { +buildPythonPackage { pname = "pylev"; version = "1.3.0"; diff --git a/pkgs/development/python-modules/pymaging/default.nix b/pkgs/development/python-modules/pymaging/default.nix index 234aee8436d..81100a8e214 100644 --- a/pkgs/development/python-modules/pymaging/default.nix +++ b/pkgs/development/python-modules/pymaging/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -buildPythonPackage rec { +buildPythonPackage { pname = "pymaging"; version = "unstable-2016-11-16"; diff --git a/pkgs/development/python-modules/pymaging_png/default.nix b/pkgs/development/python-modules/pymaging_png/default.nix index fb92739776d..61239f1cbe3 100644 --- a/pkgs/development/python-modules/pymaging_png/default.nix +++ b/pkgs/development/python-modules/pymaging_png/default.nix @@ -4,7 +4,7 @@ , pymaging }: -buildPythonPackage rec { +buildPythonPackage { pname = "pymaging-png"; version = "unstable-2016-11-16"; diff --git a/pkgs/development/python-modules/pynac/default.nix b/pkgs/development/python-modules/pynac/default.nix index 0839cb1aa4a..755dda341c9 100644 --- a/pkgs/development/python-modules/pynac/default.nix +++ b/pkgs/development/python-modules/pynac/default.nix @@ -3,7 +3,7 @@ , fetchurl }: -buildPythonPackage rec { +buildPythonPackage { pname = "pynac"; version = "0.2"; diff --git a/pkgs/development/python-modules/pysc2/default.nix b/pkgs/development/python-modules/pysc2/default.nix index 280981ab2c2..d02c85fb4ff 100644 --- a/pkgs/development/python-modules/pysc2/default.nix +++ b/pkgs/development/python-modules/pysc2/default.nix @@ -16,7 +16,7 @@ , sc2-headless }: -buildPythonPackage rec { +buildPythonPackage { pname = "PySC2"; version = "1.2"; diff --git a/pkgs/development/python-modules/pyscss/default.nix b/pkgs/development/python-modules/pyscss/default.nix index 625eae7b74b..2dfa1f22962 100644 --- a/pkgs/development/python-modules/pyscss/default.nix +++ b/pkgs/development/python-modules/pyscss/default.nix @@ -9,7 +9,7 @@ , pythonOlder }: -buildPythonPackage rec { +buildPythonPackage { pname = "pyScss"; version = "1.3.5"; diff --git a/pkgs/development/python-modules/pysensors/default.nix b/pkgs/development/python-modules/pysensors/default.nix index 5069bbe9648..3f55a015991 100644 --- a/pkgs/development/python-modules/pysensors/default.nix +++ b/pkgs/development/python-modules/pysensors/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, python, fetchFromGitHub, lm_sensors }: -buildPythonPackage rec { +buildPythonPackage { version = "2017-07-13"; pname = "pysensors"; diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix index 0950726172d..feeeda812f9 100644 --- a/pkgs/development/python-modules/pyside/generatorrunner.nix +++ b/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -5,7 +5,7 @@ let pythonEnv = python2.withPackages(ps: with ps; [ sphinx ]); pname = "pyside-generatorrunner"; version = "0.6.16"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { diff --git a/pkgs/development/python-modules/pyside2-tools/default.nix b/pkgs/development/python-modules/pyside2-tools/default.nix index 5314a5cc713..a96ea5d32ff 100644 --- a/pkgs/development/python-modules/pyside2-tools/default.nix +++ b/pkgs/development/python-modules/pyside2-tools/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage, wrapPython, python, fetchurl, stdenv, cmake, qt5, shiboken2, pyside2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pyside2-tools"; inherit (pyside2) version src; diff --git a/pkgs/development/python-modules/pysparse/default.nix b/pkgs/development/python-modules/pysparse/default.nix index 45ff5a9b5b4..5c3a6bb26f8 100644 --- a/pkgs/development/python-modules/pysparse/default.nix +++ b/pkgs/development/python-modules/pysparse/default.nix @@ -8,7 +8,7 @@ , python }: -buildPythonPackage rec { +buildPythonPackage { pname = "pysparse"; version = "1.3-dev"; disabled = !isPy27; diff --git a/pkgs/development/python-modules/python-unshare/default.nix b/pkgs/development/python-modules/python-unshare/default.nix index e6425c30047..a7f0bd93b0a 100644 --- a/pkgs/development/python-modules/python-unshare/default.nix +++ b/pkgs/development/python-modules/python-unshare/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -buildPythonPackage rec { +buildPythonPackage { pname = "python-unshare"; # pypi version doesn't support Python 3 and the package didn't update for a long time: # https://github.com/TheTincho/python-unshare/pull/8 diff --git a/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/pkgs/development/python-modules/python-xmp-toolkit/default.nix index 93fa36fa2fc..8a160da2964 100644 --- a/pkgs/development/python-modules/python-xmp-toolkit/default.nix +++ b/pkgs/development/python-modules/python-xmp-toolkit/default.nix @@ -7,7 +7,7 @@ , stdenv }: -buildPythonPackage rec { +buildPythonPackage { pname = "python-xmp-toolkit"; version = "2.0.2"; diff --git a/pkgs/development/python-modules/qasm2image/default.nix b/pkgs/development/python-modules/qasm2image/default.nix index 8a49e8418fd..00f15f801d1 100644 --- a/pkgs/development/python-modules/qasm2image/default.nix +++ b/pkgs/development/python-modules/qasm2image/default.nix @@ -11,7 +11,7 @@ , pythonOlder }: -buildPythonPackage rec { +buildPythonPackage { pname = "qasm2image"; version = "0.8.0"; diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix index 987c1ca9049..e8076db6053 100644 --- a/pkgs/development/python-modules/qscintilla-qt5/default.nix +++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -5,7 +5,7 @@ , qtbase }: with pythonPackages; -buildPythonPackage rec { +buildPythonPackage { pname = "qscintilla"; version = qscintilla.version; src = qscintilla.src; diff --git a/pkgs/development/python-modules/qscintilla/default.nix b/pkgs/development/python-modules/qscintilla/default.nix index 06010b40ed9..e44f6205d39 100644 --- a/pkgs/development/python-modules/qscintilla/default.nix +++ b/pkgs/development/python-modules/qscintilla/default.nix @@ -9,7 +9,7 @@ }: disabledIf (isPy3k || isPyPy) - (buildPythonPackage rec { + (buildPythonPackage { # TODO: Qt5 support pname = "qscintilla"; version = pkgs.qscintilla.version; diff --git a/pkgs/development/python-modules/radicale_infcloud/default.nix b/pkgs/development/python-modules/radicale_infcloud/default.nix index 4d80a407564..08d4a8f36a3 100644 --- a/pkgs/development/python-modules/radicale_infcloud/default.nix +++ b/pkgs/development/python-modules/radicale_infcloud/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildPythonPackage }: -buildPythonPackage rec { +buildPythonPackage { pname = "radicale_infcloud"; version = "2017-07-27"; diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix index 83edfa4f1d2..a2da451905a 100644 --- a/pkgs/development/python-modules/rarfile/default.nix +++ b/pkgs/development/python-modules/rarfile/default.nix @@ -6,7 +6,7 @@ assert useUnrar -> unrar != null; assert !useUnrar -> libarchive != null; -buildPythonPackage rec { +buildPythonPackage { pname = "rarfile"; version = "3.0"; diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix index e394b964643..2bd42172917 100644 --- a/pkgs/development/python-modules/rbtools/default.nix +++ b/pkgs/development/python-modules/rbtools/default.nix @@ -6,7 +6,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { pname = "rbtools"; version = "0.7.2"; disabled = isPy3k; diff --git a/pkgs/development/python-modules/recursive-pth-loader/default.nix b/pkgs/development/python-modules/recursive-pth-loader/default.nix index 9644055b007..c49f891ec1d 100644 --- a/pkgs/development/python-modules/recursive-pth-loader/default.nix +++ b/pkgs/development/python-modules/recursive-pth-loader/default.nix @@ -1,6 +1,6 @@ { stdenv, python }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "python-recursive-pth-loader"; version = "1.0"; diff --git a/pkgs/development/python-modules/rencode/default.nix b/pkgs/development/python-modules/rencode/default.nix index ac041d664ae..46f562ee5d6 100644 --- a/pkgs/development/python-modules/rencode/default.nix +++ b/pkgs/development/python-modules/rencode/default.nix @@ -5,7 +5,7 @@ , cython }: -buildPythonPackage rec { +buildPythonPackage { pname = "rencode"; version = "git20150810"; disabled = isPy33; diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix index 1a40f61cc50..577c21d6e0b 100644 --- a/pkgs/development/python-modules/rhpl/default.nix +++ b/pkgs/development/python-modules/rhpl/default.nix @@ -1,6 +1,6 @@ {buildPythonPackage, fetchurl, rpmextract, python, wirelesstools, gettext}: -buildPythonPackage rec { +buildPythonPackage { pname = "rhpl"; version = "0.218"; format = "other"; diff --git a/pkgs/development/python-modules/samplerate/default.nix b/pkgs/development/python-modules/samplerate/default.nix index b5952e6ee15..8de675d4ea1 100644 --- a/pkgs/development/python-modules/samplerate/default.nix +++ b/pkgs/development/python-modules/samplerate/default.nix @@ -4,7 +4,7 @@ , pkgs }: -buildPythonPackage rec { +buildPythonPackage { pname = "scikits.samplerate"; version = "0.3.3"; diff --git a/pkgs/development/python-modules/scandir/default.nix b/pkgs/development/python-modules/scandir/default.nix index 2736eb2ee9a..bc71fde5ced 100644 --- a/pkgs/development/python-modules/scandir/default.nix +++ b/pkgs/development/python-modules/scandir/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, python, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "scandir"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 ="1bkqwmf056pkchf05ywbnf659wqlp6lljcdb0y88wr9f0vv32ijd"; }; - checkPhase = "python test/run_tests.py"; + checkPhase = "${python.interpreter} test/run_tests.py"; meta = with lib; { description = "A better directory iterator and faster os.walk()"; diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index 4072268609d..3201de0ba46 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildPythonPackage, pytest }: -buildPythonPackage rec { +buildPythonPackage { pname = "semver"; version = "2.8.1"; diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix index 82dfa3c4ea2..0a0a3d8a9b2 100644 --- a/pkgs/development/python-modules/shiboken2/default.nix +++ b/pkgs/development/python-modules/shiboken2/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage, python, fetchurl, stdenv, pyside2, cmake, qt5, llvmPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "shiboken2"; inherit (pyside2) version src; diff --git a/pkgs/development/python-modules/simple-websocket-server/default.nix b/pkgs/development/python-modules/simple-websocket-server/default.nix index ee9444fd38e..312f58bf9fa 100644 --- a/pkgs/development/python-modules/simple-websocket-server/default.nix +++ b/pkgs/development/python-modules/simple-websocket-server/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub }: -buildPythonPackage rec { +buildPythonPackage { pname = "simple-websocket-server"; version = "20180414"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/simplebayes/default.nix b/pkgs/development/python-modules/simplebayes/default.nix index 705b7559372..57f7df73c21 100644 --- a/pkgs/development/python-modules/simplebayes/default.nix +++ b/pkgs/development/python-modules/simplebayes/default.nix @@ -6,7 +6,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { pname = "simplebayes"; version = "1.5.8"; diff --git a/pkgs/development/python-modules/slob/default.nix b/pkgs/development/python-modules/slob/default.nix index 490113d6952..8a6971ceb8f 100644 --- a/pkgs/development/python-modules/slob/default.nix +++ b/pkgs/development/python-modules/slob/default.nix @@ -6,7 +6,7 @@ , python }: -buildPythonPackage rec { +buildPythonPackage { name = "slob"; verison = "unstable-2016-11-03"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/snappergui/default.nix b/pkgs/development/python-modules/snappergui/default.nix index db1a75ab7f2..6b31145d519 100644 --- a/pkgs/development/python-modules/snappergui/default.nix +++ b/pkgs/development/python-modules/snappergui/default.nix @@ -5,7 +5,7 @@ , dbus-python }: -buildPythonPackage rec { +buildPythonPackage { pname = "Snapper-GUI"; version = "0.1"; diff --git a/pkgs/development/python-modules/spacy/models.nix b/pkgs/development/python-modules/spacy/models.nix index d9a67454fe6..b091c3b7d56 100644 --- a/pkgs/development/python-modules/spacy/models.nix +++ b/pkgs/development/python-modules/spacy/models.nix @@ -13,7 +13,7 @@ let meta = with stdenv.lib; { description = "Models for the spaCy NLP library"; homepage = "https://github.com/explosion/spacy-models"; - license = licenses."${license}"; + license = licenses.${license}; maintainers = with maintainers; [ rvl ]; }; }; diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix index 967e365dde0..71b643e5cb5 100644 --- a/pkgs/development/python-modules/stumpy/default.nix +++ b/pkgs/development/python-modules/stumpy/default.nix @@ -14,7 +14,7 @@ , codecov }: -buildPythonPackage rec { +buildPythonPackage { pname = "stumpy"; version = "1.0"; diff --git a/pkgs/development/python-modules/subunit/default.nix b/pkgs/development/python-modules/subunit/default.nix index 024fd136c40..eeef94e6c76 100644 --- a/pkgs/development/python-modules/subunit/default.nix +++ b/pkgs/development/python-modules/subunit/default.nix @@ -4,7 +4,7 @@ , testscenarios }: -buildPythonPackage rec { +buildPythonPackage { name = pkgs.subunit.name; src = pkgs.subunit.src; diff --git a/pkgs/development/python-modules/tempita/default.nix b/pkgs/development/python-modules/tempita/default.nix index 4eff644a161..a903aae104e 100644 --- a/pkgs/development/python-modules/tempita/default.nix +++ b/pkgs/development/python-modules/tempita/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, nose }: -buildPythonPackage rec { +buildPythonPackage { version = "0.5.3-2016-09-28"; pname = "tempita"; diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 0f03adfccf5..b585ab4f81b 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -63,7 +63,7 @@ let ''; }; }; -in buildPythonPackage rec { +in buildPythonPackage { inherit version pname; format = "wheel"; diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index a562ba8f2fa..f7e3906ee1f 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -45,7 +45,7 @@ let variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; -in buildPythonPackage rec { +in buildPythonPackage { inherit pname; inherit (packages) version; format = "wheel"; diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 5f808bafe6f..7f6952e8fe5 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -76,7 +76,7 @@ let mock ]); - bazel-build = buildBazelPackage rec { + bazel-build = buildBazelPackage { name = "${pname}-${version}"; src = fetchFromGitHub { @@ -298,7 +298,7 @@ let }; }; -in buildPythonPackage rec { +in buildPythonPackage { inherit version pname; src = bazel-build.python; diff --git a/pkgs/development/python-modules/tess/default.nix b/pkgs/development/python-modules/tess/default.nix index 987fbf01019..c168492be72 100644 --- a/pkgs/development/python-modules/tess/default.nix +++ b/pkgs/development/python-modules/tess/default.nix @@ -6,7 +6,7 @@ , scipy }: -buildPythonPackage rec { +buildPythonPackage { pname = "tess"; version = "unstable-2019-05-07"; diff --git a/pkgs/development/python-modules/tkinter/default.nix b/pkgs/development/python-modules/tkinter/default.nix index bd242c62ab8..ba910f75e19 100644 --- a/pkgs/development/python-modules/tkinter/default.nix +++ b/pkgs/development/python-modules/tkinter/default.nix @@ -5,7 +5,7 @@ , isPyPy }: -buildPythonPackage rec { +buildPythonPackage { name = "tkinter-${python.version}"; src = py; format = "other"; diff --git a/pkgs/development/python-modules/tlsh/default.nix b/pkgs/development/python-modules/tlsh/default.nix index 848c114543d..27c4ac2468f 100644 --- a/pkgs/development/python-modules/tlsh/default.nix +++ b/pkgs/development/python-modules/tlsh/default.nix @@ -4,7 +4,7 @@ , cmake }: -buildPythonPackage rec { +buildPythonPackage { pname = "tlsh"; version = "3.4.5"; diff --git a/pkgs/development/python-modules/typesentry/default.nix b/pkgs/development/python-modules/typesentry/default.nix index 3aeb84113c2..ef3b1c78c39 100644 --- a/pkgs/development/python-modules/typesentry/default.nix +++ b/pkgs/development/python-modules/typesentry/default.nix @@ -6,7 +6,7 @@ , pytestcov }: -buildPythonPackage rec { +buildPythonPackage { pname = "typesentry"; version = "0.2.7"; diff --git a/pkgs/development/python-modules/waitress-django/default.nix b/pkgs/development/python-modules/waitress-django/default.nix index c230cd9cfa6..6b3ca778ead 100644 --- a/pkgs/development/python-modules/waitress-django/default.nix +++ b/pkgs/development/python-modules/waitress-django/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage, django_1_8, waitress }: -buildPythonPackage rec { +buildPythonPackage { pname = "waitress-django"; version = "0.0.0"; diff --git a/pkgs/development/python-modules/warrant/default.nix b/pkgs/development/python-modules/warrant/default.nix index ef6089baa50..7cf69fdb614 100644 --- a/pkgs/development/python-modules/warrant/default.nix +++ b/pkgs/development/python-modules/warrant/default.nix @@ -2,7 +2,7 @@ , mock , boto3, envs, python-jose, requests }: -buildPythonPackage rec { +buildPythonPackage { pname = "warrant"; version = "0.6.1"; diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/pkgs/development/python-modules/wordfreq/default.nix index d672cb8bae9..97530989a38 100644 --- a/pkgs/development/python-modules/wordfreq/default.nix +++ b/pkgs/development/python-modules/wordfreq/default.nix @@ -11,7 +11,7 @@ , fetchFromGitHub }: -buildPythonPackage rec { +buildPythonPackage { pname = "wordfreq"; version = "2.2.0"; diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix index c75362436e4..81a8d05f5bf 100644 --- a/pkgs/development/python-modules/xgboost/default.nix +++ b/pkgs/development/python-modules/xgboost/default.nix @@ -12,7 +12,7 @@ , datatable }: -buildPythonPackage rec { +buildPythonPackage { pname = "xgboost"; inherit (xgboost) version src meta; diff --git a/pkgs/development/python-modules/zerobin/default.nix b/pkgs/development/python-modules/zerobin/default.nix index d1cab88b45b..ce993d3d41a 100644 --- a/pkgs/development/python-modules/zerobin/default.nix +++ b/pkgs/development/python-modules/zerobin/default.nix @@ -7,7 +7,7 @@ , clize }: -buildPythonPackage rec { +buildPythonPackage { pname = "zerobin"; version = "20160108"; diff --git a/pkgs/development/python-modules/zxcvbn/default.nix b/pkgs/development/python-modules/zxcvbn/default.nix index 8c9a0af142c..67f48f34731 100644 --- a/pkgs/development/python-modules/zxcvbn/default.nix +++ b/pkgs/development/python-modules/zxcvbn/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, pytest }: -buildPythonPackage rec { +buildPythonPackage { pname = "zxcvbn"; version = "4.4.28"; diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index c31dfb63b3c..0812ff590a5 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -52,7 +52,7 @@ let name else let - gem = gems."${pname}"; + gem = gems.${pname}; version = gem.version; in "${pname}-${version}"; @@ -70,7 +70,7 @@ let maybeCopyAll = pkgname: if pkgname == null then "" else let - mainGem = gems."${pkgname}" or (throw "bundlerEnv: gem ${pkgname} not found"); + mainGem = gems.${pkgname} or (throw "bundlerEnv: gem ${pkgname} not found"); in copyIfBundledByPath mainGem; diff --git a/pkgs/development/ruby-modules/bundled-common/functions.nix b/pkgs/development/ruby-modules/bundled-common/functions.nix index 6324f27e9fa..a093cc4dc95 100644 --- a/pkgs/development/ruby-modules/bundled-common/functions.nix +++ b/pkgs/development/ruby-modules/bundled-common/functions.nix @@ -42,21 +42,21 @@ in rec { converge expandDependencies directlyMatchingGems; platformMatches = {rubyEngine, version, ...}: attrs: ( - !(attrs ? "platforms") || + !(attrs ? platforms) || builtins.length attrs.platforms == 0 || builtins.any (platform: platform.engine == rubyEngine && - (!(platform ? "version") || platform.version == version.majMin) + (!(platform ? version) || platform.version == version.majMin) ) attrs.platforms ); groupMatches = groups: attrs: - groups == null || !(attrs ? "groups") || + groups == null || !(attrs ? groups) || (intersectLists (groups ++ [ "default" ]) attrs.groups) != []; applyGemConfigs = attrs: - (if gemConfig ? "${attrs.gemName}" - then attrs // gemConfig."${attrs.gemName}" attrs + (if gemConfig ? ${attrs.gemName} + then attrs // gemConfig.${attrs.gemName} attrs else attrs); genStubsScript = { lib, ruby, confFiles, bundler, groups, binPaths, ... }: '' @@ -88,6 +88,6 @@ in rec { inherit (attrs.source) type; source = removeAttrs attrs.source ["type"]; gemName = name; - gemPath = map (gemName: gems."${gemName}") (attrs.dependencies or []); + gemPath = map (gemName: gems.${gemName}) (attrs.dependencies or []); }); } diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix index b3f91b678c4..9e9ccb128cf 100644 --- a/pkgs/development/ruby-modules/bundler-env/default.nix +++ b/pkgs/development/ruby-modules/bundler-env/default.nix @@ -49,7 +49,7 @@ in postBuild = genStubsScript { inherit lib ruby bundler groups; confFiles = basicEnv.confFiles; - binPaths = [ basicEnv.gems."${pname}" ]; + binPaths = [ basicEnv.gems.${pname} ]; } + lib.optionalString (postBuild != null) postBuild; meta = { platforms = ruby.meta.platforms; } // meta; diff --git a/pkgs/development/ruby-modules/solargraph/default.nix b/pkgs/development/ruby-modules/solargraph/default.nix index f5854a6533d..ff9b1bac321 100644 --- a/pkgs/development/ruby-modules/solargraph/default.nix +++ b/pkgs/development/ruby-modules/solargraph/default.nix @@ -1,6 +1,6 @@ { lib, bundlerApp, bundlerUpdateScript }: -bundlerApp rec { +bundlerApp { pname = "solargraph"; exes = ["solargraph" "solargraph-runtime"]; gemdir = ./.; diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/development/tools/analysis/evmdis/default.nix index 36fa7bb1f16..c250f442a0e 100644 --- a/pkgs/development/tools/analysis/evmdis/default.nix +++ b/pkgs/development/tools/analysis/evmdis/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "evmdis-unstable"; version = "2018-03-23"; goPackagePath = "github.com/Arachnid/evmdis"; diff --git a/pkgs/development/tools/analysis/makefile2graph/default.nix b/pkgs/development/tools/analysis/makefile2graph/default.nix index 7afa71429a7..20fe74ecb74 100644 --- a/pkgs/development/tools/analysis/makefile2graph/default.nix +++ b/pkgs/development/tools/analysis/makefile2graph/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, bash, gnumake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "makefile2graph-2018-01-03"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix index 300feb9a41b..250002a16b7 100644 --- a/pkgs/development/tools/analysis/panopticon/default.nix +++ b/pkgs/development/tools/analysis/panopticon/default.nix @@ -4,7 +4,6 @@ rustPlatform.buildRustPackage rec { pname = "panopticon"; version = "unstable-20171202"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "das-labor"; diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index fb0f7414841..d9f39667cef 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -3,7 +3,7 @@ let name = stdenv.lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit name; src = kcachegrind.src; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 3b9d91182d1..cd8ae42f20b 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -31,7 +31,7 @@ let cs_ver, cs_sha256 }: - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "radare2"; inherit version; diff --git a/pkgs/development/tools/analysis/swarm/default.nix b/pkgs/development/tools/analysis/swarm/default.nix index 86e4d6ef5f6..922a73a4be0 100644 --- a/pkgs/development/tools/analysis/swarm/default.nix +++ b/pkgs/development/tools/analysis/swarm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "swarm-2019-03-11"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index e06965b6f09..01619e0cb11 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -46,12 +46,12 @@ let srcs.io_bazel_rules_sass srcs.platforms (if stdenv.hostPlatform.isDarwin - then srcs.${"java_tools_javac11_darwin-v4.0.zip"} - else srcs.${"java_tools_javac11_linux-v4.0.zip"}) - srcs.${"coverage_output_generator-v1.0.zip"} + then srcs."java_tools_javac11_darwin-v4.0.zip" + else srcs."java_tools_javac11_linux-v4.0.zip") + srcs."coverage_output_generator-v1.0.zip" srcs.build_bazel_rules_nodejs - srcs.${"android_tools_pkg-0.8.tar.gz"} - srcs.${"0.27.1.tar.gz"} + srcs."android_tools_pkg-0.8.tar.gz" + srcs."0.27.1.tar.gz" srcs.rules_pkg srcs.rules_cc srcs.rules_java diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index ba842289dba..23ffe286824 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -49,7 +49,7 @@ let installPhase = ''cp $src $out''; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${baseName}-${version}"; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/development/tools/build-managers/colormake/default.nix index 60a011a49d0..f14aa4eea6e 100644 --- a/pkgs/development/tools/build-managers/colormake/default.nix +++ b/pkgs/development/tools/build-managers/colormake/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchgit, perl}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "colormake"; version = "2.1.0"; diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix index 24df6fa6ff3..7b29e7d02dc 100644 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -16,7 +16,7 @@ let ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gn"; version = "20190403"; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 902c74a08b4..5e01438844c 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, jdk, java ? jdk, makeWrapper }: rec { - gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation rec { + gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation { inherit name src nativeVersion; dontBuild = true; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index b5ee5d75817..fad5bc9e630 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -3,20 +3,20 @@ let # See https://mesonbuild.com/Reference-tables.html#cpu-families cpuFamilies = { - "aarch64" = "aarch64"; - "armv6l" = "arm"; - "armv7l" = "arm"; - "i686" = "x86"; - "x86_64" = "x86_64"; + aarch64 = "aarch64"; + armv6l = "arm"; + armv7l = "arm"; + i686 = "x86"; + x86_64 = "x86_64"; }; in python3Packages.buildPythonApplication rec { pname = "meson"; - version = "0.50.1"; + version = "0.51.2"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "05k3wsxjcnnq7a8n5kzxh2cdh5jdkh13xagigz5axs48j36zfai4"; + sha256 = "0cqhkjbab1mbvxmbjvyfrbjfkm7bh436svqpjapca36c2k9h1vwr"; }; postFixup = '' @@ -60,6 +60,7 @@ python3Packages.buildPythonApplication rec { # pass it `-Wl,-O1` flag but optimizations are not recognized by # Mac linker. # https://github.com/mesonbuild/meson/issues/4784 + # Should be fixed in 0.52 ./fix-objc-linking.patch ]; diff --git a/pkgs/development/tools/build-managers/meson/fix-objc-linking.patch b/pkgs/development/tools/build-managers/meson/fix-objc-linking.patch index 60a205828f5..996e0c3420e 100644 --- a/pkgs/development/tools/build-managers/meson/fix-objc-linking.patch +++ b/pkgs/development/tools/build-managers/meson/fix-objc-linking.patch @@ -1,20 +1,22 @@ +diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py +index dc8f099b..d8581fcf 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py -@@ -795,7 +795,7 @@ +@@ -944,7 +944,7 @@ compiler_type = self.get_gnu_compiler_type(defines) version = self.get_gnu_version_from_defines(defines) - return GnuObjCCompiler(ccache + compiler, version, compiler_type, is_cross, exe_wrap, defines) -- if out.startswith('Apple LLVM'): -+ if out.startswith('Apple LLVM') or mesonlib.for_darwin(want_cross, self): - return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, is_cross, exe_wrap) - if out.startswith('clang'): - return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_STANDARD, is_cross, exe_wrap) -@@ -822,7 +822,7 @@ + return GnuObjCCompiler(ccache + compiler, version, compiler_type, for_machine, is_cross, exe_wrap, defines) +- if out.startswith('Apple LLVM') or out.startswith('Apple clang'): ++ if out.startswith('Apple LLVM') or out.startswith('Apple clang') or self.machines.build.is_darwin(): + return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, for_machine, is_cross, exe_wrap) + if 'windows' in out: + return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_MINGW, for_machine, is_cross, exe_wrap) +@@ -974,7 +974,7 @@ compiler_type = self.get_gnu_compiler_type(defines) version = self.get_gnu_version_from_defines(defines) - return GnuObjCPPCompiler(ccache + compiler, version, compiler_type, is_cross, exe_wrap, defines) -- if out.startswith('Apple LLVM'): -+ if out.startswith('Apple LLVM') or mesonlib.for_darwin(want_cross, self): - return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, is_cross, exe_wrap) - if out.startswith('clang'): - return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_STANDARD, is_cross, exe_wrap) + return GnuObjCPPCompiler(ccache + compiler, version, compiler_type, for_machine, is_cross, exe_wrap, defines) +- if out.startswith('Apple LLVM') or out.startswith('Apple clang'): ++ if out.startswith('Apple LLVM') or out.startswith('Apple clang') or self.machines.build.is_darwin(): + return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, for_machine, is_cross, exe_wrap) + if 'windows' in out: + return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_MINGW, for_machine, is_cross, exe_wrap) diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix index 28697f4c69c..7d08bbf6df2 100644 --- a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix +++ b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchFromGitHub, python2, which}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "redo-apenwarr"; version = "unstable-2019-06-21"; diff --git a/pkgs/development/tools/build-managers/redo-sh/default.nix b/pkgs/development/tools/build-managers/redo-sh/default.nix index 612dd5c7810..19ce0b44bf7 100644 --- a/pkgs/development/tools/build-managers/redo-sh/default.nix +++ b/pkgs/development/tools/build-managers/redo-sh/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2.0.3"; pname = "redo-sh"; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 317186ea3e0..3e6d6604885 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -14,7 +14,7 @@ let goPackagePath = "github.com/containers/buildah"; -in buildGoPackage rec { +in buildGoPackage { pname = "buildah"; inherit version; inherit src; diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix index 001f87b3b27..8a1d81acaaa 100644 --- a/pkgs/development/tools/casperjs/default.nix +++ b/pkgs/development/tools/casperjs/default.nix @@ -2,7 +2,7 @@ let version = "1.1.1"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "casperjs"; inherit version; diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index 921448855a6..d5c74201418 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -1,6 +1,6 @@ { lib, bundlerEnv, bundlerUpdateScript, ruby_2_4, perl, autoconf }: -bundlerEnv rec { +bundlerEnv { pname = "chef-dk"; ruby = ruby_2_4; diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix index 0c8e6ff591b..12289cbb68a 100644 --- a/pkgs/development/tools/clog-cli/default.nix +++ b/pkgs/development/tools/clog-cli/default.nix @@ -3,7 +3,7 @@ with rustPlatform; buildRustPackage rec { - name = "clog-cli-${version}"; + pname = "clog-cli"; version = "0.9.3"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/database/pyrseas/default.nix b/pkgs/development/tools/database/pyrseas/default.nix index 0390e7b86bb..a83b5a21944 100644 --- a/pkgs/development/tools/database/pyrseas/default.nix +++ b/pkgs/development/tools/database/pyrseas/default.nix @@ -1,7 +1,7 @@ { stdenv, pythonPackages, fetchFromGitHub }: let - pgdbconn = pythonPackages.buildPythonPackage rec { + pgdbconn = pythonPackages.buildPythonPackage { pname = "pgdbconn"; version = "0.8.0"; src = fetchFromGitHub { @@ -19,7 +19,7 @@ let }; in -pythonPackages.buildPythonApplication rec { +pythonPackages.buildPythonApplication { pname = "pyrseas"; version = "0.8.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/database/sqldeveloper/18.2.nix b/pkgs/development/tools/database/sqldeveloper/18.2.nix index ca87395b917..070c7c81c40 100644 --- a/pkgs/development/tools/database/sqldeveloper/18.2.nix +++ b/pkgs/development/tools/database/sqldeveloper/18.2.nix @@ -13,7 +13,7 @@ let categories = "Application;Development;"; }; in - stdenv.mkDerivation rec { + stdenv.mkDerivation { inherit version; pname = "sqldeveloper"; diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 461acacf4e9..9e75088aa5c 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -13,7 +13,7 @@ let categories = "Application;Development;"; }; in - stdenv.mkDerivation rec { + stdenv.mkDerivation { inherit version; pname = "sqldeveloper"; diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix index af25f3f7595..a88963c6e2c 100644 --- a/pkgs/development/tools/documentation/mdsh/default.nix +++ b/pkgs/development/tools/documentation/mdsh/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "mdsh-${version}"; + pname = "mdsh"; version = "0.1.4"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix index 9dff0cc3ebe..4f3d89c0788 100644 --- a/pkgs/development/tools/easyjson/default.nix +++ b/pkgs/development/tools/easyjson/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "easyjson"; version = "unstable-2019-06-26"; goPackagePath = "github.com/mailru/easyjson"; diff --git a/pkgs/development/tools/fusee-launcher/default.nix b/pkgs/development/tools/fusee-launcher/default.nix index eb6f937800a..4fb05da3067 100644 --- a/pkgs/development/tools/fusee-launcher/default.nix +++ b/pkgs/development/tools/fusee-launcher/default.nix @@ -6,7 +6,7 @@ , makeWrapper } : -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "fusee-launcher"; version = "unstable-2018-07-14"; diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix index 17560f55ec4..68d1a74b277 100644 --- a/pkgs/development/tools/geckodriver/default.nix +++ b/pkgs/development/tools/geckodriver/default.nix @@ -9,7 +9,7 @@ with rustPlatform; buildRustPackage rec { version = "0.22.0"; - name = "geckodriver-${version}"; + pname = "geckodriver"; src = fetchFromGitHub { owner = "mozilla"; diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index 70fa18ceddb..5faceca5716 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -4,7 +4,7 @@ with rustPlatform; buildRustPackage rec { version = "0.9.1"; - name = "git-series-${version}"; + pname = "git-series"; src = fetchFromGitHub { owner = "git-series"; diff --git a/pkgs/development/tools/github-changelog-generator/default.nix b/pkgs/development/tools/github-changelog-generator/default.nix index 39aab9cfa27..9a14cc7f6e2 100644 --- a/pkgs/development/tools/github-changelog-generator/default.nix +++ b/pkgs/development/tools/github-changelog-generator/default.nix @@ -1,6 +1,6 @@ { lib, bundlerApp, bundlerUpdateScript }: -bundlerApp rec { +bundlerApp { pname = "github_changelog_generator"; gemdir = ./.; exes = [ "github_changelog_generator" ]; diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index 20d1f7c0f1e..fd22295540d 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -4,7 +4,7 @@ , Cocoa }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "glslviewer"; version = "2019-04-22"; diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix index 25b80d9cf69..6caa32c16f2 100644 --- a/pkgs/development/tools/gox/default.nix +++ b/pkgs/development/tools/gox/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "gox"; version = "20181025"; diff --git a/pkgs/development/tools/gpp/default.nix b/pkgs/development/tools/gpp/default.nix index 009f475bb7d..ee15df1a9f6 100644 --- a/pkgs/development/tools/gpp/default.nix +++ b/pkgs/development/tools/gpp/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gpp"; version = "2.25"; diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/development/tools/grabserial/default.nix index c86c2e275ed..d1709369511 100644 --- a/pkgs/development/tools/grabserial/default.nix +++ b/pkgs/development/tools/grabserial/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, pythonPackages }: -pythonPackages.buildPythonApplication rec { +pythonPackages.buildPythonApplication { name = "grabserial-1.9.3"; namePrefix = ""; diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix index b394e9e71fb..549a4d1b826 100644 --- a/pkgs/development/tools/imatix_gsl/default.nix +++ b/pkgs/development/tools/imatix_gsl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pcre } : -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "imatix_gsl"; version = "4.1"; diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix index 035964dafc0..f2c926a6f39 100644 --- a/pkgs/development/tools/irony-server/default.nix +++ b/pkgs/development/tools/irony-server/default.nix @@ -1,6 +1,6 @@ { stdenv, cmake, llvmPackages, irony }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "irony-server"; inherit (irony) version; diff --git a/pkgs/development/tools/jazzy/default.nix b/pkgs/development/tools/jazzy/default.nix index ad71dfb22a8..a6cb7a92b63 100644 --- a/pkgs/development/tools/jazzy/default.nix +++ b/pkgs/development/tools/jazzy/default.nix @@ -1,6 +1,6 @@ { lib, bundlerApp, bundlerUpdateScript }: -bundlerApp rec { +bundlerApp { pname = "jazzy"; gemdir = ./.; exes = [ "jazzy" ]; diff --git a/pkgs/development/tools/kexpand/default.nix b/pkgs/development/tools/kexpand/default.nix index a82c21b72e9..e6c562721c2 100644 --- a/pkgs/development/tools/kexpand/default.nix +++ b/pkgs/development/tools/kexpand/default.nix @@ -1,6 +1,6 @@ { buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { name = "kexpand-unstable-2017-05-12"; goPackagePath = "github.com/kopeio/kexpand"; diff --git a/pkgs/development/tools/lattice-diamond/default.nix b/pkgs/development/tools/lattice-diamond/default.nix index 1691f09e6e4..1dea1440113 100644 --- a/pkgs/development/tools/lattice-diamond/default.nix +++ b/pkgs/development/tools/lattice-diamond/default.nix @@ -1,7 +1,7 @@ { stdenv, rpmextract, patchelf, makeWrapper, file, requireFile, glib, zlib, freetype, fontconfig, xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "diamond-3.10"; nativeBuildInputs = [ rpmextract patchelf makeWrapper file ]; diff --git a/pkgs/development/tools/manul/default.nix b/pkgs/development/tools/manul/default.nix index a5dd0a88272..f921e900e56 100644 --- a/pkgs/development/tools/manul/default.nix +++ b/pkgs/development/tools/manul/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { name = "manul-unstable-2016-09-30"; goPackagePath = "github.com/kovetskiy/manul"; diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 664e7d28d79..b3d380b0a0a 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -14,7 +14,7 @@ let sha256 = "0x0xxiar202ypbgxh19swzjil546bbp8li4k5yrpvab55y8ymkd4"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "arcanist"; version = "20180916"; diff --git a/pkgs/development/tools/misc/bin_replace_string/default.nix b/pkgs/development/tools/misc/bin_replace_string/default.nix index ea9b340fb0b..c246ddb9d90 100644 --- a/pkgs/development/tools/misc/bin_replace_string/default.nix +++ b/pkgs/development/tools/misc/bin_replace_string/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libelf, txt2man }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bin_replace_string"; version = "0.2"; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index c33741740ad..210659289d1 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -22,7 +22,7 @@ let "${stdenv.targetPlatform.config}-"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = targetPrefix + basename; # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix index 0d78cfbbab8..6548e964397 100644 --- a/pkgs/development/tools/misc/bossa/default.nix +++ b/pkgs/development/tools/misc/bossa/default.nix @@ -13,7 +13,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "bossa-1.8"; src = fetchgit { diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 0577165bcff..4eeb61a7edd 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -30,7 +30,7 @@ let ccache = stdenv.mkDerivation rec { passthru = { # A derivation that provides gcc and g++ commands, but that # will end up calling ccache for the given cacheDir - links = {unwrappedCC, extraConfig}: stdenv.mkDerivation rec { + links = {unwrappedCC, extraConfig}: stdenv.mkDerivation { name = "ccache-links"; passthru = { isClang = unwrappedCC.isClang or false; diff --git a/pkgs/development/tools/misc/chrpath/default.nix b/pkgs/development/tools/misc/chrpath/default.nix index 4170570e08a..956a8df69ce 100644 --- a/pkgs/development/tools/misc/chrpath/default.nix +++ b/pkgs/development/tools/misc/chrpath/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "chrpath-0.16"; src = fetchurl { diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index daf39318432..e1b89d07cdf 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -5,7 +5,7 @@ let pname = "circleci-cli"; version = "0.1.2569"; in -buildGoPackage rec { +buildGoPackage { name = "${pname}-${version}"; inherit version; diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix index 02d480cf2cd..c43509a4f43 100644 --- a/pkgs/development/tools/misc/cquery/default.nix +++ b/pkgs/development/tools/misc/cquery/default.nix @@ -14,7 +14,7 @@ let stdenv = llvmPackages.stdenv; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cquery"; version = "2018-10-14"; diff --git a/pkgs/development/tools/misc/dbench/default.nix b/pkgs/development/tools/misc/dbench/default.nix index a1c9e85a83a..5bccea9ced8 100644 --- a/pkgs/development/tools/misc/dbench/default.nix +++ b/pkgs/development/tools/misc/dbench/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, autoconf, popt, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "dbench-2013-01-01"; src = fetchgit { diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index afe9b59e012..ab2ab0de9cf 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "gnum4-1.4.18"; src = fetchurl { diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 264f2aec44d..c4cba5ffc69 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perlPackages, gettext }: stdenv.mkDerivation rec { - name = "help2man-1.47.10"; + name = "help2man-1.47.11"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "1yywli520246aba12vpgj7bhr1r13swad3xm49a0cygqcgywnwgk"; + sha256 = "123vsimgx8zq1h077sbyh3bd0hbmlc3wih2231wwh133z1bv51ar"; }; nativeBuildInputs = [ gettext perlPackages.LocaleGettext ]; diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix index 46a72a32722..635be9e0876 100644 --- a/pkgs/development/tools/misc/kibana/6.x.nix +++ b/pkgs/development/tools/misc/kibana/6.x.nix @@ -18,12 +18,12 @@ let shas = if enableUnfree then { - "x86_64-linux" = "1i3zmzxihplwd8n994lfxhhgygdg3qxjqgrj1difa8w3vss0zbfn"; - "x86_64-darwin" = "09a96ms9id77infxd9xxfs6r7j01mn0rz5yw3g9sl92j9ri7r52c"; + x86_64-linux = "1i3zmzxihplwd8n994lfxhhgygdg3qxjqgrj1difa8w3vss0zbfn"; + x86_64-darwin = "09a96ms9id77infxd9xxfs6r7j01mn0rz5yw3g9sl92j9ri7r52c"; } else { - "x86_64-linux" = "166rhxr0qlv1yarj2mg1c3b8mxvhl70jhz53azq7ic6laj55q7fk"; - "x86_64-darwin" = "0ngngkbl036p2mzwhp8qafi3aqzk398a218w12srfqny5n630vdk"; + x86_64-linux = "166rhxr0qlv1yarj2mg1c3b8mxvhl70jhz53azq7ic6laj55q7fk"; + x86_64-darwin = "0ngngkbl036p2mzwhp8qafi3aqzk398a218w12srfqny5n630vdk"; }; in stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz"; - sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture"); + sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); }; patches = [ diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index 9fba3b43e11..2fc0242c014 100644 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -18,12 +18,12 @@ let shas = if enableUnfree then { - "x86_64-linux" = "1mzycd0ljnkslz9p9jhq279bkpk35r7svhngxjnmsh11ampsvxb8"; - "x86_64-darwin" = "1bz409njdpmsagh5dg062114wpa96w7pmxwfjsizwksqyyjdwdv7"; + x86_64-linux = "1mzycd0ljnkslz9p9jhq279bkpk35r7svhngxjnmsh11ampsvxb8"; + x86_64-darwin = "1bz409njdpmsagh5dg062114wpa96w7pmxwfjsizwksqyyjdwdv7"; } else { - "x86_64-linux" = "1x3gjc9xa03m4jfnl5vjxigzcnb8ysnhxgd8618v85x4l0010v38"; - "x86_64-darwin" = "1nsbmrswv2jv2z7686i2sf6rrmxysbqi5ih6jjrbrqnk64xi18j2"; + x86_64-linux = "1x3gjc9xa03m4jfnl5vjxigzcnb8ysnhxgd8618v85x4l0010v38"; + x86_64-darwin = "1nsbmrswv2jv2z7686i2sf6rrmxysbqi5ih6jjrbrqnk64xi18j2"; }; in stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz"; - sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture"); + sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); }; patches = [ diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix index 77d4c5771f9..b8fa02306c4 100644 --- a/pkgs/development/tools/misc/ltrace/default.nix +++ b/pkgs/development/tools/misc/ltrace/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, elfutils, libunwind }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ltrace-0.7.3"; src = fetchurl { diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/pkgs/development/tools/misc/macdylibbundler/default.nix index ce62634e7d7..518d128890a 100644 --- a/pkgs/development/tools/misc/macdylibbundler/default.nix +++ b/pkgs/development/tools/misc/macdylibbundler/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "macdylibbundler"; version = "20180825"; diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix index af3b45a8e62..8af12170798 100644 --- a/pkgs/development/tools/misc/ninka/default.nix +++ b/pkgs/development/tools/misc/ninka/default.nix @@ -2,7 +2,7 @@ assert stdenv ? glibc; -perlPackages.buildPerlPackage rec { +perlPackages.buildPerlPackage { pname = "ninka"; version = "2.0-pre"; diff --git a/pkgs/development/tools/misc/prelink/default.nix b/pkgs/development/tools/misc/prelink/default.nix index c0e7a3653a8..7bfff632826 100644 --- a/pkgs/development/tools/misc/prelink/default.nix +++ b/pkgs/development/tools/misc/prelink/default.nix @@ -3,7 +3,7 @@ let version = "20130503"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "prelink"; inherit version; diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index 0c994e88e23..b9a4658d3de 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { version = "0.2.10"; - name = "sccache-${version}"; + pname = "sccache"; src = fetchFromGitHub { owner = "mozilla"; diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index 7b6048eb475..e2d507ab801 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, mysql , libaio }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "sysbench-1.0.17"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/tools/misc/tet/default.nix b/pkgs/development/tools/misc/tet/default.nix index 29d809b5f05..fb38d096ab4 100644 --- a/pkgs/development/tools/misc/tet/default.nix +++ b/pkgs/development/tools/misc/tet/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ version = "3.8"; pname = "tet"; diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index 613fd2673d5..7741f2d4ffb 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -8,7 +8,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "texinfo-${optionalString interactive "interactive-"}${version}"; inherit version; diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index 68409a59f37..bad3ecd9241 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "universal-ctags"; version = "unstable-2019-07-30"; diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix index e2ea96cd590..e1726efc40c 100644 --- a/pkgs/development/tools/misc/watson-ruby/default.nix +++ b/pkgs/development/tools/misc/watson-ruby/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "watson-ruby"; version = (import ./gemset.nix).watson-ruby.version; - env = bundlerEnv rec { + env = bundlerEnv { name = "watson-ruby-gems-${version}"; inherit ruby; # expects Gemfile, Gemfile.lock and gemset.nix in the same directory diff --git a/pkgs/development/tools/misc/xc3sprog/default.nix b/pkgs/development/tools/misc/xc3sprog/default.nix index 6edf6551b06..caecad4b678 100644 --- a/pkgs/development/tools/misc/xc3sprog/default.nix +++ b/pkgs/development/tools/misc/xc3sprog/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "787"; pname = "xc3sprog"; - src = fetchsvn rec { + src = fetchsvn { url = "https://svn.code.sf.net/p/xc3sprog/code/trunk"; sha256 = "1rfhms3i7375kdlg0sdg5k52ix3xv5llj2dr30vamyg7pk74y8rx"; rev = "${version}"; diff --git a/pkgs/development/tools/misc/xxdiff/tip.nix b/pkgs/development/tools/misc/xxdiff/tip.nix index 1424b8fe197..04827fade70 100644 --- a/pkgs/development/tools/misc/xxdiff/tip.nix +++ b/pkgs/development/tools/misc/xxdiff/tip.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromBitbucket, qtbase, flex, bison, docutils }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "xxdiff-5.0b1"; src = fetchFromBitbucket { diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index b409009b524..12f0b13a660 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -5,7 +5,7 @@ , fixDarwinDylibNames, Cocoa ? null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ycmd"; version = "2018-09-20"; diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix index 689b7da8802..6e0014b3773 100644 --- a/pkgs/development/tools/nailgun/default.nix +++ b/pkgs/development/tools/nailgun/default.nix @@ -9,7 +9,7 @@ let sha256 = "1mk8pv0g2xg9m0gsb96plbh6mc24xrlyrmnqac5mlbl4637l4q95"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nailgun"; inherit version; diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix index 06945f10eb2..b07ab21fdf1 100644 --- a/pkgs/development/tools/neoload/default.nix +++ b/pkgs/development/tools/neoload/default.nix @@ -30,7 +30,7 @@ let dotInstall4j = path: writeTextFile { name = "dot-install4j"; text = '' sys.symlinkDir=INSTALLDIR/bin ''; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "neoload-4.1.4"; src = fetchurl ( diff --git a/pkgs/development/tools/nrpl/default.nix b/pkgs/development/tools/nrpl/default.nix index 081e86c44dd..068028c7da9 100644 --- a/pkgs/development/tools/nrpl/default.nix +++ b/pkgs/development/tools/nrpl/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper, nim, pcre, tinycc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nrpl"; version = "20150522"; diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index 4a4203a2f59..a7ef6d7bedd 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -22,7 +22,7 @@ let param = { "4.08" = { version = "4.08+1"; sha256 = "0qplawvxwai25bi27niw2cgz2al01kcnkj8wxwhxslpi21z6pyx1"; }; - }."${ocaml.meta.branch}"; + }.${ocaml.meta.branch}; in stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index 159260750a2..90d74414308 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -26,7 +26,7 @@ let param = } ; in -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ name = "${pname}-${param.version}"; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix index 90e88979de4..d1ff9eee817 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix @@ -2,7 +2,7 @@ , ocaml-migrate-parsetree, ppx_tools_versioned, uchar }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "js_of_ocaml"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index e6fb1b353d2..e535ba29aeb 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = { "2.7" = "1dali1akyd4zmkwav0d957ynxq2jj6cc94r4xiaql7ca89ajz4jj"; "2.8.4" = "098ph50s9kqw6rc3qjn39zv9b5swdf4qr44afwqfkkjgjs5d7vbl"; - }."${version}"; + }.${version}; }; buildInputs = [ ocaml findlib menhir ocsigen_deriving ocamlbuild diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix index 65afee16afb..5c8f4377e8d 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix @@ -3,7 +3,7 @@ , js_of_ocaml, ocaml_lwt, lwt_log }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "js_of_ocaml-lwt"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix index 4b2b14d317b..344352467e9 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix @@ -2,7 +2,7 @@ , ocamlbuild }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "js_of_ocaml-ocamlbuild"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix index 277973afba8..3adad22bd9c 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix @@ -3,7 +3,7 @@ , js_of_ocaml }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "js_of_ocaml-ppx"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix index 5b5f7d18f79..2ff9ddbcf9e 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix @@ -2,7 +2,7 @@ , js_of_ocaml, ppx_deriving }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "js_of_ocaml-ppx_deriving_json"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix index c24162cccf7..c39c985183a 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix @@ -3,7 +3,7 @@ , js_of_ocaml, reactivedata, tyxml }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "js_of_ocaml-tyxml"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index 90b092f0e4b..04aeab5f431 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocamlmod, ocamlify }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.4.10"; pname = "ocaml-oasis"; diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix index dbf33424439..91e2e67eaf1 100644 --- a/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ocamlmod"; version = "0.0.9"; diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index 0ed7312660a..cf5372bdc20 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -2,7 +2,7 @@ let version = "1.99.19-beta"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ocaml${ocaml.version}-ocp-build-${version}"; diff --git a/pkgs/development/tools/ocaml/opam/1.2.2.nix b/pkgs/development/tools/ocaml/opam/1.2.2.nix index 87490bcb617..53482598f13 100644 --- a/pkgs/development/tools/ocaml/opam/1.2.2.nix +++ b/pkgs/development/tools/ocaml/opam/1.2.2.nix @@ -43,7 +43,7 @@ let sha256 = "c590ce55ae69ec74f46215cf16a156a02b23c5f3ecb22f23a3ad9ba3d91ddb6e"; }; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "opam"; version = "1.2.2"; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 763642e5da1..df4c0f2d12c 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -59,7 +59,7 @@ let sha256 = "0arv5zaikvcqbicdk47jpfgvjrqhqm71yq2zmj7pp6zf7bm0js6s"; }; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "opam"; version = "2.0.5"; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 8b7354ae48a..28ad85b42e9 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # derivation of just runtime deps so env vars created by # setup-hooks can be saved for use at runtime - runtime = stdenv.mkDerivation rec { + runtime = stdenv.mkDerivation { pname = "utop-runtime-env"; inherit version; diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/pkgs/development/tools/ofono-phonesim/default.nix index 137f56bee59..cc33b675954 100644 --- a/pkgs/development/tools/ofono-phonesim/default.nix +++ b/pkgs/development/tools/ofono-phonesim/default.nix @@ -7,7 +7,7 @@ , qtscript }: -mkDerivation rec { +mkDerivation { pname = "ofono-phonesim"; version = "unstable-2014-04-22"; diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix index f2915333427..af295eb242f 100644 --- a/pkgs/development/tools/omniorb/default.nix +++ b/pkgs/development/tools/omniorb/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.2.3"; - src = fetchurl rec { + src = fetchurl { url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2"; sha256 = "1jlb0wps6311dmhnphn64gv46z0bl8grch4fd9dcx5dlib02lh96"; }; diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/development/tools/parinfer-rust/default.nix index 6f96b81e7a4..fac5b8e5830 100644 --- a/pkgs/development/tools/parinfer-rust/default.nix +++ b/pkgs/development/tools/parinfer-rust/default.nix @@ -1,7 +1,7 @@ { stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { - name = "parinfer-rust-${version}"; + pname = "parinfer-rust"; version = "0.3.1"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix index 7e09b0a8cd3..e555f1d5985 100644 --- a/pkgs/development/tools/parsing/flex/2.5.35.nix +++ b/pkgs/development/tools/parsing/flex/2.5.35.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, autoreconfHook, flex, bison, texinfo, help2man, m4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "flex-2.5.35"; src = fetchurl { diff --git a/pkgs/development/tools/parsing/flex/2.6.1.nix b/pkgs/development/tools/parsing/flex/2.6.1.nix index 3a46c6c8f01..fc2c7699583 100644 --- a/pkgs/development/tools/parsing/flex/2.6.1.nix +++ b/pkgs/development/tools/parsing/flex/2.6.1.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, bison, m4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "flex-2.6.1"; src = fetchurl { diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix index d41c113821a..e10fe49b1e4 100644 --- a/pkgs/development/tools/parsing/hammer/default.nix +++ b/pkgs/development/tools/parsing/hammer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, glib, pkgconfig, python, scons }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "hammer"; version = "e7aa734"; diff --git a/pkgs/development/tools/parsing/lemon/default.nix b/pkgs/development/tools/parsing/lemon/default.nix index aa7b63dafea..009ebe8e2ff 100644 --- a/pkgs/development/tools/parsing/lemon/default.nix +++ b/pkgs/development/tools/parsing/lemon/default.nix @@ -15,7 +15,7 @@ let }; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "lemon"; version = "1.69"; diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix index ee6a7ec78c2..f1bda9997ac 100644 --- a/pkgs/development/tools/pax-rs/default.nix +++ b/pkgs/development/tools/pax-rs/default.nix @@ -2,7 +2,7 @@ with rustPlatform; buildRustPackage rec { - name = "pax-rs-${version}"; + pname = "pax-rs"; version = "0.4.0"; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/protoc-gen-doc/default.nix b/pkgs/development/tools/protoc-gen-doc/default.nix index 6d6a02ab49f..77c1df6f43e 100644 --- a/pkgs/development/tools/protoc-gen-doc/default.nix +++ b/pkgs/development/tools/protoc-gen-doc/default.nix @@ -1,6 +1,6 @@ { buildGoModule, fetchFromGitHub, lib }: -buildGoModule rec { +buildGoModule { pname = "protoc-gen-doc-unstable"; version = "2019-04-22"; diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix index b5dfe3c8bfd..060875924d8 100644 --- a/pkgs/development/tools/pyre/default.nix +++ b/pkgs/development/tools/pyre/default.nix @@ -91,7 +91,7 @@ typeshed = stdenv.mkDerivation { phases = [ "unpackPhase" "installPhase" ]; installPhase = "cp -r $src $out"; }; -in python3.pkgs.buildPythonApplication rec { +in python3.pkgs.buildPythonApplication { pname = "pyre-check"; version = pyre-version; src = pyre-src; diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index 1b3bc7a2162..c8f7ccb18d5 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -11,7 +11,7 @@ let # Fetch clang from qt vendor, this contains submodules like this: # clang<-clang-tools-extra<-clazy. - clang_qt_vendor = llvmPackages_8.clang-unwrapped.overrideAttrs (oldAttrs: rec { + clang_qt_vendor = llvmPackages_8.clang-unwrapped.overrideAttrs (oldAttrs: { src = fetchgit { url = "https://code.qt.io/clang/clang.git"; rev = "c12b012bb7465299490cf93c2ae90499a5c417d5"; diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix index 6af444c7ce0..d9433f535da 100644 --- a/pkgs/development/tools/quicktemplate/default.nix +++ b/pkgs/development/tools/quicktemplate/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "quicktemplate"; version = "unstable-2019-07-08"; goPackagePath = "github.com/valyala/quicktemplate"; diff --git a/pkgs/development/tools/rdocker/default.nix b/pkgs/development/tools/rdocker/default.nix index a2ab9a47a79..d92003a575e 100644 --- a/pkgs/development/tools/rdocker/default.nix +++ b/pkgs/development/tools/rdocker/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, openssh }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rdocker"; version = "unstable-2018-07-17"; diff --git a/pkgs/development/tools/ronn/default.nix b/pkgs/development/tools/ronn/default.nix index 51801864796..e4762796c18 100644 --- a/pkgs/development/tools/ronn/default.nix +++ b/pkgs/development/tools/ronn/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "ronn"; version = env.gems.ronn.version; - env = bundlerEnv rec { + env = bundlerEnv { name = "ronn-gems"; gemdir = ./.; }; diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix index 72b9406211c..e00f0ae7dd0 100644 --- a/pkgs/development/tools/rq/default.nix +++ b/pkgs/development/tools/rq/default.nix @@ -3,7 +3,7 @@ with rustPlatform; buildRustPackage rec { - name = "rq-${version}"; + pname = "rq"; version = "0.10.4"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/rubocop/default.nix b/pkgs/development/tools/rubocop/default.nix index 5d965fc87a7..9a6393977d7 100644 --- a/pkgs/development/tools/rubocop/default.nix +++ b/pkgs/development/tools/rubocop/default.nix @@ -1,6 +1,6 @@ { lib, bundlerEnv, ruby, bundlerUpdateScript }: -bundlerEnv rec { +bundlerEnv { pname = "rubocop"; inherit ruby; diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix index 8fb0b63727a..17103bae50a 100644 --- a/pkgs/development/tools/rust/cargo-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-asm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { - name = "cargo-asm-${version}"; + pname = "cargo-asm"; version = "0.1.17"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix index f19aabae7a1..7ccc8528359 100644 --- a/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, runCommand, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "cargo-fuzz-${version}"; + pname = "cargo-fuzz"; version = "0.5.3"; # Note to self: on 0.5.4, remove the hand-added Cargo.lock src = diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index 0ca12bd7bf4..144e1d71a11 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkgconfig, libiconv, curl }: rustPlatform.buildRustPackage rec { - name = "cargo-generate-${version}"; + pname = "cargo-generate"; version = "0.3.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 945b78caccc..d58b848c87e 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { - name = "rust-cbindgen-${version}"; + pname = "rust-cbindgen"; version = "0.9.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index b2f6701be87..a06723fc28c 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform, makeWrapper, substituteAll, Security }: rustPlatform.buildRustPackage rec { - name = "racer-${version}"; + pname = "racer"; version = "2.1.22"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix index aa33f04123f..bfc30193eed 100644 --- a/pkgs/development/tools/rust/racerd/default.nix +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -3,7 +3,7 @@ with rustPlatform; buildRustPackage rec { - name = "racerd-${version}"; + pname = "racerd"; version = "2019-03-20"; src = fetchFromGitHub { owner = "jwilm"; diff --git a/pkgs/development/tools/rust/rainicorn/default.nix b/pkgs/development/tools/rust/rainicorn/default.nix index fd5bc697831..8a87bf5cf4d 100644 --- a/pkgs/development/tools/rust/rainicorn/default.nix +++ b/pkgs/development/tools/rust/rainicorn/default.nix @@ -3,7 +3,7 @@ with rustPlatform; buildRustPackage rec { - name = "rainicorn-${version}"; + pname = "rainicorn"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index 4e7032025c3..32cc66f76e9 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -3,7 +3,7 @@ with rustPlatform; buildRustPackage rec { - name = "svd2rust-${version}"; + pname = "svd2rust"; version = "0.14.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/scalafix/default.nix b/pkgs/development/tools/scalafix/default.nix index bd8a013fe2d..ab70552c2e8 100644 --- a/pkgs/development/tools/scalafix/default.nix +++ b/pkgs/development/tools/scalafix/default.nix @@ -16,7 +16,7 @@ let outputHash = "19j260prx7k010nxyvc1m9jj1ncxr73m2cym7if39360v5dc05c0"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${baseName}-${version}"; buildInputs = [ jdk makeWrapper deps ]; diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 79afb54bfb7..1f789a6ade5 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -16,7 +16,7 @@ let outputHash = "1k5qn0w6hqql8yqhlma67ilp8hf0xwxwkzvwg8bkky1jvsapjsl5"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${baseName}-${version}"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/scry/default.nix b/pkgs/development/tools/scry/default.nix index 05f7805a55a..9a87f5f9369 100644 --- a/pkgs/development/tools/scry/default.nix +++ b/pkgs/development/tools/scry/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, crystal, shards, llvm, which }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "scry"; version = "0.8.0"; diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 5937b00f459..eff06daac06 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -4,18 +4,18 @@ }: let allSpecs = { - "x86_64-linux" = { + x86_64-linux = { system = "linux64"; sha256 = "04wb6h57daxmnv3a3xrcsznawbx7r8wyi1vk1g26z2l2ppcnsbzv"; }; - "x86_64-darwin" = { + x86_64-darwin = { system = "mac64"; sha256 = "0f8j7m8ardaaw8pv02vxhwkqbcm34366bln0np0j0ig21d4fag09"; }; }; - spec = allSpecs."${stdenv.hostPlatform.system}" + spec = allSpecs.${stdenv.hostPlatform.system} or (throw "missing chromedriver binary for ${stdenv.hostPlatform.system}"); libs = stdenv.lib.makeLibraryPath [ diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix index 82b6d7e1161..27e87d212e6 100644 --- a/pkgs/development/tools/selenium/selendroid/default.nix +++ b/pkgs/development/tools/selenium/selendroid/default.nix @@ -16,7 +16,7 @@ let }; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit name; inherit version; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 786cac68425..e7b21c40f17 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -19,7 +19,7 @@ let goPackagePath = "github.com/containers/skopeo"; in -buildGoPackage rec { +buildGoPackage { pname = "skopeo"; inherit version; inherit src goPackagePath; diff --git a/pkgs/development/tools/statik/default.nix b/pkgs/development/tools/statik/default.nix index d24c3e88b8c..e26431b2687 100644 --- a/pkgs/development/tools/statik/default.nix +++ b/pkgs/development/tools/statik/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "statik"; version = "unstable-2019-07-31"; goPackagePath = "github.com/rakyll/statik"; diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix index 7f35d3c438d..74f1f22426f 100644 --- a/pkgs/development/tools/tora/default.nix +++ b/pkgs/development/tools/tora/default.nix @@ -1,41 +1,37 @@ { mkDerivation, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeWrapper -, boost, doxygen, openssl, mysql, postgresql, graphviz, loki, qscintilla, qtbase }: +, boost, doxygen, openssl, mysql, postgresql, graphviz, loki +, qscintilla, qtbase, qttools }: -let - qscintillaLib = (qscintilla.override { withQt5 = true; }); - -in mkDerivation rec { +mkDerivation { pname = "tora"; - version = "3.1"; + version = "3.2.176"; src = fetchFromGitHub { owner = "tora-tool"; repo = "tora"; - rev = "v${version}"; - sha256 = "0wninl10bcgiljf6wnhn2rv8kmzryw78x5qvbw8s2zfjlnxjsbn7"; + rev = "39bf2837779bf458fc72a9f0e49271152e57829f"; + sha256 = "0fr9b542i8r6shgnz33lc3cz333fnxgmac033yxfrdjfglzk0j2k"; }; - nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper ]; + nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper qttools ]; + buildInputs = [ - boost doxygen graphviz loki mysql.connector-c openssl postgresql qscintillaLib qtbase + boost doxygen graphviz loki mysql.connector-c openssl postgresql qscintilla qtbase ]; preConfigure = '' - sed -i \ - 's|defaultGvHome = "/usr/bin"|defaultGvHome = "${lib.getBin graphviz}/bin"|' \ - src/widgets/toglobalsetting.cpp - - sed -i \ - 's|/usr/bin/dot|${lib.getBin graphviz}/bin/dot|' \ - extlibs/libermodel/dotgraph.cpp + substituteInPlace src/widgets/toglobalsetting.cpp \ + --replace 'defaultGvHome = "/usr/bin"' 'defaultGvHome = "${lib.getBin graphviz}/bin"' + substituteInPlace extlibs/libermodel/dotgraph.cpp \ + --replace /usr/bin/dot ${lib.getBin graphviz}/bin/dot ''; cmakeFlags = [ "-DWANT_INTERNAL_LOKI=0" "-DWANT_INTERNAL_QSCINTILLA=0" # cmake/modules/FindQScintilla.cmake looks in qtbase and for the wrong library name - "-DQSCINTILLA_INCLUDE_DIR=${qscintillaLib}/include" - "-DQSCINTILLA_LIBRARY=${qscintillaLib}/lib/libqscintilla2.so" + "-DQSCINTILLA_INCLUDE_DIR=${qscintilla}/include" + "-DQSCINTILLA_LIBRARY=${qscintilla}/lib/libqscintilla2.so" "-DENABLE_DB2=0" "-DENABLE_ORACLE=0" "-DENABLE_TERADATA=0" diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index 0ca7e37ef70..895cedd7010 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -22,7 +22,7 @@ let ver = "2018.3.0"; build = "f2"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "unity-editor"; version = "${ver}x${build}"; diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix index e8173a6b5b0..df0c360f75c 100644 --- a/pkgs/development/tools/vgo2nix/default.nix +++ b/pkgs/development/tools/vgo2nix/default.nix @@ -7,7 +7,7 @@ , fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "vgo2nix"; version = "unstable-2019-02-06"; goPackagePath = "github.com/adisbladis/vgo2nix"; diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix index b0768ca4b7e..e6dccbd332e 100644 --- a/pkgs/development/tools/vogl/default.nix +++ b/pkgs/development/tools/vogl/default.nix @@ -7,7 +7,7 @@ , fetchpatch }: -mkDerivation rec { +mkDerivation { pname = "vogl"; version = "2016-05-13"; diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix index d9ff6f673d8..3f721eaee2a 100644 --- a/pkgs/development/tools/wasm-pack/default.nix +++ b/pkgs/development/tools/wasm-pack/default.nix @@ -8,7 +8,7 @@ }: rustPlatform.buildRustPackage rec { - name = "wasm-pack-${version}"; + pname = "wasm-pack"; version = "0.8.1"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix index 0874c9e5515..8090aca5ff3 100644 --- a/pkgs/development/tools/xcbuild/default.nix +++ b/pkgs/development/tools/xcbuild/default.nix @@ -15,7 +15,7 @@ let rev = "c894b9e59f02203dbe4e2be657572cf88c4230c3"; sha256 = "0wasql7ph5g473zxhc2z47z3pjp42q0dsn4gpijwzbxawid71b4w"; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "xcbuild"; # Once a version is released that includes diff --git a/pkgs/development/tools/yaml2json/default.nix b/pkgs/development/tools/yaml2json/default.nix index ece440c692f..f31a119bb65 100644 --- a/pkgs/development/tools/yaml2json/default.nix +++ b/pkgs/development/tools/yaml2json/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "yaml2json"; version = "unstable-2017-05-03"; goPackagePath = "github.com/bronze1man/yaml2json"; diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index 82e4402361d..f5989390c4b 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -406,7 +406,7 @@ in rec { ''; }; - fixup_yarn_lock = stdenv.mkDerivation rec { + fixup_yarn_lock = stdenv.mkDerivation { name = "fixup_yarn_lock"; buildInputs = [ nodejs ]; diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix index 10fbc98d51a..bbdaeb5d292 100644 --- a/pkgs/development/web/remarkjs/nodepkgs.nix +++ b/pkgs/development/web/remarkjs/nodepkgs.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 ../../node-packages/node-env.nix { diff --git a/pkgs/development/web/wml/default.nix b/pkgs/development/web/wml/default.nix index 82faf32a321..57fedb78407 100644 --- a/pkgs/development/web/wml/default.nix +++ b/pkgs/development/web/wml/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perlPackages, ncurses, lynx, makeWrapper }: -perlPackages.buildPerlPackage rec { +perlPackages.buildPerlPackage { pname = "wml"; version = "2.0.11"; diff --git a/pkgs/games/90secondportraits/default.nix b/pkgs/games/90secondportraits/default.nix index f2be128fd99..0b0cea70366 100644 --- a/pkgs/games/90secondportraits/default.nix +++ b/pkgs/games/90secondportraits/default.nix @@ -21,7 +21,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index 628a521126f..89c74d83b49 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libjpeg, libX11, libXxf86vm, curl, libogg , libvorbis, freetype, openal, libGLU_combined }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "alienarena-7.65"; src = fetchurl { diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix index d4ff86c424b..943f9eb881c 100644 --- a/pkgs/games/andyetitmoves/default.nix +++ b/pkgs/games/andyetitmoves/default.nix @@ -4,7 +4,7 @@ let plainName = "andyetitmoves"; version = "1.2.2"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${plainName}-${version}"; src = if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index 5b1f240e7b5..c224784e8f2 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -9,7 +9,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "arx-libertatis"; version = "2019-02-16"; diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix index bf58b523e76..a35b449f92f 100644 --- a/pkgs/games/blackshades/default.nix +++ b/pkgs/games/blackshades/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchsvn, SDL, libGLU_combined, openal, libvorbis, freealut, SDL_image}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "blackshades-svn-110"; src = fetchsvn { url = svn://svn.icculus.org/blackshades/trunk; diff --git a/pkgs/games/cuyo/default.nix b/pkgs/games/cuyo/default.nix index f4e5290df27..24e45719f51 100644 --- a/pkgs/games/cuyo/default.nix +++ b/pkgs/games/cuyo/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, SDL, SDL_mixer, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cuyo"; version = "2.1.0"; diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix index 52d3bdd5b79..117ebcc1ac1 100644 --- a/pkgs/games/devilutionx/default.nix +++ b/pkgs/games/devilutionx/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "unstable-2019-07-28"; pname = "devilutionx"; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 0b25af645cf..71024f3d5c9 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -83,7 +83,7 @@ let fi ''; - dfhack = stdenv.mkDerivation rec { + dfhack = stdenv.mkDerivation { pname = "dfhack-base"; inherit version; diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index e3005373b95..6871a611784 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -7,7 +7,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "dwarf-therapist-${dwarf-therapist.version}"; wrapper = ./dwarf-therapist.in; diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index b5c80a0a56d..291e32b6406 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -18,12 +18,12 @@ let # Other srcs are avilable like 32-bit mac & win, but I have only # included the ones most likely to be needed by Nixpkgs users. platforms = { - "x86_64-linux" = "linux"; - "i686-linux" = "linux32"; - "x86_64-darwin" = "osx"; - "i686-darwin" = "osx32"; - "x86_64-cygwin" = "win"; - "i686-cygwin" = "win32"; + x86_64-linux = "linux"; + i686-linux = "linux32"; + x86_64-darwin = "osx"; + i686-darwin = "osx32"; + x86_64-cygwin = "win"; + i686-cygwin = "win32"; }; dfVersionTriple = splitString "." dfVersion; diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix index e1f8e8abab8..e191d372704 100644 --- a/pkgs/games/dwarf-fortress/twbt/default.nix +++ b/pkgs/games/dwarf-fortress/twbt/default.nix @@ -44,7 +44,7 @@ let in stdenvNoCC.mkDerivation rec { - name = "twbt-${version}"; + pname = "twbt"; version = release.twbtRelease; src = fetchurl { diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 06bc6ca1fe5..31b21c5a435 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -80,7 +80,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "dwarf-fortress-${dwarf-fortress.dfVersion}"; dfInit = substituteAll { diff --git a/pkgs/games/dxx-rebirth/full.nix b/pkgs/games/dxx-rebirth/full.nix index 020a4593de2..7a1e690c39d 100644 --- a/pkgs/games/dxx-rebirth/full.nix +++ b/pkgs/games/dxx-rebirth/full.nix @@ -2,7 +2,7 @@ , dxx-rebirth, descent1-assets, descent2-assets }: let - generic = ver: assets: stdenv.mkDerivation rec { + generic = ver: assets: stdenv.mkDerivation { name = "d${toString ver}x-rebirth-full-${assets.version}"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix index 18c83b8c5a4..cee9be00a3a 100644 --- a/pkgs/games/empty-epsilon/default.nix +++ b/pkgs/games/empty-epsilon/default.nix @@ -8,7 +8,7 @@ let version = "${major}.${minor}.${patch}"; - serious-proton = stdenv.mkDerivation rec { + serious-proton = stdenv.mkDerivation { pname = "serious-proton"; inherit version; @@ -34,7 +34,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "empty-epsilon"; inherit version; diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix index a138b46f81b..14bea8185c6 100644 --- a/pkgs/games/endless-sky/default.nix +++ b/pkgs/games/endless-sky/default.nix @@ -6,7 +6,7 @@ let version = "0.9.8"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "endless-sky"; inherit version; diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix index b269a5d12d6..281691d283d 100644 --- a/pkgs/games/freedroidrpg/default.nix +++ b/pkgs/games/freedroidrpg/default.nix @@ -2,7 +2,7 @@ let version = "0.16.1"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "freedroidrpg"; inherit version; diff --git a/pkgs/games/frogatto/data.nix b/pkgs/games/frogatto/data.nix index ec2cb941666..6531d407d21 100644 --- a/pkgs/games/frogatto/data.nix +++ b/pkgs/games/frogatto/data.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "frogatto-data"; version = "unstable-2018-12-18"; diff --git a/pkgs/games/frogatto/default.nix b/pkgs/games/frogatto/default.nix index 51975c17a8e..4c5f1af8a9b 100644 --- a/pkgs/games/frogatto/default.nix +++ b/pkgs/games/frogatto/default.nix @@ -15,7 +15,7 @@ let categories = "Application;Game;ArcadeGame;"; }; version = "unstable-2018-12-18"; -in buildEnv rec { +in buildEnv { name = "frogatto-${version}"; buildInputs = [ makeWrapper ]; diff --git a/pkgs/games/frogatto/engine.nix b/pkgs/games/frogatto/engine.nix index 5a01d2512c4..5254ff25b02 100644 --- a/pkgs/games/frogatto/engine.nix +++ b/pkgs/games/frogatto/engine.nix @@ -2,7 +2,7 @@ , boost, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf , glew, zlib, icu, pkgconfig, cairo, libvpx }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "anura-engine"; version = "unstable-2018-11-28"; diff --git a/pkgs/games/gambatte/default.nix b/pkgs/games/gambatte/default.nix index de4a89eac07..6d8d14d8de0 100644 --- a/pkgs/games/gambatte/default.nix +++ b/pkgs/games/gambatte/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, scons, qt4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gambatte"; version = "2016-05-03"; diff --git a/pkgs/games/gnome-hexgl/default.nix b/pkgs/games/gnome-hexgl/default.nix index 7a720239182..340dd20aaaf 100644 --- a/pkgs/games/gnome-hexgl/default.nix +++ b/pkgs/games/gnome-hexgl/default.nix @@ -9,7 +9,7 @@ , gtk3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gnome-hexgl"; version = "unstable-2019-08-21"; diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix index 62c5ee80304..43c60c66730 100644 --- a/pkgs/games/gnuchess/default.nix +++ b/pkgs/games/gnuchess/default.nix @@ -12,7 +12,7 @@ let flex ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (s) name version; src = fetchurl { inherit (s) url sha256; diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix index fc73f89f66c..f9dd851af8e 100644 --- a/pkgs/games/gscrabble/default.nix +++ b/pkgs/games/gscrabble/default.nix @@ -2,7 +2,7 @@ , gtk3, wrapGAppsHook, gst_all_1, gobject-introspection , python3Packages, gnome3, hicolor-icon-theme }: -buildPythonApplication rec { +buildPythonApplication { pname = "gscrabble"; version = "unstable-2019-03-11"; diff --git a/pkgs/games/hawkthorne/default.nix b/pkgs/games/hawkthorne/default.nix index 97aee425fd1..a770e452ae4 100644 --- a/pkgs/games/hawkthorne/default.nix +++ b/pkgs/games/hawkthorne/default.nix @@ -1,6 +1,6 @@ { fetchgit, stdenv, love, curl, zip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.12.1"; pname = "hawkthorne"; diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 7ef5c6a49b3..b3764ea1efc 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -9,7 +9,7 @@ let SHA entropy pkgs.zlib sandi regex-tdfa ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "1.0.0-beta1"; pname = "hedgewars"; src = fetchhg { diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index b0acd789afe..b25341da01d 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -28,7 +28,7 @@ let ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "instead-" + version; src = fetchurl { diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix index 94c614598bf..fa0720e51fd 100644 --- a/pkgs/games/ja2-stracciatella/default.nix +++ b/pkgs/games/ja2-stracciatella/default.nix @@ -26,7 +26,7 @@ let doCheck = false; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ja2-stracciatella"; inherit src; inherit version; diff --git a/pkgs/games/liberal-crime-squad/default.nix b/pkgs/games/liberal-crime-squad/default.nix index 0e819278dc3..0811c01aa79 100644 --- a/pkgs/games/liberal-crime-squad/default.nix +++ b/pkgs/games/liberal-crime-squad/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, stdenv, autoreconfHook, libiconv, ncurses, SDL2, SDL2_mixer }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2016-07-06"; pname = "liberal-crime-squad"; diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix index cfc06e11e19..3ec508040e7 100644 --- a/pkgs/games/lincity/ng.nix +++ b/pkgs/games/lincity/ng.nix @@ -3,7 +3,7 @@ , SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, physfs }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lincity-ng"; version = "2.9beta.20170715"; diff --git a/pkgs/games/linux-steam-integration/default.nix b/pkgs/games/linux-steam-integration/default.nix index f57571b2a2c..a3c9599e7b1 100644 --- a/pkgs/games/linux-steam-integration/default.nix +++ b/pkgs/games/linux-steam-integration/default.nix @@ -4,7 +4,7 @@ let version = "0.7.3"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "linux-steam-integration"; inherit version; diff --git a/pkgs/games/meritous/default.nix b/pkgs/games/meritous/default.nix index 8b0808d8e8c..4a37fc8f676 100644 --- a/pkgs/games/meritous/default.nix +++ b/pkgs/games/meritous/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, SDL, SDL_image, SDL_mixer, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "meritous"; version = "1.4"; diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 9ddae8b65bf..2fde729e935 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, jre }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "minecraft-server"; version = "1.14.4"; diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix index aa4a06bc7d2..c75fbbb1ca9 100644 --- a/pkgs/games/mrrescue/default.nix +++ b/pkgs/games/mrrescue/default.nix @@ -21,7 +21,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { diff --git a/pkgs/games/newtonwars/default.nix b/pkgs/games/newtonwars/default.nix index c465b413db1..a0ae03cefb7 100644 --- a/pkgs/games/newtonwars/default.nix +++ b/pkgs/games/newtonwars/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, freeglut, libGLU_combined }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "newtonwars"; version = "20150609"; diff --git a/pkgs/games/njam/default.nix b/pkgs/games/njam/default.nix index bcbbc9e7756..6f700ad3204 100644 --- a/pkgs/games/njam/default.nix +++ b/pkgs/games/njam/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, SDL, SDL_image, SDL_mixer, SDL_net }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "njam-1.25"; src = fetchurl { diff --git a/pkgs/games/odamex/default.nix b/pkgs/games/odamex/default.nix index c70744ea299..6c6bb9f78ba 100644 --- a/pkgs/games/odamex/default.nix +++ b/pkgs/games/odamex/default.nix @@ -1,6 +1,6 @@ { stdenv, cmake, fetchurl, pkgconfig, SDL, SDL_mixer, SDL_net }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "odamex-0.7.0"; src = fetchurl { url = mirror://sourceforge/odamex/odamex-src-0.7.0.tar.bz2; diff --git a/pkgs/games/onscripter-en/default.nix b/pkgs/games/onscripter-en/default.nix index 921ed8a72f3..618e78553a5 100644 --- a/pkgs/games/onscripter-en/default.nix +++ b/pkgs/games/onscripter-en/default.nix @@ -3,7 +3,7 @@ , SDL, SDL_image, SDL_mixer, SDL_ttf }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "onscripter-en-20110930"; src = fetchurl { diff --git a/pkgs/games/openarena/default.nix b/pkgs/games/openarena/default.nix index b39519193e7..141e0151cfb 100644 --- a/pkgs/games/openarena/default.nix +++ b/pkgs/games/openarena/default.nix @@ -1,6 +1,6 @@ { fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libglvnd, libogg, libvorbis, curl, openal }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "openarena"; version = "0.8.8"; diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix index 1da23a98f71..9109d2667c3 100644 --- a/pkgs/games/openjk/default.nix +++ b/pkgs/games/openjk/default.nix @@ -19,7 +19,7 @@ let genericName = "Jedi Academy"; categories = "Game;"; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "OpenJK"; version = "2019-06-24"; diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index e7636e8320e..d546ff8481e 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -28,7 +28,7 @@ let sha256 = "1yb1ynkfmiankii3fngr9km5wbc07rp30nh0apkj6wryrhy7imgm"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit name; src = openrct2-src; diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index fab4de64ee2..f35077c084a 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, cmake, sfml, libGLU_combined, bullet, glm, libmad, xlibsWrapper, openal , SDL2, boost, ffmpeg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2017-09-17"; pname = "openrw"; diff --git a/pkgs/games/orthorobot/default.nix b/pkgs/games/orthorobot/default.nix index 377dc865229..461d7008577 100644 --- a/pkgs/games/orthorobot/default.nix +++ b/pkgs/games/orthorobot/default.nix @@ -21,7 +21,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchFromGitHub { diff --git a/pkgs/games/pacvim/default.nix b/pkgs/games/pacvim/default.nix index a0169debfef..d7805ad66fb 100644 --- a/pkgs/games/pacvim/default.nix +++ b/pkgs/games/pacvim/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pacvim"; version = "2018-05-16"; src = fetchFromGitHub { diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix index 6beb68b97ab..dc47e5aa58e 100644 --- a/pkgs/games/pingus/default.nix +++ b/pkgs/games/pingus/default.nix @@ -2,7 +2,7 @@ , pkgconfig, libGLU_combined}: let s = # Generated upstream information - rec { + { baseName="pingus"; version="0.7.6"; name="pingus-0.7.6"; @@ -11,7 +11,7 @@ let sha256="0q34d2k6anzqvb0mf67x85q92lfx9jr71ry13dlp47jx0x9i573m"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (s) name version; nativeBuildInputs = [ pkgconfig ]; buildInputs = [scons SDL SDL_image boost libpng SDL_mixer libGLU_combined]; diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix index 92429218178..610be7efdce 100644 --- a/pkgs/games/qgo/default.nix +++ b/pkgs/games/qgo/default.nix @@ -7,7 +7,7 @@ , qttranslations }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qgo"; version = "unstable-2017-12-18"; diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix index 0602aace319..c831163be97 100644 --- a/pkgs/games/quake2/yquake2/default.nix +++ b/pkgs/games/quake2/yquake2/default.nix @@ -66,7 +66,7 @@ let }; }; -in rec { +in { inherit yquake2; yquake2-ctf = wrapper { diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index 7f0fb6fd062..a592455486b 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -2,7 +2,7 @@ , curl, speex, opusfile, libogg, libvorbis, libopus, libjpeg, mumble, freetype }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ioquake3-git"; version = "2019-05-29"; diff --git a/pkgs/games/racer/default.nix b/pkgs/games/racer/default.nix index d11315cd6df..1347f88cc2c 100644 --- a/pkgs/games/racer/default.nix +++ b/pkgs/games/racer/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, allegro, libjpeg, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "racer-1.1"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { diff --git a/pkgs/games/riko4/default.nix b/pkgs/games/riko4/default.nix index 780025f5222..1ddca346fbb 100644 --- a/pkgs/games/riko4/default.nix +++ b/pkgs/games/riko4/default.nix @@ -4,7 +4,7 @@ let # Newer versions of sdl-gpu don't work with Riko4 (corrupted graphics), # and this library does not have a proper release version, so let the # derivation for this stay next to the Riko4 derivation for now. - sdl-gpu = stdenv.mkDerivation rec { + sdl-gpu = stdenv.mkDerivation { pname = "sdl-gpu"; version = "2018-11-01"; src = fetchFromGitHub { diff --git a/pkgs/games/rimshot/default.nix b/pkgs/games/rimshot/default.nix index ac6fdee1f6b..2813bbf8869 100644 --- a/pkgs/games/rimshot/default.nix +++ b/pkgs/games/rimshot/default.nix @@ -21,7 +21,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { diff --git a/pkgs/games/scid/default.nix b/pkgs/games/scid/default.nix index 040902ffd73..048a8fdc09b 100644 --- a/pkgs/games/scid/default.nix +++ b/pkgs/games/scid/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "scid"; version = "4.3"; diff --git a/pkgs/games/sienna/default.nix b/pkgs/games/sienna/default.nix index 58ed85c79fd..aa96a5a8ae5 100644 --- a/pkgs/games/sienna/default.nix +++ b/pkgs/games/sienna/default.nix @@ -21,7 +21,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index e6889731619..d8ab792bb62 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -106,7 +106,7 @@ let passthru.binaries = binaries; }; - binaries = stdenv.mkDerivation rec { + binaries = stdenv.mkDerivation { pname = "simutrans"; inherit version; diff --git a/pkgs/games/snipes/default.nix b/pkgs/games/snipes/default.nix index 1334f555bbd..e035bc436cc 100644 --- a/pkgs/games/snipes/default.nix +++ b/pkgs/games/snipes/default.nix @@ -6,7 +6,7 @@ let sha256 = "06n8gq18js0bv4svx84ljzhs9zmi81wy0zqcqj3b4g0rsrkr20a7"; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "snipes"; version = "20180930"; diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index a851b5b8d97..8e4f5b866bb 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -26,7 +26,7 @@ let libs = [ "lib/${gnuArch}" "lib" "usr/lib/${gnuArch}" "usr/lib" ]; bins = [ "bin" "usr/bin" ]; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "steam-runtime-wrapped"; nativeBuildInputs = [ perl ]; diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index 1d1912d97a1..0276122655f 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -4,7 +4,7 @@ let traceLog = "/tmp/steam-trace-dependencies.log"; version = "1.0.0.61"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "steam-original"; inherit version; diff --git a/pkgs/games/steam/steamcmd.nix b/pkgs/games/steam/steamcmd.nix index be865d20f2f..a38122702f2 100644 --- a/pkgs/games/steam/steamcmd.nix +++ b/pkgs/games/steam/steamcmd.nix @@ -2,7 +2,7 @@ , steamRoot ? "~/.local/share/Steam" }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "steamcmd"; version = "20180104"; # According to steamcmd_linux.tar.gz mtime diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix index b9cc8a6cd6d..2020066ee65 100644 --- a/pkgs/games/ue4demos/default.nix +++ b/pkgs/games/ue4demos/default.nix @@ -57,7 +57,7 @@ let }; in { - tappy_chicken = buildDemo rec { + tappy_chicken = buildDemo { name = "ue4demos-tappy_chicken"; src = fetchurl { urls = urls "tappy_chicken.zip"; @@ -65,7 +65,7 @@ in { }; }; - swing_ninja = buildDemo rec { + swing_ninja = buildDemo { name = "ue4demos-swing_ninja"; src = fetchurl { urls = urls "swing_ninja.zip"; @@ -73,7 +73,7 @@ in { }; }; - card_game = buildDemo rec { + card_game = buildDemo { name = "ue4demos-card_game"; src = fetchurl { urls = urls "card_game.zip"; @@ -81,7 +81,7 @@ in { }; }; - vehicle_game = buildDemo rec { + vehicle_game = buildDemo { name = "ue4demos-vehicle_game"; src = fetchurl { urls = urls "vehicle_game.zip"; @@ -89,7 +89,7 @@ in { }; }; - shooter_game = buildDemo rec { + shooter_game = buildDemo { name = "ue4demos-shooter_game"; src = fetchurl { urls = urls "shooter_game.zip"; @@ -97,7 +97,7 @@ in { }; }; - strategy_game = buildDemo rec { + strategy_game = buildDemo { name = "ue4demos-strategy_game"; src = fetchurl { urls = urls "strategy_game.zip"; @@ -105,7 +105,7 @@ in { }; }; - black_jack = buildDemo rec { + black_jack = buildDemo { name = "ue4demos-black_jack"; src = fetchurl { urls = urls "black_jack.zip"; @@ -113,7 +113,7 @@ in { }; }; - landscape_mountains = buildDemo rec { + landscape_mountains = buildDemo { name = "ue4demos-landscape_mountains"; src = fetchurl { urls = urls "landscape_mountains.zip"; @@ -121,7 +121,7 @@ in { }; }; - matinee_demo = buildDemo rec { + matinee_demo = buildDemo { name = "ue4demos-matinee_demo"; src = fetchurl { urls = urls "matinee_demo.zip"; @@ -129,7 +129,7 @@ in { }; }; - elemental_demo = buildDemo rec { + elemental_demo = buildDemo { name = "ue4demos-elemental_demo"; src = fetchurl { urls = urls "elemental_demo.zip"; @@ -137,7 +137,7 @@ in { }; }; - effects_cave_demo = buildDemo rec { + effects_cave_demo = buildDemo { name = "ue4demos-effects_cave_demo"; src = fetchurl { urls = urls "effects_cave_demo.zip"; @@ -145,7 +145,7 @@ in { }; }; - realistic_rendering = buildDemo rec { + realistic_rendering = buildDemo { name = "ue4demos-realistic_rendering"; src = fetchurl { urls = urls "realistic_rendering_demo.zip"; @@ -153,7 +153,7 @@ in { }; }; - reflections_subway = buildDemo rec { + reflections_subway = buildDemo { name = "ue4demos-reflections_subway"; src = fetchurl { urls = urls "reflections_subway_demo.zip"; @@ -161,7 +161,7 @@ in { }; }; - scifi_hallway_demo = buildDemo rec { + scifi_hallway_demo = buildDemo { name = "ue4demos-scifi_hallway_demo"; src = fetchurl { urls = urls "sci-fi_hallway_demo.zip"; @@ -169,7 +169,7 @@ in { }; }; - mobile_temple_demo = buildDemo rec { + mobile_temple_demo = buildDemo { name = "ue4demos-mobile_temple_demo"; src = fetchurl { urls = urls "mobile_temple_demo.zip"; @@ -177,7 +177,7 @@ in { }; }; - stylized_demo = buildDemo rec { + stylized_demo = buildDemo { name = "ue4demos-stylized_demo"; src = fetchurl { urls = urls "stylized_demo.zip"; @@ -185,7 +185,7 @@ in { }; }; - blueprint_examples_demo = buildDemo rec { + blueprint_examples_demo = buildDemo { name = "ue4demos-blueprint_examples_demo"; src = fetchurl { urls = urls "blueprint_examples_demo.zip"; diff --git a/pkgs/games/ultimatestunts/default.nix b/pkgs/games/ultimatestunts/default.nix index 63da4685485..a7ad366aa19 100644 --- a/pkgs/games/ultimatestunts/default.nix +++ b/pkgs/games/ultimatestunts/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, SDL, libGLU_combined, SDL_image, freealut, openal, libvorbis, pkgconfig}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ultimate-stunts-0.7.6.1"; src = fetchurl { url = mirror://sourceforge/ultimatestunts/ultimatestunts-srcdata-0761.tar.gz; diff --git a/pkgs/games/vapor/default.nix b/pkgs/games/vapor/default.nix index 0209fd83b1c..7d965dee1c7 100644 --- a/pkgs/games/vapor/default.nix +++ b/pkgs/games/vapor/default.nix @@ -22,7 +22,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { diff --git a/pkgs/games/warmux/default.nix b/pkgs/games/warmux/default.nix index a861e3725a2..c3896f6cf71 100644 --- a/pkgs/games/warmux/default.nix +++ b/pkgs/games/warmux/default.nix @@ -4,7 +4,7 @@ , gettext, intltool, libtool, perl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "warmux"; version = "unstable-2017-10-20"; diff --git a/pkgs/games/xjump/default.nix b/pkgs/games/xjump/default.nix index dd59ebbedd9..afac2de9fce 100644 --- a/pkgs/games/xjump/default.nix +++ b/pkgs/games/xjump/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoconf, automake, libX11, libXt, libXpm, libXaw, localStateDir?null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xjump"; version = "2.9.3"; src = fetchFromGitHub { diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index da2f256aeb7..c14eda2968e 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer , mysql, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "zod-engine-2011-03-18"; src = fetchurl { diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 01c35d99ae7..5ff131dad9d 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 e7b4f81f7e0..735ea623247 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 9c5ef1d0283..b6219e1c749 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 abd50850b18..13e3013267b 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 15e3a1d97a9..a09311a8292 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 ba8cffc0e65..8866b425ca8 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 a2fdd1abc19..ad8b0089a87 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 21a276f9d14..cd4c049e67f 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 b70b5daa766..87a023af1ca 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 a232552712d..bdc8b3a75df 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 c65c13e886f..3d6fb8f081a 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 ebea49d9540..779325c99b0 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 68220392fd0..d95eb85168e 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 851aa9f3f88..978fd9b9e03 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 fb6b4956ef1..2dd32a93219 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 366535b51c6..4b19932450e 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 88e8556ec6c..39a7e38e034 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 efa1a881f4a..d8717b46eef 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 7312ad41ada..d8f5f1cbdb0 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 c2494d70270..da6a7c8bf2f 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 8a95d6f2883..6ac6f93750e 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 3f20390fba7..fbde2ff54c9 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 8bdc79f2d8e..d751c4f7fc4 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 25af4f8d50a..44571de3489 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 ae1b1bf6bda..674222dc355 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 0f2abedd3b5..e866a1937d6 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 f3d5450c94b..4597fa40390 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 06a6a7e6550..ec0dd0b1fd5 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 5cfddaaea57..f69b0794ce3 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 f61c9f5e1b9..1072bac7816 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 b5dc7a13f18..d0d3fbdf2d7 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 054cd1aeffc..decdbdfac2d 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 dfa788f6ea7..72e87e2e274 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 2f7a53dc2d4..e7235a900cf 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 3d9403b84f4..96843e8d78b 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 6fe1a2081d2..6f1c8af390c 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 = []; @@ -108,45 +108,45 @@ in rec { ]; }; - ubootA20OlinuxinoLime = buildUBoot rec { + ubootA20OlinuxinoLime = buildUBoot { defconfig = "A20-OLinuXino-Lime_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; - ubootBananaPi = buildUBoot rec { + ubootBananaPi = buildUBoot { defconfig = "Bananapi_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; - ubootBananaPim64 = buildUBoot rec { + ubootBananaPim64 = buildUBoot { defconfig = "bananapi_m64_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; - ubootBeagleboneBlack = buildUBoot rec { + ubootBeagleboneBlack = buildUBoot { defconfig = "am335x_boneblack_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["MLO" "u-boot.img"]; }; # http://git.denx.de/?p=u-boot.git;a=blob;f=board/solidrun/clearfog/README;hb=refs/heads/master - ubootClearfog = buildUBoot rec { + ubootClearfog = buildUBoot { defconfig = "clearfog_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot-spl.kwb"]; }; - ubootGuruplug = buildUBoot rec { + ubootGuruplug = buildUBoot { defconfig = "guruplug_defconfig"; extraMeta.platforms = ["armv5tel-linux"]; filesToInstall = ["u-boot.bin"]; }; - ubootJetsonTK1 = buildUBoot rec { + ubootJetsonTK1 = buildUBoot { defconfig = "jetson-tk1_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"]; @@ -157,114 +157,114 @@ in rec { ''; }; - ubootNovena = buildUBoot rec { + ubootNovena = buildUBoot { defconfig = "novena_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot.bin" "SPL"]; }; - ubootOdroidXU3 = buildUBoot rec { + ubootOdroidXU3 = buildUBoot { defconfig = "odroid-xu3_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot-dtb.bin"]; }; - ubootOrangePiPc = buildUBoot rec { + ubootOrangePiPc = buildUBoot { defconfig = "orangepi_pc_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; - ubootOrangePiZeroPlus2H5 = buildUBoot rec { + ubootOrangePiZeroPlus2H5 = buildUBoot { defconfig = "orangepi_zero_plus2_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; - ubootPcduino3Nano = buildUBoot rec { + ubootPcduino3Nano = buildUBoot { defconfig = "Linksprite_pcDuino3_Nano_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; - ubootPine64 = buildUBoot rec { + ubootPine64 = buildUBoot { defconfig = "pine64_plus_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; - ubootPine64LTS = buildUBoot rec { + ubootPine64LTS = buildUBoot { defconfig = "pine64-lts_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; - ubootPinebook = buildUBoot rec { + ubootPinebook = buildUBoot { defconfig = "pinebook_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; - ubootQemuAarch64 = buildUBoot rec { + ubootQemuAarch64 = buildUBoot { defconfig = "qemu_arm64_defconfig"; extraMeta.platforms = ["aarch64-linux"]; filesToInstall = ["u-boot.bin"]; }; - ubootQemuArm = buildUBoot rec { + ubootQemuArm = buildUBoot { defconfig = "qemu_arm_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot.bin"]; }; - ubootRaspberryPi = buildUBoot rec { + ubootRaspberryPi = buildUBoot { defconfig = "rpi_defconfig"; extraMeta.platforms = ["armv6l-linux"]; filesToInstall = ["u-boot.bin"]; }; - ubootRaspberryPi2 = buildUBoot rec { + ubootRaspberryPi2 = buildUBoot { defconfig = "rpi_2_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot.bin"]; }; - ubootRaspberryPi3_32bit = buildUBoot rec { + ubootRaspberryPi3_32bit = buildUBoot { defconfig = "rpi_3_32b_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot.bin"]; }; - ubootRaspberryPi3_64bit = buildUBoot rec { + ubootRaspberryPi3_64bit = buildUBoot { defconfig = "rpi_3_defconfig"; extraMeta.platforms = ["aarch64-linux"]; filesToInstall = ["u-boot.bin"]; }; - ubootRaspberryPiZero = buildUBoot rec { + ubootRaspberryPiZero = buildUBoot { defconfig = "rpi_0_w_defconfig"; extraMeta.platforms = ["armv6l-linux"]; filesToInstall = ["u-boot.bin"]; }; - ubootSheevaplug = buildUBoot rec { + ubootSheevaplug = buildUBoot { defconfig = "sheevaplug_defconfig"; extraMeta.platforms = ["armv5tel-linux"]; filesToInstall = ["u-boot.bin"]; }; - ubootSopine = buildUBoot rec { + ubootSopine = buildUBoot { defconfig = "sopine_baseboard_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; - ubootUtilite = buildUBoot rec { + ubootUtilite = buildUBoot { defconfig = "cm_fx6_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot-with-nand-spl.imx"]; @@ -276,7 +276,7 @@ in rec { # sf probe; sf update $loadaddr 0 80000 }; - ubootWandboard = buildUBoot rec { + ubootWandboard = buildUBoot { defconfig = "wandboard_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot.img" "SPL"]; diff --git a/pkgs/misc/uboot/rock64.nix b/pkgs/misc/uboot/rock64.nix index e49b4b519f1..9dd43f5fe7e 100644 --- a/pkgs/misc/uboot/rock64.nix +++ b/pkgs/misc/uboot/rock64.nix @@ -5,7 +5,7 @@ rev = "f79a708978232a2b6b06c2e4173c5314559e0d3a"; sha256 = "0h7xm4ck3p3380c6bqm5ixrkxwcx6z5vysqdwvfa7gcqx5d6x5zz"; }; -in buildUBoot rec { +in buildUBoot { version = "2017.09"; src = fetchFromGitHub { diff --git a/pkgs/misc/uboot/rockpro64.nix b/pkgs/misc/uboot/rockpro64.nix index 45f6d5de2a9..436e1bcdf87 100644 --- a/pkgs/misc/uboot/rockpro64.nix +++ b/pkgs/misc/uboot/rockpro64.nix @@ -5,7 +5,7 @@ rev = "f79a708978232a2b6b06c2e4173c5314559e0d3a"; sha256 = "0h7xm4ck3p3380c6bqm5ixrkxwcx6z5vysqdwvfa7gcqx5d6x5zz"; }; -in buildUBoot rec { +in buildUBoot { version = "2017.09"; src = fetchFromGitHub { diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 44bc7ec3ced..c7b618323fc 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -264,7 +264,7 @@ let ${lib.concatMapStrings (plugin: '' let g:nix_plugin_locations['${plugin.pname}'] = "${plugin.rtp}" '') plugins} - let g:nix_plugin_locations['vim-addon-manager'] = "${knownPlugins."vim-addon-manager".rtp}" + let g:nix_plugin_locations['vim-addon-manager'] = "${knownPlugins.vim-addon-manager.rtp}" let g:vim_addon_manager = {} @@ -316,7 +316,7 @@ let ++ (builtins.map (link packageName "opt") opt) ); packDir = (packages: - stdenv.mkDerivation rec { + stdenv.mkDerivation { name = "vim-pack-dir"; src = ./.; installPhase = lib.concatStringsSep @@ -513,7 +513,7 @@ rec { name = "vim_with_custom_plugin"; vimrcConfig.vam.knownPlugins = vimPlugins // ({ - "vim-trailing-whitespace" = buildVimPluginFrom2Nix { + vim-trailing-whitespace = buildVimPluginFrom2Nix { name = "vim-trailing-whitespace"; src = fetchFromGitHub { owner = "bronson"; diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index c4742253120..e1b928b1373 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -10,7 +10,7 @@ in # So an extension's attribute name should be of the form: # "${mktplcRef.publisher}.${mktplcRef.name}". # -rec { +{ alanz.vscode-hie-server = buildVscodeMarketplaceExtension { mktplcRef = { diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index 423f39f9bbc..f4ebea8e438 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -23,9 +23,9 @@ let else throw "Only x86_64 Linux and Darwin are supported."; languageServerSha256 = { - "linux-x64" = "0j9251f8dfccmg0x9gzg1cai4k5zd0alcfpb0443gs4jqakl0lr2"; - "osx-x64" = "070qwwl08fa24rsnln4i5x9mfriqaw920l6v2j8d1r0zylxnyjsa"; - }."${arch}"; + linux-x64 = "0j9251f8dfccmg0x9gzg1cai4k5zd0alcfpb0443gs4jqakl0lr2"; + osx-x64 = "070qwwl08fa24rsnln4i5x9mfriqaw920l6v2j8d1r0zylxnyjsa"; + }.${arch}; # version is languageServerVersion in the package.json languageServer = extractNuGet rec { diff --git a/pkgs/os-specific/bsd/default.nix b/pkgs/os-specific/bsd/default.nix index a75c132b55a..ee7158e2a8c 100644 --- a/pkgs/os-specific/bsd/default.nix +++ b/pkgs/os-specific/bsd/default.nix @@ -1,5 +1,5 @@ { callPackages, recurseIntoAttrs }: -rec { +{ netbsd = recurseIntoAttrs (callPackages ./netbsd {}); } diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 93b6f4a6209..7370901f319 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -38,14 +38,14 @@ let HOST_SH = "${buildPackages.bash}/bin/sh"; MACHINE_ARCH = { - "i686" = "i386"; + i686 = "i386"; }.${stdenv'.hostPlatform.parsed.cpu.name} or stdenv'.hostPlatform.parsed.cpu.name; MACHINE = { - "x86_64" = "amd64"; - "aarch64" = "evbarm64"; - "i686" = "i386"; + x86_64 = "amd64"; + aarch64 = "evbarm64"; + i686 = "i386"; }.${stdenv'.hostPlatform.parsed.cpu.name} or stdenv'.hostPlatform.parsed.cpu.name; @@ -79,7 +79,7 @@ let ## ## START BOOTSTRAPPING ## - makeMinimal = mkDerivation rec { + makeMinimal = mkDerivation { path = "tools/make"; sha256 = "1xbzfd4i7allrkk1if74a8ymgpizyj0gkvdigzzj37qar7la7nc1"; version = "8.0"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix index 7002f82fe56..a7b2bd7d981 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix @@ -1,6 +1,6 @@ { stdenv, appleDerivation, developer_cmds }: -appleDerivation rec { +appleDerivation { buildInputs = [ developer_cmds ]; installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 7b19194be96..99d67002803 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -3,7 +3,7 @@ , copyfile, removefile, libresolv, Libnotify, libplatform, libpthread , mDNSResponder, launchd, libutil, hfs, darling }: -appleDerivation rec { +appleDerivation { dontBuild = true; dontFixup = true; diff --git a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix index 4a0180dda7a..eadf18e028e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix @@ -1,6 +1,6 @@ { stdenv, appleDerivation, xcbuildHook }: -appleDerivation rec { +appleDerivation { nativeBuildInputs = [ xcbuildHook ]; # These PBXcp calls should be patched in xcbuild to allow them to diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix index b2d8522f326..21971ea2e28 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix @@ -1,6 +1,6 @@ { stdenv, appleDerivation, xcbuildHook }: -appleDerivation rec { +appleDerivation { nativeBuildInputs = [ xcbuildHook ]; patchPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix index f0394a20c2c..5de84d2a6e5 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix @@ -1,6 +1,6 @@ { stdenv, appleDerivation, xcbuildHook, zlib, bzip2, lzma, ncurses, libutil }: -appleDerivation rec { +appleDerivation { nativeBuildInputs = [ xcbuildHook ]; buildInputs = [ zlib bzip2 lzma ncurses libutil ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix index 9ca0f3b4e56..82be7dc860e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -1,7 +1,7 @@ { stdenv, appleDerivation, xcbuildHook , openssl_1_0_2, Librpcsvc, xnu, libpcap, developer_cmds }: -appleDerivation rec { +appleDerivation { nativeBuildInputs = [ xcbuildHook ]; buildInputs = [ openssl_1_0_2 xnu Librpcsvc libpcap developer_cmds ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix index 5b2322915dc..b87dadd391d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix @@ -1,6 +1,6 @@ { stdenv, appleDerivation, xcbuildHook }: -appleDerivation rec { +appleDerivation { nativeBuildInputs = [ xcbuildHook ]; patchPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix index 39c903a2e7b..03556296ca1 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix @@ -1,7 +1,7 @@ { stdenv, appleDerivation, lib , Librpcsvc, apple_sdk, pam, CF, openbsm }: -appleDerivation rec { +appleDerivation { # xcbuild fails with: # /nix/store/fc0rz62dh8vr648qi7hnqyik6zi5sqx8-xcbuild-wrapper/nix-support/setup-hook: line 1: 9083 Segmentation fault: 11 xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" OTHER_CPLUSPLUSFLAGS="$NIX_CFLAGS_COMPILE" OTHER_LDFLAGS="$NIX_LDFLAGS" build # see issue facebook/xcbuild#188 diff --git a/pkgs/os-specific/darwin/lsusb/default.nix b/pkgs/os-specific/darwin/lsusb/default.nix index cb81c2e8149..02821fe61ef 100644 --- a/pkgs/os-specific/darwin/lsusb/default.nix +++ b/pkgs/os-specific/darwin/lsusb/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "1.0"; pname = "lsusb"; diff --git a/pkgs/os-specific/darwin/osxfuse/default.nix b/pkgs/os-specific/darwin/osxfuse/default.nix index 77e63c779b9..e1a00c71cb8 100644 --- a/pkgs/os-specific/darwin/osxfuse/default.nix +++ b/pkgs/os-specific/darwin/osxfuse/default.nix @@ -16,7 +16,7 @@ let ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "osxfuse"; inherit version; diff --git a/pkgs/os-specific/darwin/qes/default.nix b/pkgs/os-specific/darwin/qes/default.nix index 19ab34145e8..21b0d605021 100644 --- a/pkgs/os-specific/darwin/qes/default.nix +++ b/pkgs/os-specific/darwin/qes/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, Carbon }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qes"; version = "0.0.2"; diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix index bb9dc0a03b5..d25edff4956 100644 --- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix +++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix @@ -14,9 +14,9 @@ let minSdkVersion = "9.0"; iosPlatformArch = { parsed, ... }: { - "armv7a" = "armv7"; - "aarch64" = "arm64"; - "x86_64" = "x86_64"; + armv7a = "armv7"; + aarch64 = "arm64"; + x86_64 = "x86_64"; }.${parsed.cpu.name}; in diff --git a/pkgs/os-specific/linux/anbox/kmod.nix b/pkgs/os-specific/linux/anbox/kmod.nix index 2f5c392c173..fee8d1e7a42 100644 --- a/pkgs/os-specific/linux/anbox/kmod.nix +++ b/pkgs/os-specific/linux/anbox/kmod.nix @@ -1,6 +1,6 @@ { stdenv, kernel, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "anbox-modules"; version = "2019-07-13-" + kernel.version; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index d7d25e69664..456872cdbd4 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -2,7 +2,7 @@ let base = "batman-adv-2019.2"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${base}-${kernel.version}"; src = fetchurl { diff --git a/pkgs/os-specific/linux/beegfs/default.nix b/pkgs/os-specific/linux/beegfs/default.nix index 205d788da6e..7ce2fea6924 100644 --- a/pkgs/os-specific/linux/beegfs/default.nix +++ b/pkgs/os-specific/linux/beegfs/default.nix @@ -26,7 +26,7 @@ let "upgrade/beegfs_mirror_md/build" ]; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "beegfs"; inherit version; diff --git a/pkgs/os-specific/linux/bpftool/default.nix b/pkgs/os-specific/linux/bpftool/default.nix index ac444c28d75..c54e3e38e9b 100644 --- a/pkgs/os-specific/linux/bpftool/default.nix +++ b/pkgs/os-specific/linux/bpftool/default.nix @@ -3,7 +3,7 @@ , linuxPackages_latest }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bpftool"; inherit (linuxPackages_latest.kernel) version src; diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix index 0149398bfa3..7f16ecb9e6d 100644 --- a/pkgs/os-specific/linux/can-isotp/default.nix +++ b/pkgs/os-specific/linux/can-isotp/default.nix @@ -1,6 +1,6 @@ { stdenv, kernel, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "can-isotp"; version = "20180629"; diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/os-specific/linux/can-utils/default.nix index 7913c703b5b..6e26ef4bbce 100644 --- a/pkgs/os-specific/linux/can-utils/default.nix +++ b/pkgs/os-specific/linux/can-utils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "can-utils"; # There are no releases (source archives or git tags), so use the date of the # latest commit in git master as version number. diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix index b724112af88..fc2faa5b8f5 100644 --- a/pkgs/os-specific/linux/checkpolicy/default.nix +++ b/pkgs/os-specific/linux/checkpolicy/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "checkpolicy"; - version = "2.7"; + version = "2.9"; inherit (libsepol) se_release se_url; src = fetchurl { url = "${se_url}/${se_release}/checkpolicy-${version}.tar.gz"; - sha256 = "009j9jc0hi4l7k8f21hn8fm25n0mqgzdpd4nk30nds6d3nglf4sl"; + sha256 = "13jz6f8zdrijvn5w1j102b36fs41z0q8ii74axw48cj550mw6im9"; }; nativeBuildInputs = [ bison flex ]; diff --git a/pkgs/os-specific/linux/devmem2/default.nix b/pkgs/os-specific/linux/devmem2/default.nix index cd1400b41fc..77fa7fe3b1b 100644 --- a/pkgs/os-specific/linux/devmem2/default.nix +++ b/pkgs/os-specific/linux/devmem2/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "devmem2-2004-08-05"; src = fetchurl { diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix index 5896262ac21..a880f699b69 100644 --- a/pkgs/os-specific/linux/directvnc/default.nix +++ b/pkgs/os-specific/linux/directvnc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, directfb, zlib, libjpeg, xorgproto }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "directvnc"; version = "0.7.7.2015-04-16"; diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix index 63b766b21a5..25d0eb1fd02 100644 --- a/pkgs/os-specific/linux/dstat/default.nix +++ b/pkgs/os-specific/linux/dstat/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { - name = "dstat-${version}"; + pname = "dstat"; format = "other"; version = "0.7.3"; diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index defb45d7a86..c8fc633f8bd 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -1,7 +1,7 @@ {stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses, libx86}: let s = # Generated upstream information - rec { + { baseName="fbterm"; version="1.7.0"; name="fbterm-1.7.0"; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index 26ed2020635..e9ee91a2de7 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "raspberrypi-wireless-firmware"; version = "2018-08-20"; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix index 321ce8ffc06..1ea2b5e4e3d 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "raspberrypi-tools"; version = "2018-10-03"; diff --git a/pkgs/os-specific/linux/flashbench/default.nix b/pkgs/os-specific/linux/flashbench/default.nix index 0abd458aa8f..bf3d2ef8d6d 100644 --- a/pkgs/os-specific/linux/flashbench/default.nix +++ b/pkgs/os-specific/linux/flashbench/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "flashbench"; version = "2012-06-06"; diff --git a/pkgs/os-specific/linux/freefall/default.nix b/pkgs/os-specific/linux/freefall/default.nix index 09774016ef2..a6c5a6593d1 100644 --- a/pkgs/os-specific/linux/freefall/default.nix +++ b/pkgs/os-specific/linux/freefall/default.nix @@ -1,6 +1,6 @@ { stdenv, kernel }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (kernel) version src; pname = "freefall"; diff --git a/pkgs/os-specific/linux/gpu-switch/default.nix b/pkgs/os-specific/linux/gpu-switch/default.nix index 0325461763a..ea1051c5f05 100644 --- a/pkgs/os-specific/linux/gpu-switch/default.nix +++ b/pkgs/os-specific/linux/gpu-switch/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gpu-switch-unstable"; version = "2017-04-28"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/hdapsd/default.nix b/pkgs/os-specific/linux/hdapsd/default.nix index 53924a782df..893eb4fdd99 100644 --- a/pkgs/os-specific/linux/hdapsd/default.nix +++ b/pkgs/os-specific/linux/hdapsd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: let version = "20141203"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "hdapsd-"+version; src = fetchurl { diff --git a/pkgs/os-specific/linux/hibernate/default.nix b/pkgs/os-specific/linux/hibernate/default.nix index d2319fdcf5c..3d759001d01 100644 --- a/pkgs/os-specific/linux/hibernate/default.nix +++ b/pkgs/os-specific/linux/hibernate/default.nix @@ -2,7 +2,7 @@ let version = "2.0"; in - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "hibernate"; inherit version; src = fetchurl { diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix index 36ca1eb16b4..a209f1ab4bb 100644 --- a/pkgs/os-specific/linux/hyperv-daemons/default.nix +++ b/pkgs/os-specific/linux/hyperv-daemons/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, python, kernel, makeWrapper, writeText }: let - daemons = stdenv.mkDerivation rec { + daemons = stdenv.mkDerivation { pname = "hyperv-daemons-bin"; inherit (kernel) src version; @@ -54,7 +54,7 @@ let WantedBy=hyperv-daemons.target ''; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "hyperv-daemons"; inherit (kernel) version; diff --git a/pkgs/os-specific/linux/kbd/keymaps.nix b/pkgs/os-specific/linux/kbd/keymaps.nix index e6e89811894..b3d5fe1b63c 100644 --- a/pkgs/os-specific/linux/kbd/keymaps.nix +++ b/pkgs/os-specific/linux/kbd/keymaps.nix @@ -18,7 +18,7 @@ ''; }; - neo = stdenv.mkDerivation rec { + neo = stdenv.mkDerivation { pname = "neo"; version = "2476"; diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 1e9b1c276d0..1699324546d 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -7,7 +7,8 @@ let makeLinuxHeaders = { src, version, patches ? [] }: stdenvNoCC.mkDerivation { inherit src; - name = "linux-headers-${version}"; + pname = "linux-headers"; + inherit version; ARCH = stdenvNoCC.hostPlatform.platform.kernelArch or stdenvNoCC.hostPlatform.kernelArch; diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index d2e1a35cb2e..1b4700a2e39 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -4,7 +4,7 @@ let modDirVersion = "4.14.98"; tag = "1.20190215"; in -lib.overrideDerivation (buildLinux (args // rec { +lib.overrideDerivation (buildLinux (args // { version = "${modDirVersion}-${tag}"; inherit modDirVersion; @@ -16,9 +16,9 @@ lib.overrideDerivation (buildLinux (args // rec { }; defconfig = { - "armv6l-linux" = "bcmrpi_defconfig"; - "armv7l-linux" = "bcm2709_defconfig"; - "aarch64-linux" = "bcmrpi3_defconfig"; + armv6l-linux = "bcmrpi_defconfig"; + armv7l-linux = "bcm2709_defconfig"; + aarch64-linux = "bcmrpi3_defconfig"; }.${stdenv.hostPlatform.system} or (throw "linux_rpi not supported on '${stdenv.hostPlatform.system}'"); features = { diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 4516af19a4e..0b2ed76a4b4 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,6 +1,6 @@ { stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args: -buildLinux (args // rec { +buildLinux (args // { version = "5.1.2019.08.21"; modDirVersion = "5.1.0"; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index edca017b3c7..b80320db282 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -1,6 +1,6 @@ { fetchpatch }: -rec { +{ bridge_stp_helper = { name = "bridge-stp-helper"; patch = ./bridge-stp-helper.patch; @@ -23,7 +23,7 @@ rec { cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches; - tag_hardened = rec { + tag_hardened = { name = "tag-hardened"; patch = ./tag-hardened.patch; }; @@ -58,7 +58,7 @@ rec { }; }; - export_kernel_fpu_functions = rec { + export_kernel_fpu_functions = { name = "export_kernel_fpu_functions"; patch = ./export_kernel_fpu_functions.patch; }; diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix index f738b9f6da5..12463c736a6 100644 --- a/pkgs/os-specific/linux/kmscube/default.nix +++ b/pkgs/os-specific/linux/kmscube/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "kmscube-2018-06-17"; src = fetchgit { diff --git a/pkgs/os-specific/linux/ledger-udev-rules/default.nix b/pkgs/os-specific/linux/ledger-udev-rules/default.nix index 28027fd4510..96c60f6ea56 100644 --- a/pkgs/os-specific/linux/ledger-udev-rules/default.nix +++ b/pkgs/os-specific/linux/ledger-udev-rules/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ledger-udev-rules"; version = "unstable-2019-02-13"; diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 028c008eccf..d8a2298f3d3 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -9,14 +9,14 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "libselinux"; - version = "2.7"; + version = "2.9"; inherit (libsepol) se_release se_url; - outputs = [ "bin" "out" "dev" "man" "py" ]; + outputs = [ "bin" "out" "dev" "man" ] ++ optional enablePython "py"; src = fetchurl { url = "${se_url}/${se_release}/libselinux-${version}.tar.gz"; - sha256 = "0mwcq78v6ngbq06xmb9dvilpg0jnl2vs9fgrpakhmmiskdvc1znh"; + sha256 = "14r69mgmz7najf9wbizvp68q56mqx4yjbkxjlbcqg5a47s3wik0v"; }; nativeBuildInputs = [ pkgconfig ] ++ optionals enablePython [ swig python ]; @@ -35,7 +35,8 @@ stdenv.mkDerivation rec { "MAN3DIR=$(man)/share/man/man3" "MAN5DIR=$(man)/share/man/man5" "MAN8DIR=$(man)/share/man/man8" - "PYSITEDIR=$(py)/${python.sitePackages}" + "PYTHON=python" + "PYTHONLIBDIR=$(py)/${python.sitePackages}" "SBINDIR=$(bin)/sbin" "SHLIBDIR=$(out)/lib" diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix index 4fe323ee23d..70b2508451b 100644 --- a/pkgs/os-specific/linux/libsemanage/default.nix +++ b/pkgs/os-specific/linux/libsemanage/default.nix @@ -6,25 +6,29 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "libsemanage"; - version = "2.7"; + version = "2.9"; inherit (libsepol) se_release se_url; src = fetchurl { url = "${se_url}/${se_release}/libsemanage-${version}.tar.gz"; - sha256 = "0xnlp1yg8b1aqc6kq3pss1i1nl06rfj4x4pyl5blasnf2ivlgs87"; - }; + sha256 = "075w6y3l9hiy5hicgwrmijyxmhfyd1r7cnc08qxyg4j46jfk8xi5"; + }; + + outputs = [ "out" "dev" "man" ] ++ optional enablePython "py"; nativeBuildInputs = [ bison flex pkgconfig ]; buildInputs = [ libsepol libselinux bzip2 audit ] ++ optionals enablePython [ swig python ]; - preBuild = '' - makeFlagsArray+=("PREFIX=$out") - makeFlagsArray+=("DESTDIR=$out") - makeFlagsArray+=("MAN3DIR=$out/share/man/man3") - makeFlagsArray+=("MAN5DIR=$out/share/man/man5") - makeFlagsArray+=("PYSITEDIR=$out/lib/${python.libPrefix}/site-packages") - ''; + makeFlags = [ + "PREFIX=$(out)" + "INCLUDEDIR=$(dev)/include" + "MAN3DIR=$(man)/share/man/man3" + "MAN5DIR=$(man)/share/man/man5" + "PYTHON=python" + "PYTHONLIBDIR=$(py)/${python.sitePackages}" + "DEFAULT_SEMANAGE_CONF_LOCATION=$(out)/etc/selinux/semanage.conf" + ]; installTargets = [ "install" ] ++ optionals enablePython [ "install-pywrap" ]; diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index e96ea01cce4..03bd0252c5c 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "libsepol"; - version = "2.7"; - se_release = "20170804"; - se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases"; + version = "2.9"; + se_release = "20190315"; + se_url = "https://github.com/SELinuxProject/selinux/releases/download"; outputs = [ "bin" "out" "dev" "man" ]; src = fetchurl { url = "${se_url}/${se_release}/libsepol-${version}.tar.gz"; - sha256 = "1rzr90d3f1g5wy1b8sh6fgnqb9migys2zgpjmpakn6lhxkc3p7fn"; + sha256 = "0p8x7w73jn1nysx1d7416wqrhbi0r6isrjxib7jf68fi72q14jx3"; }; nativeBuildInputs = [ flex ]; diff --git a/pkgs/os-specific/linux/logitech-udev-rules/default.nix b/pkgs/os-specific/linux/logitech-udev-rules/default.nix index 9aa1698b766..369f412fbfc 100644 --- a/pkgs/os-specific/linux/logitech-udev-rules/default.nix +++ b/pkgs/os-specific/linux/logitech-udev-rules/default.nix @@ -3,7 +3,7 @@ # ltunifi and solaar both provide udev rules but solaar's rules are more # up-to-date so we simply use that instead of having to maintain our own rules -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "logitech-udev-rules"; inherit (solaar) version; diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix index b2d1ca4791a..63155e66678 100644 --- a/pkgs/os-specific/linux/lsiutil/default.nix +++ b/pkgs/os-specific/linux/lsiutil/default.nix @@ -12,7 +12,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lsiutils"; inherit version; diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix index 0a6fc3c977c..7c72c8a2dbf 100644 --- a/pkgs/os-specific/linux/mba6x_bl/default.nix +++ b/pkgs/os-specific/linux/mba6x_bl/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, kernel, stdenv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "mba6x_bl-2016-12-08"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix index 34f19db524c..1a24ae3b9a2 100644 --- a/pkgs/os-specific/linux/microcode/amd.nix +++ b/pkgs/os-specific/linux/microcode/amd.nix @@ -1,6 +1,6 @@ { stdenv, firmwareLinuxNonfree, libarchive }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "amd-ucode-${firmwareLinuxNonfree.version}"; src = firmwareLinuxNonfree; diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/os-specific/linux/miraclecast/default.nix index 0edf322cce5..6b67401b9b2 100644 --- a/pkgs/os-specific/linux/miraclecast/default.nix +++ b/pkgs/os-specific/linux/miraclecast/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig , glib, readline, pcre, systemd, udev }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "miraclecast"; version = "1.0-20190403"; diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index a7f0a332beb..e0b87f2010a 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mmc-utils"; version = "2018-03-27"; diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index 843676b9cca..9b4f2f1c544 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -7,12 +7,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.9.1"; + version = "0.9.2"; pname = "nftables"; src = fetchurl { url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2"; - sha256 = "1kjg3dykf2aw76d76viz1hm0rav57nfbdwlngawgn2slxmlbplza"; + sha256 = "1x8kalbggjq44j4916i6vyv1rb20dlh1dcsf9xvzqsry2j063djw"; }; configureFlags = [ diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index cfe79d4c0b7..4f8a0b68664 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -2,7 +2,7 @@ nvidia_x11: sha256: { stdenv, fetchFromGitHub, m4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nvidia-persistenced"; inherit (nvidia_x11) version; diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index 1867c1a133a..101f61f3020 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -40,7 +40,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nvidia-settings"; inherit (nvidia_x11) version; inherit src; diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/os-specific/linux/pipework/default.nix index 62aa18fa643..044f75cbd6f 100644 --- a/pkgs/os-specific/linux/pipework/default.nix +++ b/pkgs/os-specific/linux/pipework/default.nix @@ -2,7 +2,7 @@ , bridge-utils, iproute, lxc, openvswitch, docker, busybox, dhcpcd, dhcp }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pipework"; version = "2017-08-22"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix index fb507d4da48..9d229c50000 100644 --- a/pkgs/os-specific/linux/policycoreutils/default.nix +++ b/pkgs/os-specific/linux/policycoreutils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "policycoreutils"; - version = "2.7"; + version = "2.9"; inherit (libsepol) se_release se_url; src = fetchurl { url = "${se_url}/${se_release}/policycoreutils-${version}.tar.gz"; - sha256 = "1x742c7lkw30namhkw87yg7z384qzqjz0pvmqs0lk19v6958l6qa"; + sha256 = "0yqg5ws5gbl1cbn8msxdk1c3ilmmx58qg5dx883kqyq0517k8g65"; }; postPatch = '' @@ -20,13 +20,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext ]; buildInputs = [ libsepol libselinux libsemanage ]; - preBuild = '' - makeFlagsArray+=("PREFIX=$out") - makeFlagsArray+=("DESTDIR=$out") - makeFlagsArray+=("BASHCOMPLETIONDIR=$out/share/bash-completion/completions") - makeFlagsArray+=("LOCALEDIR=$out/share/locale") - makeFlagsArray+=("MAN5DIR=$out/share/man/man5") - ''; + makeFlags = [ + "PREFIX=$(out)" + "SBINDIR=$(out)/sbin" + "ETCDIR=$(out)/etc" + "BASHCOMPLETIONDIR=$out/share/bash-completion/completions" + "LOCALEDIR=$(out)/share/locale" + "MAN5DIR=$(out)/share/man/man5" + ]; meta = with stdenv.lib; { description = "SELinux policy core utilities"; diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix index b1afbfea0de..710eba642cb 100644 --- a/pkgs/os-specific/linux/rewritefs/default.nix +++ b/pkgs/os-specific/linux/rewritefs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, fuse, pcre }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rewritefs"; version = "2017-08-14"; diff --git a/pkgs/os-specific/linux/selinux-python/default.nix b/pkgs/os-specific/linux/selinux-python/default.nix index b8f80a0124c..2ca88c32f13 100644 --- a/pkgs/os-specific/linux/selinux-python/default.nix +++ b/pkgs/os-specific/linux/selinux-python/default.nix @@ -8,13 +8,13 @@ with python3.pkgs; stdenv.mkDerivation rec { pname = "selinux-python"; - version = "2.7"; - se_release = "20170804"; - se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases"; + version = "2.9"; + + inherit (libsepol) se_release se_url; src = fetchurl { url = "${se_url}/${se_release}/selinux-python-${version}.tar.gz"; - sha256 = "1va0y4b7cah7rprh04b3ylmwqgnivpkw5z2zw68nrafdbsbcn5s2"; + sha256 = "1pjzsyay5535cxcjag7y7k193ajry0s0xc3dqv5905qd7cwval1n"; }; nativeBuildInputs = [ wrapPython ]; @@ -23,17 +23,19 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace sepolicy/Makefile --replace "echo --root" "echo --prefix" + substituteInPlace sepolgen/src/share/Makefile --replace "/var/lib/sepolgen" \ + "\$PREFIX/var/lib/sepolgen" ''; - preBuild = '' - makeFlagsArray+=("PREFIX=$out") - makeFlagsArray+=("DESTDIR=$out") - makeFlagsArray+=("LOCALEDIR=$out/share/locale") - makeFlagsArray+=("LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a") - makeFlagsArray+=("BASHCOMPLETIONDIR=$out/share/bash-completion/completions") - makeFlagsArray+=("PYTHON=${python3}/bin/python") - makeFlagsArray+=("PYTHONLIBDIR=lib/${python3.libPrefix}/site-packages") - ''; + makeFlags = [ + "PREFIX=$(out)" + "LOCALEDIR=$(out)/share/locale" + "BASHCOMPLETIONDIR=$(out)/share/bash-completion/completions" + "PYTHON=python" + "PYTHONLIBDIR=$(out)/${python.sitePackages}" + "LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a" + ]; + postFixup = '' wrapPythonPrograms diff --git a/pkgs/os-specific/linux/selinux-sandbox/default.nix b/pkgs/os-specific/linux/selinux-sandbox/default.nix index 99bbfbe7287..5343c5fae1a 100644 --- a/pkgs/os-specific/linux/selinux-sandbox/default.nix +++ b/pkgs/os-specific/linux/selinux-sandbox/default.nix @@ -9,12 +9,12 @@ with python3.pkgs; stdenv.mkDerivation rec { pname = "selinux-sandbox"; - version = "2.7"; - se_release = "20170804"; + version = "2.9"; + inherit (policycoreutils) se_release se_url; src = fetchurl { - url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${se_release}/selinux-sandbox-${version}.tar.gz"; - sha256 = "0hf5chm90iapb42njaps6p5460ys3ajh5446ja544vdbh01n544l"; + url = "${se_url}/${se_release}/selinux-sandbox-${version}.tar.gz"; + sha256 = "0qj20jyi8v1653xdqj5yak3wwbvg5bw8f2jmx8fpahl6y1bmz481"; }; nativeBuildInputs = [ wrapPython ]; @@ -42,10 +42,10 @@ stdenv.mkDerivation rec { --replace "/usr/bin/test" "${coreutils}/bin/test" \ ''; - preBuild = '' - makeFlagsArray+=("PREFIX=$out") - makeFlagsArray+=("DESTDIR=$out") - ''; + makeFlags = [ + "PREFIX=$(out)" + "SYSCONFDIR=$(out)/etc/sysconfig" + ]; postFixup = '' wrapPythonPrograms diff --git a/pkgs/os-specific/linux/semodule-utils/default.nix b/pkgs/os-specific/linux/semodule-utils/default.nix index 178d102381e..bf1f36835b4 100644 --- a/pkgs/os-specific/linux/semodule-utils/default.nix +++ b/pkgs/os-specific/linux/semodule-utils/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "semodule-utils"; - version = "2.7"; + version = "2.9"; inherit (libsepol) se_release se_url; src = fetchurl { url = "${se_url}/${se_release}/${pname}-${version}.tar.gz"; - sha256 = "1fl60x4w8rn5bcwy68sy48aydwsn1a17d48slni4sfx4c8rqpjch"; + sha256 = "01yrwnd3calmw6r8kdh8ld7i7fb250n2yqqqk9p0ymrlwsg6g0w0"; }; buildInputs = [ libsepol ]; diff --git a/pkgs/os-specific/linux/syscall_limiter/default.nix b/pkgs/os-specific/linux/syscall_limiter/default.nix index db362613d37..ef13e5ded02 100644 --- a/pkgs/os-specific/linux/syscall_limiter/default.nix +++ b/pkgs/os-specific/linux/syscall_limiter/default.nix @@ -5,7 +5,7 @@ , which }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "syscall_limiter"; version = "2017-01-23"; diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 8965b5da4f4..8631ddf01d0 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchurl, nasm, perl, python, libuuid, mtools, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "syslinux-2015-11-09"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 45f4d60e4e3..4117df8cf13 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, kmod +{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod , xz, pam, acl, libuuid, m4, utillinux, libffi , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor , audit, lz4, bzip2, libmicrohttpd, pcre2 @@ -15,7 +15,7 @@ , withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "242"; pname = "systemd"; @@ -28,6 +28,14 @@ stdenv.mkDerivation rec { sha256 = "0pyjvzzh8nnxv4z58n82lz1mjnzv44sylcjgkvw8sp35vx1ryxfh"; }; + patches = [ + (fetchpatch { + name = "CVE-2019-15718.patch"; + url = https://github.com/systemd/systemd/pull/13457/commits/35e528018f315798d3bffcb592b32a0d8f5162bd.patch; + sha256 = "0m0ypnnllx4r6a2qy1586as15i2qrzxwi1sqdp14rzdwajz1rvnv"; + }) + ]; + outputs = [ "out" "lib" "man" "dev" ]; nativeBuildInputs = diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index e6571b46ee0..567dcd1068c 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, asciidoc, docbook_xsl, libxslt }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "trace-cmd"; version = "2.8.3"; diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix index 8e49af77139..b73de3193d2 100644 --- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix +++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix @@ -1,5 +1,5 @@ { stdenv, mkDerivation, fetchgit, qtbase, cmake, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }: -mkDerivation rec { +mkDerivation { pname = "kernelshark"; version = "0.9.8"; diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 6b0dc179d0f..59e39f72f51 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -12,7 +12,7 @@ , useSystemd ? true, systemd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "upower"; version = "0.99.10"; diff --git a/pkgs/os-specific/linux/usbip/default.nix b/pkgs/os-specific/linux/usbip/default.nix index 497b5c19166..1bb92d7dce1 100644 --- a/pkgs/os-specific/linux/usbip/default.nix +++ b/pkgs/os-specific/linux/usbip/default.nix @@ -1,6 +1,6 @@ { stdenv, kernel, udev, autoconf, automake, libtool }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "usbip-${kernel.name}"; src = kernel.src; diff --git a/pkgs/os-specific/linux/uvcdynctrl/default.nix b/pkgs/os-specific/linux/uvcdynctrl/default.nix index 19f59d00680..cfb93684f3b 100644 --- a/pkgs/os-specific/linux/uvcdynctrl/default.nix +++ b/pkgs/os-specific/linux/uvcdynctrl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.3.0"; pname = "uvcdynctrl"; diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 199964daa66..a688f60492a 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -1,12 +1,16 @@ -{ stdenv, lib, fetchurl, pkgconfig, perl, mkDerivation +{ stdenv, lib, fetchurl, pkgconfig, perl , libjpeg, udev , withUtils ? true -, withGUI ? true, alsaLib, libX11, qtbase, libGLU +, withGUI ? true, alsaLib, libX11, qtbase, libGLU, wrapQtAppsHook }: # See libv4l in all-packages.nix for the libs only (overrides alsa, libX11 & QT) -mkDerivation rec { +let + withQt = withUtils && withGUI; + +# we need to use stdenv.mkDerivation in order not to pollute the libv4l’s closure with Qt +in stdenv.mkDerivation rec { pname = "v4l-utils"; version = "1.16.7"; @@ -29,13 +33,13 @@ mkDerivation rec { ln -s "$dev/include/libv4l1-videodev.h" "$dev/include/videodev.h" ''; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkgconfig perl ] ++ lib.optional withQt wrapQtAppsHook; - buildInputs = [ udev ] ++ lib.optionals (withUtils && withGUI) [ alsaLib libX11 qtbase libGLU ]; + buildInputs = [ udev ] ++ lib.optionals withQt [ alsaLib libX11 qtbase libGLU ]; propagatedBuildInputs = [ libjpeg ]; - NIX_CFLAGS_COMPILE = lib.optional (withUtils && withGUI) "-std=c++11"; + NIX_CFLAGS_COMPILE = lib.optional withQt "-std=c++11"; postPatch = '' patchShebangs . diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 570eb4ca4ef..c2dca669616 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -3,7 +3,7 @@ # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements assert stdenv.lib.versionAtLeast kernel.version "3.10"; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "wireguard"; inherit (wireguard-tools) src version; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 03e11d1a8ed..1b9b5a3ba51 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -30,7 +30,7 @@ let Linux v${kernel.version} is not yet supported by zfsonlinux v${version}. ${stdenv.lib.optionalString (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."} '' - else stdenv.mkDerivation rec { + else stdenv.mkDerivation { name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; src = fetchFromGitHub { @@ -163,7 +163,7 @@ in { ]; }; - zfsUnstable = common rec { + zfsUnstable = common { # comment/uncomment if breaking kernel versions are known # incompatibleKernelVersion = "4.19"; diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix index 286f4a0d41f..25706733967 100644 --- a/pkgs/os-specific/windows/pthread-w32/default.nix +++ b/pkgs/os-specific/windows/pthread-w32/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pthreads-w32"; version = "2.9.1"; diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 6e47fce3e48..1e5ba46d382 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -6,7 +6,7 @@ }: let - common = {version, sha256, externals}: stdenv.mkDerivation rec { + common = {version, sha256, externals}: stdenv.mkDerivation { inherit version; pname = "asterisk"; diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix index e21ad5723b0..ee8925e1170 100644 --- a/pkgs/servers/brickd/default.nix +++ b/pkgs/servers/brickd/default.nix @@ -11,7 +11,7 @@ daemonlib = fetchgit { in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "brickd"; inherit version; diff --git a/pkgs/servers/demoit/default.nix b/pkgs/servers/demoit/default.nix index 93db472270e..29d00caa023 100644 --- a/pkgs/servers/demoit/default.nix +++ b/pkgs/servers/demoit/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "demoit"; version = "unstable-2019-05-10"; goPackagePath = "github.com/dgageot/demoit"; diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix index 065218a5b95..442ef45d1bf 100644 --- a/pkgs/servers/dict/dictd-db.nix +++ b/pkgs/servers/dict/dictd-db.nix @@ -7,7 +7,7 @@ let makeDictdDB src name "{.,bin}" locale; makeDictdDB = src: _name: _subdir: _locale: - stdenv.mkDerivation rec { + stdenv.mkDerivation { name = "dictd-db-${_name}"; inherit src; locale = _locale; diff --git a/pkgs/servers/echoip/default.nix b/pkgs/servers/echoip/default.nix index 0a0b6c0e1d1..d55eb1d0bbd 100644 --- a/pkgs/servers/echoip/default.nix +++ b/pkgs/servers/echoip/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "echoip"; version = "unstable-2018-11-20"; diff --git a/pkgs/servers/fingerd/bsd-fingerd/default.nix b/pkgs/servers/fingerd/bsd-fingerd/default.nix index d5671921aba..99971816021 100644 --- a/pkgs/servers/fingerd/bsd-fingerd/default.nix +++ b/pkgs/servers/fingerd/bsd-fingerd/default.nix @@ -2,7 +2,7 @@ # !!! Duplication: this package is almost exactly the same as `bsd-fingerd'. -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "bsd-fingerd-0.17"; src = fetchurl { diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index 31de5925916..40780c9a97b 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -51,7 +51,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-serivec-port=${builtins.toString port}" "--with-service-name=${serviceName}" - # "--disable-static" "--with-system-editline" "--with-fblog=/var/log/firebird" "--with-fbconf=/etc/firebird" diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index e8a1a633e4d..ac7733986ce 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -21,7 +21,7 @@ let , rev ? "refs/tags/${version}" , officialRelease ? true , patches ? [] - }: stdenv.mkDerivation rec { + }: stdenv.mkDerivation { pname = "foundationdb"; inherit version; diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index b29c5298b77..b3ca7038ebe 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -29,7 +29,7 @@ in with builtins; { # Older versions use the bespoke 'vsmake' build system # ------------------------------------------------------ - foundationdb51 = vsmakeBuild rec { + foundationdb51 = vsmakeBuild { version = "5.1.7"; branch = "release-5.1"; sha256 = "1rc472ih24f9s5g3xmnlp3v62w206ny0pvvw02bzpix2sdrpbp06"; @@ -42,7 +42,7 @@ in with builtins; { ]; }; - foundationdb52 = vsmakeBuild rec { + foundationdb52 = vsmakeBuild { version = "5.2.8"; branch = "release-5.2"; sha256 = "1kbmmhk2m9486r4kyjlc7bb3wd50204i0p6dxcmvl6pbp1bs0wlb"; @@ -55,7 +55,7 @@ in with builtins; { ]; }; - foundationdb60 = vsmakeBuild rec { + foundationdb60 = vsmakeBuild { version = "6.0.18"; branch = "release-6.0"; sha256 = "0q1mscailad0z7zf1nypv4g7gx3damfp45nf8nzyq47nsw5gz69p"; @@ -68,7 +68,7 @@ in with builtins; { # 6.1 and later versions should always use CMake # ------------------------------------------------------ - foundationdb61 = cmakeBuild rec { + foundationdb61 = cmakeBuild { version = "6.1.10"; branch = "release-6.1"; sha256 = "1v278zlrki3da2i2258j2b4rk4fq6d9bj623z01bjrvmaqxc2gry"; diff --git a/pkgs/servers/foundationdb/python.nix b/pkgs/servers/foundationdb/python.nix index 55b834c5436..e4256fab0fa 100644 --- a/pkgs/servers/foundationdb/python.nix +++ b/pkgs/servers/foundationdb/python.nix @@ -1,6 +1,6 @@ { buildPythonPackage, lib, foundationdb }: -buildPythonPackage rec { +buildPythonPackage { pname = "foundationdb"; version = foundationdb.version; diff --git a/pkgs/servers/foundationdb/vsmake.nix b/pkgs/servers/foundationdb/vsmake.nix index 34b9f6ecaf0..0265e18861e 100644 --- a/pkgs/servers/foundationdb/vsmake.nix +++ b/pkgs/servers/foundationdb/vsmake.nix @@ -12,7 +12,7 @@ let # hysterical raisins dictate a version of boost this old. however, # we luckily do not need to build anything, we just need the header # files. - boost152 = stdenv49.mkDerivation rec { + boost152 = stdenv49.mkDerivation { name = "boost-headers-1.52.0"; src = fetchurl { @@ -45,7 +45,7 @@ let , officialRelease ? true , patches ? [] - }: stdenv.mkDerivation rec { + }: stdenv.mkDerivation { pname = "foundationdb"; inherit version; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 8a2c8d0e719..104a11ad281 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,11 +2,12 @@ # Do not edit! { - version = "0.93.2"; + version = "0.96.2"; components = { "abode" = ps: with ps; [ ]; "acer_projector" = ps: with ps; [ pyserial ]; "actiontec" = ps: with ps; [ ]; + "adguard" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; "aftership" = ps: with ps; [ ]; "air_quality" = ps: with ps; [ ]; @@ -31,8 +32,10 @@ "api" = ps: with ps; [ aiohttp-cors ]; "apns" = ps: with ps; [ ]; "apple_tv" = ps: with ps; [ pyatv ]; + "aprs" = ps: with ps; [ ]; "aqualogic" = ps: with ps; [ ]; "aquostv" = ps: with ps; [ ]; + "arcam_fmj" = ps: with ps; [ ]; "arduino" = ps: with ps; [ ]; "arest" = ps: with ps; [ ]; "arlo" = ps: with ps; [ ha-ffmpeg ]; @@ -43,6 +46,7 @@ "asuswrt" = ps: with ps; [ ]; "august" = ps: with ps; [ ]; "aurora" = ps: with ps; [ ]; + "aurora_abb_powerone" = ps: with ps; [ ]; "auth" = ps: with ps; [ aiohttp-cors ]; "automatic" = ps: with ps; [ aiohttp-cors ]; "automation" = ps: with ps; [ aiohttp-cors ]; @@ -50,6 +54,7 @@ "awair" = ps: with ps; [ ]; "aws" = ps: with ps; [ ]; "axis" = ps: with ps; [ ]; + "azure_event_hub" = ps: with ps; [ ]; "baidu" = ps: with ps; [ ]; "bayesian" = ps: with ps; [ ]; "bbb_gpio" = ps: with ps; [ ]; @@ -125,12 +130,13 @@ "deconz" = ps: with ps; [ ]; "decora" = ps: with ps; [ ]; "decora_wifi" = ps: with ps; [ ]; - "default_config" = ps: with ps; [ pynacl aiohttp-cors distro sqlalchemy zeroconf ]; + "default_config" = ps: with ps; [ pynacl aiohttp-cors distro netdisco sqlalchemy zeroconf ]; "deluge" = ps: with ps; [ deluge-client ]; "demo" = ps: with ps; [ aiohttp-cors ]; "denon" = ps: with ps; [ ]; "denonavr" = ps: with ps; [ ]; "deutsche_bahn" = ps: with ps; [ ]; + "device_automation" = ps: with ps; [ aiohttp-cors ]; "device_sun_light_trigger" = ps: with ps; [ ]; "device_tracker" = ps: with ps; [ ]; "dht" = ps: with ps; [ ]; @@ -174,6 +180,7 @@ "eight_sleep" = ps: with ps; [ ]; "eliqonline" = ps: with ps; [ ]; "elkm1" = ps: with ps; [ ]; + "elv" = ps: with ps; [ ]; "emby" = ps: with ps; [ ]; "emoncms" = ps: with ps; [ ]; "emoncms_history" = ps: with ps; [ ]; @@ -183,6 +190,7 @@ "enocean" = ps: with ps; [ ]; "enphase_envoy" = ps: with ps; [ ]; "entur_public_transport" = ps: with ps; [ ]; + "environment_canada" = ps: with ps; [ ]; "envirophat" = ps: with ps; [ ]; "envisalink" = ps: with ps; [ ]; "ephember" = ps: with ps; [ ]; @@ -233,6 +241,7 @@ "fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; "fritzbox_netmonitor" = ps: with ps; [ fritzconnection ]; "fritzdect" = ps: with ps; [ ]; + "fronius" = ps: with ps; [ ]; "frontend" = ps: with ps; [ aiohttp-cors ]; "frontier_silicon" = ps: with ps; [ ]; "futurenow" = ps: with ps; [ ]; @@ -256,6 +265,7 @@ "gogogate2" = ps: with ps; [ ]; "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ]; "google_assistant" = ps: with ps; [ aiohttp-cors ]; + "google_cloud" = ps: with ps; [ google_cloud_texttospeech ]; "google_domains" = ps: with ps; [ ]; "google_maps" = ps: with ps; [ ]; "google_pubsub" = ps: with ps; [ google_cloud_pubsub ]; @@ -364,6 +374,7 @@ "lcn" = ps: with ps; [ ]; "lg_netcast" = ps: with ps; [ ]; "lg_soundbar" = ps: with ps; [ ]; + "life360" = ps: with ps; [ ]; "lifx" = ps: with ps; [ aiolifx aiolifx-effects ]; "lifx_cloud" = ps: with ps; [ ]; "lifx_legacy" = ps: with ps; [ ]; @@ -408,6 +419,7 @@ "mastodon" = ps: with ps; [ ]; "matrix" = ps: with ps; [ matrix-client ]; "maxcube" = ps: with ps; [ ]; + "mcp23017" = ps: with ps; [ ]; "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light ]; "media_player" = ps: with ps; [ aiohttp-cors ]; "mediaroom" = ps: with ps; [ ]; @@ -478,6 +490,7 @@ "noaa_tides" = ps: with ps; [ ]; "norway_air" = ps: with ps; [ ]; "notify" = ps: with ps; [ ]; + "notion" = ps: with ps; [ ]; "nsw_fuel_station" = ps: with ps; [ ]; "nsw_rural_fire_service_feed" = ps: with ps; [ ]; "nuheat" = ps: with ps; [ ]; @@ -530,6 +543,7 @@ "ping" = ps: with ps; [ ]; "pioneer" = ps: with ps; [ ]; "pjlink" = ps: with ps; [ ]; + "plaato" = ps: with ps; [ aiohttp-cors ]; "plant" = ps: with ps; [ ]; "plex" = ps: with ps; [ ]; "plum_lightpad" = ps: with ps; [ ]; @@ -554,6 +568,7 @@ "pyload" = ps: with ps; [ ]; "python_script" = ps: with ps; [ ]; "qbittorrent" = ps: with ps; [ ]; + "qld_bushfire" = ps: with ps; [ ]; "qnap" = ps: with ps; [ ]; "qrcode" = ps: with ps; [ pillow ]; "quantum_gateway" = ps: with ps; [ ]; @@ -574,6 +589,8 @@ "rejseplanen" = ps: with ps; [ ]; "remember_the_milk" = ps: with ps; [ httplib2 ]; "remote" = ps: with ps; [ ]; + "remote_rpi_gpio" = ps: with ps; [ ]; + "repetier" = ps: with ps; [ ]; "rest" = ps: with ps; [ ]; "rest_command" = ps: with ps; [ ]; "rflink" = ps: with ps; [ ]; @@ -632,7 +649,9 @@ "sleepiq" = ps: with ps; [ ]; "sma" = ps: with ps; [ ]; "smappee" = ps: with ps; [ ]; + "smarthab" = ps: with ps; [ ]; "smartthings" = ps: with ps; [ aiohttp-cors ]; + "smarty" = ps: with ps; [ ]; "smhi" = ps: with ps; [ ]; "smtp" = ps: with ps; [ ]; "snapcast" = ps: with ps; [ snapcast ]; @@ -640,7 +659,10 @@ "snmp" = ps: with ps; [ pysnmp ]; "sochain" = ps: with ps; [ ]; "socialblade" = ps: with ps; [ ]; - "solaredge" = ps: with ps; [ ]; + "solaredge" = ps: with ps; [ stringcase ]; + "solaredge_local" = ps: with ps; [ ]; + "solax" = ps: with ps; [ ]; + "somfy" = ps: with ps; [ ]; "somfy_mylink" = ps: with ps; [ ]; "sonarr" = ps: with ps; [ ]; "songpal" = ps: with ps; [ ]; @@ -657,6 +679,7 @@ "sql" = ps: with ps; [ sqlalchemy ]; "squeezebox" = ps: with ps; [ ]; "srp_energy" = ps: with ps; [ ]; + "ssdp" = ps: with ps; [ netdisco ]; "starlingbank" = ps: with ps; [ ]; "startca" = ps: with ps; [ xmltodict ]; "statistics" = ps: with ps; [ ]; @@ -664,6 +687,7 @@ "steam_online" = ps: with ps; [ ]; "stiebel_eltron" = ps: with ps; [ ]; "stream" = ps: with ps; [ aiohttp-cors av ]; + "streamlabswater" = ps: with ps; [ ]; "stride" = ps: with ps; [ ]; "sun" = ps: with ps; [ ]; "supervisord" = ps: with ps; [ ]; @@ -703,7 +727,7 @@ "tensorflow" = ps: with ps; [ numpy pillow protobuf ]; "tesla" = ps: with ps; [ ]; "tfiac" = ps: with ps; [ ]; - "thermoworks_smoke" = ps: with ps; [ ]; + "thermoworks_smoke" = ps: with ps; [ stringcase ]; "thethingsnetwork" = ps: with ps; [ ]; "thingspeak" = ps: with ps; [ ]; "thinkingcleaner" = ps: with ps; [ ]; @@ -724,9 +748,10 @@ "touchline" = ps: with ps; [ ]; "tplink" = ps: with ps; [ ]; "tplink_lte" = ps: with ps; [ ]; - "traccar" = ps: with ps; [ ]; + "traccar" = ps: with ps; [ stringcase ]; "trackr" = ps: with ps; [ ]; "tradfri" = ps: with ps; [ ]; + "trafikverket_train" = ps: with ps; [ ]; "trafikverket_weatherstation" = ps: with ps; [ ]; "transmission" = ps: with ps; [ transmissionrpc ]; "transport_nsw" = ps: with ps; [ ]; @@ -740,11 +765,10 @@ "twitch" = ps: with ps; [ ]; "twitter" = ps: with ps; [ ]; "ubee" = ps: with ps; [ ]; - "uber" = ps: with ps; [ ]; "ubus" = ps: with ps; [ ]; "ue_smart_radio" = ps: with ps; [ ]; "uk_transport" = ps: with ps; [ ]; - "unifi" = ps: with ps; [ aiounifi pyunifi ]; + "unifi" = ps: with ps; [ aiounifi ]; "unifi_direct" = ps: with ps; [ pexpect ]; "universal" = ps: with ps; [ ]; "upc_connect" = ps: with ps; [ defusedxml ]; @@ -760,6 +784,7 @@ "utility_meter" = ps: with ps; [ ]; "uvc" = ps: with ps; [ ]; "vacuum" = ps: with ps; [ ]; + "vallox" = ps: with ps; [ ]; "vasttrafik" = ps: with ps; [ ]; "velbus" = ps: with ps; [ ]; "velux" = ps: with ps; [ ]; @@ -771,6 +796,7 @@ "viaggiatreno" = ps: with ps; [ ]; "vizio" = ps: with ps; [ ]; "vlc" = ps: with ps; [ ]; + "vlc_telnet" = ps: with ps; [ ]; "voicerss" = ps: with ps; [ ]; "volkszaehler" = ps: with ps; [ ]; "volumio" = ps: with ps; [ ]; @@ -782,6 +808,7 @@ "water_heater" = ps: with ps; [ ]; "waterfurnace" = ps: with ps; [ ]; "watson_iot" = ps: with ps; [ ]; + "watson_tts" = ps: with ps; [ ]; "waze_travel_time" = ps: with ps; [ WazeRouteCalculator ]; "weather" = ps: with ps; [ ]; "webhook" = ps: with ps; [ aiohttp-cors ]; @@ -799,6 +826,7 @@ "wsdot" = ps: with ps; [ ]; "wunderground" = ps: with ps; [ ]; "wunderlist" = ps: with ps; [ ]; + "wwlln" = ps: with ps; [ ]; "x10" = ps: with ps; [ ]; "xbox_live" = ps: with ps; [ ]; "xeoma" = ps: with ps; [ ]; @@ -816,7 +844,7 @@ "yeelight" = ps: with ps; [ ]; "yeelightsunflower" = ps: with ps; [ ]; "yessssms" = ps: with ps; [ ]; - "yi" = ps: with ps; [ ha-ffmpeg ]; + "yi" = ps: with ps; [ aioftp ha-ffmpeg ]; "yr" = ps: with ps; [ xmltodict ]; "yweather" = ps: with ps; [ yahooweather ]; "zabbix" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 03f247e3bc5..43633b07818 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3, protobuf3_6 +{ lib, fetchurl, fetchFromGitHub, python3, protobuf3_6 # Look up dependencies of specified components in component-packages.nix , extraComponents ? [] @@ -26,20 +26,24 @@ let "0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f") (mkOverride "attrs" "19.1.0" "f0b870f674851ecbfbbbd364d6b5cbdff9dcedbc7f3f5e18a6891057f21fe399") - (mkOverride "bcrypt" "3.1.6" - "44636759d222baa62806bbceb20e96f75a015a6381690d1bc2eda91c01ec02ea") + (mkOverride "bcrypt" "3.1.7" + "0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42") (mkOverride "pyjwt" "1.7.1" "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96") - (mkOverride "cryptography" "2.6.1" - "26c821cbeb683facb966045e2064303029d572a87ee69ca5a1bf54bf55f93ca6") - (mkOverride "cryptography_vectors" "2.6.1" # required by cryptography==2.6.1 - "03f38115dccb266dd96538f94067442a877932c2322661bdc5bf2502c76658af") + (mkOverride "cryptography" "2.7" + "e6347742ac8f35ded4a46ff835c60e68c22a536a8ae5c4422966d06946b6d4c6") + (mkOverride "cryptography_vectors" "2.7" # required by cryptography==2.7 + "f12dfb9bd669a68004074cb5b26df6e93ed1a95ebd1a999dff0a840212ff68bc") + (mkOverride "importlib-metadata" "0.18" + "cb6ee23b46173539939964df59d3d72c3e0c1b5d54b84f1d8a7e912fe43612db") (mkOverride "python-slugify" "3.0.2" "57163ffb345c7e26063435a27add1feae67fa821f1ef4b2f292c25847575d758") - (mkOverride "requests" "2.21.0" - "502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e") - (mkOverride "ruamel_yaml" "0.15.94" - "0939bcb399ad037ef903d74ccf2f8a074f06683bc89133ad19305067d34487c8") + (mkOverride "pyyaml" "5.1.1" + "b4bb4d3f5e232425e25dda21c070ce05168a786ac9eda43768ab7f3ac2770955") + (mkOverride "requests" "2.22.0" + "11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4") + (mkOverride "ruamel_yaml" "0.15.97" + "17dbf6b7362e7aee8494f7a0f5cffd44902a6331fe89ef0853b855a7930ab845") (mkOverride "voluptuous" "0.11.5" "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef") (mkOverride "voluptuous-serialize" "2.1.0" @@ -98,7 +102,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.93.2"; + hassVersion = "0.96.2"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -113,13 +117,14 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "01zdg6yfj6qal8jpr9bskmq25crrvz7w3vifrfxmlqws6hv35gc8"; + sha256 = "0qxdsr7zh2yqzignbhi8gcp67ba6gcp2yiyr1rww33a42r4fi0g5"; }; propagatedBuildInputs = [ # From setup.py - aiohttp astral async-timeout attrs bcrypt certifi jinja2 pyjwt cryptography pip - python-slugify pytz pyyaml requests ruamel_yaml voluptuous voluptuous-serialize + aiohttp astral async-timeout attrs bcrypt certifi importlib-metadata jinja2 + pyjwt cryptography pip python-slugify pytz pyyaml requests ruamel_yaml + voluptuous voluptuous-serialize # From http, frontend and recorder components and auth.mfa_modules.totp sqlalchemy aiohttp-cors hass-frontend pyotp pyqrcode ] ++ componentBuildInputs ++ extraBuildInputs; @@ -144,6 +149,6 @@ in with py.pkgs; buildPythonApplication rec { homepage = https://home-assistant.io/; description = "Open-source home automation platform running on Python 3"; license = licenses.asl20; - maintainers = with maintainers; [ f-breidenstein dotlambda globin ]; + maintainers = with maintainers; [ fleaz dotlambda globin ]; }; } diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 4ffbb010016..63861714145 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.39"; + version = "2.4.41"; pname = "apache-httpd"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "18ngvsjq65qxk3biggnkhkq8jlll9dsg9n3csra9p99sfw2rvjml"; + sha256 = "0h7a31yxwyh7h521frnmlppl0h7sh9icc3ka6vlmlcg5iwllhg8k"; }; # FIXME: -dev depends on -doc diff --git a/pkgs/servers/http/micro-httpd/default.nix b/pkgs/servers/http/micro-httpd/default.nix index b636f79e6c6..d99af7a81ae 100644 --- a/pkgs/servers/http/micro-httpd/default.nix +++ b/pkgs/servers/http/micro-httpd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "micro-httpd-20140814"; src = fetchurl { diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index 075226f3607..6ac37a98dee 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, ffmpeg-full, graphicsmagick , quicktemplate, go-bindata, easyjson }: -buildGoPackage rec { +buildGoPackage { pname = "hydron-unstable"; version = "2019-02-17"; goPackagePath = "github.com/bakape/hydron"; diff --git a/pkgs/servers/irker/default.nix b/pkgs/servers/irker/default.nix index e7d6d9ac52a..c056a543aa1 100644 --- a/pkgs/servers/irker/default.nix +++ b/pkgs/servers/irker/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, python, pkgconfig , xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_412 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "irker"; version = "2017-02-12"; diff --git a/pkgs/servers/kwakd/default.nix b/pkgs/servers/kwakd/default.nix index 4eb0b26c306..e65e6b5ab59 100644 --- a/pkgs/servers/kwakd/default.nix +++ b/pkgs/servers/kwakd/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, stdenv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "kwakd"; version = "0.5"; diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 852ea423649..cdce369bbf9 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoModule, fetchFromGitHub }: -buildGoModule rec { +buildGoModule { pname = "mautrix-unstable"; version = "2019-09-03"; diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix index 326fae6bcf7..47530ba9db6 100644 --- a/pkgs/servers/meguca/default.nix +++ b/pkgs/servers/meguca/default.nix @@ -2,7 +2,7 @@ , ghostscript, graphicsmagick, quicktemplate, go-bindata, easyjson , nodePackages, emscripten, opencv, statik }: -buildGoPackage rec { +buildGoPackage { pname = "meguca-unstable"; version = "2019-03-12"; goPackagePath = "github.com/bakape/meguca"; diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index d367bcfd2e3..6f9c22ebecf 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -4,7 +4,7 @@ let version = "1.8.1"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit version; pname = "meteor"; src = fetchurl { diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index cb12fe819a9..9f23cc3e54c 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -11,7 +11,7 @@ let binPath = makeBinPath [ coreutils gnugrep gnused lm_sensors net_snmp procps ]; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "monitoring-plugins-${majorVersion}${minorVersion}"; src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/plugins/uptime.nix b/pkgs/servers/monitoring/plugins/uptime.nix index 79303849156..9b4f3144a37 100644 --- a/pkgs/servers/monitoring/plugins/uptime.nix +++ b/pkgs/servers/monitoring/plugins/uptime.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "check-uptime"; version = "20161112"; diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix index f126b8a7da1..4d92532c90e 100644 --- a/pkgs/servers/monitoring/prometheus/json-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix @@ -1,7 +1,7 @@ # This file was generated by go2nix. { buildGoPackage, fetchFromGitHub, fetchpatch, lib }: -buildGoPackage rec { +buildGoPackage { pname = "prometheus-json-exporter"; version = "unstable-2017-10-06"; diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/pkgs/servers/monitoring/prometheus/mail-exporter.nix index 947dfc2b70c..1e29eefba2b 100644 --- a/pkgs/servers/monitoring/prometheus/mail-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mail-exporter.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "mailexporter"; version = "2019-07-14"; diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix index 331503dfe7d..c6af09743ce 100644 --- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix @@ -1,7 +1,7 @@ # This file was generated by https://github.com/kamilchm/go2nix v2.0-dev { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "rabbitmq_exporter"; version = "0.25.2"; diff --git a/pkgs/servers/monitoring/uchiwa/default.nix b/pkgs/servers/monitoring/uchiwa/default.nix index c1f4746fadf..fafe8ad3046 100644 --- a/pkgs/servers/monitoring/uchiwa/default.nix +++ b/pkgs/servers/monitoring/uchiwa/default.nix @@ -27,7 +27,7 @@ let inherit src; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "uchiwa"; inherit version; diff --git a/pkgs/servers/mumsi/default.nix b/pkgs/servers/mumsi/default.nix index 4465febf39a..3cc3f338f2f 100644 --- a/pkgs/servers/mumsi/default.nix +++ b/pkgs/servers/mumsi/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig, boost , log4cpp, pjsip, openssl, alsaLib, mumlib }: -with lib; stdenv.mkDerivation rec { +with lib; stdenv.mkDerivation { pname = "mumsi"; version = "unstable-2018-12-12"; diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix index 955547289bc..0f1a8e120f6 100644 --- a/pkgs/servers/news/leafnode/default.nix +++ b/pkgs/servers/news/leafnode/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pcre }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "leafnode-2.0.0.alpha20121101a.12"; src = fetchurl { diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 11695d753e2..871e335628c 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -33,13 +33,13 @@ let "-DUSE_OPTIMIZE_FOR_ARCHITECTURE=OFF" # also avoid using builder's /proc/cpuinfo ] ++ - { "westmere" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - "sandybridge" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - "ivybridge" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - "haswell" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - "broadwell" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - "skylake" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - "skylake-avx512" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + { westmere = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + sandybridge = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + ivybridge = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + haswell = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + broadwell = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + skylake = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + skylake-avx512 = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; }.${stdenv.hostPlatform.platform.gcc.arch or ""} or [ "-DHAVE_SSE42=OFF" "-DASM_OPTIMIZATIONS=OFF" ]; enableParallelBuilding = true; diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 2864449267a..4c4ac4c5cb6 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -20,7 +20,7 @@ let version = "3.4.10"; "yaml" ] ++ optionals stdenv.isLinux [ "tcmalloc" ]; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "mongodb"; inherit version; diff --git a/pkgs/servers/nosql/riak-cs/2.1.1.nix b/pkgs/servers/nosql/riak-cs/2.1.1.nix index 36b29b57bf9..4ebcbafde5d 100644 --- a/pkgs/servers/nosql/riak-cs/2.1.1.nix +++ b/pkgs/servers/nosql/riak-cs/2.1.1.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam , Carbon ? null, Cocoa ? null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "riak_cs-2.1.1"; buildInputs = [ diff --git a/pkgs/servers/nosql/riak-cs/stanchion.nix b/pkgs/servers/nosql/riak-cs/stanchion.nix index 1524ca20700..5fe4ce45f84 100644 --- a/pkgs/servers/nosql/riak-cs/stanchion.nix +++ b/pkgs/servers/nosql/riak-cs/stanchion.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam , Carbon ? null, Cocoa ? null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "stanchion-2.1.1"; buildInputs = [ diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix index 170b0d5f22f..efa43f7a844 100644 --- a/pkgs/servers/nosql/riak/2.2.0.nix +++ b/pkgs/servers/nosql/riak/2.2.0.nix @@ -25,7 +25,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "riak-2.2.0"; buildInputs = [ diff --git a/pkgs/servers/openafs/1.6/default.nix b/pkgs/servers/openafs/1.6/default.nix index 6fbabc3d003..8155a951061 100644 --- a/pkgs/servers/openafs/1.6/default.nix +++ b/pkgs/servers/openafs/1.6/default.nix @@ -6,7 +6,7 @@ with (import ./srcs.nix { inherit fetchurl; }); -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "openafs"; inherit version srcs; diff --git a/pkgs/servers/openafs/1.6/module.nix b/pkgs/servers/openafs/1.6/module.nix index 6f771e2bf33..d410a4e55e5 100644 --- a/pkgs/servers/openafs/1.6/module.nix +++ b/pkgs/servers/openafs/1.6/module.nix @@ -7,7 +7,7 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs"; kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "openafs-${version}-${kernel.modDirVersion}"; inherit version src; diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix index 23e1cfae47c..fca872a4a2b 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/servers/openafs/1.8/default.nix @@ -7,7 +7,7 @@ with (import ./srcs.nix { inherit fetchurl; }); -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "openafs"; inherit version srcs; diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 958fcd578c2..95084458f47 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -7,7 +7,7 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs"; kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "openafs-${version}-${kernel.modDirVersion}"; inherit version src; diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 2f2b1195cf3..267bd4c2600 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -9,7 +9,7 @@ , dataDir ? "/var/lib/plex" }: -buildFHSUserEnv rec { +buildFHSUserEnv { name = "plexmediaserver"; inherit (plexRaw) meta; diff --git a/pkgs/servers/ps3netsrv/default.nix b/pkgs/servers/ps3netsrv/default.nix index 86a96dde540..7e6b92a0376 100644 --- a/pkgs/servers/ps3netsrv/default.nix +++ b/pkgs/servers/ps3netsrv/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ps3netsrv"; version = "1.1.0"; diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 4000c25acea..840f63f3e05 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -49,7 +49,7 @@ let postFetch = "cd $out && git tag ${rev}"; }; - soci = fetchgit rec { + soci = fetchgit { url = "https://github.com/SOCI/soci.git"; rev = "3a1f602b3021b925d38828e3ff95f9e7f8887ff7"; sha256 = "0lnps42cidlrn43h13b9yc8cs3fwgz7wb6a1kfc9rnw7swkh757f"; @@ -84,7 +84,7 @@ let postFetch = "cd $out && git tag ${rev}"; }; - google-test = fetchgit rec { + google-test = fetchgit { url = "https://github.com/google/googletest.git"; rev = "c3bb0ee2a63279a803aaad956b9b26d74bf9e6e2"; sha256 = "0pj5b6jnrj5lrccz2disr8hklbnzd8hwmrwbfqmvhiwb9q9p0k2k"; @@ -92,7 +92,7 @@ let fetchSubmodules = false; }; - google-benchmark = fetchgit rec { + google-benchmark = fetchgit { url = "https://github.com/google/benchmark.git"; rev = "5b7683f49e1e9223cf9927b24f6fd3d6bd82e3f8"; sha256 = "0qg70j47zqnrbszlgrzmxpr4g88kq0gyq6v16bhaggfm83c6mg6i"; diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index c8fd5c059a8..00d01b01efe 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -1,7 +1,7 @@ { fetchgit, stdenv, pkgconfig, libnsl, libtirpc, autoreconfHook , useSystemd ? true, systemd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rpcbind"; version = "1.2.5"; diff --git a/pkgs/servers/scylladb/default.nix b/pkgs/servers/scylladb/default.nix index 1a168608bec..f48ace22f8f 100644 --- a/pkgs/servers/scylladb/default.nix +++ b/pkgs/servers/scylladb/default.nix @@ -30,7 +30,7 @@ libtool, thrift }: -gcc8Stdenv.mkDerivation rec { +gcc8Stdenv.mkDerivation { pname = "scylladb"; version = "3.0.5"; diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index ddb1d2299cb..b94a736a4ca 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -17,12 +17,12 @@ let shas = if enableUnfree then { - "x86_64-linux" = "1jkfllafcjqhfydsy90jx2ghpv5cmm6gabv206niwg9qc6y6r1ik"; - "x86_64-darwin" = "1lgyxq3yahdww0wpqmpc1mz57kmk5hy2drb1dha69k9l0ibmjf18"; + x86_64-linux = "1jkfllafcjqhfydsy90jx2ghpv5cmm6gabv206niwg9qc6y6r1ik"; + x86_64-darwin = "1lgyxq3yahdww0wpqmpc1mz57kmk5hy2drb1dha69k9l0ibmjf18"; } else { - "x86_64-linux" = "0pg22wi2xcjla44azfvn9c58r4xq3x9jiwh7qb0d8f3nv30vfd10"; - "x86_64-darwin" = "0d9xg3bf06mr7mw2bd16gb2xrfjncrhj19846rrj4j5gb2qjz0x2"; + x86_64-linux = "0pg22wi2xcjla44azfvn9c58r4xq3x9jiwh7qb0d8f3nv30vfd10"; + x86_64-darwin = "0d9xg3bf06mr7mw2bd16gb2xrfjncrhj19846rrj4j5gb2qjz0x2"; }; in stdenv.mkDerivation (rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation (rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}-${plat}-${arch}.tar.gz"; - sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture"); + sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); }; patches = [ ./es-home-6.x.patch ]; diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix index 1238778658a..6241380ea0c 100644 --- a/pkgs/servers/search/sphinxsearch/default.nix +++ b/pkgs/servers/search/sphinxsearch/default.nix @@ -6,7 +6,7 @@ } }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sphinxsearch"; inherit version; src = mainSrc; diff --git a/pkgs/servers/sickbeard/default.nix b/pkgs/servers/sickbeard/default.nix index 6dc044092ad..6cca58a175e 100644 --- a/pkgs/servers/sickbeard/default.nix +++ b/pkgs/servers/sickbeard/default.nix @@ -2,7 +2,7 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "sickbeard"; version = "2016-03-21"; diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index 0770191c1b9..245bd811c1a 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -4,7 +4,7 @@ let version = "11.33.3"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "monetdb"; inherit version; diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix index ac79c1b3b38..7dcaac07d87 100644 --- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix +++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pgjwt"; version = "unstable-2017-04-24"; diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix index 9e3fe74aa6c..9bc556c700d 100644 --- a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix +++ b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, postgresql }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tsearch-extras"; version = "0.4"; diff --git a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix index 7ddc3abb0b4..fd6ca990947 100644 --- a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix +++ b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { +{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation { pname = "tt-rss-plugin-ff-instagram"; version = "git-2019-01-10"; # No release, see https://github.com/wltb/ff_instagram/issues/6 diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index c996d7c0c8b..dd66259eed6 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -5,7 +5,7 @@ let version = "4.2.8"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "tvheadend"; inherit version; diff --git a/pkgs/servers/udpt/default.nix b/pkgs/servers/udpt/default.nix index 12f2a08c7f4..cddfdf9f48f 100644 --- a/pkgs/servers/udpt/default.nix +++ b/pkgs/servers/udpt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, boost, sqlite, cmake, gtest }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "udpt"; version = "2017-09-27"; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 908b7b1adc9..3ca91cfd625 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -2,7 +2,7 @@ let generic = { version, sha256, suffix ? "" }: - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "unifi-controller"; inherit version; @@ -38,7 +38,7 @@ let }; }; -in rec { +in { # https://community.ui.com/releases / https://www.ui.com/download/unifi # Outdated FAQ: https://help.ubnt.com/hc/en-us/articles/115000441548-UniFi-Current-Controller-Versions diff --git a/pkgs/servers/web-apps/frab/default.nix b/pkgs/servers/web-apps/frab/default.nix index d6a5128b813..0b0583f1fb6 100644 --- a/pkgs/servers/web-apps/frab/default.nix +++ b/pkgs/servers/web-apps/frab/default.nix @@ -11,7 +11,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "frab-2016-12-28"; src = fetchFromGitHub { diff --git a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix index e3adeb0fe66..1b61632824f 100644 --- a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix +++ b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pgpkeyserver-lite"; version = "2017-07-18"; diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/servers/webmetro/default.nix index 30ab9374cba..352c5a80e1f 100644 --- a/pkgs/servers/webmetro/default.nix +++ b/pkgs/servers/webmetro/default.nix @@ -2,7 +2,6 @@ rustPlatform.buildRustPackage rec { pname = "webmetro"; - name = "${pname}-${version}"; version = "unstable-20180426"; src = fetchFromGitHub { diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 66d4643de39..bd8bba93b4e 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1132,11 +1132,11 @@ lib.makeScope newScope (self: with self; { }) {}; libpciaccess = callPackage ({ stdenv, pkgconfig, fetchurl, zlib }: stdenv.mkDerivation { - name = "libpciaccess-0.14"; + name = "libpciaccess-0.16"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2; - sha256 = "197jbcpvp4z4x6j705mq2y4fsnnypy6f85y8xalgwhgx5bhl7x9x"; + url = mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2; + sha256 = "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 80b0addd6ec..b581b7e8a4c 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -340,7 +340,7 @@ self: super: installFlags = "sdkdir=\${out}/include/xorg"; }); - xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: rec { + xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; installFlags = "sdkdir=\${dev}/include/xorg"; }); diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index beeffc21e56..fc8f2ee46bc 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -174,7 +174,7 @@ mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2 mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2 mirror://xorg/individual/lib/libFS-1.0.8.tar.bz2 mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2 -mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2 +mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 mirror://xorg/individual/lib/libX11-1.6.7.tar.bz2 diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 7bf21cbf22f..549b55705c4 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -54,12 +54,12 @@ stdenv.mkDerivation rec { cp -r $communityModules/mod_${module} $out/lib/prosody/modules/ '') (withCommunityModules ++ withOnlyInstalledCommunityModules)} wrapProgram $out/bin/prosody \ - --prefix LUA_PATH ';' "$NIX_LUA_PATH" \ - --prefix LUA_CPATH ';' "$NIX_LUA_CPATH" + --prefix LUA_PATH ';' "$LUA_PATH" \ + --prefix LUA_CPATH ';' "$LUA_CPATH" wrapProgram $out/bin/prosodyctl \ --add-flags '--config "/etc/prosody/prosody.cfg.lua"' \ - --prefix LUA_PATH ';' "$NIX_LUA_PATH" \ - --prefix LUA_CPATH ';' "$NIX_LUA_CPATH" + --prefix LUA_PATH ';' "$LUA_PATH" \ + --prefix LUA_CPATH ';' "$LUA_CPATH" ''; passthru.communityModules = withCommunityModules; diff --git a/pkgs/shells/dgsh/default.nix b/pkgs/shells/dgsh/default.nix index 4fd88d3261b..e2fd845c286 100644 --- a/pkgs/shells/dgsh/default.nix +++ b/pkgs/shells/dgsh/default.nix @@ -3,7 +3,7 @@ perl, texinfo, help2man, gettext, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "dgsh-unstable"; version = "2017-02-05"; diff --git a/pkgs/shells/fish/fish-foreign-env/default.nix b/pkgs/shells/fish/fish-foreign-env/default.nix index b2aecdf6c14..a5f429ed373 100644 --- a/pkgs/shells/fish/fish-foreign-env/default.nix +++ b/pkgs/shells/fish/fish-foreign-env/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, gnused, bash, coreutils }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "fish-foreign-env"; version = "git-20170324"; diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix index 383387b4056..2bd37659387 100644 --- a/pkgs/shells/ion/default.nix +++ b/pkgs/shells/ion/default.nix @@ -3,7 +3,7 @@ with rustPlatform; buildRustPackage rec { - name = "ion-${version}"; + pname = "ion"; version = "1.0.5"; src = fetchFromGitHub { diff --git a/pkgs/shells/ksh/default.nix b/pkgs/shells/ksh/default.nix index 74e70feaa8d..80059e448c9 100644 --- a/pkgs/shells/ksh/default.nix +++ b/pkgs/shells/ksh/default.nix @@ -1,6 +1,6 @@ { stdenv, meson, ninja, fetchFromGitHub, which, python, libiconv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ksh"; version = "93v"; diff --git a/pkgs/shells/pash/default.nix b/pkgs/shells/pash/default.nix index 78d508840ba..8b8601e326c 100644 --- a/pkgs/shells/pash/default.nix +++ b/pkgs/shells/pash/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildDotnetPackage }: -buildDotnetPackage rec { +buildDotnetPackage { baseName = "pash"; version = "git-2016-07-06"; diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index 3ce32a5e436..b1e403e7de3 100644 --- a/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -4,7 +4,7 @@ let version = "0.4.3"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nix-zsh-completions"; inherit version; diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix index 4e089dd4d73..ad7b46a907e 100644 --- a/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation { pname = "spaceship-prompt"; version = "3.7.1"; diff --git a/pkgs/shells/zsh/zsh-command-time/default.nix b/pkgs/shells/zsh/zsh-command-time/default.nix index 3e403b62322..6228b97685a 100644 --- a/pkgs/shells/zsh/zsh-command-time/default.nix +++ b/pkgs/shells/zsh/zsh-command-time/default.nix @@ -8,7 +8,7 @@ # ZSH_COMMAND_TIME_ECHO=1 # ''; -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2018-04-30"; pname = "zsh-command-time"; diff --git a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix index 00e7612b17b..c80ff0da60a 100644 --- a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix @@ -3,7 +3,7 @@ # To make use of this derivation, use # `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel9k}/share/zsh-powerlevel9k/powerlevel9k.zsh-theme";` -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "powerlevel9k"; version = "2017-11-10"; src = fetchFromGitHub { diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix index efb62c2a0fd..383d1967531 100644 --- a/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/pkgs/shells/zsh/zsh-prezto/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "zsh-prezto-2019-03-18"; src = fetchgit { url = "https://github.com/sorin-ionescu/prezto"; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index b6a488ed2f2..86a6e33c942 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -39,7 +39,7 @@ in rec { export gl_cv_func_getcwd_abort_bug=no ''; - bootstrapTools = derivation rec { + bootstrapTools = derivation { inherit system; name = "bootstrap-tools"; @@ -142,7 +142,7 @@ in rec { }; stage0 = stageFun 0 null { - overrides = self: super: with stage0; rec { + overrides = self: super: with stage0; { darwin = super.darwin // { Libsystem = stdenv.mkDerivation { name = "bootstrap-stage0-Libsystem"; diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 1f752f02152..b0db1be5f44 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -39,25 +39,25 @@ in if crossSystem != localSystem || crossOverlays != [] then stagesCross else if config ? replaceStdenv then stagesCustom else { # switch - "i686-linux" = stagesLinux; - "x86_64-linux" = stagesLinux; - "armv5tel-linux" = stagesLinux; - "armv6l-linux" = stagesLinux; - "armv6m-linux" = stagesLinux; - "armv7a-linux" = stagesLinux; - "armv7l-linux" = stagesLinux; - "armv7r-linux" = stagesLinux; - "armv7m-linux" = stagesLinux; - "armv8a-linux" = stagesLinux; - "armv8r-linux" = stagesLinux; - "armv8m-linux" = stagesLinux; - "aarch64-linux" = stagesLinux; - "mipsel-linux" = stagesLinux; - "powerpc-linux" = /* stagesLinux */ stagesNative; - "powerpc64le-linux" = stagesLinux; - "x86_64-darwin" = stagesDarwin; - "x86_64-solaris" = stagesNix; - "i686-cygwin" = stagesNative; - "x86_64-cygwin" = stagesNative; - "x86_64-freebsd" = stagesFreeBSD; + i686-linux = stagesLinux; + x86_64-linux = stagesLinux; + armv5tel-linux = stagesLinux; + armv6l-linux = stagesLinux; + armv6m-linux = stagesLinux; + armv7a-linux = stagesLinux; + armv7l-linux = stagesLinux; + armv7r-linux = stagesLinux; + armv7m-linux = stagesLinux; + armv8a-linux = stagesLinux; + armv8r-linux = stagesLinux; + armv8m-linux = stagesLinux; + aarch64-linux = stagesLinux; + mipsel-linux = stagesLinux; + powerpc-linux = /* stagesLinux */ stagesNative; + powerpc64le-linux = stagesLinux; + x86_64-darwin = stagesDarwin; + x86_64-solaris = stagesNix; + i686-cygwin = stagesNative; + x86_64-cygwin = stagesNative; + x86_64-freebsd = stagesFreeBSD; }.${localSystem.system} or stagesNative diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 1a96d9b3acf..b754230b0be 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -153,7 +153,7 @@ let '' + (builtins.getAttr reason remediation) attrs; - handler = if config ? "handleEvalIssue" + handler = if config ? handleEvalIssue then config.handleEvalIssue reason else throw; in handler msg; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 1ef2ab52029..2f43db9cfc2 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -108,7 +108,7 @@ let __impureHostDeps = __stdenvImpureHostDeps; }) - // rec { + // { meta = { description = "The default build environment for Unix packages in Nixpkgs"; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index ebcedce60b8..311292169ec 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -212,6 +212,18 @@ isELF() { if [ "$magic" = $'\177ELF' ]; then return 0; else return 1; fi } +# Return success if the specified file is an ELF object +# and its e_type is ET_EXEC (executable file) +isELFExec() { + grep -ao -P '^\177ELF.{11}\x00\x02' "$1" >/dev/null +} + +# Return success if the specified file is an ELF object +# and its e_type is ET_DYN (shared object file) +isELFDyn() { + grep -ao -P '^\177ELF.{11}\x00\x03' "$1" >/dev/null +} + # Return success if the specified file is a script (i.e. starts with # "#!"). isScript() { diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 390c7f1123e..8344c9dfb2b 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -8,21 +8,21 @@ , bootstrapFiles ? let table = { - "glibc" = { - "i686-linux" = import ./bootstrap-files/i686.nix; - "x86_64-linux" = import ./bootstrap-files/x86_64.nix; - "armv5tel-linux" = import ./bootstrap-files/armv5tel.nix; - "armv6l-linux" = import ./bootstrap-files/armv6l.nix; - "armv7l-linux" = import ./bootstrap-files/armv7l.nix; - "aarch64-linux" = import ./bootstrap-files/aarch64.nix; - "mipsel-linux" = import ./bootstrap-files/loongson2f.nix; - "powerpc64le-linux" = import ./bootstrap-files/ppc64le.nix; + glibc = { + i686-linux = import ./bootstrap-files/i686.nix; + x86_64-linux = import ./bootstrap-files/x86_64.nix; + armv5tel-linux = import ./bootstrap-files/armv5tel.nix; + armv6l-linux = import ./bootstrap-files/armv6l.nix; + armv7l-linux = import ./bootstrap-files/armv7l.nix; + aarch64-linux = import ./bootstrap-files/aarch64.nix; + mipsel-linux = import ./bootstrap-files/loongson2f.nix; + powerpc64le-linux = import ./bootstrap-files/ppc64le.nix; }; - "musl" = { - "aarch64-linux" = import ./bootstrap-files/aarch64-musl.nix; - "armv6l-linux" = import ./bootstrap-files/armv6l-musl.nix; - "x86_64-linux" = import ./bootstrap-files/x86_64-musl.nix; - "powerpc64le-linux" = import ./bootstrap-files/ppc64le-musl.nix; + musl = { + aarch64-linux = import ./bootstrap-files/aarch64-musl.nix; + armv6l-linux = import ./bootstrap-files/armv6l-musl.nix; + x86_64-linux = import ./bootstrap-files/x86_64-musl.nix; + powerpc64le-linux = import ./bootstrap-files/ppc64le-musl.nix; }; }; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index ba53a6f1d14..f6e0df161ad 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -121,8 +121,8 @@ in cc = let nativePrefix = { # switch - "i686-solaris" = "/usr/gnu"; - "x86_64-solaris" = "/opt/local/gcc47"; + i686-solaris = "/usr/gnu"; + x86_64-solaris = "/opt/local/gcc47"; }.${system} or "/usr"; in import ../../build-support/cc-wrapper { diff --git a/pkgs/test/macos-sierra-shared/default.nix b/pkgs/test/macos-sierra-shared/default.nix index 73b359ffe6a..810d5d97829 100644 --- a/pkgs/test/macos-sierra-shared/default.nix +++ b/pkgs/test/macos-sierra-shared/default.nix @@ -25,7 +25,7 @@ let meta.platforms = lib.platforms.darwin; }) count; - finalExe = stdenv.mkDerivation rec { + finalExe = stdenv.mkDerivation { name = "${prefix}-final-asdf"; unpackPhase = '' src=$PWD diff --git a/pkgs/tools/X11/grobi/default.nix b/pkgs/tools/X11/grobi/default.nix index f917bda6f71..976cabc33f8 100644 --- a/pkgs/tools/X11/grobi/default.nix +++ b/pkgs/tools/X11/grobi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildGoPackage }: -buildGoPackage rec { +buildGoPackage { version = "0.5.1"; pname = "grobi"; diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix index 7863542d190..5eb74a26798 100644 --- a/pkgs/tools/X11/keynav/default.nix +++ b/pkgs/tools/X11/keynav/default.nix @@ -2,7 +2,7 @@ , libXinerama, libXrandr, glib, cairo, xdotool }: let release = "20180821"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "keynav-0.${release}.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/X11/ksuperkey/default.nix b/pkgs/tools/X11/ksuperkey/default.nix index f7d8914722a..1472e39c83c 100644 --- a/pkgs/tools/X11/ksuperkey/default.nix +++ b/pkgs/tools/X11/ksuperkey/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, libX11, libXtst, pkgconfig, xorgproto, libXi }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ksuperkey-git-2015-07-21"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/X11/oblogout/default.nix b/pkgs/tools/X11/oblogout/default.nix index ad2ee549a6d..9acd113d0ab 100644 --- a/pkgs/tools/X11/oblogout/default.nix +++ b/pkgs/tools/X11/oblogout/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, intltool, file, pythonPackages, cairo }: -pythonPackages.buildPythonApplication rec { +pythonPackages.buildPythonApplication { pname = "oblogout-unstable"; version = "2009-11-18"; diff --git a/pkgs/tools/X11/run-scaled/default.nix b/pkgs/tools/X11/run-scaled/default.nix index ae4dc08770d..fc0068e6e27 100644 --- a/pkgs/tools/X11/run-scaled/default.nix +++ b/pkgs/tools/X11/run-scaled/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, bc, xorgserver, xpra, xrandr }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "git-2018-06-03"; pname = "run-scaled"; diff --git a/pkgs/tools/X11/runningx/default.nix b/pkgs/tools/X11/runningx/default.nix index 479617b6b93..31e2320e1b9 100644 --- a/pkgs/tools/X11/runningx/default.nix +++ b/pkgs/tools/X11/runningx/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libX11 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "runningx"; version = "1.0"; diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix index cb01d0a4d4a..6075f0070f9 100644 --- a/pkgs/tools/X11/x2vnc/default.nix +++ b/pkgs/tools/X11/x2vnc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "x2vnc-1.7.2"; src = fetchurl { diff --git a/pkgs/tools/X11/xcwd/default.nix b/pkgs/tools/X11/xcwd/default.nix index c36334d478d..48cab6529cc 100644 --- a/pkgs/tools/X11/xcwd/default.nix +++ b/pkgs/tools/X11/xcwd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, libX11 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2016-09-30"; pname = "xcwd"; diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index edafbf5525b..b1770af2406 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -2,7 +2,7 @@ , xlibsWrapper, xorg, libpulseaudio, pkgconfig, patchelf, Security }: rustPlatform.buildRustPackage rec { - name = "xidlehook-${version}"; + pname = "xidlehook"; version = "0.7.0"; doCheck = false; diff --git a/pkgs/tools/X11/xmagnify/default.nix b/pkgs/tools/X11/xmagnify/default.nix index 463df6ad935..dfd28e31771 100644 --- a/pkgs/tools/X11/xmagnify/default.nix +++ b/pkgs/tools/X11/xmagnify/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, libX11, xorgproto }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "xmagnify-0.1.0"; src = fetchFromGitLab { diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/tools/X11/xrestop/default.nix index 70b471c795e..6f75d2360cf 100644 --- a/pkgs/tools/X11/xrestop/default.nix +++ b/pkgs/tools/X11/xrestop/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, xorg, pkgconfig, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xrestop"; version = "0.4"; diff --git a/pkgs/tools/X11/xtrace/default.nix b/pkgs/tools/X11/xtrace/default.nix index 8db15a8f033..aae31d649f4 100644 --- a/pkgs/tools/X11/xtrace/default.nix +++ b/pkgs/tools/X11/xtrace/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "xtrace"; version = "1.4.0"; - src = fetchFromGitLab rec { + src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = pname; diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix index 5f789a0151f..3c1dc3de2b4 100644 --- a/pkgs/tools/X11/xvkbd/default.nix +++ b/pkgs/tools/X11/xvkbd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, imake, libXt, libXaw, libXtst , libXi, libXpm, xorgproto, gccmakedep, Xaw3d }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xvkbd"; version = "3.9"; src = fetchurl { diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix index 61f284cf85f..8195207ef60 100644 --- a/pkgs/tools/admin/cli53/default.nix +++ b/pkgs/tools/admin/cli53/default.nix @@ -1,7 +1,7 @@ # This file was generated by https://github.com/kamilchm/go2nix v2.0-dev { lib, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "cli53"; version = "0.8.12"; diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix index 1225441392c..f0945d7d778 100644 --- a/pkgs/tools/admin/intecture/agent.nix +++ b/pkgs/tools/admin/intecture/agent.nix @@ -4,7 +4,7 @@ with rustPlatform; buildRustPackage rec { - name = "intecture-agent-${version}"; + pname = "intecture-agent"; version = "0.3.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix index 577d439c805..a3208bddabe 100644 --- a/pkgs/tools/admin/intecture/auth.nix +++ b/pkgs/tools/admin/intecture/auth.nix @@ -4,7 +4,7 @@ with rustPlatform; buildRustPackage rec { - name = "intecture-auth-${version}"; + pname = "intecture-auth"; version = "0.1.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix index b0bb63984f0..90d65a3f295 100644 --- a/pkgs/tools/admin/intecture/cli.nix +++ b/pkgs/tools/admin/intecture/cli.nix @@ -4,7 +4,7 @@ with rustPlatform; buildRustPackage rec { - name = "intecture-cli-${version}"; + pname = "intecture-cli"; version = "0.3.4"; src = fetchFromGitHub { diff --git a/pkgs/tools/admin/oxidized/default.nix b/pkgs/tools/admin/oxidized/default.nix index e49d3957659..a11906e80f0 100644 --- a/pkgs/tools/admin/oxidized/default.nix +++ b/pkgs/tools/admin/oxidized/default.nix @@ -1,6 +1,6 @@ { lib, ruby, bundlerApp, bundlerUpdateScript }: -bundlerApp rec { +bundlerApp { pname = "oxidized"; gemdir = ./.; diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index 2df63ea1e15..de09931e7c1 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -8,17 +8,17 @@ let # switch the dropdown to “manual” on https://pulumi.io/quickstart/install.html # TODO: update script pulumiArchPackage = { - "x86_64-linux" = { + x86_64-linux = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz"; sha256 = "13ajgc8x5l3s93hmz6jg88if10bvd319jmkljy4n26zdp30vfqmw"; }; - "x86_64-darwin" = { + x86_64-darwin = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz"; sha256 = "0chpbnz2s4icwgmfq6kl8blz5mg4lpdqg061w3nh0p04adpgrn48"; }; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit version; pname = "pulumi"; diff --git a/pkgs/tools/admin/vncdo/default.nix b/pkgs/tools/admin/vncdo/default.nix index 538464499fa..a126a430e52 100644 --- a/pkgs/tools/admin/vncdo/default.nix +++ b/pkgs/tools/admin/vncdo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub , pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonPackage { pname = "vncdo"; version = "0.11.2"; diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix index e305a1739f7..64a606a4cb5 100644 --- a/pkgs/tools/archivers/atool/default.nix +++ b/pkgs/tools/archivers/atool/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, perl, bash}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "atool-0.39.0"; src = fetchurl { url = mirror://savannah/atool/atool-0.39.0.tar.gz; diff --git a/pkgs/tools/archivers/pxattr/default.nix b/pkgs/tools/archivers/pxattr/default.nix index 7f813dd76c8..b507b60287c 100644 --- a/pkgs/tools/archivers/pxattr/default.nix +++ b/pkgs/tools/archivers/pxattr/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gcc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "pxattr-2.1.0"; src = fetchurl { diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/tools/archivers/rpmextract/default.nix index 3c515b8c195..59ff67e3eef 100644 --- a/pkgs/tools/archivers/rpmextract/default.nix +++ b/pkgs/tools/archivers/rpmextract/default.nix @@ -1,6 +1,6 @@ { stdenv, rpm, cpio, substituteAll }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "rpmextract"; buildCommand = '' diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/tools/archivers/unp/default.nix index e1cac4fc61f..82e83a8c6a3 100644 --- a/pkgs/tools/archivers/unp/default.nix +++ b/pkgs/tools/archivers/unp/default.nix @@ -7,7 +7,7 @@ let runtime_bins = [ file unzip gzip ] ++ extraBackends; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "unp"; version = "2.0-pre7"; buildInputs = [ perl makeWrapper ]; diff --git a/pkgs/tools/audio/beets/copyartifacts-plugin.nix b/pkgs/tools/audio/beets/copyartifacts-plugin.nix index 3c9cc5639a8..fac37962f3c 100644 --- a/pkgs/tools/audio/beets/copyartifacts-plugin.nix +++ b/pkgs/tools/audio/beets/copyartifacts-plugin.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, beets, pythonPackages, glibcLocales }: -pythonPackages.buildPythonApplication rec { +pythonPackages.buildPythonApplication { name = "beets-copyartifacts"; src = fetchFromGitHub { diff --git a/pkgs/tools/audio/mididings/default.nix b/pkgs/tools/audio/mididings/default.nix index fb3d0e51341..35d1af1e767 100644 --- a/pkgs/tools/audio/mididings/default.nix +++ b/pkgs/tools/audio/mididings/default.nix @@ -1,6 +1,6 @@ { stdenv, pythonPackages, fetchFromGitHub, pkg-config, glib, alsaLib, libjack2 }: -pythonPackages.buildPythonApplication rec { +pythonPackages.buildPythonApplication { version = "20151117"; pname = "mididings"; diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix index 3b59d5aceb0..a791a81db35 100644 --- a/pkgs/tools/audio/mpdcron/default.nix +++ b/pkgs/tools/audio/mpdcron/default.nix @@ -6,7 +6,7 @@ let name = "mpdcron-bundle"; gemdir = ./.; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { version = "20161228"; pname = "mpdcron"; diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix index 239e4b3fcca..69e5976e6d5 100644 --- a/pkgs/tools/audio/pa-applet/default.nix +++ b/pkgs/tools/audio/pa-applet/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, libpulseaudio, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "pa-applet-2012-04-11"; src = fetchgit { diff --git a/pkgs/tools/audio/trx/default.nix b/pkgs/tools/audio/trx/default.nix index d72cb856437..5d31193ee8d 100644 --- a/pkgs/tools/audio/trx/default.nix +++ b/pkgs/tools/audio/trx/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, alsaLib, libopus, ortp, bctoolbox }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "trx-unstable"; version = "2018-01-23"; diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/tools/audio/volumeicon/default.nix index 36afd11aa2c..3871bbd39a1 100644 --- a/pkgs/tools/audio/volumeicon/default.nix +++ b/pkgs/tools/audio/volumeicon/default.nix @@ -1,6 +1,6 @@ { pkgs, fetchurl, stdenv, gtk3, pkgconfig, intltool, alsaLib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "volumeicon"; version = "0.5.1"; diff --git a/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix b/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix index 472b4a6508f..3d219eed012 100644 --- a/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix +++ b/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2Packages }: python2Packages.buildPythonApplication rec { - name = "amazon-glacier-cmd-interface-${version}"; + pname = "amazon-glacier-cmd-interface"; version = "2016-09-01"; src = fetchFromGitHub { diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 8f4cd60e1ee..3097756ddf8 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -9,7 +9,7 @@ let version = "0.29.2"; in with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bup"; inherit version; diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index b090da85263..1cf7a19014e 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -5,11 +5,11 @@ , rsync, makeWrapper }: python2Packages.buildPythonApplication rec { - name = "duplicity-${version}"; + pname = "duplicity"; version = "0.7.19"; src = fetchurl { - url = "https://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${name}.tar.gz"; + url = "https://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "0ag9dknslxlasslwfjhqgcqbkb1mvzzx93ry7lch2lfzcdd91am6"; }; patches = [ diff --git a/pkgs/tools/backup/easysnap/default.nix b/pkgs/tools/backup/easysnap/default.nix index 412c9696d02..a56d1274f92 100644 --- a/pkgs/tools/backup/easysnap/default.nix +++ b/pkgs/tools/backup/easysnap/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, zfs }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "easysnap"; version = "unstable-2019-02-17"; diff --git a/pkgs/tools/backup/flockit/default.nix b/pkgs/tools/backup/flockit/default.nix index 739f14ca1a6..8d71671f6fe 100644 --- a/pkgs/tools/backup/flockit/default.nix +++ b/pkgs/tools/backup/flockit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, runtimeShell }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "flockit"; version = "2012-08-11"; diff --git a/pkgs/tools/backup/lvmsync/default.nix b/pkgs/tools/backup/lvmsync/default.nix index 0ed70ade829..814c02267ba 100644 --- a/pkgs/tools/backup/lvmsync/default.nix +++ b/pkgs/tools/backup/lvmsync/default.nix @@ -3,7 +3,7 @@ let pname = "lvmsync"; - version = (import ./gemset.nix)."${pname}".version; + version = (import ./gemset.nix).${pname}.version; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/backup/ori/default.nix b/pkgs/tools/backup/ori/default.nix index e07eb33abb5..30ee0041c7c 100644 --- a/pkgs/tools/backup/ori/default.nix +++ b/pkgs/tools/backup/ori/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, boost, pkgconfig, scons, utillinux, fuse, libevent, openssl, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.8.1"; pname = "ori"; diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix index e0ac2c3f232..bd5c10ea122 100644 --- a/pkgs/tools/backup/rdedup/default.nix +++ b/pkgs/tools/backup/rdedup/default.nix @@ -3,7 +3,7 @@ , Security }: rustPlatform.buildRustPackage rec { - name = "rdedup-${version}"; + pname = "rdedup"; version = "3.1.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/backup/rdup/default.nix b/pkgs/tools/backup/rdup/default.nix index 56f9c4f9daf..0df4ecda89e 100644 --- a/pkgs/tools/backup/rdup/default.nix +++ b/pkgs/tools/backup/rdup/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, pcre }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rdup"; version = "1.1.15"; diff --git a/pkgs/tools/backup/rsbep/default.nix b/pkgs/tools/backup/rsbep/default.nix index 4c13c831ba9..90a8c665cd4 100644 --- a/pkgs/tools/backup/rsbep/default.nix +++ b/pkgs/tools/backup/rsbep/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, coreutils, gnused, gawk, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rsbep"; version = "0.1.0"; diff --git a/pkgs/tools/backup/zbackup/default.nix b/pkgs/tools/backup/zbackup/default.nix index 928ba9842b2..d7a160328ed 100644 --- a/pkgs/tools/backup/zbackup/default.nix +++ b/pkgs/tools/backup/zbackup/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, zlib, openssl, protobuf, protobufc, lzo, libunwind } : -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "zbackup"; version = "1.4.4"; src = fetchurl { diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix index 973e9217644..b44564efb82 100644 --- a/pkgs/tools/backup/znapzend/default.nix +++ b/pkgs/tools/backup/znapzend/default.nix @@ -23,7 +23,7 @@ let version = "0.18.0"; checksum = "1nlvw56viwgafma506slywfg54z6009jmzc9q6wljgr6mqfmmchd"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "znapzend"; inherit version; diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index 4ddc7554294..cf0ad78d1d7 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -2,9 +2,9 @@ let archids = { - "x86_64-linux" = { hostarch = "x86_64"; efiPlatform = "x64"; }; - "i686-linux" = rec { hostarch = "ia32"; efiPlatform = hostarch; }; - "aarch64-linux" = rec { hostarch = "aarch64"; efiPlatform = "aa64"; }; + x86_64-linux = { hostarch = "x86_64"; efiPlatform = "x64"; }; + i686-linux = rec { hostarch = "ia32"; efiPlatform = hostarch; }; + aarch64-linux = { hostarch = "aarch64"; efiPlatform = "aa64"; }; }; inherit diff --git a/pkgs/tools/cd-dvd/cdimgtools/default.nix b/pkgs/tools/cd-dvd/cdimgtools/default.nix index d617a9a6c54..ece45944c5c 100644 --- a/pkgs/tools/cd-dvd/cdimgtools/default.nix +++ b/pkgs/tools/cd-dvd/cdimgtools/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromRepoOrCz, autoreconfHook, makeWrapper, libdvdcss, libdvdread, perl, perlPackages, asciidoc, xmlto, sourceHighlight, docbook_xsl, docbook_xml_dtd_45 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cdimgtools"; version = "0.3"; diff --git a/pkgs/tools/cd-dvd/cue2pops/default.nix b/pkgs/tools/cd-dvd/cue2pops/default.nix index 970b32eb08f..2ee69682a1d 100644 --- a/pkgs/tools/cd-dvd/cue2pops/default.nix +++ b/pkgs/tools/cd-dvd/cue2pops/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cue2pops"; version = "git-2018-01-04"; diff --git a/pkgs/tools/compression/lzfse/default.nix b/pkgs/tools/compression/lzfse/default.nix index ef185f706dc..0c54c3b452b 100644 --- a/pkgs/tools/compression/lzfse/default.nix +++ b/pkgs/tools/compression/lzfse/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lzfse"; version = "2017-03-08"; diff --git a/pkgs/tools/compression/lzham/default.nix b/pkgs/tools/compression/lzham/default.nix index cdc155474a7..0aa30ceb663 100644 --- a/pkgs/tools/compression/lzham/default.nix +++ b/pkgs/tools/compression/lzham/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake } : -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "lzham-1.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix index 2e34c9dd485..b9c5c55a8e4 100644 --- a/pkgs/tools/filesystems/9pfs/default.nix +++ b/pkgs/tools/filesystems/9pfs/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fuse }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "9pfs-20150918"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/afpfs-ng/default.nix b/pkgs/tools/filesystems/afpfs-ng/default.nix index 137b00802df..7f8a8c4f931 100644 --- a/pkgs/tools/filesystems/afpfs-ng/default.nix +++ b/pkgs/tools/filesystems/afpfs-ng/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fuse, readline, libgcrypt, gmp }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "afpfs-ng"; version = "0.8.2"; diff --git a/pkgs/tools/filesystems/apfs-fuse/default.nix b/pkgs/tools/filesystems/apfs-fuse/default.nix index 9ee0b813326..2c7b1c27156 100644 --- a/pkgs/tools/filesystems/apfs-fuse/default.nix +++ b/pkgs/tools/filesystems/apfs-fuse/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fuse3, bzip2, zlib, attr, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "apfs-fuse-unstable"; version = "2019-07-23"; diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix index b95a9ad68a8..b66d67fbc9f 100644 --- a/pkgs/tools/filesystems/avfs/default.nix +++ b/pkgs/tools/filesystems/avfs/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-library" "--enable-fuse" - "--disable-static" ]; meta = { diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 95923f202cf..98dab6278b0 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils , liburcu, zlib, libaio, zstd, lz4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bcachefs-tools"; version = "2019-08-21"; diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix index 842ef6712ac..94573bcd201 100644 --- a/pkgs/tools/filesystems/bees/default.nix +++ b/pkgs/tools/filesystems/bees/default.nix @@ -5,7 +5,7 @@ let version = "0.6.1"; sha256 = "0h7idclmhyp14mq6786x7f2237vqpn70gyi88ik4g70xl84yfgyh"; - bees = stdenv.mkDerivation rec { + bees = stdenv.mkDerivation { pname = "bees"; inherit version; diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix index a0983004fcc..3ddc9527397 100644 --- a/pkgs/tools/filesystems/boxfs/default.nix +++ b/pkgs/tools/filesystems/boxfs/default.nix @@ -21,7 +21,7 @@ let owner = "vincenthz"; }; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "boxfs"; version = "2-20150109"; diff --git a/pkgs/tools/filesystems/btrfs-dedupe/default.nix b/pkgs/tools/filesystems/btrfs-dedupe/default.nix index ebab6c5b16b..e2538387d45 100644 --- a/pkgs/tools/filesystems/btrfs-dedupe/default.nix +++ b/pkgs/tools/filesystems/btrfs-dedupe/default.nix @@ -3,7 +3,7 @@ with rustPlatform; buildRustPackage rec { - name = "btrfs-dedupe-${version}"; + pname = "btrfs-dedupe"; version = "1.1.0"; diff --git a/pkgs/tools/filesystems/dislocker/default.nix b/pkgs/tools/filesystems/dislocker/default.nix index e6c4474765c..81faed5bfa8 100644 --- a/pkgs/tools/filesystems/dislocker/default.nix +++ b/pkgs/tools/filesystems/dislocker/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; let version = "0.7.1"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "dislocker"; inherit version; diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix index a61c3c80e6d..3981521097a 100644 --- a/pkgs/tools/filesystems/duff/default.nix +++ b/pkgs/tools/filesystems/duff/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, gettext }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "duff"; # The last release (0.5.2) is more than 2 years old and lacks features like -D, # limiting its usefulness. Upstream appears comatose if not dead. diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index d8ddde24ade..ee3cce37bc7 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -26,6 +26,14 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + # Remove six failing tests + # https://github.com/NixOS/nixpkgs/issues/65471 + for test in m_image_mmp m_mmp m_mmp_bad_csum m_mmp_bad_magic t_mmp_1on t_mmp_2off; do + rm -r "tests/$test" + done + ''; + configureFlags = if stdenv.isLinux then [ "--enable-elf-shlibs" diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix index 274126e1a71..b84992e1acb 100644 --- a/pkgs/tools/filesystems/extundelete/default.nix +++ b/pkgs/tools/filesystems/extundelete/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, e2fsprogs }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.2.4"; pname = "extundelete"; diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix index 8a417cfe397..41c4cc84f96 100644 --- a/pkgs/tools/filesystems/fuseiso/default.nix +++ b/pkgs/tools/filesystems/fuseiso/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, fuse, zlib, glib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "fuseiso-20070708"; src = fetchurl { diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix index ec734e52f73..614e323e6b2 100644 --- a/pkgs/tools/filesystems/gitfs/default.nix +++ b/pkgs/tools/filesystems/gitfs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2Packages }: python2Packages.buildPythonApplication rec { - name = "gitfs-${version}"; + pname = "gitfs"; version = "0.4.5.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 606e41e582e..07ba47dda4d 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -62,7 +62,7 @@ let ]; in stdenv.mkDerivation -rec { +{ inherit (s) name version; inherit buildInputs propagatedBuildInputs; diff --git a/pkgs/tools/filesystems/hfsprogs/default.nix b/pkgs/tools/filesystems/hfsprogs/default.nix index 25ec31ea698..2032ca1c1e7 100644 --- a/pkgs/tools/filesystems/hfsprogs/default.nix +++ b/pkgs/tools/filesystems/hfsprogs/default.nix @@ -2,7 +2,7 @@ let version = "332.25"; package_name = "hfsprogs"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${package_name}-${version}"; srcs = [ (fetchurl { diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix index c4910b166de..049a6165874 100644 --- a/pkgs/tools/filesystems/mtdutils/default.nix +++ b/pkgs/tools/filesystems/mtdutils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libuuid, lzo, zlib, acl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mtd-utils"; version = "1.5.2"; diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index ea321200fb9..dd8116ff401 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -8,7 +8,7 @@ let name = "${baseName}-${version}"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { src = fetchurl { url = sourceInfo.url; sha256 = sourceInfo.sha256; diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix index 408d02bced7..2abab905737 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.53"; md5_path = "f6d33a8362dee358517d0a9e2ebdd044"; - src = fetchurl rec { + src = fetchurl { url = "https://src.fedoraproject.org/repo/pkgs/python-pyblock/" + "${pname}-${version}.tar.bz2/${md5_path}/${pname}-${version}.tar.bz2"; sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815"; diff --git a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix index ffe31b464b8..8a1fce78037 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix @@ -5,7 +5,7 @@ buildPythonApplication rec { version = "1.99.39"; md5_path = "d249f60aa89b1b4facd63f776925116d"; - src = fetchurl rec { + src = fetchurl { url = "https://src.fedoraproject.org/repo/pkgs/pykickstart/" + "${pname}-${version}.tar.gz/${md5_path}/${pname}-${version}.tar.gz"; sha256 = "e0d0f98ac4c5607e6a48d5c1fba2d50cc804de1081043f9da68cbfc69cad957a"; diff --git a/pkgs/tools/filesystems/relfs/default.nix b/pkgs/tools/filesystems/relfs/default.nix index 04a15dfa22b..c99a95714c0 100644 --- a/pkgs/tools/filesystems/relfs/default.nix +++ b/pkgs/tools/filesystems/relfs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchcvs, ocaml, fuse, postgresql, pcre , libuuid, gnome_vfs, pkgconfig, GConf }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "relfs-2008.03.05"; src = fetchcvs { diff --git a/pkgs/tools/filesystems/rmount/default.nix b/pkgs/tools/filesystems/rmount/default.nix index cdc90097653..46be9e30f70 100644 --- a/pkgs/tools/filesystems/rmount/default.nix +++ b/pkgs/tools/filesystems/rmount/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "rmount"; version = "1.0.1"; - src = fetchFromGitHub rec { + src = fetchFromGitHub { rev = "v${version}"; owner = "Luis-Hebendanz"; repo = "rmount"; diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 9a0073f939f..5bd3b27eded 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -6,7 +6,7 @@ assert lz4Support -> (lz4 != null); -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "squashfs"; version = "4.4dev_20180612"; diff --git a/pkgs/tools/filesystems/vmfs-tools/default.nix b/pkgs/tools/filesystems/vmfs-tools/default.nix index 6cc049a4409..c15a782fa3c 100644 --- a/pkgs/tools/filesystems/vmfs-tools/default.nix +++ b/pkgs/tools/filesystems/vmfs-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig , asciidoc, docbook_xsl, fuse, libuuid, libxslt }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "vmfs-tools"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/tools/filesystems/wdfs/default.nix index 135373e09f4..50a50ad18f0 100644 --- a/pkgs/tools/filesystems/wdfs/default.nix +++ b/pkgs/tools/filesystems/wdfs/default.nix @@ -1,7 +1,6 @@ {stdenv, fetchurl, glib, neon, fuse, pkgconfig}: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation { name = "wdfs-fuse-1.4.2"; src = fetchurl { url = "http://noedler.de/projekte/wdfs/wdfs-1.4.2.tar.gz"; diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index 557367ea22c..ea25b302e35 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -1,7 +1,7 @@ { stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python , lib, valgrind, makeWrapper, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { src = fetchFromGitHub { # using unstable release because stable (v1.5.1) has broken repl java plugin rev = "7ddcb081aa125b0cfb008dc98addd260b8353ab3"; diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/pkgs/tools/filesystems/zkfuse/default.nix index 0269df84634..89516d525af 100644 --- a/pkgs/tools/filesystems/zkfuse/default.nix +++ b/pkgs/tools/filesystems/zkfuse/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, zookeeper, zookeeper_mt, fuse, autoreconfHook, log4cxx, boost }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "zkfuse"; inherit (zookeeper) version src; diff --git a/pkgs/tools/graphics/cfdg/src-for-default.nix b/pkgs/tools/graphics/cfdg/src-for-default.nix index 179f0432dd1..6d98ea240de 100644 --- a/pkgs/tools/graphics/cfdg/src-for-default.nix +++ b/pkgs/tools/graphics/cfdg/src-for-default.nix @@ -1,4 +1,4 @@ -rec { +{ version="3.0.2"; name="cfdg-3.0.2"; hash="1pd1hjippbhad8l4s4lsglykh22i24qfrgmnxrsx71bvcqbr356p"; diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 04b73995580..3d48b328934 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, imagemagick }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cuneiform"; version = "1.1.0"; diff --git a/pkgs/tools/graphics/eplot/default.nix b/pkgs/tools/graphics/eplot/default.nix index ad8d9ebc6a2..ff2091fc299 100644 --- a/pkgs/tools/graphics/eplot/default.nix +++ b/pkgs/tools/graphics/eplot/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gnuplot, ruby }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "eplot-2.07"; # Upstream has been contacted (2015-03) regarding providing versioned diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index 7719406cb6b..5875f64f7ef 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -1,7 +1,7 @@ { stdenv, rustPlatform, fetchFromGitHub, pkgconfig }: rustPlatform.buildRustPackage rec { - name = "gifski-${version}"; + pname = "gifski"; version = "0.8.7"; src = fetchFromGitHub { diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index 111a9b59afd..5668e755d01 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGL, libdrm, python27, wayland, udev, mesa, wafHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "glmark2"; version = "2017-09-01"; diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 848d804bb38..c487e42329d 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -12,7 +12,7 @@ let url = "https://github.com/dtschump/gmic/raw/v.${version}/CMakeLists.txt"; sha256 = "0lv5jrg98cpbk13fl4xm7l4sk1axfz054q570bpi741w815d7cpg"; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "gmic"; inherit version; diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index 6cdd6dd71c1..cd2302efd16 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -24,7 +24,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "graphviz"; inherit version; diff --git a/pkgs/tools/graphics/lepton/default.nix b/pkgs/tools/graphics/lepton/default.nix index b0836d67086..0b6c1263942 100644 --- a/pkgs/tools/graphics/lepton/default.nix +++ b/pkgs/tools/graphics/lepton/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, git, glibc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "1.2.1"; pname = "lepton"; diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index b65cbfca7bb..4826bd64984 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -13,7 +13,7 @@ let boost_static = boost165.override { enablePython = true; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "luxcorerender"; version = "2.0"; diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 534cefe9bf6..9de7603c973 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -2,7 +2,7 @@ , makeWrapper, libtiff , enableX11 ? false, libX11 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced name = "netpbm-10.82.01"; diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index ebebe508752..0e545fbfab9 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qmake, qtbase, qttools, substituteAll, libGLU, wrapQtAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nifskope"; version = "2.0.dev7"; diff --git a/pkgs/tools/graphics/optar/default.nix b/pkgs/tools/graphics/optar/default.nix index c1138e5f458..b831e359e9c 100644 --- a/pkgs/tools/graphics/optar/default.nix +++ b/pkgs/tools/graphics/optar/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, imagemagick, libpng }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "optar"; version = "20150210"; diff --git a/pkgs/tools/graphics/pngtoico/default.nix b/pkgs/tools/graphics/pngtoico/default.nix index e4163cd93a8..ed8fa5ee519 100644 --- a/pkgs/tools/graphics/pngtoico/default.nix +++ b/pkgs/tools/graphics/pngtoico/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libpng }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "pngtoico-1.0"; src = fetchurl { diff --git a/pkgs/tools/graphics/qrcode/default.nix b/pkgs/tools/graphics/qrcode/default.nix index eec8c5158b4..909f0e39726 100644 --- a/pkgs/tools/graphics/qrcode/default.nix +++ b/pkgs/tools/graphics/qrcode/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qrcode-git"; version = "20160804"; diff --git a/pkgs/tools/graphics/rocket/default.nix b/pkgs/tools/graphics/rocket/default.nix index 8628b72bbae..97c400fbc9e 100644 --- a/pkgs/tools/graphics/rocket/default.nix +++ b/pkgs/tools/graphics/rocket/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qmake, qtbase }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rocket"; version = "2018-06-09"; diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/tools/graphics/structure-synth/default.nix index a3497aefe10..2c586cd3b1f 100644 --- a/pkgs/tools/graphics/structure-synth/default.nix +++ b/pkgs/tools/graphics/structure-synth/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, qt4, qmake4Hook, unzip, libGLU, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "structure-synth"; version = "v1.5"; diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix index 6e455caf906..50aeae78fce 100644 --- a/pkgs/tools/graphics/svgcleaner/default.nix +++ b/pkgs/tools/graphics/svgcleaner/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "svgcleaner-${version}"; + pname = "svgcleaner"; version = "0.9.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/graphics/transfig/default.nix b/pkgs/tools/graphics/transfig/default.nix index ceee3b7674d..db204113226 100644 --- a/pkgs/tools/graphics/transfig/default.nix +++ b/pkgs/tools/graphics/transfig/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, zlib, libjpeg, libpng, imake, gccmakedep }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "transfig-3.2.4"; src = fetchurl { url = ftp://ftp.tex.ac.uk/pub/archive/graphics/transfig/transfig.3.2.4.tar.gz; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix index cf0a0f1fa17..187587fbfb4 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, fcitx, libskk, skk-dicts }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "fcitx-skk"; version = "0.1.4"; src = fetchFromGitHub { diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix index c3ee5eafd7b..b77394f218b 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix @@ -13,7 +13,7 @@ let rev = "7d5297759aef4cd086bdfa30cf6d4b2ad9446992"; sha256 = "0mx9jvxpiva9v2ffaqlyny48iqr073h84yw8ln43z2avv11ipr7n"; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "ibus-table-chinese"; version = "1.8.2"; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index d36697221a4..a6c2404ef34 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -60,7 +60,7 @@ let sha256 = "a1a3ca4381eb91f7b65afe7cb7df615cdcf67993fef4b486585f66b349993a10"; }; }; - ucd = stdenv.mkDerivation rec { + ucd = stdenv.mkDerivation { name = "ucd-12.0.0"; dontUnpack = true; installPhase = '' diff --git a/pkgs/tools/inputmethods/keyfuzz/default.nix b/pkgs/tools/inputmethods/keyfuzz/default.nix index cd7d1cd8bbf..a2f01c7367c 100644 --- a/pkgs/tools/inputmethods/keyfuzz/default.nix +++ b/pkgs/tools/inputmethods/keyfuzz/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "keyfuzz"; version = "0.2"; diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index cf32e8d51ca..2f8425bd8b5 100644 --- a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix +++ b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -27,7 +27,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "skk-dicts-unstable"; version = "2017-10-26"; srcs = [ small medium large edict assoc ]; diff --git a/pkgs/tools/inputmethods/skk/skktools/default.nix b/pkgs/tools/inputmethods/skk/skktools/default.nix index d4ef2e2422e..19d871bc77f 100644 --- a/pkgs/tools/inputmethods/skk/skktools/default.nix +++ b/pkgs/tools/inputmethods/skk/skktools/default.nix @@ -8,7 +8,7 @@ # dependencies on a Ruby interpreter etc. # - We for the moment do not package them to keep the dependencies slim. # Probably, shall package the newer tools as skktools-extra in the future. -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "skktools"; version = "1.3.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix index 02993b248ab..afacc302eda 100644 --- a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix +++ b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tegaki-zinnia-japanese"; version = "0.3"; diff --git a/pkgs/tools/inputmethods/zinnia/default.nix b/pkgs/tools/inputmethods/zinnia/default.nix index ce87e1a7141..b23e0c369a6 100644 --- a/pkgs/tools/inputmethods/zinnia/default.nix +++ b/pkgs/tools/inputmethods/zinnia/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "zinnia"; version = "2016-08-28"; diff --git a/pkgs/tools/misc/0x0/default.nix b/pkgs/tools/misc/0x0/default.nix index a349a3f2fc0..d78846922c6 100644 --- a/pkgs/tools/misc/0x0/default.nix +++ b/pkgs/tools/misc/0x0/default.nix @@ -1,6 +1,6 @@ { stdenv, xsel, curl, fetchFromGitLab, makeWrapper}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "0x0"; version = "2018-06-24"; diff --git a/pkgs/tools/misc/argtable/default.nix b/pkgs/tools/misc/argtable/default.nix index 8b2a2a4b215..c16e4aded0d 100644 --- a/pkgs/tools/misc/argtable/default.nix +++ b/pkgs/tools/misc/argtable/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchgit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "argtable"; version = "3.0.1"; diff --git a/pkgs/tools/misc/bashplotlib/default.nix b/pkgs/tools/misc/bashplotlib/default.nix index 79f72746f90..14ab790d9c7 100644 --- a/pkgs/tools/misc/bashplotlib/default.nix +++ b/pkgs/tools/misc/bashplotlib/default.nix @@ -1,6 +1,6 @@ { stdenv, python3Packages, fetchFromGitHub }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "bashplotlib"; version = "2019-01-02"; diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix index c7a9af4abd1..c0339834b64 100644 --- a/pkgs/tools/misc/bibtex2html/default.nix +++ b/pkgs/tools/misc/bibtex2html/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ocaml }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bibtex2html"; version = "1.99"; diff --git a/pkgs/tools/misc/blsd/default.nix b/pkgs/tools/misc/blsd/default.nix index 655fd44c039..23bd7ed172c 100644 --- a/pkgs/tools/misc/blsd/default.nix +++ b/pkgs/tools/misc/blsd/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, libgit2 }: -buildGoPackage rec { +buildGoPackage { pname = "blsd"; version = "2017-07-27"; diff --git a/pkgs/tools/misc/bmap-tools/default.nix b/pkgs/tools/misc/bmap-tools/default.nix index 7391c271cd1..6b7a51e08f5 100644 --- a/pkgs/tools/misc/bmap-tools/default.nix +++ b/pkgs/tools/misc/bmap-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2Packages }: python2Packages.buildPythonApplication rec { - name = "bmap-tools-${version}"; + pname = "bmap-tools"; version = "3.4"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/broadlink-cli/default.nix b/pkgs/tools/misc/broadlink-cli/default.nix index 2ba5499d7f7..c40ccad5e39 100644 --- a/pkgs/tools/misc/broadlink-cli/default.nix +++ b/pkgs/tools/misc/broadlink-cli/default.nix @@ -1,6 +1,6 @@ { stdenv, python2Packages, fetchFromGitHub }: -python2Packages.buildPythonApplication rec { +python2Packages.buildPythonApplication { pname = "broadlink-cli"; inherit (python2Packages.broadlink) version; diff --git a/pkgs/tools/misc/capture/default.nix b/pkgs/tools/misc/capture/default.nix index 377297ee479..e7134961c25 100644 --- a/pkgs/tools/misc/capture/default.nix +++ b/pkgs/tools/misc/capture/default.nix @@ -1,6 +1,6 @@ { stdenv, slop, ffmpeg, fetchFromGitHub, makeWrapper}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "capture-unstable"; version = "2019-03-10"; diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix index a1b1b4eac2d..4d33d957b4d 100644 --- a/pkgs/tools/misc/cht.sh/default.nix +++ b/pkgs/tools/misc/cht.sh/default.nix @@ -7,7 +7,7 @@ , xsel }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cht.sh"; version = "unstable-2019-08-06"; diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index 1b3c5f16969..f3d7fbd8127 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, xcbuildHook, Foundation, AddressBook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "1.1a-3"; pname = "contacts"; diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix index f35da52081b..5792fa4121b 100644 --- a/pkgs/tools/misc/cpuminer-multi/default.nix +++ b/pkgs/tools/misc/cpuminer-multi/default.nix @@ -5,7 +5,7 @@ let rev = "8393e03089c0abde61bd5d72aba8f926c3d6eca4"; date = "20160316"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "cpuminer-multi-${date}-${stdenv.lib.strings.substring 0 7 rev}"; src = fetchgit { diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/tools/misc/crudini/default.nix index 7ca103062c1..f5291d0789e 100644 --- a/pkgs/tools/misc/crudini/default.nix +++ b/pkgs/tools/misc/crudini/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2Packages, help2man }: python2Packages.buildPythonApplication rec { - name = "crudini-${version}"; + pname = "crudini"; version = "0.9"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/dbus-map/default.nix b/pkgs/tools/misc/dbus-map/default.nix index ab52d73ac27..72687f4bfa4 100644 --- a/pkgs/tools/misc/dbus-map/default.nix +++ b/pkgs/tools/misc/dbus-map/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, glib, procps, libxml2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "dbus-map"; version = "2015-05-28"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix index ef00c753d3a..591cd5fe040 100644 --- a/pkgs/tools/misc/diskus/default.nix +++ b/pkgs/tools/misc/diskus/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { - name = "diskus-${version}"; + pname = "diskus"; version = "0.5.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index b9a66ba95d9..4dffae557a4 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "dust-${version}"; + pname = "dust"; version = "0.2.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/dvtm/dvtm.nix b/pkgs/tools/misc/dvtm/dvtm.nix index 10fb4cd89bd..df2e25c7ea3 100644 --- a/pkgs/tools/misc/dvtm/dvtm.nix +++ b/pkgs/tools/misc/dvtm/dvtm.nix @@ -1,5 +1,5 @@ { stdenv, ncurses, customConfig ? null, name, src, patches ? [] }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit name src patches; diff --git a/pkgs/tools/misc/dylibbundler/default.nix b/pkgs/tools/misc/dylibbundler/default.nix index c88e29bb455..6bb9924ddd0 100644 --- a/pkgs/tools/misc/dylibbundler/default.nix +++ b/pkgs/tools/misc/dylibbundler/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "dylibbundler"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix index bcd3ec6d8f7..11a46f620c0 100644 --- a/pkgs/tools/misc/edid-decode/default.nix +++ b/pkgs/tools/misc/edid-decode/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: let version = "2018-12-06"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "edid-decode-unstable"; inherit version; diff --git a/pkgs/tools/misc/emv/default.nix b/pkgs/tools/misc/emv/default.nix index 160c3982cc1..6a5fcfb1217 100644 --- a/pkgs/tools/misc/emv/default.nix +++ b/pkgs/tools/misc/emv/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "emv"; version = "1.95"; diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix index d4f69340d0a..1c0401e2ead 100644 --- a/pkgs/tools/misc/ent/default.nix +++ b/pkgs/tools/misc/ent/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, unzip}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ent-1.1"; src = fetchurl { diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 1447c70412b..d94f1c1929f 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -5,7 +5,7 @@ with rustPlatform; buildRustPackage rec { - name = "exa-${version}"; + pname = "exa"; version = "0.9.0"; cargoSha256 = "1hgjp23rjd90wyf0nq6d5akjxdfjlaps54dv23zgwjvkhw24fidf"; diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 91c1b3b7071..7465cb67f61 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "fd-${version}"; + pname = "fd"; version = "7.3.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/fffuu/default.nix b/pkgs/tools/misc/fffuu/default.nix index 7b275220c19..5d79b26f230 100644 --- a/pkgs/tools/misc/fffuu/default.nix +++ b/pkgs/tools/misc/fffuu/default.nix @@ -1,6 +1,6 @@ { mkDerivation, haskellPackages, fetchFromGitHub, lib }: -mkDerivation rec { +mkDerivation { pname = "fffuu"; version = "unstable-2018-05-26"; diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 9db66480cb1..2df8ee420fa 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -3,20 +3,16 @@ }: stdenv.mkDerivation rec { - name = "findutils-4.6.0"; + pname = "findutils"; + version = "4.7.0"; src = fetchurl { - url = "mirror://gnu/findutils/${name}.tar.gz"; - sha256 = "178nn4dl7wbcw499czikirnkniwnx36argdnqgz4ik9i6zvwkm6y"; + url = "mirror://gnu/findutils/${pname}-${version}.tar.xz"; + sha256 = "16kqz9yz98dasmj70jwf5py7jk558w96w0vgp3zf9xsqk3gzpzn5"; }; patches = [ - ./memory-leak.patch ./no-install-statedir.patch - - # Prevent tests from failing on old kernels (2.6x) - # getdtablesize reports incorrect values if getrlimit() fails - ./disable-getdtablesize-test.patch ]; buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort diff --git a/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch b/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch deleted file mode 100644 index 611df364b68..00000000000 --- a/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/tests/test-dup2.c b/tests/test-dup2.c ---- a/tests/test-dup2.c -+++ b/tests/test-dup2.c -@@ -157,8 +157,6 @@ main (void) - ASSERT (close (255) == 0); - ASSERT (close (256) == 0); - } -- ASSERT (dup2 (fd, bad_fd - 1) == bad_fd - 1); -- ASSERT (close (bad_fd - 1) == 0); - errno = 0; - ASSERT (dup2 (fd, bad_fd) == -1); - ASSERT (errno == EBADF); -diff --git a/tests/test-getdtablesize.c b/tests/test-getdtablesize.c -index a0325af..a83f8ec 100644 ---- a/tests/test-getdtablesize.c -+++ b/tests/test-getdtablesize.c -@@ -29,8 +29,6 @@ int - main (int argc, char *argv[]) - { - ASSERT (getdtablesize () >= 3); -- ASSERT (dup2 (0, getdtablesize() - 1) == getdtablesize () - 1); -- ASSERT (dup2 (0, getdtablesize()) == -1); - - return 0; - } diff --git a/pkgs/tools/misc/findutils/memory-leak.patch b/pkgs/tools/misc/findutils/memory-leak.patch deleted file mode 100644 index 56f65f85622..00000000000 --- a/pkgs/tools/misc/findutils/memory-leak.patch +++ /dev/null @@ -1,21 +0,0 @@ -http://git.savannah.gnu.org/cgit/findutils.git/patch/?id=c1556892a -diff --git a/find/fstype.c b/find/fstype.c -index 535f920..a0ac8bc 100644 ---- a/find/fstype.c -+++ b/find/fstype.c -@@ -75,14 +75,7 @@ free_file_system_list (struct mount_entry *p) - while (p) - { - struct mount_entry *pnext = p->me_next; -- -- free (p->me_devname); -- free (p->me_mountdir); -- -- if (p->me_type_malloced) -- free (p->me_type); -- p->me_next = NULL; -- free (p); -+ free_mount_entry (p); - p = pnext; - } - } diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 6d24f3a4473..08d091cb300 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "fluent-bit"; version = "1.0.6"; diff --git a/pkgs/tools/misc/gif-for-cli/default.nix b/pkgs/tools/misc/gif-for-cli/default.nix index b8b86e07abb..771fc354da4 100644 --- a/pkgs/tools/misc/gif-for-cli/default.nix +++ b/pkgs/tools/misc/gif-for-cli/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python3Packages, ffmpeg, zlib, libjpeg }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "gif-for-cli"; version = "unstable-2018-08-14"; diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix index 51c6d9c2075..705c1a7e1d6 100644 --- a/pkgs/tools/misc/gringo/default.nix +++ b/pkgs/tools/misc/gringo/default.nix @@ -7,7 +7,7 @@ let version = "4.5.4"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gringo"; inherit version; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 7e30ffe0b28..3f5485718dc 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -10,22 +10,22 @@ with stdenv.lib; let pcSystems = { - "i686-linux".target = "i386"; - "x86_64-linux".target = "i386"; + i686-linux.target = "i386"; + x86_64-linux.target = "i386"; }; efiSystemsBuild = { - "i686-linux".target = "i386"; - "x86_64-linux".target = "x86_64"; - "aarch64-linux".target = "aarch64"; + i686-linux.target = "i386"; + x86_64-linux.target = "x86_64"; + aarch64-linux.target = "aarch64"; }; # For aarch64, we need to use '--target=aarch64-efi' when building, # but '--target=arm64-efi' when installing. Insanity! efiSystemsInstall = { - "i686-linux".target = "i386"; - "x86_64-linux".target = "x86_64"; - "aarch64-linux".target = "arm64"; + i686-linux.target = "i386"; + x86_64-linux.target = "x86_64"; + aarch64-linux.target = "arm64"; }; canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild); diff --git a/pkgs/tools/misc/grub/pvgrub_image/default.nix b/pkgs/tools/misc/grub/pvgrub_image/default.nix index 19d8afb1857..6b796dedb0a 100644 --- a/pkgs/tools/misc/grub/pvgrub_image/default.nix +++ b/pkgs/tools/misc/grub/pvgrub_image/default.nix @@ -3,9 +3,9 @@ with stdenv.lib; let efiSystemsBuild = { - "i686-linux".target = "i386"; - "x86_64-linux".target = "x86_64"; - "aarch64-linux".target = "aarch64"; + i686-linux.target = "i386"; + x86_64-linux.target = "x86_64"; + aarch64-linux.target = "aarch64"; }; in ( diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index 7b432df3e8b..1033a489c76 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -6,8 +6,8 @@ with stdenv.lib; let pcSystems = { - "i686-linux".target = "i386"; - "x86_64-linux".target = "i386"; + i686-linux.target = "i386"; + x86_64-linux.target = "i386"; }; inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems); diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix index edb9508df31..2dd8688232f 100644 --- a/pkgs/tools/misc/grub4dos/default.nix +++ b/pkgs/tools/misc/grub4dos/default.nix @@ -4,7 +4,7 @@ let arch = if stdenv.isi686 then "i386" else if stdenv.isx86_64 then "x86_64" else throw "Unknown architecture"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "grub4dos"; version = "0.4.6a-2019-05-12"; diff --git a/pkgs/tools/misc/hackertyper/default.nix b/pkgs/tools/misc/hackertyper/default.nix index 8657e34e160..4b5973e7eec 100644 --- a/pkgs/tools/misc/hackertyper/default.nix +++ b/pkgs/tools/misc/hackertyper/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "hackertyper"; version = "2.1"; diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix index 76795892e71..bf6740d7ee4 100644 --- a/pkgs/tools/misc/heatseeker/default.nix +++ b/pkgs/tools/misc/heatseeker/default.nix @@ -3,7 +3,7 @@ with rustPlatform; buildRustPackage rec { - name = "heatseeker-${version}"; + pname = "heatseeker"; version = "1.5.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/hostsblock/default.nix b/pkgs/tools/misc/hostsblock/default.nix index 61832a5d326..a6ed7bf92ff 100644 --- a/pkgs/tools/misc/hostsblock/default.nix +++ b/pkgs/tools/misc/hostsblock/default.nix @@ -19,7 +19,7 @@ ".bp.blogspot.com" ] }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "hostsblock"; version = "20161213"; diff --git a/pkgs/tools/misc/ix/default.nix b/pkgs/tools/misc/ix/default.nix index fdbd7611dce..cedaa13b74a 100644 --- a/pkgs/tools/misc/ix/default.nix +++ b/pkgs/tools/misc/ix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, curl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ix"; version = "20190815"; diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix index 08fbba873e5..b1d71a892d6 100644 --- a/pkgs/tools/misc/jdiskreport/default.nix +++ b/pkgs/tools/misc/jdiskreport/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip, jre }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "jdiskreport-1.4.1"; builder = ./builder.sh; diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/tools/misc/journaldriver/default.nix index 7e6b6124024..56a1dc75a45 100644 --- a/pkgs/tools/misc/journaldriver/default.nix +++ b/pkgs/tools/misc/journaldriver/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, rustPlatform, pkgconfig, openssl, systemd }: rustPlatform.buildRustPackage rec { - name = "journaldriver-${version}"; + pname = "journaldriver"; version = "1.1.0"; cargoSha256 = "0wmr0r54ar7gvhvhv76a49ap74lx8hl79bf73vc4f4xlj7hj303g"; diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix index 822932dc5ac..480c0abc728 100644 --- a/pkgs/tools/misc/kargo/default.nix +++ b/pkgs/tools/misc/kargo/default.nix @@ -2,10 +2,10 @@ python2Packages.buildPythonApplication rec { version = "0.4.6"; - name = "kargo-${version}"; + pname = "kargo"; src = fetchurl { - url = "mirror://pypi/k/kargo/${name}.tar.gz"; + url = "mirror://pypi/k/kargo/${pname}-${version}.tar.gz"; sha256 = "1sm721c3d4scpc1gj2j3qwssr6jjvw6aq3p7ipvhbd9ywmm9dd7b"; }; diff --git a/pkgs/tools/misc/kdecoration-viewer/default.nix b/pkgs/tools/misc/kdecoration-viewer/default.nix index ce343c7cc39..0fd1c7c5cd7 100644 --- a/pkgs/tools/misc/kdecoration-viewer/default.nix +++ b/pkgs/tools/misc/kdecoration-viewer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, mkDerivation , cmake, extra-cmake-modules, qtquickcontrols, kconfigwidgets, kdeclarative, kdecoration }: -mkDerivation rec { +mkDerivation { name = "kdecoration-viewer-2018-07-24"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/kermit/default.nix b/pkgs/tools/misc/kermit/default.nix index a021064a5ff..9f739da0afa 100644 --- a/pkgs/tools/misc/kermit/default.nix +++ b/pkgs/tools/misc/kermit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ncurses, glibc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "kermit-9.0.302"; src = fetchurl { diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/tools/misc/kisslicer/default.nix index b6b56e1df93..3667b483383 100644 --- a/pkgs/tools/misc/kisslicer/default.nix +++ b/pkgs/tools/misc/kisslicer/default.nix @@ -17,7 +17,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "kisslicer-1.6.3"; src = fetchzip { diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix index 4e83c2479f1..632001f6329 100644 --- a/pkgs/tools/misc/kronometer/default.nix +++ b/pkgs/tools/misc/kronometer/default.nix @@ -4,15 +4,12 @@ kconfig, kcrash, kinit }: -let +mkDerivation rec { pname = "kronometer"; version = "2.2.3"; -in -mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; sha256 = "05hs8729a3aqjpwmn2xdf2sriacrll4sj4ax3lm4s1ravj09n9bm"; }; @@ -22,6 +19,6 @@ mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kconfig kcrash kinit ]; } diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix index 5955c1104d3..3d2b7c5b214 100644 --- a/pkgs/tools/misc/ldapvi/default.nix +++ b/pkgs/tools/misc/ldapvi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, openldap, openssl, popt, glib, ncurses, readline, pkgconfig, cyrus_sasl, autoconf, automake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ldapvi"; version = "0lz1sb5r0y9ypy8d7hm0l2wfa8l69f8ll0i5c78c0apz40nyjqkg"; diff --git a/pkgs/tools/misc/ltunify/default.nix b/pkgs/tools/misc/ltunify/default.nix index 4521f8b407a..84a92ec7712 100644 --- a/pkgs/tools/misc/ltunify/default.nix +++ b/pkgs/tools/misc/ltunify/default.nix @@ -3,7 +3,7 @@ # Although we copy in the udev rules here, you probably just want to use logitech-udev-rules instead of # adding this to services.udev.packages on NixOS -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ltunify"; version = "unstable-20180330"; diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index ced4a156137..df1a2daddb9 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -1,33 +1,47 @@ { stdenv, fetchurl, pkgconfig, libpipeline, db, groff, libiconv, makeWrapper, buildPackages }: stdenv.mkDerivation rec { - name = "man-db-2.7.5"; + name = "man-db-2.8.6.1"; src = fetchurl { url = "mirror://savannah/man-db/${name}.tar.xz"; - sha256 = "056a3il7agfazac12yggcg4gf412yq34k065im0cpfxbcw6xskaw"; + sha256 = "0a1sh5gxa16k6irzf3q2lli8m204w9ik1xm62wjgf1mzknxs4xrc"; }; outputs = [ "out" "doc" ]; outputMan = "out"; # users will want `man man` to work - nativeBuildInputs = [ pkgconfig makeWrapper groff ] - ++ stdenv.lib.optionals doCheck checkInputs; + nativeBuildInputs = [ pkgconfig makeWrapper groff ]; buildInputs = [ libpipeline db groff ]; # (Yes, 'groff' is both native and build input) checkInputs = [ libiconv /* for 'iconv' binary */ ]; postPatch = '' - substituteInPlace src/man_db.conf.in \ - --replace "/usr/local/share" "/run/current-system/sw/share" \ - --replace "/usr/share" "/run/current-system/sw/share" + # Remove all mandatory manpaths. Nixpkgs makes no requirements on + # these directories existing. + sed -i 's/^MANDATORY_MANPATH/# &/' src/man_db.conf.in + + # Add Nixpkgs and NixOS-related manpaths + echo "MANPATH_MAP /run/current-system/sw/bin /run/current-system/sw/share/man" >> src/man_db.conf.in + echo "MANPATH_MAP /run/wrappers/bin /run/current-system/sw/share/man" >> src/man_db.conf.in + echo "MANPATH_MAP /nix/var/nix/profiles/default/bin /nix/var/nix/profiles/default/share/man" >> src/man_db.conf.in + + # Add mandb locations for the above + echo "MANDB_MAP /run/current-system/sw/share/man /var/cache/man/nixos" >> src/man_db.conf.in + echo "MANDB_MAP /nix/var/nix/profiles/default/share/man /var/cache/man/nixpkgs" >> src/man_db.conf.in ''; configureFlags = [ "--disable-setuid" + "--disable-cache-owner" "--localstatedir=/var" # Don't try /etc/man_db.conf by default, so we avoid error messages. - "--with-config-file=\${out}/etc/man_db.conf" - "--with-systemdtmpfilesdir=\${out}/lib/tmpfiles.d" + "--with-config-file=${placeholder "out"}/etc/man_db.conf" + "--with-systemdtmpfilesdir=${placeholder "out"}/lib/tmpfiles.d" + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin [ + "ac_cv_func__set_invalid_parameter_handler=no" + "ac_cv_func_posix_fadvise=no" + "ac_cv_func_mempcpy=no" ]; preConfigure = '' @@ -57,7 +71,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = !stdenv.hostPlatform.isMusl; /* iconv binary */ + doCheck = !stdenv.hostPlatform.isMusl /* iconv binary */ && !stdenv.hostPlatform.isDarwin; meta = with stdenv.lib; { homepage = http://man-db.nongnu.org; diff --git a/pkgs/tools/misc/man/conf.patch b/pkgs/tools/misc/man/conf.patch deleted file mode 100644 index 43e8642fb34..00000000000 --- a/pkgs/tools/misc/man/conf.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru -x '*~' man-1.6g-orig/src/man-config.c man-1.6g/src/man-config.c ---- man-1.6g-orig/src/man-config.c 2005-08-21 01:26:06.000000000 +0200 -+++ man-1.6g/src/man-config.c 2012-03-06 11:11:28.159050524 +0100 -@@ -214,8 +214,9 @@ - const char *configuration_file = "[no configuration file]"; - - char *default_config_files[] = { -+ "/etc/man.conf", - CONFIG_FILE, /* compiled-in default */ -- "/etc/man.conf", "/etc/man.config", -+ "/etc/man.config", - "/usr/lib/man.conf", "/usr/lib/man.config", - "/usr/share/misc/man.conf", "/usr/share/misc/man.config" - }; diff --git a/pkgs/tools/misc/man/default.nix b/pkgs/tools/misc/man/default.nix deleted file mode 100644 index 2f61a30714e..00000000000 --- a/pkgs/tools/misc/man/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, fetchurl, groff, less }: - -stdenv.mkDerivation rec { - name = "man-1.6g"; - - src = fetchurl { - url = "http://primates.ximian.com/~flucifredi/man/${name}.tar.gz"; - sha256 = "17wmp2ahkhl72cvfzshmck22dnq2lbjg0678swihj270yk1vip6c"; - }; - - buildInputs = [ groff less ]; - - preBuild = '' - makeFlagsArray=(bindir=$out/bin sbindir=$out/sbin libdir=$out/lib mandir=$out/share/man) - ''; - - patches = [ - # Search in "share/man" relative to each path in $PATH (in addition to "man"). - ./share.patch - - # Prefer /etc/man.conf over $out/lib/man.conf. Man only reads the - # first file that exists, so this is necessary to allow the - # builtin config to be overriden. - ./conf.patch - ]; - - preConfigure = '' - sed 's/^PREPATH=.*/PREPATH=$PATH/' -i configure - ''; - - postInstall = - '' - # Use UTF-8 by default. Otherwise man won't know how to deal - # with certain characters. - substituteInPlace $out/lib/man.conf \ - --replace "nroff -Tlatin1" "nroff" \ - --replace "eqn -Tlatin1" "eqn -Tutf8" - - # Work around a bug in substituteInPlace. It loses the final - # newline, and man requires every line in man.conf to be - # terminated by a newline. - echo >> $out/lib/man.conf - ''; - - meta = { - homepage = http://primates.ximian.com/~flucifredi/man/; - description = "Tool to read online Unix documentation"; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/tools/misc/man/share.patch b/pkgs/tools/misc/man/share.patch deleted file mode 100644 index 837786e28eb..00000000000 --- a/pkgs/tools/misc/man/share.patch +++ /dev/null @@ -1,116 +0,0 @@ -diff -rc man-1.6f-orig/src/manpath.c man-1.6f/src/manpath.c -*** man-1.6f-orig/src/manpath.c 2006-08-03 23:18:33.000000000 +0200 ---- man-1.6f/src/manpath.c 2008-02-07 15:31:43.000000000 +0100 -*************** -*** 109,121 **** - * or ../man or ../man1 or ../man8 subdirectories. - */ - static char * -! find_man_subdir (char *p) { - int len; - char *t, *sp; - - len = strlen (p); - -! t = my_malloc ((unsigned) len + 20); - - memcpy (t, p, len); - strcpy (t + len, "/man"); ---- 109,121 ---- - * or ../man or ../man1 or ../man8 subdirectories. - */ - static char * -! find_man_subdir (char *p, char * maybe_share) { - int len; - char *t, *sp; - - len = strlen (p); - -! t = my_malloc ((unsigned) len + 30); - - memcpy (t, p, len); - strcpy (t + len, "/man"); -*************** -*** 139,159 **** - } - - /* look for the situation with packagedir/bin and packagedir/man */ -! strcpy (t + len, "/man"); - - if (is_directory (t) == 1) - return t; - - /* look for the situation with pkg/bin and pkg/man1 or pkg/man8 */ - /* (looking for all man[1-9] would probably be a waste of stats) */ -! strcpy (t + len, "/man1"); - - if (is_directory (t) == 1) { - t[len] = 0; - return t; - } - -! strcpy (t + len, "/man8"); - - if (is_directory (t) == 1) { - t[len] = 0; ---- 139,159 ---- - } - - /* look for the situation with packagedir/bin and packagedir/man */ -! sprintf (t + len, "%s/man", maybe_share); - - if (is_directory (t) == 1) - return t; - - /* look for the situation with pkg/bin and pkg/man1 or pkg/man8 */ - /* (looking for all man[1-9] would probably be a waste of stats) */ -! sprintf (t + len, "%s/man1", maybe_share); - - if (is_directory (t) == 1) { - t[len] = 0; - return t; - } - -! sprintf (t + len, "%s/man8", maybe_share); - - if (is_directory (t) == 1) { - t[len] = 0; -*************** -*** 341,347 **** - if (debug) - gripe (IS_NOT_IN_CONFIG); - -! t = find_man_subdir (dir); - if (t != NULL) { - if (debug) - gripe (MAN_NEARBY); ---- 341,347 ---- - if (debug) - gripe (IS_NOT_IN_CONFIG); - -! t = find_man_subdir (dir, ""); - if (t != NULL) { - if (debug) - gripe (MAN_NEARBY); -*************** -*** 352,357 **** ---- 352,370 ---- - if (debug) - gripe (NO_MAN_NEARBY); - } -+ -+ t = find_man_subdir (dir, "/share"); -+ if (t != NULL) { -+ if (debug) -+ gripe (MAN_NEARBY); -+ -+ add_to_mandirlist (t, perrs); -+ free (t); -+ } else { -+ if (debug) -+ gripe (NO_MAN_NEARBY); -+ } -+ - } - } - diff --git a/pkgs/tools/misc/marlin-calc/default.nix b/pkgs/tools/misc/marlin-calc/default.nix index 34b10a550f6..5c175053fc9 100644 --- a/pkgs/tools/misc/marlin-calc/default.nix +++ b/pkgs/tools/misc/marlin-calc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "marlin-calc"; version = "2019-06-04"; diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index 334daef4481..ebf93f0684f 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -1,7 +1,7 @@ { stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { - name = "mcfly-${version}"; + pname = "mcfly"; version = "v0.3.1"; rev = "${version}"; diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix index b1d1971c75c..48f048b3abf 100644 --- a/pkgs/tools/misc/memtest86+/default.nix +++ b/pkgs/tools/misc/memtest86+/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "memtest86+"; version = "5.01-coreboot-002"; diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix index 3e23e2bddcc..168e1dac3a3 100644 --- a/pkgs/tools/misc/minicom/default.nix +++ b/pkgs/tools/misc/minicom/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoreconfHook, makeWrapper, pkgconfig , lrzsz, ncurses, libiconv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "minicom"; version = "2.7.1"; diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index 8e65d4d2a54..412726e276d 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -1,7 +1,7 @@ { stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib }: rustPlatform.buildRustPackage rec { - name = "miniserve-${version}"; + pname = "miniserve"; version = "0.2.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/nginx-config-formatter/default.nix b/pkgs/tools/misc/nginx-config-formatter/default.nix index 91dd56c9b0f..db60010490e 100644 --- a/pkgs/tools/misc/nginx-config-formatter/default.nix +++ b/pkgs/tools/misc/nginx-config-formatter/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2019-02-13"; pname = "nginx-config-formatter"; diff --git a/pkgs/tools/misc/notify-desktop/default.nix b/pkgs/tools/misc/notify-desktop/default.nix index 307a08bbdf9..61aa2c41c4f 100644 --- a/pkgs/tools/misc/notify-desktop/default.nix +++ b/pkgs/tools/misc/notify-desktop/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, dbus, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "notify-desktop"; version = "0.2.0"; diff --git a/pkgs/tools/misc/parallel-rust/default.nix b/pkgs/tools/misc/parallel-rust/default.nix index 37cbea46c81..c77ca56655a 100644 --- a/pkgs/tools/misc/parallel-rust/default.nix +++ b/pkgs/tools/misc/parallel-rust/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "parallel-rust-${version}"; + pname = "parallel-rust"; version = "0.11.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix index 045c004fb6a..80583ea19cf 100644 --- a/pkgs/tools/misc/peruse/default.nix +++ b/pkgs/tools/misc/peruse/default.nix @@ -8,7 +8,7 @@ let pname = "peruse"; version = "1.2.20180816"; -in mkDerivation rec { +in mkDerivation { name = "${pname}-${version}"; # The last formal release from 2016 uses kirigami1 which is deprecated diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix index e366a03a7f4..1aa7dbedd93 100644 --- a/pkgs/tools/misc/ponysay/default.nix +++ b/pkgs/tools/misc/ponysay/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python3, texinfo, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ponysay-3.0.3"; src = fetchurl { diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix index 7acbbc21061..ff98bce39d8 100644 --- a/pkgs/tools/misc/powerline-rs/default.nix +++ b/pkgs/tools/misc/powerline-rs/default.nix @@ -1,7 +1,6 @@ { stdenv, lib, rustPlatform, fetchFromGitLab, pkgconfig, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }: rustPlatform.buildRustPackage rec { pname = "powerline-rs"; - name = "${pname}-${version}"; version = "0.1.9"; src = fetchFromGitLab { diff --git a/pkgs/tools/misc/rename/default.nix b/pkgs/tools/misc/rename/default.nix index a2087902c93..770b229a315 100644 --- a/pkgs/tools/misc/rename/default.nix +++ b/pkgs/tools/misc/rename/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, perlPackages }: -perlPackages.buildPerlPackage rec { +perlPackages.buildPerlPackage { pname = "rename"; version = "1.9"; outputs = [ "out" ]; diff --git a/pkgs/tools/misc/scfbuild/default.nix b/pkgs/tools/misc/scfbuild/default.nix index 2ba3224a5f8..f66567798ff 100644 --- a/pkgs/tools/misc/scfbuild/default.nix +++ b/pkgs/tools/misc/scfbuild/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonApplication, fetchFromGitHub, python, pyyaml, fonttools, fontforge }: -buildPythonApplication rec { +buildPythonApplication { pname = "scfbuild"; version = "1.0.3"; diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/tools/misc/sdl-jstest/default.nix index e821d5e4332..0be5b8d1379 100644 --- a/pkgs/tools/misc/sdl-jstest/default.nix +++ b/pkgs/tools/misc/sdl-jstest/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, cmake, pkgconfig, SDL, SDL2, ncurses, docbook_xsl, git }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sdl-jstest"; version = "2018-06-15"; diff --git a/pkgs/tools/misc/smc/default.nix b/pkgs/tools/misc/smc/default.nix index 0e84f738e80..f442df399d9 100644 --- a/pkgs/tools/misc/smc/default.nix +++ b/pkgs/tools/misc/smc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, jre, runtimeShell }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "smc-6.6.3"; src = fetchurl { diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix index ce633ac4447..85f90ed1692 100644 --- a/pkgs/tools/misc/tealdeer/default.nix +++ b/pkgs/tools/misc/tealdeer/default.nix @@ -1,7 +1,7 @@ { stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, cacert, curl }: rustPlatform.buildRustPackage rec { - name = "tealdeer-${version}"; + pname = "tealdeer"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/teamocil/default.nix b/pkgs/tools/misc/teamocil/default.nix index 82aba612699..a5e356edbf4 100644 --- a/pkgs/tools/misc/teamocil/default.nix +++ b/pkgs/tools/misc/teamocil/default.nix @@ -1,6 +1,6 @@ { lib, bundlerEnv, ruby, bundlerUpdateScript }: -bundlerEnv rec { +bundlerEnv { inherit ruby; pname = "teamocil"; gemdir = ./.; diff --git a/pkgs/tools/misc/termplay/default.nix b/pkgs/tools/misc/termplay/default.nix index 4f6a71135aa..f9ccec87adc 100644 --- a/pkgs/tools/misc/termplay/default.nix +++ b/pkgs/tools/misc/termplay/default.nix @@ -1,6 +1,6 @@ { rustPlatform, fetchFromGitHub, lib, makeWrapper, gst_all_1, libsixel }: rustPlatform.buildRustPackage rec { - name = "termplay-${version}"; + pname = "termplay"; version = "2.0.4"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix index d79e480327c..59aa3861510 100644 --- a/pkgs/tools/misc/tmpwatch/default.nix +++ b/pkgs/tools/misc/tmpwatch/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, psmisc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "tmpwatch-2.11"; src = fetchurl { diff --git a/pkgs/tools/misc/togglesg-download/default.nix b/pkgs/tools/misc/togglesg-download/default.nix index fa024e58fa8..e2d263817ee 100644 --- a/pkgs/tools/misc/togglesg-download/default.nix +++ b/pkgs/tools/misc/togglesg-download/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, pythonPackages, makeWrapper, ffmpeg_3 }: -pythonPackages.buildPythonApplication rec { +pythonPackages.buildPythonApplication { pname = "togglesg-download-git"; version = "2017-12-07"; diff --git a/pkgs/tools/misc/ttwatch/default.nix b/pkgs/tools/misc/ttwatch/default.nix index 59091bcd2bd..5a2d1aaa427 100644 --- a/pkgs/tools/misc/ttwatch/default.nix +++ b/pkgs/tools/misc/ttwatch/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, perl, openssl, curl, libusb1 , enableUnsafe ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ttwatch"; version = "2018-12-04"; diff --git a/pkgs/tools/misc/uhubctl/default.nix b/pkgs/tools/misc/uhubctl/default.nix index 5c858944b3f..f2c0f43cca9 100644 --- a/pkgs/tools/misc/uhubctl/default.nix +++ b/pkgs/tools/misc/uhubctl/default.nix @@ -3,7 +3,7 @@ , libusb }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "uhubctl"; version = "unstable-2019-07-31"; diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix index d80af088342..d70fded5e3e 100644 --- a/pkgs/tools/misc/ultrastar-creator/default.nix +++ b/pkgs/tools/misc/ultrastar-creator/default.nix @@ -6,7 +6,7 @@ # there’s a WIP branch here: # https://github.com/UltraStar-Deluxe/UltraStar-Creator/commits/BASS_removed -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ultrastar-creator"; version = "2019-04-23"; diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index fe89e74cb69..865fd4f44f8 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -7,7 +7,7 @@ , jedecSupport ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.10"; pname = "urjtag"; diff --git a/pkgs/tools/misc/vimpager/build.nix b/pkgs/tools/misc/vimpager/build.nix index 858cbe9e317..19cc6cd2234 100644 --- a/pkgs/tools/misc/vimpager/build.nix +++ b/pkgs/tools/misc/vimpager/build.nix @@ -6,7 +6,7 @@ , sha256 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit version; pname = "vimpager"; diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/tools/misc/vivid/default.nix index 856bda755cb..4ffa250bdf5 100644 --- a/pkgs/tools/misc/vivid/default.nix +++ b/pkgs/tools/misc/vivid/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "${pname}-${version}"; pname = "vivid"; version = "0.4.0"; diff --git a/pkgs/tools/misc/void/default.nix b/pkgs/tools/misc/void/default.nix index be8745802da..eb14d89bfc9 100644 --- a/pkgs/tools/misc/void/default.nix +++ b/pkgs/tools/misc/void/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "void-${version}"; + pname = "void"; version = "1.1.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix index a276b13a59c..b994aecfc0e 100644 --- a/pkgs/tools/misc/websocat/default.nix +++ b/pkgs/tools/misc/websocat/default.nix @@ -2,7 +2,7 @@ }: rustPlatform.buildRustPackage rec { - name = "websocat-${version}"; + pname = "websocat"; version = "1.3.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/xdxf2slob/default.nix b/pkgs/tools/misc/xdxf2slob/default.nix index 444b14c5a63..b6801130a45 100644 --- a/pkgs/tools/misc/xdxf2slob/default.nix +++ b/pkgs/tools/misc/xdxf2slob/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python3Packages }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { name = "xdxf2slob-unstable-2015-06-30"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix index cd4d709fb76..3d2fb50371e 100644 --- a/pkgs/tools/misc/xsel/default.nix +++ b/pkgs/tools/misc/xsel/default.nix @@ -1,6 +1,6 @@ {stdenv, lib, fetchFromGitHub, libX11, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xsel-unstable"; version = "2018-01-10"; diff --git a/pkgs/tools/misc/xtitle/default.nix b/pkgs/tools/misc/xtitle/default.nix index fb4257b35e6..84cf506fb63 100644 --- a/pkgs/tools/misc/xtitle/default.nix +++ b/pkgs/tools/misc/xtitle/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libxcb, xcbutil, xcbutilwm, git }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "xtitle-0.4.4"; src = fetchurl { diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/tools/misc/zsh-autoenv/default.nix index 657d93a3ca0..4b19331f392 100644 --- a/pkgs/tools/misc/zsh-autoenv/default.nix +++ b/pkgs/tools/misc/zsh-autoenv/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, runtimeShell }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "zsh-autoenv"; version = "2017-12-16"; diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix index 8fe405e1b3e..4377681e20d 100644 --- a/pkgs/tools/networking/airfield/node.nix +++ b/pkgs/tools/networking/airfield/node.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/tools/networking/bgpdump/default.nix b/pkgs/tools/networking/bgpdump/default.nix index 55b168a21ae..2f74ac713d7 100644 --- a/pkgs/tools/networking/bgpdump/default.nix +++ b/pkgs/tools/networking/bgpdump/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, autoreconfHook, zlib, bzip2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "bgpdump-2017-09-29"; src = fetchzip { diff --git a/pkgs/tools/networking/bud/default.nix b/pkgs/tools/networking/bud/default.nix index 2c5e1a2f8f4..a79cbdc8bbd 100644 --- a/pkgs/tools/networking/bud/default.nix +++ b/pkgs/tools/networking/bud/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchgit, python, gyp, utillinux }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bud"; version = "0.34.1"; diff --git a/pkgs/tools/networking/bukubrow/default.nix b/pkgs/tools/networking/bukubrow/default.nix index 34b227d5a6d..aee1b5c0e1d 100644 --- a/pkgs/tools/networking/bukubrow/default.nix +++ b/pkgs/tools/networking/bukubrow/default.nix @@ -1,7 +1,7 @@ { stdenv, rustPlatform, fetchFromGitHub, sqlite }: rustPlatform.buildRustPackage rec { - name = "bukubrow-${version}"; + pname = "bukubrow"; version = "2.4.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/carddav-util/default.nix b/pkgs/tools/networking/carddav-util/default.nix index 7cc89bebf47..08014ed1226 100644 --- a/pkgs/tools/networking/carddav-util/default.nix +++ b/pkgs/tools/networking/carddav-util/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, python, pythonPackages, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "carddav-0.1-2014-02-26"; diff --git a/pkgs/tools/networking/connman/connman-ncurses/default.nix b/pkgs/tools/networking/connman/connman-ncurses/default.nix index dd636173cb7..140105c2475 100644 --- a/pkgs/tools/networking/connman/connman-ncurses/default.nix +++ b/pkgs/tools/networking/connman/connman-ncurses/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dbus, json_c, ncurses, connman }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "connman-ncurses"; version = "2015-07-21"; diff --git a/pkgs/tools/networking/connman/connman-notify/default.nix b/pkgs/tools/networking/connman/connman-notify/default.nix index 3b30935d6cf..0cb32ca415f 100644 --- a/pkgs/tools/networking/connman/connman-notify/default.nix +++ b/pkgs/tools/networking/connman/connman-notify/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "connman-notify"; version = "2014-06-23"; diff --git a/pkgs/tools/networking/connman/connman_dmenu/default.nix b/pkgs/tools/networking/connman/connman_dmenu/default.nix index 0d91dabaaeb..7096b9b7586 100644 --- a/pkgs/tools/networking/connman/connman_dmenu/default.nix +++ b/pkgs/tools/networking/connman/connman_dmenu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, connman, dmenu }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "connman_dmenu"; version = "git-29-9-2015"; diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index f0ae7e014be..dfc56d440e6 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { # when updating this to >=7, check, see previous reverts: # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix pname = "dhcpcd"; - version = "8.0.2"; + version = "8.0.3"; src = fetchurl { url = "mirror://roy/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0p3sc9yfb40fn1z8rvvxqd0jpxsxm1967pp6w77x4v2lc7anm8ik"; + sha256 = "07cg0sp8sk9b6ch2ajmvkbn6z08bgyx8xbd004s5mkasrlgrfx4n"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/tools/networking/dhcpdump/default.nix index 8ed9d1d1d70..a7cc90c2b33 100644 --- a/pkgs/tools/networking/dhcpdump/default.nix +++ b/pkgs/tools/networking/dhcpdump/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libpcap, perl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "dhcpdump-1.8"; src = fetchurl { diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix index 566579555d3..a0f5b5b0842 100644 --- a/pkgs/tools/networking/driftnet/default.nix +++ b/pkgs/tools/networking/driftnet/default.nix @@ -4,7 +4,7 @@ with lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "driftnet"; version = "1.1.5"; diff --git a/pkgs/tools/networking/easyrsa/2.x.nix b/pkgs/tools/networking/easyrsa/2.x.nix index 3c6c5f3d299..9d6a1712e67 100644 --- a/pkgs/tools/networking/easyrsa/2.x.nix +++ b/pkgs/tools/networking/easyrsa/2.x.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, makeWrapper , gnugrep, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "easyrsa-2.2.0"; src = fetchurl { diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix index b5d4d5e6dcb..4d374cece3d 100644 --- a/pkgs/tools/networking/easyrsa/default.nix +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -2,7 +2,7 @@ let version = "3.0.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "easyrsa"; inherit version; diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/tools/networking/eggdrop/default.nix index f5dfff62a96..c490464c31a 100644 --- a/pkgs/tools/networking/eggdrop/default.nix +++ b/pkgs/tools/networking/eggdrop/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, tcl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "eggdrop"; version = "1.6.21-nix1"; diff --git a/pkgs/tools/networking/envoy/default.nix b/pkgs/tools/networking/envoy/default.nix index 2800139f8fa..f35a9027353 100644 --- a/pkgs/tools/networking/envoy/default.nix +++ b/pkgs/tools/networking/envoy/default.nix @@ -127,7 +127,7 @@ let # Generate the BUILD file. buildFile = let field = name: attrs: - if attrs ? "${name}" then " ${name} = ${attrs.${name}},\n" else ""; + if attrs ? ${name} then " ${name} = ${attrs.${name}},\n" else ""; in '' licenses(["notice"]) # Apache 2 diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix index 54e20539066..abb76e633ee 100644 --- a/pkgs/tools/networking/fdm/default.nix +++ b/pkgs/tools/networking/fdm/default.nix @@ -7,7 +7,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${baseName}-${version}"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/freebind/default.nix b/pkgs/tools/networking/freebind/default.nix index 4ac979cc4a6..0c74f14e174 100644 --- a/pkgs/tools/networking/freebind/default.nix +++ b/pkgs/tools/networking/freebind/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, libnetfilter_queue, libnfnetlink }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "freebind"; version = "2017-12-27"; diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix index 8261ba6e284..37d2eea825f 100644 --- a/pkgs/tools/networking/gnirehtet/default.nix +++ b/pkgs/tools/networking/gnirehtet/default.nix @@ -14,8 +14,9 @@ apk = stdenv.mkDerivation { ''; }; in -rustPlatform.buildRustPackage rec { - name = "gnirehtet-${version}"; +rustPlatform.buildRustPackage { + pname = "gnirehtet"; + inherit version; src = fetchFromGitHub { owner = "Genymobile"; diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix index 96723146ad4..bc6f657f378 100644 --- a/pkgs/tools/networking/iftop/default.nix +++ b/pkgs/tools/networking/iftop/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, ncurses, libpcap, automake}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "iftop-1.0pre4"; src = fetchurl { diff --git a/pkgs/tools/networking/imapproxy/default.nix b/pkgs/tools/networking/imapproxy/default.nix index 5b54e4099f5..984b0a2f87e 100644 --- a/pkgs/tools/networking/imapproxy/default.nix +++ b/pkgs/tools/networking/imapproxy/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, openssl, ncurses}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "imapproxy-1.2.7"; src = fetchurl { url = mirror://sourceforge/squirrelmail/squirrelmail-imap_proxy-1.2.7.tar.bz2; diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix index 47aeb8574b6..083ec23af56 100644 --- a/pkgs/tools/networking/jnettop/default.nix +++ b/pkgs/tools/networking/jnettop/default.nix @@ -1,6 +1,6 @@ { fetchurl, fetchpatch, stdenv, autoconf, libpcap, ncurses, pkgconfig, glib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "jnettop-0.13.0"; src = fetchurl { diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix index 134e9b6df76..44c8b9a9c4d 100644 --- a/pkgs/tools/networking/maildrop/default.nix +++ b/pkgs/tools/networking/maildrop/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, pcre, perl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "maildrop-2.6.0"; src = fetchurl { diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/tools/networking/ndjbdns/default.nix index 77f797fc7c7..85de6d13183 100644 --- a/pkgs/tools/networking/ndjbdns/default.nix +++ b/pkgs/tools/networking/ndjbdns/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "1.06"; pname = "ndjbdns"; diff --git a/pkgs/tools/networking/netalyzr/default.nix b/pkgs/tools/networking/netalyzr/default.nix index 940a37ab86f..969084582ae 100644 --- a/pkgs/tools/networking/netalyzr/default.nix +++ b/pkgs/tools/networking/netalyzr/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, jre, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "netalyzr"; version = "57861"; diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 062d6e2d0a9..8da36d72fda 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.6.6"; # Upstream recommends and supports git - src = fetchFromGitHub rec { + src = fetchFromGitHub { repo = pname; owner = pname; rev = "v${version}"; diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix index 0fb11e1b0eb..1a6538ad104 100644 --- a/pkgs/tools/networking/network-manager/applet.nix +++ b/pkgs/tools/networking/network-manager/applet.nix @@ -2,7 +2,7 @@ , libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl, docbook_xml_dtd_43 , mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas , libgudev, jansson, wrapGAppsHook, gobject-introspection, python3, gtk3 -, libappindicator-gtk3, withGnome ? false, gcr }: +, libappindicator-gtk3, withGnome ? false, gcr, glib }: let pname = "network-manager-applet"; @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py - substituteInPlace src/wireless-security/eap-method.c --subst-var-by NM_APPLET_GSETTINGS $lib/share/gsettings-schemas/${name}/glib-2.0/schemas + substituteInPlace src/wireless-security/eap-method.c --subst-var-by NM_APPLET_GSETTINGS ${glib.makeSchemaPath "$lib" name} ''; passthru = { diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix index f4ffe620e74..7773548576b 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix @@ -4,7 +4,7 @@ networkmanager, ppp, libsecret, withGnome ? true, gnome3 }: let pname = "NetworkManager-fortisslvpn"; version = "1.2.10"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix index d3eb3f79933..27e091b6b60 100644 --- a/pkgs/tools/networking/network-manager/iodine/default.nix +++ b/pkgs/tools/networking/network-manager/iodine/default.nix @@ -4,7 +4,7 @@ let pname = "NetworkManager-iodine"; version = "1.2.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { diff --git a/pkgs/tools/networking/network-manager/openconnect/default.nix b/pkgs/tools/networking/network-manager/openconnect/default.nix index 566179d85b3..1fb50686d0d 100644 --- a/pkgs/tools/networking/network-manager/openconnect/default.nix +++ b/pkgs/tools/networking/network-manager/openconnect/default.nix @@ -4,7 +4,7 @@ let pname = "NetworkManager-openconnect"; version = "1.2.4"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index fa764788e2c..04ec49f7b9b 100644 --- a/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -4,7 +4,7 @@ let pname = "NetworkManager-openvpn"; version = "1.8.10"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/pkgs/tools/networking/network-manager/vpnc/default.nix index 3231c276be5..1aa4cd5658b 100644 --- a/pkgs/tools/networking/network-manager/vpnc/default.nix +++ b/pkgs/tools/networking/network-manager/vpnc/default.nix @@ -3,7 +3,7 @@ let pname = "NetworkManager-vpnc"; version = "1.2.6"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { diff --git a/pkgs/tools/networking/noip/default.nix b/pkgs/tools/networking/noip/default.nix index c63d7ac057b..0ef2ce50867 100644 --- a/pkgs/tools/networking/noip/default.nix +++ b/pkgs/tools/networking/noip/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "noip-2.1.9-1"; src = fetchurl { diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index 154788b3c5d..7e614629484 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -4,13 +4,13 @@ assert (openssl != null) == (gnutls == null); stdenv.mkDerivation rec { pname = "openconnect"; - version = "8.03"; + version = "8.04"; src = fetchurl { urls = [ "ftp://ftp.infradead.org/pub/openconnect/${pname}-${version}.tar.gz" ]; - sha256 = "1wlypi68kqqg2mdck8wvf6aanhrmf9i7z6lngyxvcrp23jdzz34h"; + sha256 = "07zqcl2ykdc4mgix9sbv4jgpg7cybifxfgrycvf99ckq7xp9r5wq"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/tools/networking/openconnect_pa/default.nix b/pkgs/tools/networking/openconnect_pa/default.nix index ba8fc6694d1..68d18bff777 100644 --- a/pkgs/tools/networking/openconnect_pa/default.nix +++ b/pkgs/tools/networking/openconnect_pa/default.nix @@ -2,7 +2,7 @@ assert (openssl != null) == (gnutls == null); -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "unstable-2018-10-08"; pname = "openconnect_pa"; diff --git a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix index 706f2434a95..d86934d079b 100644 --- a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix +++ b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, makeWrapper, coreutils, gawk, utillinux }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "openvpn-learnaddress-19b03c3"; src = fetchgit { diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix index e96aa25fede..0f7e8f2c445 100644 --- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix +++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix @@ -3,7 +3,7 @@ let binPath = lib.makeBinPath [ coreutils openresolv systemd ]; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "update-resolv-conf-2017-06-21"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/packetdrill/default.nix b/pkgs/tools/networking/packetdrill/default.nix index 13aa8fcbd00..2041d935c94 100644 --- a/pkgs/tools/networking/packetdrill/default.nix +++ b/pkgs/tools/networking/packetdrill/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, bison, flex }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "1.0"; pname = "packetdrill"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/pdnsd/default.nix b/pkgs/tools/networking/pdnsd/default.nix index 10c004ecd94..f5d30fa32a8 100644 --- a/pkgs/tools/networking/pdnsd/default.nix +++ b/pkgs/tools/networking/pdnsd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "pdnsd-1.2.9a-par"; src = fetchurl { diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix index 57cd093e1cd..fdfa0f808ec 100644 --- a/pkgs/tools/networking/pykms/default.nix +++ b/pkgs/tools/networking/pykms/default.nix @@ -29,7 +29,7 @@ let fi ''); -in buildPythonApplication rec { +in buildPythonApplication { pname = "pykms"; version = "20180208"; diff --git a/pkgs/tools/networking/qr-filetransfer/default.nix b/pkgs/tools/networking/qr-filetransfer/default.nix index b1d972a733b..b95d0facda8 100644 --- a/pkgs/tools/networking/qr-filetransfer/default.nix +++ b/pkgs/tools/networking/qr-filetransfer/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "qr-filetransfer-unstable"; version = "2018-10-22"; diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix index 12e07386516..87071e23a96 100644 --- a/pkgs/tools/networking/quicktun/default.nix +++ b/pkgs/tools/networking/quicktun/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, libsodium }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "quicktun"; version = "2.2.5"; diff --git a/pkgs/tools/networking/redsocks/default.nix b/pkgs/tools/networking/redsocks/default.nix index 641513eaf47..32a30f48ec6 100644 --- a/pkgs/tools/networking/redsocks/default.nix +++ b/pkgs/tools/networking/redsocks/default.nix @@ -4,7 +4,7 @@ let pkg = "redsocks"; version = "0.5"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pkg}-${version}"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix index 2beb8aec389..bdb526c7054 100644 --- a/pkgs/tools/networking/rp-pppoe/default.nix +++ b/pkgs/tools/networking/rp-pppoe/default.nix @@ -2,7 +2,7 @@ let version = "3.12"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "rp-pppoe-" + version; src = fetchurl { url = "https://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz"; diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index e74a3554dc2..31b111f2b83 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2Packages }: python2Packages.buildPythonApplication rec { - name = "s3cmd-${version}"; + pname = "s3cmd"; version = "2.0.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index b42b3ff5b73..8dfaae63ffa 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -11,7 +11,7 @@ let inherit (stdenv) lib; sslSupportEnabled = sslSupport != false; sslLibs = { - "libressl" = libressl; + libressl = libressl; }; in diff --git a/pkgs/tools/networking/shncpd/default.nix b/pkgs/tools/networking/shncpd/default.nix index 211758f692b..be861654f65 100644 --- a/pkgs/tools/networking/shncpd/default.nix +++ b/pkgs/tools/networking/shncpd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "shncpd"; version = "2016-06-22"; diff --git a/pkgs/tools/networking/srelay/default.nix b/pkgs/tools/networking/srelay/default.nix index 7d3f773b193..b55860a20c1 100644 --- a/pkgs/tools/networking/srelay/default.nix +++ b/pkgs/tools/networking/srelay/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "srelay-0.4.8"; src = fetchurl { diff --git a/pkgs/tools/networking/ssh-agents/default.nix b/pkgs/tools/networking/ssh-agents/default.nix index 84e7558713c..b01d373088b 100644 --- a/pkgs/tools/networking/ssh-agents/default.nix +++ b/pkgs/tools/networking/ssh-agents/default.nix @@ -4,7 +4,7 @@ }: stdenvNoCC.mkDerivation rec { - name = "ssh-agents-${version}"; + pname = "ssh-agents"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/ssh-ident/default.nix b/pkgs/tools/networking/ssh-ident/default.nix index 0264da5c817..cb07d73a631 100644 --- a/pkgs/tools/networking/ssh-ident/default.nix +++ b/pkgs/tools/networking/ssh-ident/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, python }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ssh-ident"; version = "2016-04-21"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix index ad8f9830264..0081e7d1ddb 100644 --- a/pkgs/tools/networking/ssldump/default.nix +++ b/pkgs/tools/networking/ssldump/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, openssl, libpcap }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ssldump"; version = "0.9b3"; diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index b05ab3eeb88..65b88a34fb0 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "subfinder-git"; version = "2018-07-15"; diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/tools/networking/surfraw/default.nix index 80daf6447ef..d69221d9d50 100644 --- a/pkgs/tools/networking/surfraw/default.nix +++ b/pkgs/tools/networking/surfraw/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, perl}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "surfraw-2.3.0"; src = fetchurl { diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index a04d47b6414..9cebc267260 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libpcap, perl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tcpdump"; version = "4.9.2"; diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix index b992fef2253..df199869e60 100644 --- a/pkgs/tools/networking/tlspool/default.nix +++ b/pkgs/tools/networking/tlspool/default.nix @@ -9,7 +9,7 @@ let version = "20180227"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchFromGitHub { owner = "arpa2"; diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix index f72d004c291..f47ccab45ea 100644 --- a/pkgs/tools/networking/tox-node/default.nix +++ b/pkgs/tools/networking/tox-node/default.nix @@ -6,7 +6,7 @@ with rustPlatform; buildRustPackage rec { - name = "tox-node-${version}"; + pname = "tox-node"; version = "0.0.8"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix index ccb9f3bc0d6..fed7eccdf48 100644 --- a/pkgs/tools/networking/toxvpn/default.nix +++ b/pkgs/tools/networking/toxvpn/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "toxvpn-2018-04-17"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 660ffcb823b..8a4b6e6650e 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unbound"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { url = "https://unbound.net/downloads/${pname}-${version}.tar.gz"; - sha256 = "15bbrczibap30db8a1pmqhvjbmkxms39hwiivby7f4j5rz2wwykg"; + sha256 = "1ykdy62sgzv33ggkmzwx2h0ifm7hyyxyfkb4zckv7gz4f28xsm8v"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB diff --git a/pkgs/tools/networking/unbound/python.nix b/pkgs/tools/networking/unbound/python.nix index f6b5852a675..fdd110e14b3 100644 --- a/pkgs/tools/networking/unbound/python.nix +++ b/pkgs/tools/networking/unbound/python.nix @@ -4,11 +4,11 @@ let inherit (pythonPackages) python; in stdenv.mkDerivation rec { pname = "pyunbound"; - version = "1.9.0"; + version = "1.9.3"; src = fetchurl { url = "http://unbound.net/downloads/unbound-${version}.tar.gz"; - sha256 = "0bb0p8nbda77ghx20yfl7hqxm9x709223q35465v99i8v4ay27f1"; + sha256 = "1ykdy62sgzv33ggkmzwx2h0ifm7hyyxyfkb4zckv7gz4f28xsm8v"; }; buildInputs = [ openssl expat libevent swig python ]; diff --git a/pkgs/tools/networking/vlan/default.nix b/pkgs/tools/networking/vlan/default.nix index 1684da45ccc..7a6a37c9112 100644 --- a/pkgs/tools/networking/vlan/default.nix +++ b/pkgs/tools/networking/vlan/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "vlan-1.9"; src = fetchurl { diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index 6a23c81569f..424355e41df 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchsvn, nettools, libgcrypt, openssl, openresolv, perl, gawk, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "vpnc-0.5.3-post-r550"; src = fetchsvn { url = "https://svn.unix-ag.uni-kl.de/vpnc"; diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/tools/networking/webalizer/default.nix index e9b9452c756..bd80eae2beb 100644 --- a/pkgs/tools/networking/webalizer/default.nix +++ b/pkgs/tools/networking/webalizer/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation { configureFlags = [ "--enable-dns" "--enable-geoip" - "--disable-static" "--enable-shared" ]; diff --git a/pkgs/tools/nix/nix-script/default.nix b/pkgs/tools/nix/nix-script/default.nix index 664e55125b5..d69b5943123 100644 --- a/pkgs/tools/nix/nix-script/default.nix +++ b/pkgs/tools/nix/nix-script/default.nix @@ -1,6 +1,6 @@ { stdenv, haskellPackages, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nix-script"; version = "2015-09-22"; diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index 69f4fc435c9..13b7ffd2af7 100644 --- a/pkgs/tools/nix/nixdoc/default.nix +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform, darwin }: rustPlatform.buildRustPackage rec { - name = "nixdoc-${version}"; + pname = "nixdoc"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/cargo-download/crates-io.nix b/pkgs/tools/package-management/cargo-download/crates-io.nix index d120a05e00d..e0c0abf4dc6 100644 --- a/pkgs/tools/package-management/cargo-download/crates-io.nix +++ b/pkgs/tools/package-management/cargo-download/crates-io.nix @@ -14,7 +14,7 @@ rec { authors = [ "Remi Rampin <remirampin@gmail.com>" ]; sha256 = "1974q3nysai026zhz24df506cxwi09jdzqksll4h7ibpb5n9g1d4"; }; - features_.adler32."1.0.2" = deps: f: updateFeatures f (rec { + features_.adler32."1.0.2" = deps: f: updateFeatures f ({ adler32."1.0.2".default = (f.adler32."1.0.2".default or true); }) []; @@ -35,7 +35,7 @@ rec { (crates."memchr"."${deps."aho_corasick"."0.5.3"."memchr"}" deps) ]); }; - features_.aho_corasick."0.5.3" = deps: f: updateFeatures f (rec { + features_.aho_corasick."0.5.3" = deps: f: updateFeatures f ({ aho_corasick."0.5.3".default = (f.aho_corasick."0.5.3".default or true); memchr."${deps.aho_corasick."0.5.3".memchr}".default = true; }) [ @@ -53,7 +53,7 @@ rec { authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>" ]; sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij"; }; - features_.ansi_term."0.9.0" = deps: f: updateFeatures f (rec { + features_.ansi_term."0.9.0" = deps: f: updateFeatures f ({ ansi_term."0.9.0".default = (f.ansi_term."0.9.0".default or true); }) []; @@ -110,7 +110,7 @@ rec { (crates."winapi"."${deps."atty"."0.2.3"."winapi"}" deps) ]) else []); }; - features_.atty."0.2.3" = deps: f: updateFeatures f (rec { + features_.atty."0.2.3" = deps: f: updateFeatures f ({ atty."0.2.3".default = (f.atty."0.2.3".default or true); kernel32_sys."${deps.atty."0.2.3".kernel32_sys}".default = true; libc."${deps.atty."0.2.3".libc}".default = (f.libc."${deps.atty."0.2.3".libc}".default or false); @@ -138,7 +138,7 @@ rec { (crates."safemem"."${deps."base64"."0.9.3"."safemem"}" deps) ]); }; - features_.base64."0.9.3" = deps: f: updateFeatures f (rec { + features_.base64."0.9.3" = deps: f: updateFeatures f ({ base64."0.9.3".default = (f.base64."0.9.3".default or true); byteorder."${deps.base64."0.9.3".byteorder}".default = true; safemem."${deps.base64."0.9.3".safemem}".default = true; @@ -158,7 +158,7 @@ rec { authors = [ "The Rust Project Developers" ]; sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; }; - features_.bitflags."0.7.0" = deps: f: updateFeatures f (rec { + features_.bitflags."0.7.0" = deps: f: updateFeatures f ({ bitflags."0.7.0".default = (f.bitflags."0.7.0".default or true); }) []; @@ -196,7 +196,7 @@ rec { sha256 = "1g1wmz2001qmfrd37dnd5qiss5njrw26aywmg6yhkmkbyrhjxb08"; features = mkFeatures (features."bitflags"."1.0.4" or {}); }; - features_.bitflags."1.0.4" = deps: f: updateFeatures f (rec { + features_.bitflags."1.0.4" = deps: f: updateFeatures f ({ bitflags."1.0.4".default = (f.bitflags."1.0.4".default or true); }) []; @@ -288,7 +288,7 @@ rec { (crates."time"."${deps."cargo_download"."0.1.2"."time"}" deps) ]); }; - features_.cargo_download."0.1.2" = deps: f: updateFeatures f (rec { + features_.cargo_download."0.1.2" = deps: f: updateFeatures f ({ ansi_term."${deps.cargo_download."0.1.2".ansi_term}".default = true; cargo_download."0.1.2".default = (f.cargo_download."0.1.2".default or true); clap."${deps.cargo_download."0.1.2".clap}".default = true; @@ -344,7 +344,7 @@ rec { authors = [ "Skyler Lipthay <skyler.lipthay@gmail.com>" ]; sha256 = "06i1x3wqv30rkvlgj134qf9vzxhzz28bz41mm0rgki0i0f7gf96n"; }; - features_.case."0.1.0" = deps: f: updateFeatures f (rec { + features_.case."0.1.0" = deps: f: updateFeatures f ({ case."0.1.0".default = (f.case."0.1.0".default or true); }) []; @@ -383,7 +383,7 @@ rec { authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi"; }; - features_.cfg_if."0.1.2" = deps: f: updateFeatures f (rec { + features_.cfg_if."0.1.2" = deps: f: updateFeatures f ({ cfg_if."0.1.2".default = (f.cfg_if."0.1.2".default or true); }) []; @@ -402,7 +402,7 @@ rec { (crates."time"."${deps."chrono"."0.2.25"."time"}" deps) ]); }; - features_.chrono."0.2.25" = deps: f: updateFeatures f (rec { + features_.chrono."0.2.25" = deps: f: updateFeatures f ({ chrono."0.2.25".default = (f.chrono."0.2.25".default or true); num."${deps.chrono."0.2.25".num}".default = (f.num."${deps.chrono."0.2.25".num}".default or false); time."${deps.chrono."0.2.25".time}".default = true; @@ -542,7 +542,7 @@ rec { (crates."custom_derive"."${deps."conv"."0.3.3"."custom_derive"}" deps) ]); }; - features_.conv."0.3.3" = deps: f: updateFeatures f (rec { + features_.conv."0.3.3" = deps: f: updateFeatures f ({ conv."0.3.3".default = (f.conv."0.3.3".default or true); custom_derive."${deps.conv."0.3.3".custom_derive}".default = true; }) [ @@ -610,7 +610,7 @@ rec { ]); features = mkFeatures (features."core_foundation_sys"."0.5.1" or {}); }; - features_.core_foundation_sys."0.5.1" = deps: f: updateFeatures f (rec { + features_.core_foundation_sys."0.5.1" = deps: f: updateFeatures f ({ core_foundation_sys."0.5.1".default = (f.core_foundation_sys."0.5.1".default or true); libc."${deps.core_foundation_sys."0.5.1".libc}".default = true; }) [ @@ -628,7 +628,7 @@ rec { authors = [ "Sam Rijs <srijs@airpost.net>" "Alex Crichton <alex@alexcrichton.com>" ]; sha256 = "1rwvhb98w41mk5phr84mryally58f68h0v933772gdxqvqbcayqy"; }; - features_.crc32fast."1.1.1" = deps: f: updateFeatures f (rec { + features_.crc32fast."1.1.1" = deps: f: updateFeatures f ({ crc32fast."1.1.1".default = (f.crc32fast."1.1.1".default or true); }) []; @@ -644,7 +644,7 @@ rec { sha256 = "1k1a4q5gy7zakiw39hdzrblnw3kk4nsqmkdp1dpzh8h558140rhq"; features = mkFeatures (features."crossbeam"."0.2.10" or {}); }; - features_.crossbeam."0.2.10" = deps: f: updateFeatures f (rec { + features_.crossbeam."0.2.10" = deps: f: updateFeatures f ({ crossbeam."0.2.10".default = (f.crossbeam."0.2.10".default or true); }) []; @@ -663,7 +663,7 @@ rec { (crates."crossbeam_utils"."${deps."crossbeam_deque"."0.6.2"."crossbeam_utils"}" deps) ]); }; - features_.crossbeam_deque."0.6.2" = deps: f: updateFeatures f (rec { + features_.crossbeam_deque."0.6.2" = deps: f: updateFeatures f ({ crossbeam_deque."0.6.2".default = (f.crossbeam_deque."0.6.2".default or true); crossbeam_epoch."${deps.crossbeam_deque."0.6.2".crossbeam_epoch}".default = true; crossbeam_utils."${deps.crossbeam_deque."0.6.2".crossbeam_utils}".default = true; @@ -798,7 +798,7 @@ rec { (crates."syn"."${deps."derive_error"."0.0.3"."syn"}" deps) ]); }; - features_.derive_error."0.0.3" = deps: f: updateFeatures f (rec { + features_.derive_error."0.0.3" = deps: f: updateFeatures f ({ case."${deps.derive_error."0.0.3".case}".default = true; derive_error."0.0.3".default = (f.derive_error."0.0.3".default or true); quote."${deps.derive_error."0.0.3".quote}".default = true; @@ -820,7 +820,7 @@ rec { authors = [ "David Tolnay <dtolnay@gmail.com>" ]; sha256 = "1bxsh6fags7nr36vlz07ik2a1rzyipc8x1y30kjk832hf2pzadmw"; }; - features_.dtoa."0.4.2" = deps: f: updateFeatures f (rec { + features_.dtoa."0.4.2" = deps: f: updateFeatures f ({ dtoa."0.4.2".default = (f.dtoa."0.4.2".default or true); }) []; @@ -907,7 +907,7 @@ rec { authors = [ "Ben Wilber <benwilber@gmail.com>" ]; sha256 = "1cw9p4vzbscvyrbzv7z68gv2cairrns2d4wcb4nkahkcjk25phip"; }; - features_.exitcode."1.1.2" = deps: f: updateFeatures f (rec { + features_.exitcode."1.1.2" = deps: f: updateFeatures f ({ exitcode."1.1.2".default = (f.exitcode."1.1.2".default or true); }) []; @@ -931,7 +931,7 @@ rec { (crates."libc"."${deps."filetime"."0.1.14"."libc"}" deps) ]) else []); }; - features_.filetime."0.1.14" = deps: f: updateFeatures f (rec { + features_.filetime."0.1.14" = deps: f: updateFeatures f ({ cfg_if."${deps.filetime."0.1.14".cfg_if}".default = true; filetime."0.1.14".default = (f.filetime."0.1.14".default or true); libc."${deps.filetime."0.1.14".libc}".default = true; @@ -997,7 +997,7 @@ rec { sha256 = "128mlh23y3gg6ag5h8iiqlcbl59smisdzraqy88ldrf75kbw27ip"; libPath = "lib.rs"; }; - features_.fnv."1.0.6" = deps: f: updateFeatures f (rec { + features_.fnv."1.0.6" = deps: f: updateFeatures f ({ fnv."1.0.6".default = (f.fnv."1.0.6".default or true); }) []; @@ -1015,7 +1015,7 @@ rec { (crates."foreign_types_shared"."${deps."foreign_types"."0.3.2"."foreign_types_shared"}" deps) ]); }; - features_.foreign_types."0.3.2" = deps: f: updateFeatures f (rec { + features_.foreign_types."0.3.2" = deps: f: updateFeatures f ({ foreign_types."0.3.2".default = (f.foreign_types."0.3.2".default or true); foreign_types_shared."${deps.foreign_types."0.3.2".foreign_types_shared}".default = true; }) [ @@ -1033,7 +1033,7 @@ rec { authors = [ "Steven Fackler <sfackler@gmail.com>" ]; sha256 = "0b6cnvqbflws8dxywk4589vgbz80049lz4x1g9dfy4s1ppd3g4z5"; }; - features_.foreign_types_shared."0.1.1" = deps: f: updateFeatures f (rec { + features_.foreign_types_shared."0.1.1" = deps: f: updateFeatures f ({ foreign_types_shared."0.1.1".default = (f.foreign_types_shared."0.1.1".default or true); }) []; @@ -1051,7 +1051,7 @@ rec { (crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.2.1"."fuchsia_zircon_sys"}" deps) ]); }; - features_.fuchsia_zircon."0.2.1" = deps: f: updateFeatures f (rec { + features_.fuchsia_zircon."0.2.1" = deps: f: updateFeatures f ({ fuchsia_zircon."0.2.1".default = (f.fuchsia_zircon."0.2.1".default or true); fuchsia_zircon_sys."${deps.fuchsia_zircon."0.2.1".fuchsia_zircon_sys}".default = true; }) [ @@ -1073,7 +1073,7 @@ rec { (crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps) ]); }; - features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f (rec { + features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f ({ bitflags."${deps.fuchsia_zircon."0.3.3".bitflags}".default = true; fuchsia_zircon."0.3.3".default = (f.fuchsia_zircon."0.3.3".default or true); fuchsia_zircon_sys."${deps.fuchsia_zircon."0.3.3".fuchsia_zircon_sys}".default = true; @@ -1096,7 +1096,7 @@ rec { (crates."bitflags"."${deps."fuchsia_zircon_sys"."0.2.0"."bitflags"}" deps) ]); }; - features_.fuchsia_zircon_sys."0.2.0" = deps: f: updateFeatures f (rec { + features_.fuchsia_zircon_sys."0.2.0" = deps: f: updateFeatures f ({ bitflags."${deps.fuchsia_zircon_sys."0.2.0".bitflags}".default = true; fuchsia_zircon_sys."0.2.0".default = (f.fuchsia_zircon_sys."0.2.0".default or true); }) [ @@ -1114,7 +1114,7 @@ rec { authors = [ "Raph Levien <raph@google.com>" ]; sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; }; - features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f (rec { + features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f ({ fuchsia_zircon_sys."0.3.3".default = (f.fuchsia_zircon_sys."0.3.3".default or true); }) []; @@ -1206,7 +1206,7 @@ rec { ]); features = mkFeatures (features."h2"."0.1.13" or {}); }; - features_.h2."0.1.13" = deps: f: updateFeatures f (rec { + features_.h2."0.1.13" = deps: f: updateFeatures f ({ byteorder."${deps.h2."0.1.13".byteorder}".default = true; bytes."${deps.h2."0.1.13".bytes}".default = true; fnv."${deps.h2."0.1.13".fnv}".default = true; @@ -1247,7 +1247,7 @@ rec { (crates."itoa"."${deps."http"."0.1.14"."itoa"}" deps) ]); }; - features_.http."0.1.14" = deps: f: updateFeatures f (rec { + features_.http."0.1.14" = deps: f: updateFeatures f ({ bytes."${deps.http."0.1.14".bytes}".default = true; fnv."${deps.http."0.1.14".fnv}".default = true; http."0.1.14".default = (f.http."0.1.14".default or true); @@ -1454,7 +1454,7 @@ rec { (crates."unicode_normalization"."${deps."idna"."0.1.4"."unicode_normalization"}" deps) ]); }; - features_.idna."0.1.4" = deps: f: updateFeatures f (rec { + features_.idna."0.1.4" = deps: f: updateFeatures f ({ idna."0.1.4".default = (f.idna."0.1.4".default or true); matches."${deps.idna."0.1.4".matches}".default = true; unicode_bidi."${deps.idna."0.1.4".unicode_bidi}".default = true; @@ -1506,7 +1506,7 @@ rec { (crates."winapi"."${deps."iovec"."0.1.1"."winapi"}" deps) ]) else []); }; - features_.iovec."0.1.1" = deps: f: updateFeatures f (rec { + features_.iovec."0.1.1" = deps: f: updateFeatures f ({ iovec."0.1.1".default = (f.iovec."0.1.1".default or true); libc."${deps.iovec."0.1.1".libc}".default = true; winapi."${deps.iovec."0.1.1".winapi}".default = true; @@ -1533,7 +1533,7 @@ rec { (crates."winapi"."${deps."isatty"."0.1.5"."winapi"}" deps) ]) else []); }; - features_.isatty."0.1.5" = deps: f: updateFeatures f (rec { + features_.isatty."0.1.5" = deps: f: updateFeatures f ({ isatty."0.1.5".default = (f.isatty."0.1.5".default or true); kernel32_sys."${deps.isatty."0.1.5".kernel32_sys}".default = true; libc."${deps.isatty."0.1.5".libc}".default = true; @@ -1558,7 +1558,7 @@ rec { (crates."either"."${deps."itertools"."0.6.5"."either"}" deps) ]); }; - features_.itertools."0.6.5" = deps: f: updateFeatures f (rec { + features_.itertools."0.6.5" = deps: f: updateFeatures f ({ either."${deps.itertools."0.6.5".either}".default = (f.either."${deps.itertools."0.6.5".either}".default or false); itertools."0.6.5".default = (f.itertools."0.6.5".default or true); }) [ @@ -1577,7 +1577,7 @@ rec { sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9"; features = mkFeatures (features."itoa"."0.3.4" or {}); }; - features_.itoa."0.3.4" = deps: f: updateFeatures f (rec { + features_.itoa."0.3.4" = deps: f: updateFeatures f ({ itoa."0.3.4".default = (f.itoa."0.3.4".default or true); }) []; @@ -1623,7 +1623,7 @@ rec { (crates."winapi_build"."${deps."kernel32_sys"."0.2.2"."winapi_build"}" deps) ]); }; - features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f (rec { + features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f ({ kernel32_sys."0.2.2".default = (f.kernel32_sys."0.2.2".default or true); winapi."${deps.kernel32_sys."0.2.2".winapi}".default = true; winapi_build."${deps.kernel32_sys."0.2.2".winapi_build}".default = true; @@ -1765,7 +1765,7 @@ rec { (crates."crc32fast"."${deps."libflate"."0.1.19"."crc32fast"}" deps) ]); }; - features_.libflate."0.1.19" = deps: f: updateFeatures f (rec { + features_.libflate."0.1.19" = deps: f: updateFeatures f ({ adler32."${deps.libflate."0.1.19".adler32}".default = true; byteorder."${deps.libflate."0.1.19".byteorder}".default = true; crc32fast."${deps.libflate."0.1.19".crc32fast}".default = true; @@ -1792,7 +1792,7 @@ rec { ++ (if features.lock_api."0.1.5".owning_ref or false then [ (crates.owning_ref."${deps."lock_api"."0.1.5".owning_ref}" deps) ] else [])); features = mkFeatures (features."lock_api"."0.1.5" or {}); }; - features_.lock_api."0.1.5" = deps: f: updateFeatures f (rec { + features_.lock_api."0.1.5" = deps: f: updateFeatures f ({ lock_api."0.1.5".default = (f.lock_api."0.1.5".default or true); owning_ref."${deps.lock_api."0.1.5".owning_ref}".default = true; scopeguard."${deps.lock_api."0.1.5".scopeguard}".default = (f.scopeguard."${deps.lock_api."0.1.5".scopeguard}".default or false); @@ -1838,7 +1838,7 @@ rec { ]); features = mkFeatures (features."log"."0.4.6" or {}); }; - features_.log."0.4.6" = deps: f: updateFeatures f (rec { + features_.log."0.4.6" = deps: f: updateFeatures f ({ cfg_if."${deps.log."0.4.6".cfg_if}".default = true; log."0.4.6".default = (f.log."0.4.6".default or true); }) [ @@ -1856,7 +1856,7 @@ rec { authors = [ "bluss" ]; sha256 = "1f8kf5v7xra8ssvh5c10qlacbk4l0z2817pkscflx5s5q6y7925h"; }; - features_.maplit."0.1.6" = deps: f: updateFeatures f (rec { + features_.maplit."0.1.6" = deps: f: updateFeatures f ({ maplit."0.1.6".default = (f.maplit."0.1.6".default or true); }) []; @@ -1872,7 +1872,7 @@ rec { sha256 = "1zlrqlbvzxdil8z8ial2ihvxjwvlvg3g8dr0lcdpsjclkclasjan"; libPath = "lib.rs"; }; - features_.matches."0.1.6" = deps: f: updateFeatures f (rec { + features_.matches."0.1.6" = deps: f: updateFeatures f ({ matches."0.1.6".default = (f.matches."0.1.6".default or true); }) []; @@ -1890,7 +1890,7 @@ rec { (crates."libc"."${deps."memchr"."0.1.11"."libc"}" deps) ]); }; - features_.memchr."0.1.11" = deps: f: updateFeatures f (rec { + features_.memchr."0.1.11" = deps: f: updateFeatures f ({ libc."${deps.memchr."0.1.11".libc}".default = true; memchr."0.1.11".default = (f.memchr."0.1.11".default or true); }) [ @@ -1908,7 +1908,7 @@ rec { authors = [ "Gilad Naaman <gilad.naaman@gmail.com>" ]; sha256 = "00vym01jk9slibq2nsiilgffp7n6k52a4q3n4dqp0xf5kzxvffcf"; }; - features_.memoffset."0.2.1" = deps: f: updateFeatures f (rec { + features_.memoffset."0.2.1" = deps: f: updateFeatures f ({ memoffset."0.2.1".default = (f.memoffset."0.2.1".default or true); }) []; @@ -1926,7 +1926,7 @@ rec { (crates."unicase"."${deps."mime"."0.3.12"."unicase"}" deps) ]); }; - features_.mime."0.3.12" = deps: f: updateFeatures f (rec { + features_.mime."0.3.12" = deps: f: updateFeatures f ({ mime."0.3.12".default = (f.mime."0.3.12".default or true); unicase."${deps.mime."0.3.12".unicase}".default = true; }) [ @@ -1955,7 +1955,7 @@ rec { ]); features = mkFeatures (features."mime_guess"."2.0.0-alpha.6" or {}); }; - features_.mime_guess."2.0.0-alpha.6" = deps: f: updateFeatures f (rec { + features_.mime_guess."2.0.0-alpha.6" = deps: f: updateFeatures f ({ mime."${deps.mime_guess."2.0.0-alpha.6".mime}".default = true; mime_guess."2.0.0-alpha.6".default = (f.mime_guess."2.0.0-alpha.6".default or true); phf = fold recursiveUpdate {} [ @@ -1993,7 +1993,7 @@ rec { (crates."cc"."${deps."miniz_sys"."0.1.10"."cc"}" deps) ]); }; - features_.miniz_sys."0.1.10" = deps: f: updateFeatures f (rec { + features_.miniz_sys."0.1.10" = deps: f: updateFeatures f ({ cc."${deps.miniz_sys."0.1.10".cc}".default = true; libc."${deps.miniz_sys."0.1.10".libc}".default = true; miniz_sys."0.1.10".default = (f.miniz_sys."0.1.10".default or true); @@ -2083,7 +2083,7 @@ rec { (crates."ws2_32_sys"."${deps."miow"."0.2.1"."ws2_32_sys"}" deps) ]); }; - features_.miow."0.2.1" = deps: f: updateFeatures f (rec { + features_.miow."0.2.1" = deps: f: updateFeatures f ({ kernel32_sys."${deps.miow."0.2.1".kernel32_sys}".default = true; miow."0.2.1".default = (f.miow."0.2.1".default or true); net2."${deps.miow."0.2.1".net2}".default = (f.net2."${deps.miow."0.2.1".net2}".default or false); @@ -2126,7 +2126,7 @@ rec { ]) else []); features = mkFeatures (features."native_tls"."0.2.2" or {}); }; - features_.native_tls."0.2.2" = deps: f: updateFeatures f (rec { + features_.native_tls."0.2.2" = deps: f: updateFeatures f ({ lazy_static."${deps.native_tls."0.2.2".lazy_static}".default = true; libc."${deps.native_tls."0.2.2".libc}".default = true; log."${deps.native_tls."0.2.2".log}".default = true; @@ -2296,7 +2296,7 @@ rec { (crates."num_traits"."${deps."num_integer"."0.1.35"."num_traits"}" deps) ]); }; - features_.num_integer."0.1.35" = deps: f: updateFeatures f (rec { + features_.num_integer."0.1.35" = deps: f: updateFeatures f ({ num_integer."0.1.35".default = (f.num_integer."0.1.35".default or true); num_traits."${deps.num_integer."0.1.35".num_traits}".default = true; }) [ @@ -2318,7 +2318,7 @@ rec { (crates."num_traits"."${deps."num_iter"."0.1.34"."num_traits"}" deps) ]); }; - features_.num_iter."0.1.34" = deps: f: updateFeatures f (rec { + features_.num_iter."0.1.34" = deps: f: updateFeatures f ({ num_integer."${deps.num_iter."0.1.34".num_integer}".default = true; num_iter."0.1.34".default = (f.num_iter."0.1.34".default or true); num_traits."${deps.num_iter."0.1.34".num_traits}".default = true; @@ -2338,7 +2338,7 @@ rec { authors = [ "The Rust Project Developers" ]; sha256 = "1fr8ghp4i97q3agki54i0hpmqxv3s65i2mqd1pinc7w7arc3fplw"; }; - features_.num_traits."0.1.40" = deps: f: updateFeatures f (rec { + features_.num_traits."0.1.40" = deps: f: updateFeatures f ({ num_traits."0.1.40".default = (f.num_traits."0.1.40".default or true); }) []; @@ -2356,7 +2356,7 @@ rec { (crates."libc"."${deps."num_cpus"."1.8.0"."libc"}" deps) ]); }; - features_.num_cpus."1.8.0" = deps: f: updateFeatures f (rec { + features_.num_cpus."1.8.0" = deps: f: updateFeatures f ({ libc."${deps.num_cpus."1.8.0".libc}".default = true; num_cpus."1.8.0".default = (f.num_cpus."1.8.0".default or true); }) [ @@ -2417,7 +2417,7 @@ rec { authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; sha256 = "1a89fznx26vvaxyrxdvgf6iwai5xvs6xjvpjin68fgvrslv6n15a"; }; - features_.openssl_probe."0.1.2" = deps: f: updateFeatures f (rec { + features_.openssl_probe."0.1.2" = deps: f: updateFeatures f ({ openssl_probe."0.1.2".default = (f.openssl_probe."0.1.2".default or true); }) []; @@ -2475,7 +2475,7 @@ rec { (crates."stable_deref_trait"."${deps."owning_ref"."0.4.0"."stable_deref_trait"}" deps) ]); }; - features_.owning_ref."0.4.0" = deps: f: updateFeatures f (rec { + features_.owning_ref."0.4.0" = deps: f: updateFeatures f ({ owning_ref."0.4.0".default = (f.owning_ref."0.4.0".default or true); stable_deref_trait."${deps.owning_ref."0.4.0".stable_deref_trait}".default = true; }) [ @@ -2609,7 +2609,7 @@ rec { sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i"; libPath = "lib.rs"; }; - features_.percent_encoding."1.0.1" = deps: f: updateFeatures f (rec { + features_.percent_encoding."1.0.1" = deps: f: updateFeatures f ({ percent_encoding."1.0.1".default = (f.percent_encoding."1.0.1".default or true); }) []; @@ -2661,7 +2661,7 @@ rec { (crates."phf_shared"."${deps."phf_codegen"."0.7.21"."phf_shared"}" deps) ]); }; - features_.phf_codegen."0.7.21" = deps: f: updateFeatures f (rec { + features_.phf_codegen."0.7.21" = deps: f: updateFeatures f ({ phf_codegen."0.7.21".default = (f.phf_codegen."0.7.21".default or true); phf_generator."${deps.phf_codegen."0.7.21".phf_generator}".default = true; phf_shared."${deps.phf_codegen."0.7.21".phf_shared}".default = true; @@ -2685,7 +2685,7 @@ rec { (crates."rand"."${deps."phf_generator"."0.7.21"."rand"}" deps) ]); }; - features_.phf_generator."0.7.21" = deps: f: updateFeatures f (rec { + features_.phf_generator."0.7.21" = deps: f: updateFeatures f ({ phf_generator."0.7.21".default = (f.phf_generator."0.7.21".default or true); phf_shared."${deps.phf_generator."0.7.21".phf_shared}".default = true; rand."${deps.phf_generator."0.7.21".rand}".default = true; @@ -2711,7 +2711,7 @@ rec { ++ (if features.phf_shared."0.7.21".unicase or false then [ (crates.unicase."${deps."phf_shared"."0.7.21".unicase}" deps) ] else [])); features = mkFeatures (features."phf_shared"."0.7.21" or {}); }; - features_.phf_shared."0.7.21" = deps: f: updateFeatures f (rec { + features_.phf_shared."0.7.21" = deps: f: updateFeatures f ({ phf_shared."0.7.21".default = (f.phf_shared."0.7.21".default or true); siphasher."${deps.phf_shared."0.7.21".siphasher}".default = true; unicase."${deps.phf_shared."0.7.21".unicase}".default = true; @@ -2731,7 +2731,7 @@ rec { authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; }; - features_.pkg_config."0.3.9" = deps: f: updateFeatures f (rec { + features_.pkg_config."0.3.9" = deps: f: updateFeatures f ({ pkg_config."0.3.9".default = (f.pkg_config."0.3.9".default or true); }) []; @@ -2746,7 +2746,7 @@ rec { authors = [ "David Tolnay <dtolnay@gmail.com>" ]; sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg"; }; - features_.quote."0.3.15" = deps: f: updateFeatures f (rec { + features_.quote."0.3.15" = deps: f: updateFeatures f ({ quote."0.3.15".default = (f.quote."0.3.15".default or true); }) []; @@ -3036,7 +3036,7 @@ rec { (crates."rustc_version"."${deps."rand_chacha"."0.1.0"."rustc_version"}" deps) ]); }; - features_.rand_chacha."0.1.0" = deps: f: updateFeatures f (rec { + features_.rand_chacha."0.1.0" = deps: f: updateFeatures f ({ rand_chacha."0.1.0".default = (f.rand_chacha."0.1.0".default or true); rand_core."${deps.rand_chacha."0.1.0".rand_core}".default = (f.rand_core."${deps.rand_chacha."0.1.0".rand_core}".default or false); rustc_version."${deps.rand_chacha."0.1.0".rustc_version}".default = true; @@ -3131,7 +3131,7 @@ rec { (crates."rand_core"."${deps."rand_hc"."0.1.0"."rand_core"}" deps) ]); }; - features_.rand_hc."0.1.0" = deps: f: updateFeatures f (rec { + features_.rand_hc."0.1.0" = deps: f: updateFeatures f ({ rand_core."${deps.rand_hc."0.1.0".rand_core}".default = (f.rand_core."${deps.rand_hc."0.1.0".rand_core}".default or false); rand_hc."0.1.0".default = (f.rand_hc."0.1.0".default or true); }) [ @@ -3259,7 +3259,7 @@ rec { sha256 = "0kipd9qslzin4fgj4jrxv6yz5l3l71gnbd7fq1jhk2j7f2sq33j4"; libName = "syscall"; }; - features_.redox_syscall."0.1.31" = deps: f: updateFeatures f (rec { + features_.redox_syscall."0.1.31" = deps: f: updateFeatures f ({ redox_syscall."0.1.31".default = (f.redox_syscall."0.1.31".default or true); }) []; @@ -3278,7 +3278,7 @@ rec { (crates."redox_syscall"."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps) ]); }; - features_.redox_termios."0.1.1" = deps: f: updateFeatures f (rec { + features_.redox_termios."0.1.1" = deps: f: updateFeatures f ({ redox_syscall."${deps.redox_termios."0.1.1".redox_syscall}".default = true; redox_termios."0.1.1".default = (f.redox_termios."0.1.1".default or true); }) [ @@ -3336,7 +3336,7 @@ rec { authors = [ "The Rust Project Developers" ]; sha256 = "1mzhphkbwppwd1zam2jkgjk550cqgf6506i87bw2yzrvcsraiw7m"; }; - features_.regex_syntax."0.3.9" = deps: f: updateFeatures f (rec { + features_.regex_syntax."0.3.9" = deps: f: updateFeatures f ({ regex_syntax."0.3.9".default = (f.regex_syntax."0.3.9".default or true); }) []; @@ -3354,7 +3354,7 @@ rec { (crates."winapi"."${deps."remove_dir_all"."0.5.1"."winapi"}" deps) ]) else []); }; - features_.remove_dir_all."0.5.1" = deps: f: updateFeatures f (rec { + features_.remove_dir_all."0.5.1" = deps: f: updateFeatures f ({ remove_dir_all."0.5.1".default = (f.remove_dir_all."0.5.1".default or true); winapi = fold recursiveUpdate {} [ { "${deps.remove_dir_all."0.5.1".winapi}"."errhandlingapi" = true; } @@ -3479,7 +3479,7 @@ rec { (crates."semver"."${deps."rustc_version"."0.2.3"."semver"}" deps) ]); }; - features_.rustc_version."0.2.3" = deps: f: updateFeatures f (rec { + features_.rustc_version."0.2.3" = deps: f: updateFeatures f ({ rustc_version."0.2.3".default = (f.rustc_version."0.2.3".default or true); semver."${deps.rustc_version."0.2.3".semver}".default = true; }) [ @@ -3523,7 +3523,7 @@ rec { (crates."winapi"."${deps."schannel"."0.1.14"."winapi"}" deps) ]); }; - features_.schannel."0.1.14" = deps: f: updateFeatures f (rec { + features_.schannel."0.1.14" = deps: f: updateFeatures f ({ lazy_static."${deps.schannel."0.1.14".lazy_static}".default = true; schannel."0.1.14".default = (f.schannel."0.1.14".default or true); winapi = fold recursiveUpdate {} [ @@ -3706,7 +3706,7 @@ rec { authors = [ "Steve Klabnik <steve@steveklabnik.com>" ]; sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h"; }; - features_.semver_parser."0.7.0" = deps: f: updateFeatures f (rec { + features_.semver_parser."0.7.0" = deps: f: updateFeatures f ({ semver_parser."0.7.0".default = (f.semver_parser."0.7.0".default or true); }) []; @@ -3798,7 +3798,7 @@ rec { (crates."url"."${deps."serde_urlencoded"."0.5.1"."url"}" deps) ]); }; - features_.serde_urlencoded."0.5.1" = deps: f: updateFeatures f (rec { + features_.serde_urlencoded."0.5.1" = deps: f: updateFeatures f ({ dtoa."${deps.serde_urlencoded."0.5.1".dtoa}".default = true; itoa."${deps.serde_urlencoded."0.5.1".itoa}".default = true; serde."${deps.serde_urlencoded."0.5.1".serde}".default = true; @@ -3824,7 +3824,7 @@ rec { dependencies = mapFeatures features ([ ]); }; - features_.siphasher."0.2.2" = deps: f: updateFeatures f (rec { + features_.siphasher."0.2.2" = deps: f: updateFeatures f ({ siphasher."0.2.2".default = (f.siphasher."0.2.2".default or true); }) []; @@ -3839,7 +3839,7 @@ rec { authors = [ "Carl Lerche <me@carllerche.com>" ]; sha256 = "1qy2vkgwqgj5z4ygdkh040n9yh1vz80v5flxb1xrvw3i4wxs7yx0"; }; - features_.slab."0.4.0" = deps: f: updateFeatures f (rec { + features_.slab."0.4.0" = deps: f: updateFeatures f ({ slab."0.4.0".default = (f.slab."0.4.0".default or true); }) []; @@ -3884,7 +3884,7 @@ rec { (crates."slog_term"."${deps."slog_envlogger"."0.5.0"."slog_term"}" deps) ]); }; - features_.slog_envlogger."0.5.0" = deps: f: updateFeatures f (rec { + features_.slog_envlogger."0.5.0" = deps: f: updateFeatures f ({ log."${deps.slog_envlogger."0.5.0".log}".default = true; regex."${deps.slog_envlogger."0.5.0".regex}".default = true; slog."${deps.slog_envlogger."0.5.0".slog}".default = true; @@ -3915,7 +3915,7 @@ rec { (crates."thread_local"."${deps."slog_extra"."0.1.2"."thread_local"}" deps) ]); }; - features_.slog_extra."0.1.2" = deps: f: updateFeatures f (rec { + features_.slog_extra."0.1.2" = deps: f: updateFeatures f ({ slog."${deps.slog_extra."0.1.2".slog}".default = true; slog_extra."0.1.2".default = (f.slog_extra."0.1.2".default or true); thread_local."${deps.slog_extra."0.1.2".thread_local}".default = true; @@ -3943,7 +3943,7 @@ rec { (crates."slog_term"."${deps."slog_stdlog"."1.1.0"."slog_term"}" deps) ]); }; - features_.slog_stdlog."1.1.0" = deps: f: updateFeatures f (rec { + features_.slog_stdlog."1.1.0" = deps: f: updateFeatures f ({ crossbeam."${deps.slog_stdlog."1.1.0".crossbeam}".default = true; lazy_static."${deps.slog_stdlog."1.1.0".lazy_static}".default = true; log."${deps.slog_stdlog."1.1.0".log}".default = true; @@ -3975,7 +3975,7 @@ rec { (crates."thread_local"."${deps."slog_stream"."1.2.1"."thread_local"}" deps) ]); }; - features_.slog_stream."1.2.1" = deps: f: updateFeatures f (rec { + features_.slog_stream."1.2.1" = deps: f: updateFeatures f ({ slog."${deps.slog_stream."1.2.1".slog}".default = true; slog_extra."${deps.slog_stream."1.2.1".slog_extra}".default = true; slog_stream."1.2.1".default = (f.slog_stream."1.2.1".default or true); @@ -4005,7 +4005,7 @@ rec { (crates."thread_local"."${deps."slog_term"."1.5.0"."thread_local"}" deps) ]); }; - features_.slog_term."1.5.0" = deps: f: updateFeatures f (rec { + features_.slog_term."1.5.0" = deps: f: updateFeatures f ({ chrono."${deps.slog_term."1.5.0".chrono}".default = true; isatty."${deps.slog_term."1.5.0".isatty}".default = true; slog."${deps.slog_term."1.5.0".slog}".default = true; @@ -4082,7 +4082,7 @@ rec { authors = [ "Carl Lerche <me@carllerche.com>" ]; sha256 = "1120qvf02aydqj0k3kpr8d7zybq0y5arnmgmfsdw75r8qwz75wc6"; }; - features_.string."0.1.2" = deps: f: updateFeatures f (rec { + features_.string."0.1.2" = deps: f: updateFeatures f ({ string."0.1.2".default = (f.string."0.1.2".default or true); }) []; @@ -4097,7 +4097,7 @@ rec { authors = [ "Danny Guo <dannyguo91@gmail.com>" ]; sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd"; }; - features_.strsim."0.6.0" = deps: f: updateFeatures f (rec { + features_.strsim."0.6.0" = deps: f: updateFeatures f ({ strsim."0.6.0".default = (f.strsim."0.6.0".default or true); }) []; @@ -4165,7 +4165,7 @@ rec { (crates."unicode_xid"."${deps."synom"."0.11.3"."unicode_xid"}" deps) ]); }; - features_.synom."0.11.3" = deps: f: updateFeatures f (rec { + features_.synom."0.11.3" = deps: f: updateFeatures f ({ synom."0.11.3".default = (f.synom."0.11.3".default or true); unicode_xid."${deps.synom."0.11.3".unicode_xid}".default = true; }) [ @@ -4233,7 +4233,7 @@ rec { (crates."winapi"."${deps."tempfile"."3.0.5"."winapi"}" deps) ]) else []); }; - features_.tempfile."3.0.5" = deps: f: updateFeatures f (rec { + features_.tempfile."3.0.5" = deps: f: updateFeatures f ({ cfg_if."${deps.tempfile."3.0.5".cfg_if}".default = true; libc."${deps.tempfile."3.0.5".libc}".default = true; rand."${deps.tempfile."3.0.5".rand}".default = true; @@ -4273,7 +4273,7 @@ rec { (crates."redox_termios"."${deps."termion"."1.5.1"."redox_termios"}" deps) ]) else []); }; - features_.termion."1.5.1" = deps: f: updateFeatures f (rec { + features_.termion."1.5.1" = deps: f: updateFeatures f ({ libc."${deps.termion."1.5.1".libc}".default = true; redox_syscall."${deps.termion."1.5.1".redox_syscall}".default = true; redox_termios."${deps.termion."1.5.1".redox_termios}".default = true; @@ -4298,7 +4298,7 @@ rec { (crates."unicode_width"."${deps."textwrap"."0.9.0"."unicode_width"}" deps) ]); }; - features_.textwrap."0.9.0" = deps: f: updateFeatures f (rec { + features_.textwrap."0.9.0" = deps: f: updateFeatures f ({ textwrap."0.9.0".default = (f.textwrap."0.9.0".default or true); unicode_width."${deps.textwrap."0.9.0".unicode_width}".default = true; }) [ @@ -4320,7 +4320,7 @@ rec { (crates."libc"."${deps."thread_id"."2.0.0"."libc"}" deps) ]); }; - features_.thread_id."2.0.0" = deps: f: updateFeatures f (rec { + features_.thread_id."2.0.0" = deps: f: updateFeatures f ({ kernel32_sys."${deps.thread_id."2.0.0".kernel32_sys}".default = true; libc."${deps.thread_id."2.0.0".libc}".default = true; thread_id."2.0.0".default = (f.thread_id."2.0.0".default or true); @@ -4343,7 +4343,7 @@ rec { (crates."thread_id"."${deps."thread_local"."0.2.7"."thread_id"}" deps) ]); }; - features_.thread_local."0.2.7" = deps: f: updateFeatures f (rec { + features_.thread_local."0.2.7" = deps: f: updateFeatures f ({ thread_id."${deps.thread_local."0.2.7".thread_id}".default = true; thread_local."0.2.7".default = (f.thread_local."0.2.7".default or true); }) [ @@ -4365,7 +4365,7 @@ rec { (crates."unreachable"."${deps."thread_local"."0.3.4"."unreachable"}" deps) ]); }; - features_.thread_local."0.3.4" = deps: f: updateFeatures f (rec { + features_.thread_local."0.3.4" = deps: f: updateFeatures f ({ lazy_static."${deps.thread_local."0.3.4".lazy_static}".default = true; thread_local."0.3.4".default = (f.thread_local."0.3.4".default or true); unreachable."${deps.thread_local."0.3.4".unreachable}".default = true; @@ -4395,7 +4395,7 @@ rec { (crates."winapi"."${deps."time"."0.1.38"."winapi"}" deps) ]) else []); }; - features_.time."0.1.38" = deps: f: updateFeatures f (rec { + features_.time."0.1.38" = deps: f: updateFeatures f ({ kernel32_sys."${deps.time."0.1.38".kernel32_sys}".default = true; libc."${deps.time."0.1.38".libc}".default = true; redox_syscall."${deps.time."0.1.38".redox_syscall}".default = true; @@ -4431,7 +4431,7 @@ rec { (crates."tokio_udp"."${deps."tokio"."0.1.7"."tokio_udp"}" deps) ]); }; - features_.tokio."0.1.7" = deps: f: updateFeatures f (rec { + features_.tokio."0.1.7" = deps: f: updateFeatures f ({ futures."${deps.tokio."0.1.7".futures}".default = true; mio."${deps.tokio."0.1.7".mio}".default = true; tokio."0.1.7".default = (f.tokio."0.1.7".default or true); @@ -4472,7 +4472,7 @@ rec { (crates."tokio_io"."${deps."tokio_codec"."0.1.1"."tokio_io"}" deps) ]); }; - features_.tokio_codec."0.1.1" = deps: f: updateFeatures f (rec { + features_.tokio_codec."0.1.1" = deps: f: updateFeatures f ({ bytes."${deps.tokio_codec."0.1.1".bytes}".default = true; futures."${deps.tokio_codec."0.1.1".futures}".default = true; tokio_codec."0.1.1".default = (f.tokio_codec."0.1.1".default or true); @@ -4497,7 +4497,7 @@ rec { (crates."futures"."${deps."tokio_executor"."0.1.5"."futures"}" deps) ]); }; - features_.tokio_executor."0.1.5" = deps: f: updateFeatures f (rec { + features_.tokio_executor."0.1.5" = deps: f: updateFeatures f ({ futures."${deps.tokio_executor."0.1.5".futures}".default = true; tokio_executor."0.1.5".default = (f.tokio_executor."0.1.5".default or true); }) [ @@ -4520,7 +4520,7 @@ rec { (crates."tokio_threadpool"."${deps."tokio_fs"."0.1.4"."tokio_threadpool"}" deps) ]); }; - features_.tokio_fs."0.1.4" = deps: f: updateFeatures f (rec { + features_.tokio_fs."0.1.4" = deps: f: updateFeatures f ({ futures."${deps.tokio_fs."0.1.4".futures}".default = true; tokio_fs."0.1.4".default = (f.tokio_fs."0.1.4".default or true); tokio_io."${deps.tokio_fs."0.1.4".tokio_io}".default = true; @@ -4547,7 +4547,7 @@ rec { (crates."log"."${deps."tokio_io"."0.1.10"."log"}" deps) ]); }; - features_.tokio_io."0.1.10" = deps: f: updateFeatures f (rec { + features_.tokio_io."0.1.10" = deps: f: updateFeatures f ({ bytes."${deps.tokio_io."0.1.10".bytes}".default = true; futures."${deps.tokio_io."0.1.10".futures}".default = true; log."${deps.tokio_io."0.1.10".log}".default = true; @@ -4581,7 +4581,7 @@ rec { (crates."tokio_io"."${deps."tokio_reactor"."0.1.7"."tokio_io"}" deps) ]); }; - features_.tokio_reactor."0.1.7" = deps: f: updateFeatures f (rec { + features_.tokio_reactor."0.1.7" = deps: f: updateFeatures f ({ crossbeam_utils."${deps.tokio_reactor."0.1.7".crossbeam_utils}".default = true; futures."${deps.tokio_reactor."0.1.7".futures}".default = true; lazy_static."${deps.tokio_reactor."0.1.7".lazy_static}".default = true; @@ -4625,7 +4625,7 @@ rec { (crates."tokio_reactor"."${deps."tokio_tcp"."0.1.2"."tokio_reactor"}" deps) ]); }; - features_.tokio_tcp."0.1.2" = deps: f: updateFeatures f (rec { + features_.tokio_tcp."0.1.2" = deps: f: updateFeatures f ({ bytes."${deps.tokio_tcp."0.1.2".bytes}".default = true; futures."${deps.tokio_tcp."0.1.2".futures}".default = true; iovec."${deps.tokio_tcp."0.1.2".iovec}".default = true; @@ -4662,7 +4662,7 @@ rec { (crates."tokio_executor"."${deps."tokio_threadpool"."0.1.9"."tokio_executor"}" deps) ]); }; - features_.tokio_threadpool."0.1.9" = deps: f: updateFeatures f (rec { + features_.tokio_threadpool."0.1.9" = deps: f: updateFeatures f ({ crossbeam_deque."${deps.tokio_threadpool."0.1.9".crossbeam_deque}".default = true; crossbeam_utils."${deps.tokio_threadpool."0.1.9".crossbeam_utils}".default = true; futures."${deps.tokio_threadpool."0.1.9".futures}".default = true; @@ -4696,7 +4696,7 @@ rec { (crates."tokio_executor"."${deps."tokio_timer"."0.2.5"."tokio_executor"}" deps) ]); }; - features_.tokio_timer."0.2.5" = deps: f: updateFeatures f (rec { + features_.tokio_timer."0.2.5" = deps: f: updateFeatures f ({ futures."${deps.tokio_timer."0.2.5".futures}".default = true; tokio_executor."${deps.tokio_timer."0.2.5".tokio_executor}".default = true; tokio_timer."0.2.5".default = (f.tokio_timer."0.2.5".default or true); @@ -4725,7 +4725,7 @@ rec { (crates."tokio_reactor"."${deps."tokio_udp"."0.1.3"."tokio_reactor"}" deps) ]); }; - features_.tokio_udp."0.1.3" = deps: f: updateFeatures f (rec { + features_.tokio_udp."0.1.3" = deps: f: updateFeatures f ({ bytes."${deps.tokio_udp."0.1.3".bytes}".default = true; futures."${deps.tokio_udp."0.1.3".futures}".default = true; log."${deps.tokio_udp."0.1.3".log}".default = true; @@ -4755,7 +4755,7 @@ rec { authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; sha256 = "1k8xc0jpbrmzp0fwghdh6pwzjb9xx2p8yy0xxnnb8065smc5fsrv"; }; - features_.try_lock."0.2.2" = deps: f: updateFeatures f (rec { + features_.try_lock."0.2.2" = deps: f: updateFeatures f ({ try_lock."0.2.2".default = (f.try_lock."0.2.2".default or true); }) []; @@ -4812,7 +4812,7 @@ rec { ]); features = mkFeatures (features."unicase"."2.1.0" or {}); }; - features_.unicase."2.1.0" = deps: f: updateFeatures f (rec { + features_.unicase."2.1.0" = deps: f: updateFeatures f ({ unicase."2.1.0".default = (f.unicase."2.1.0".default or true); version_check."${deps.unicase."2.1.0".version_check}".default = true; }) [ @@ -4867,7 +4867,7 @@ rec { authors = [ "kwantam <kwantam@gmail.com>" ]; sha256 = "0hg29g86fca7b65mwk4sm5s838js6bqrl0gabadbazvbsgjam0j5"; }; - features_.unicode_normalization."0.1.5" = deps: f: updateFeatures f (rec { + features_.unicode_normalization."0.1.5" = deps: f: updateFeatures f ({ unicode_normalization."0.1.5".default = (f.unicode_normalization."0.1.5".default or true); }) []; @@ -4883,7 +4883,7 @@ rec { sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; features = mkFeatures (features."unicode_width"."0.1.4" or {}); }; - features_.unicode_width."0.1.4" = deps: f: updateFeatures f (rec { + features_.unicode_width."0.1.4" = deps: f: updateFeatures f ({ unicode_width."0.1.4".default = (f.unicode_width."0.1.4".default or true); }) []; @@ -4899,7 +4899,7 @@ rec { sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v"; features = mkFeatures (features."unicode_xid"."0.0.4" or {}); }; - features_.unicode_xid."0.0.4" = deps: f: updateFeatures f (rec { + features_.unicode_xid."0.0.4" = deps: f: updateFeatures f ({ unicode_xid."0.0.4".default = (f.unicode_xid."0.0.4".default or true); }) []; @@ -4917,7 +4917,7 @@ rec { (crates."void"."${deps."unreachable"."1.0.0"."void"}" deps) ]); }; - features_.unreachable."1.0.0" = deps: f: updateFeatures f (rec { + features_.unreachable."1.0.0" = deps: f: updateFeatures f ({ unreachable."1.0.0".default = (f.unreachable."1.0.0".default or true); void."${deps.unreachable."1.0.0".void}".default = (f.void."${deps.unreachable."1.0.0".void}".default or false); }) [ @@ -4973,7 +4973,7 @@ rec { authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; sha256 = "1cj548a91a93j8375p78qikaiam548xh84cb0ck8y119adbmsvbp"; }; - features_.utf8_ranges."0.1.3" = deps: f: updateFeatures f (rec { + features_.utf8_ranges."0.1.3" = deps: f: updateFeatures f ({ utf8_ranges."0.1.3".default = (f.utf8_ranges."0.1.3".default or true); }) []; @@ -5040,7 +5040,7 @@ rec { authors = [ "Jim McGrath <jimmc2@gmail.com>" ]; sha256 = "1fl5j0ksnwrnsrf1b1a9lqbjgnajdipq0030vsbhx81mb7d9478a"; }; - features_.vcpkg."0.2.2" = deps: f: updateFeatures f (rec { + features_.vcpkg."0.2.2" = deps: f: updateFeatures f ({ vcpkg."0.2.2".default = (f.vcpkg."0.2.2".default or true); }) []; @@ -5083,7 +5083,7 @@ rec { authors = [ "Sergio Benitez <sb@sergio.bz>" ]; sha256 = "0z635wdclv9bvafj11fpgndn7y79ibpsnc364pm61i1m4wwg8msg"; }; - features_.version_check."0.1.3" = deps: f: updateFeatures f (rec { + features_.version_check."0.1.3" = deps: f: updateFeatures f ({ version_check."0.1.3".default = (f.version_check."0.1.3".default or true); }) []; @@ -5125,7 +5125,7 @@ rec { (crates."try_lock"."${deps."want"."0.0.6"."try_lock"}" deps) ]); }; - features_.want."0.0.6" = deps: f: updateFeatures f (rec { + features_.want."0.0.6" = deps: f: updateFeatures f ({ futures."${deps.want."0.0.6".futures}".default = true; log."${deps.want."0.0.6".log}".default = true; try_lock."${deps.want."0.0.6".try_lock}".default = true; @@ -5147,7 +5147,7 @@ rec { authors = [ "Peter Atashian <retep998@gmail.com>" ]; sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; }; - features_.winapi."0.2.8" = deps: f: updateFeatures f (rec { + features_.winapi."0.2.8" = deps: f: updateFeatures f ({ winapi."0.2.8".default = (f.winapi."0.2.8".default or true); }) []; @@ -5170,7 +5170,7 @@ rec { ]) else []); features = mkFeatures (features."winapi"."0.3.6" or {}); }; - features_.winapi."0.3.6" = deps: f: updateFeatures f (rec { + features_.winapi."0.3.6" = deps: f: updateFeatures f ({ winapi."0.3.6".default = (f.winapi."0.3.6".default or true); winapi_i686_pc_windows_gnu."${deps.winapi."0.3.6".winapi_i686_pc_windows_gnu}".default = true; winapi_x86_64_pc_windows_gnu."${deps.winapi."0.3.6".winapi_x86_64_pc_windows_gnu}".default = true; @@ -5191,7 +5191,7 @@ rec { sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; libName = "build"; }; - features_.winapi_build."0.1.1" = deps: f: updateFeatures f (rec { + features_.winapi_build."0.1.1" = deps: f: updateFeatures f ({ winapi_build."0.1.1".default = (f.winapi_build."0.1.1".default or true); }) []; @@ -5207,7 +5207,7 @@ rec { sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp"; build = "build.rs"; }; - features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec { + features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({ winapi_i686_pc_windows_gnu."0.4.0".default = (f.winapi_i686_pc_windows_gnu."0.4.0".default or true); }) []; @@ -5223,7 +5223,7 @@ rec { sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj"; build = "build.rs"; }; - features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec { + features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({ winapi_x86_64_pc_windows_gnu."0.4.0".default = (f.winapi_x86_64_pc_windows_gnu."0.4.0".default or true); }) []; @@ -5247,7 +5247,7 @@ rec { (crates."winapi_build"."${deps."ws2_32_sys"."0.2.1"."winapi_build"}" deps) ]); }; - features_.ws2_32_sys."0.2.1" = deps: f: updateFeatures f (rec { + features_.ws2_32_sys."0.2.1" = deps: f: updateFeatures f ({ winapi."${deps.ws2_32_sys."0.2.1".winapi}".default = true; winapi_build."${deps.ws2_32_sys."0.2.1".winapi_build}".default = true; ws2_32_sys."0.2.1".default = (f.ws2_32_sys."0.2.1".default or true); diff --git a/pkgs/tools/package-management/cargo-graph/default.nix b/pkgs/tools/package-management/cargo-graph/default.nix index 5e635f0fc26..2fe89ccfa98 100644 --- a/pkgs/tools/package-management/cargo-graph/default.nix +++ b/pkgs/tools/package-management/cargo-graph/default.nix @@ -1,6 +1,6 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { - name = "cargo-graph-${version}"; + pname = "cargo-graph"; version = "0.2.0-d895af1"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/cargo-license/default.nix b/pkgs/tools/package-management/cargo-license/default.nix index 619fbb11597..c8a43bda64a 100644 --- a/pkgs/tools/package-management/cargo-license/default.nix +++ b/pkgs/tools/package-management/cargo-license/default.nix @@ -1,6 +1,6 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { - name = "cargo-license-${version}"; + pname = "cargo-license"; version = "0.2.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 2521a2ceebf..2dcb0304857 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -1,7 +1,7 @@ { stdenv, rustPlatform, fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { - name = "cargo-release-${version}"; + pname = "cargo-release"; version = "0.10.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/cargo-tree/default.nix b/pkgs/tools/package-management/cargo-tree/default.nix index 8b654188c51..8c3035ae79a 100644 --- a/pkgs/tools/package-management/cargo-tree/default.nix +++ b/pkgs/tools/package-management/cargo-tree/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, cmake, curl, libiconv, darwin }: rustPlatform.buildRustPackage rec { - name = "cargo-tree-${version}"; + pname = "cargo-tree"; version = "0.26.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/cargo-update/cargo-update.nix b/pkgs/tools/package-management/cargo-update/cargo-update.nix index 1bd8aadf498..9b8cf24605a 100644 --- a/pkgs/tools/package-management/cargo-update/cargo-update.nix +++ b/pkgs/tools/package-management/cargo-update/cargo-update.nix @@ -520,7 +520,7 @@ rec { dependencies = mapFeatures features ([ winapi_0_2_8 ]); buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); }; - advapi32_sys_0_2_0_features = f: updateFeatures f (rec { + advapi32_sys_0_2_0_features = f: updateFeatures f ({ advapi32_sys_0_2_0.default = (f.advapi32_sys_0_2_0.default or true); winapi_0_2_8.default = true; winapi_build_0_1_1.default = true; @@ -528,14 +528,14 @@ rec { aho_corasick_0_6_4 = { features?(aho_corasick_0_6_4_features {}) }: aho_corasick_0_6_4_ { dependencies = mapFeatures features ([ memchr_2_0_1 ]); }; - aho_corasick_0_6_4_features = f: updateFeatures f (rec { + aho_corasick_0_6_4_features = f: updateFeatures f ({ aho_corasick_0_6_4.default = (f.aho_corasick_0_6_4.default or true); memchr_2_0_1.default = true; }) [ memchr_2_0_1_features ]; ansi_term_0_11_0 = { features?(ansi_term_0_11_0_features {}) }: ansi_term_0_11_0_ { dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); }; - ansi_term_0_11_0_features = f: updateFeatures f (rec { + ansi_term_0_11_0_features = f: updateFeatures f ({ ansi_term_0_11_0.default = (f.ansi_term_0_11_0.default or true); winapi_0_3_4.consoleapi = true; winapi_0_3_4.default = true; @@ -543,7 +543,7 @@ rec { winapi_0_3_4.processenv = true; }) [ winapi_0_3_4_features ]; array_tool_1_0_3 = { features?(array_tool_1_0_3_features {}) }: array_tool_1_0_3_ {}; - array_tool_1_0_3_features = f: updateFeatures f (rec { + array_tool_1_0_3_features = f: updateFeatures f ({ array_tool_1_0_3.default = (f.array_tool_1_0_3.default or true); }) []; atty_0_2_10 = { features?(atty_0_2_10_features {}) }: atty_0_2_10_ { @@ -551,7 +551,7 @@ rec { ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_40 ]) else []) ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); }; - atty_0_2_10_features = f: updateFeatures f (rec { + atty_0_2_10_features = f: updateFeatures f ({ atty_0_2_10.default = (f.atty_0_2_10.default or true); libc_0_2_40.default = (f.libc_0_2_40.default or false); termion_1_5_1.default = true; @@ -575,14 +575,14 @@ rec { bitflags_1_0_3 = { features?(bitflags_1_0_3_features {}) }: bitflags_1_0_3_ { features = mkFeatures (features.bitflags_1_0_3 or {}); }; - bitflags_1_0_3_features = f: updateFeatures f (rec { + bitflags_1_0_3_features = f: updateFeatures f ({ bitflags_1_0_3.default = (f.bitflags_1_0_3.default or true); }) []; cargo_update_1_5_2 = { features?(cargo_update_1_5_2_features {}) }: cargo_update_1_5_2_ { dependencies = mapFeatures features ([ array_tool_1_0_3 clap_2_31_2 git2_0_6_11 json_0_11_13 lazy_static_1_0_0 lazysort_0_2_0 regex_0_2_11 semver_0_9_0 serde_1_0_55 serde_derive_1_0_55 tabwriter_1_0_4 toml_0_4_6 url_1_7_0 ]); buildDependencies = mapFeatures features ([ embed_resource_1_1_4 ]); }; - cargo_update_1_5_2_features = f: updateFeatures f (rec { + cargo_update_1_5_2_features = f: updateFeatures f ({ array_tool_1_0_3.default = true; cargo_update_1_5_2.default = (f.cargo_update_1_5_2.default or true); clap_2_31_2.default = true; @@ -677,7 +677,7 @@ rec { cmake_0_1_31 = { features?(cmake_0_1_31_features {}) }: cmake_0_1_31_ { dependencies = mapFeatures features ([ cc_1_0_15 ]); }; - cmake_0_1_31_features = f: updateFeatures f (rec { + cmake_0_1_31_features = f: updateFeatures f ({ cc_1_0_15.default = true; cmake_0_1_31.default = (f.cmake_0_1_31.default or true); }) [ cc_1_0_15_features ]; @@ -688,7 +688,7 @@ rec { ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); buildDependencies = mapFeatures features ([ cc_1_0_15 pkg_config_0_3_11 ]); }; - curl_sys_0_4_5_features = f: updateFeatures f (rec { + curl_sys_0_4_5_features = f: updateFeatures f ({ cc_1_0_15.default = true; curl_sys_0_4_5.default = (f.curl_sys_0_4_5.default or true); libc_0_2_40.default = true; @@ -702,20 +702,20 @@ rec { embed_resource_1_1_4 = { features?(embed_resource_1_1_4_features {}) }: embed_resource_1_1_4_ { dependencies = (if kernel == "windows" && abi == "msvc" then mapFeatures features ([ winreg_0_4_0 ]) else []); }; - embed_resource_1_1_4_features = f: updateFeatures f (rec { + embed_resource_1_1_4_features = f: updateFeatures f ({ embed_resource_1_1_4.default = (f.embed_resource_1_1_4.default or true); winreg_0_4_0.default = (f.winreg_0_4_0.default or false); }) [ winreg_0_4_0_features ]; fuchsia_zircon_0_3_3 = { features?(fuchsia_zircon_0_3_3_features {}) }: fuchsia_zircon_0_3_3_ { dependencies = mapFeatures features ([ bitflags_1_0_3 fuchsia_zircon_sys_0_3_3 ]); }; - fuchsia_zircon_0_3_3_features = f: updateFeatures f (rec { + fuchsia_zircon_0_3_3_features = f: updateFeatures f ({ bitflags_1_0_3.default = true; fuchsia_zircon_0_3_3.default = (f.fuchsia_zircon_0_3_3.default or true); fuchsia_zircon_sys_0_3_3.default = true; }) [ bitflags_1_0_3_features fuchsia_zircon_sys_0_3_3_features ]; fuchsia_zircon_sys_0_3_3 = { features?(fuchsia_zircon_sys_0_3_3_features {}) }: fuchsia_zircon_sys_0_3_3_ {}; - fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f (rec { + fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f ({ fuchsia_zircon_sys_0_3_3.default = (f.fuchsia_zircon_sys_0_3_3.default or true); }) []; git2_0_6_11 = { features?(git2_0_6_11_features {}) }: git2_0_6_11_ { @@ -769,21 +769,21 @@ rec { idna_0_1_4 = { features?(idna_0_1_4_features {}) }: idna_0_1_4_ { dependencies = mapFeatures features ([ matches_0_1_6 unicode_bidi_0_3_4 unicode_normalization_0_1_7 ]); }; - idna_0_1_4_features = f: updateFeatures f (rec { + idna_0_1_4_features = f: updateFeatures f ({ idna_0_1_4.default = (f.idna_0_1_4.default or true); matches_0_1_6.default = true; unicode_bidi_0_3_4.default = true; unicode_normalization_0_1_7.default = true; }) [ matches_0_1_6_features unicode_bidi_0_3_4_features unicode_normalization_0_1_7_features ]; json_0_11_13 = { features?(json_0_11_13_features {}) }: json_0_11_13_ {}; - json_0_11_13_features = f: updateFeatures f (rec { + json_0_11_13_features = f: updateFeatures f ({ json_0_11_13.default = (f.json_0_11_13.default or true); }) []; kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ { dependencies = mapFeatures features ([ winapi_0_2_8 ]); buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); }; - kernel32_sys_0_2_2_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2_features = f: updateFeatures f ({ kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); winapi_0_2_8.default = true; winapi_build_0_1_1.default = true; @@ -811,7 +811,7 @@ rec { dependencies = mapFeatures features ([ rand_0_3_22 ]); features = mkFeatures (features.lazysort_0_2_0 or {}); }; - lazysort_0_2_0_features = f: updateFeatures f (rec { + lazysort_0_2_0_features = f: updateFeatures f ({ lazysort_0_2_0.default = (f.lazysort_0_2_0.default or true); rand_0_3_22.default = true; }) [ rand_0_3_22_features ]; @@ -863,7 +863,7 @@ rec { ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ openssl_sys_0_9_30 ]) else []); buildDependencies = mapFeatures features ([ cmake_0_1_31 pkg_config_0_3_11 ]); }; - libssh2_sys_0_2_7_features = f: updateFeatures f (rec { + libssh2_sys_0_2_7_features = f: updateFeatures f ({ cmake_0_1_31.default = true; libc_0_2_40.default = true; libssh2_sys_0_2_7.default = (f.libssh2_sys_0_2_7.default or true); @@ -876,14 +876,14 @@ rec { ++ (if abi == "msvc" then mapFeatures features ([]) else []); buildDependencies = mapFeatures features ([ cc_1_0_15 pkg_config_0_3_11 ]); }; - libz_sys_1_0_18_features = f: updateFeatures f (rec { + libz_sys_1_0_18_features = f: updateFeatures f ({ cc_1_0_15.default = true; libc_0_2_40.default = true; libz_sys_1_0_18.default = (f.libz_sys_1_0_18.default or true); pkg_config_0_3_11.default = true; }) [ libc_0_2_40_features cc_1_0_15_features pkg_config_0_3_11_features ]; matches_0_1_6 = { features?(matches_0_1_6_features {}) }: matches_0_1_6_ {}; - matches_0_1_6_features = f: updateFeatures f (rec { + matches_0_1_6_features = f: updateFeatures f ({ matches_0_1_6.default = (f.matches_0_1_6.default or true); }) []; memchr_2_0_1 = { features?(memchr_2_0_1_features {}) }: memchr_2_0_1_ { @@ -910,7 +910,7 @@ rec { (memchr_2_0_1.default or false); }) [ libc_0_2_40_features ]; openssl_probe_0_1_2 = { features?(openssl_probe_0_1_2_features {}) }: openssl_probe_0_1_2_ {}; - openssl_probe_0_1_2_features = f: updateFeatures f (rec { + openssl_probe_0_1_2_features = f: updateFeatures f ({ openssl_probe_0_1_2.default = (f.openssl_probe_0_1_2.default or true); }) []; openssl_sys_0_9_30 = { features?(openssl_sys_0_9_30_features {}) }: openssl_sys_0_9_30_ { @@ -918,18 +918,18 @@ rec { ++ (if abi == "msvc" then mapFeatures features ([]) else []); buildDependencies = mapFeatures features ([ cc_1_0_15 pkg_config_0_3_11 ]); }; - openssl_sys_0_9_30_features = f: updateFeatures f (rec { + openssl_sys_0_9_30_features = f: updateFeatures f ({ cc_1_0_15.default = true; libc_0_2_40.default = true; openssl_sys_0_9_30.default = (f.openssl_sys_0_9_30.default or true); pkg_config_0_3_11.default = true; }) [ libc_0_2_40_features cc_1_0_15_features pkg_config_0_3_11_features ]; percent_encoding_1_0_1 = { features?(percent_encoding_1_0_1_features {}) }: percent_encoding_1_0_1_ {}; - percent_encoding_1_0_1_features = f: updateFeatures f (rec { + percent_encoding_1_0_1_features = f: updateFeatures f ({ percent_encoding_1_0_1.default = (f.percent_encoding_1_0_1.default or true); }) []; pkg_config_0_3_11 = { features?(pkg_config_0_3_11_features {}) }: pkg_config_0_3_11_ {}; - pkg_config_0_3_11_features = f: updateFeatures f (rec { + pkg_config_0_3_11_features = f: updateFeatures f ({ pkg_config_0_3_11.default = (f.pkg_config_0_3_11.default or true); }) []; proc_macro2_0_3_8 = { features?(proc_macro2_0_3_8_features {}) }: proc_macro2_0_3_8_ { @@ -1007,13 +1007,13 @@ rec { winapi_0_3_4.winnt = true; }) [ fuchsia_zircon_0_3_3_features libc_0_2_40_features winapi_0_3_4_features ]; redox_syscall_0_1_37 = { features?(redox_syscall_0_1_37_features {}) }: redox_syscall_0_1_37_ {}; - redox_syscall_0_1_37_features = f: updateFeatures f (rec { + redox_syscall_0_1_37_features = f: updateFeatures f ({ redox_syscall_0_1_37.default = (f.redox_syscall_0_1_37.default or true); }) []; redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ { dependencies = mapFeatures features ([ redox_syscall_0_1_37 ]); }; - redox_termios_0_1_1_features = f: updateFeatures f (rec { + redox_termios_0_1_1_features = f: updateFeatures f ({ redox_syscall_0_1_37.default = true; redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true); }) [ redox_syscall_0_1_37_features ]; @@ -1036,7 +1036,7 @@ rec { regex_syntax_0_5_6 = { features?(regex_syntax_0_5_6_features {}) }: regex_syntax_0_5_6_ { dependencies = mapFeatures features ([ ucd_util_0_1_1 ]); }; - regex_syntax_0_5_6_features = f: updateFeatures f (rec { + regex_syntax_0_5_6_features = f: updateFeatures f ({ regex_syntax_0_5_6.default = (f.regex_syntax_0_5_6.default or true); ucd_util_0_1_1.default = true; }) [ ucd_util_0_1_1_features ]; @@ -1055,7 +1055,7 @@ rec { serde_1_0_55.default = true; }) [ semver_parser_0_7_0_features serde_1_0_55_features ]; semver_parser_0_7_0 = { features?(semver_parser_0_7_0_features {}) }: semver_parser_0_7_0_ {}; - semver_parser_0_7_0_features = f: updateFeatures f (rec { + semver_parser_0_7_0_features = f: updateFeatures f ({ semver_parser_0_7_0.default = (f.semver_parser_0_7_0.default or true); }) []; serde_1_0_55 = { features?(serde_1_0_55_features {}) }: serde_1_0_55_ { @@ -1081,7 +1081,7 @@ rec { dependencies = mapFeatures features ([ proc_macro2_0_3_8 quote_0_5_2 syn_0_13_10 ]); features = mkFeatures (features.serde_derive_1_0_55 or {}); }; - serde_derive_1_0_55_features = f: updateFeatures f (rec { + serde_derive_1_0_55_features = f: updateFeatures f ({ proc_macro2_0_3_8.default = true; quote_0_5_2.default = true; serde_derive_1_0_55.default = (f.serde_derive_1_0_55.default or true); @@ -1089,7 +1089,7 @@ rec { syn_0_13_10.visit = true; }) [ proc_macro2_0_3_8_features quote_0_5_2_features syn_0_13_10_features ]; strsim_0_7_0 = { features?(strsim_0_7_0_features {}) }: strsim_0_7_0_ {}; - strsim_0_7_0_features = f: updateFeatures f (rec { + strsim_0_7_0_features = f: updateFeatures f ({ strsim_0_7_0.default = (f.strsim_0_7_0.default or true); }) []; syn_0_13_10 = { features?(syn_0_13_10_features {}) }: syn_0_13_10_ { @@ -1155,7 +1155,7 @@ rec { dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_40 ]) else []) ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_37 redox_termios_0_1_1 ]) else []); }; - termion_1_5_1_features = f: updateFeatures f (rec { + termion_1_5_1_features = f: updateFeatures f ({ libc_0_2_40.default = true; redox_syscall_0_1_37.default = true; redox_termios_0_1_1.default = true; @@ -1164,14 +1164,14 @@ rec { textwrap_0_9_0 = { features?(textwrap_0_9_0_features {}) }: textwrap_0_9_0_ { dependencies = mapFeatures features ([ unicode_width_0_1_4 ]); }; - textwrap_0_9_0_features = f: updateFeatures f (rec { + textwrap_0_9_0_features = f: updateFeatures f ({ textwrap_0_9_0.default = (f.textwrap_0_9_0.default or true); unicode_width_0_1_4.default = true; }) [ unicode_width_0_1_4_features ]; thread_local_0_3_5 = { features?(thread_local_0_3_5_features {}) }: thread_local_0_3_5_ { dependencies = mapFeatures features ([ lazy_static_1_0_0 unreachable_1_0_0 ]); }; - thread_local_0_3_5_features = f: updateFeatures f (rec { + thread_local_0_3_5_features = f: updateFeatures f ({ lazy_static_1_0_0.default = true; thread_local_0_3_5.default = (f.thread_local_0_3_5.default or true); unreachable_1_0_0.default = true; @@ -1179,12 +1179,12 @@ rec { toml_0_4_6 = { features?(toml_0_4_6_features {}) }: toml_0_4_6_ { dependencies = mapFeatures features ([ serde_1_0_55 ]); }; - toml_0_4_6_features = f: updateFeatures f (rec { + toml_0_4_6_features = f: updateFeatures f ({ serde_1_0_55.default = true; toml_0_4_6.default = (f.toml_0_4_6.default or true); }) [ serde_1_0_55_features ]; ucd_util_0_1_1 = { features?(ucd_util_0_1_1_features {}) }: ucd_util_0_1_1_ {}; - ucd_util_0_1_1_features = f: updateFeatures f (rec { + ucd_util_0_1_1_features = f: updateFeatures f ({ ucd_util_0_1_1.default = (f.ucd_util_0_1_1.default or true); }) []; unicode_bidi_0_3_4 = { features?(unicode_bidi_0_3_4_features {}) }: unicode_bidi_0_3_4_ { @@ -1208,25 +1208,25 @@ rec { (unicode_bidi_0_3_4.with_serde or false); }) [ matches_0_1_6_features ]; unicode_normalization_0_1_7 = { features?(unicode_normalization_0_1_7_features {}) }: unicode_normalization_0_1_7_ {}; - unicode_normalization_0_1_7_features = f: updateFeatures f (rec { + unicode_normalization_0_1_7_features = f: updateFeatures f ({ unicode_normalization_0_1_7.default = (f.unicode_normalization_0_1_7.default or true); }) []; unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ { features = mkFeatures (features.unicode_width_0_1_4 or {}); }; - unicode_width_0_1_4_features = f: updateFeatures f (rec { + unicode_width_0_1_4_features = f: updateFeatures f ({ unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true); }) []; unicode_xid_0_1_0 = { features?(unicode_xid_0_1_0_features {}) }: unicode_xid_0_1_0_ { features = mkFeatures (features.unicode_xid_0_1_0 or {}); }; - unicode_xid_0_1_0_features = f: updateFeatures f (rec { + unicode_xid_0_1_0_features = f: updateFeatures f ({ unicode_xid_0_1_0.default = (f.unicode_xid_0_1_0.default or true); }) []; unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ { dependencies = mapFeatures features ([ void_1_0_2 ]); }; - unreachable_1_0_0_features = f: updateFeatures f (rec { + unreachable_1_0_0_features = f: updateFeatures f ({ unreachable_1_0_0.default = (f.unreachable_1_0_0.default or true); void_1_0_2.default = (f.void_1_0_2.default or false); }) [ void_1_0_2_features ]; @@ -1249,11 +1249,11 @@ rec { (url_1_7_0.heap_size or false); }) [ idna_0_1_4_features matches_0_1_6_features percent_encoding_1_0_1_features ]; utf8_ranges_1_0_0 = { features?(utf8_ranges_1_0_0_features {}) }: utf8_ranges_1_0_0_ {}; - utf8_ranges_1_0_0_features = f: updateFeatures f (rec { + utf8_ranges_1_0_0_features = f: updateFeatures f ({ utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true); }) []; vcpkg_0_2_3 = { features?(vcpkg_0_2_3_features {}) }: vcpkg_0_2_3_ {}; - vcpkg_0_2_3_features = f: updateFeatures f (rec { + vcpkg_0_2_3_features = f: updateFeatures f ({ vcpkg_0_2_3.default = (f.vcpkg_0_2_3.default or true); }) []; vec_map_0_8_1 = { features?(vec_map_0_8_1_features {}) }: vec_map_0_8_1_ { @@ -1278,7 +1278,7 @@ rec { (void_1_0_2.default or false); }) []; winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; - winapi_0_2_8_features = f: updateFeatures f (rec { + winapi_0_2_8_features = f: updateFeatures f ({ winapi_0_2_8.default = (f.winapi_0_2_8.default or true); }) []; winapi_0_3_4 = { features?(winapi_0_3_4_features {}) }: winapi_0_3_4_ { @@ -1286,21 +1286,21 @@ rec { ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ winapi_x86_64_pc_windows_gnu_0_4_0 ]) else []); features = mkFeatures (features.winapi_0_3_4 or {}); }; - winapi_0_3_4_features = f: updateFeatures f (rec { + winapi_0_3_4_features = f: updateFeatures f ({ winapi_0_3_4.default = (f.winapi_0_3_4.default or true); winapi_i686_pc_windows_gnu_0_4_0.default = true; winapi_x86_64_pc_windows_gnu_0_4_0.default = true; }) [ winapi_i686_pc_windows_gnu_0_4_0_features winapi_x86_64_pc_windows_gnu_0_4_0_features ]; winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; - winapi_build_0_1_1_features = f: updateFeatures f (rec { + winapi_build_0_1_1_features = f: updateFeatures f ({ winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); }) []; winapi_i686_pc_windows_gnu_0_4_0 = { features?(winapi_i686_pc_windows_gnu_0_4_0_features {}) }: winapi_i686_pc_windows_gnu_0_4_0_ {}; - winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec { + winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f ({ winapi_i686_pc_windows_gnu_0_4_0.default = (f.winapi_i686_pc_windows_gnu_0_4_0.default or true); }) []; winapi_x86_64_pc_windows_gnu_0_4_0 = { features?(winapi_x86_64_pc_windows_gnu_0_4_0_features {}) }: winapi_x86_64_pc_windows_gnu_0_4_0_ {}; - winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec { + winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f ({ winapi_x86_64_pc_windows_gnu_0_4_0.default = (f.winapi_x86_64_pc_windows_gnu_0_4_0.default or true); }) []; winreg_0_4_0 = { features?(winreg_0_4_0_features {}) }: winreg_0_4_0_ { diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index 9b666dbfa64..17d023f6daf 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz, darwin }: rustPlatform.buildRustPackage rec { - name = "nix-du-${version}"; + pname = "nix-du"; version = "0.3.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index 62e0bc81afa..1d025581b61 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -3,7 +3,7 @@ }: rustPlatform.buildRustPackage rec { - name = "nix-index-${version}"; + pname = "nix-index"; version = "0.1.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix index 660dce347a5..b191d1c3211 100644 --- a/pkgs/tools/package-management/nix-serve/default.nix +++ b/pkgs/tools/package-management/nix-serve/default.nix @@ -9,7 +9,7 @@ let sha256 = "1wm24p6pkxl1d7hrvf4ph6mwzawvqi22c60z9xzndn5xfyr4v0yr"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "nix-serve-0.2-${substring 0 7 rev}"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix index b495577ef66..131a3bb5fdd 100644 --- a/pkgs/tools/package-management/nixui/default.nix +++ b/pkgs/tools/package-management/nixui/default.nix @@ -24,7 +24,7 @@ let genericName = "NixUI"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nixui"; inherit version src; installPhase = '' diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix index 8fe405e1b3e..4377681e20d 100644 --- a/pkgs/tools/package-management/nixui/nixui.nix +++ b/pkgs/tools/package-management/nixui/nixui.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/tools/package-management/opkg-utils/default.nix b/pkgs/tools/package-management/opkg-utils/default.nix index 8575f126e62..1c97757ff8a 100644 --- a/pkgs/tools/package-management/opkg-utils/default.nix +++ b/pkgs/tools/package-management/opkg-utils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "opkg-utils-20141030"; # No releases, only a git tree diff --git a/pkgs/tools/package-management/python2nix/default.nix b/pkgs/tools/package-management/python2nix/default.nix index 1a7c24e2c38..675ec61f4db 100644 --- a/pkgs/tools/package-management/python2nix/default.nix +++ b/pkgs/tools/package-management/python2nix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages }: -pythonPackages.buildPythonApplication rec { +pythonPackages.buildPythonApplication { name = "python2nix-20140927"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/afl/libdislocator.nix b/pkgs/tools/security/afl/libdislocator.nix index 58b25e6d3ee..47e74573b81 100644 --- a/pkgs/tools/security/afl/libdislocator.nix +++ b/pkgs/tools/security/afl/libdislocator.nix @@ -1,6 +1,6 @@ { stdenv, afl}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = (builtins.parseDrvName afl.name).version; pname = "libdislocator"; diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix index 9e0f19361fb..d80d301351f 100644 --- a/pkgs/tools/security/afl/qemu.nix +++ b/pkgs/tools/security/afl/qemu.nix @@ -11,7 +11,7 @@ let else if stdenv.hostPlatform.system == "i686-linux" then "i386-linux-user" else throw "afl: no support for ${stdenv.hostPlatform.system}!"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "afl-${qemuName}"; srcs = [ diff --git a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix index 19c9acc0a45..6b3a922bbe5 100644 --- a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix +++ b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix @@ -4,7 +4,7 @@ assert testQR -> zbar != false; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "asc-key-to-qr-code-gif"; version = "20180613"; diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix index 2fa50f91111..fdd4f2c73fd 100644 --- a/pkgs/tools/security/b2sum/default.nix +++ b/pkgs/tools/security/b2sum/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "b2sum"; version = "unstable-2018-06-11"; diff --git a/pkgs/tools/security/bash-supergenpass/default.nix b/pkgs/tools/security/bash-supergenpass/default.nix index c6d2cbd53c9..b745a2c872e 100644 --- a/pkgs/tools/security/bash-supergenpass/default.nix +++ b/pkgs/tools/security/bash-supergenpass/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, openssl, coreutils, gnugrep }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bash-supergenpass-unstable"; version = "2018-04-18"; diff --git a/pkgs/tools/security/bitwarden-cli/node-packages.nix b/pkgs/tools/security/bitwarden-cli/node-packages.nix index 41e23864c44..66560873b4c 100644 --- a/pkgs/tools/security/bitwarden-cli/node-packages.nix +++ b/pkgs/tools/security/bitwarden-cli/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/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index e6874d085d2..d94e02c4adc 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -16,11 +16,11 @@ let pname = "bitwarden"; version = { - "x86_64-linux" = "1.15.2"; + x86_64-linux = "1.15.2"; }.${system} or ""; sha256 = { - "x86_64-linux" = "0yz4hkqqwq2zrdjfxk5kybhs90n80k6bkn0625m47b09lwl2di4f"; + x86_64-linux = "0yz4hkqqwq2zrdjfxk5kybhs90n80k6bkn0625m47b09lwl2di4f"; }.${system} or ""; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/default.nix b/pkgs/tools/security/default.nix index cee198c1b3b..0e57a5bab88 100644 --- a/pkgs/tools/security/default.nix +++ b/pkgs/tools/security/default.nix @@ -1,6 +1,6 @@ { stdenv, pkgs }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.0.1"; pname = "ecdsatool"; diff --git a/pkgs/tools/security/ecdsautils/default.nix b/pkgs/tools/security/ecdsautils/default.nix index 00dac6e9429..13280e3226d 100644 --- a/pkgs/tools/security/ecdsautils/default.nix +++ b/pkgs/tools/security/ecdsautils/default.nix @@ -1,6 +1,6 @@ { stdenv, pkgs }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.4.0"; pname = "ecdsautils"; diff --git a/pkgs/tools/security/ecryptfs/helper.nix b/pkgs/tools/security/ecryptfs/helper.nix index 4acef56a2c5..fcb8d091d93 100644 --- a/pkgs/tools/security/ecryptfs/helper.nix +++ b/pkgs/tools/security/ecryptfs/helper.nix @@ -4,7 +4,7 @@ , python2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ecryptfs-helper"; version = "20160722"; diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 8ba80c46457..89e09a47858 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -39,7 +39,7 @@ let libuuid cups ]); - package = stdenv.mkDerivation rec { + package = stdenv.mkDerivation { inherit (data) version; pname = "enpass"; @@ -80,7 +80,7 @@ let ''; }; updater = { - update = stdenv.mkDerivation rec { + update = stdenv.mkDerivation { name = "enpass-update-script"; SCRIPT =./update_script.py; diff --git a/pkgs/tools/security/fprot/default.nix b/pkgs/tools/security/fprot/default.nix index 59d126c5e2c..3fff99a6ce1 100644 --- a/pkgs/tools/security/fprot/default.nix +++ b/pkgs/tools/security/fprot/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "f-prot"; version = "6.2.1"; diff --git a/pkgs/tools/security/haka/default.nix b/pkgs/tools/security/haka/default.nix index c4b96f04dc2..bd7d356c1a0 100644 --- a/pkgs/tools/security/haka/default.nix +++ b/pkgs/tools/security/haka/default.nix @@ -2,7 +2,7 @@ let version = "0.3.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "haka"; inherit version; diff --git a/pkgs/tools/security/hash_extender/default.nix b/pkgs/tools/security/hash_extender/default.nix index 9efa7e2afa2..30ba2fb3087 100644 --- a/pkgs/tools/security/hash_extender/default.nix +++ b/pkgs/tools/security/hash_extender/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "hash_extender"; version = "2017-04-10"; diff --git a/pkgs/tools/security/ifdnfc/default.nix b/pkgs/tools/security/ifdnfc/default.nix index 8f30b5885e4..5ec66a5b98c 100644 --- a/pkgs/tools/security/ifdnfc/default.nix +++ b/pkgs/tools/security/ifdnfc/default.nix @@ -4,7 +4,7 @@ , libnfc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ifdnfc"; version = "2016-03-01"; diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix index 2eda1908837..213f7c30051 100644 --- a/pkgs/tools/security/jd-gui/default.nix +++ b/pkgs/tools/security/jd-gui/default.nix @@ -63,7 +63,7 @@ let categories = "Development;Debugger;"; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit name version src; nativeBuildInputs = [ gradle_2_5 perl makeWrapper ]; diff --git a/pkgs/tools/security/keybase/kbfs.nix b/pkgs/tools/security/keybase/kbfs.nix index 302e996213d..9448182a65a 100644 --- a/pkgs/tools/security/keybase/kbfs.nix +++ b/pkgs/tools/security/keybase/kbfs.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub, keybase }: -buildGoPackage rec { +buildGoPackage { pname = "kbfs"; inherit (keybase) src version; diff --git a/pkgs/tools/security/libacr38u/default.nix b/pkgs/tools/security/libacr38u/default.nix index 4af6e3de3cf..248fbe008fc 100644 --- a/pkgs/tools/security/libacr38u/default.nix +++ b/pkgs/tools/security/libacr38u/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, pcsclite , libusb }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "1.7.11"; pname = "libacr38u"; diff --git a/pkgs/tools/security/logkeys/default.nix b/pkgs/tools/security/logkeys/default.nix index a325c47ca0d..f06ce2f246a 100644 --- a/pkgs/tools/security/logkeys/default.nix +++ b/pkgs/tools/security/logkeys/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoconf, automake, which, procps, kbd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "logkeys"; version = "2018-01-22"; diff --git a/pkgs/tools/security/mfcuk/default.nix b/pkgs/tools/security/mfcuk/default.nix index 9098457cec1..a23e2917561 100644 --- a/pkgs/tools/security/mfcuk/default.nix +++ b/pkgs/tools/security/mfcuk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libnfc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mfcuk"; version = "0.3.8"; diff --git a/pkgs/tools/security/mkrand/default.nix b/pkgs/tools/security/mkrand/default.nix index 5d1cfdd4023..bb9c932d19e 100644 --- a/pkgs/tools/security/mkrand/default.nix +++ b/pkgs/tools/security/mkrand/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "mkrand-0.1.0"; src = fetchurl { diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index 9e154c19a9c..e31d62dc8b7 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -5,7 +5,7 @@ let if stdenv.isDarwin then xmlsec else pam; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "oath-toolkit-2.6.2"; src = fetchFromGitLab { diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix index 1fbb52985fb..25fa180c48b 100644 --- a/pkgs/tools/security/pinentry/mac.nix +++ b/pkgs/tools/security/pinentry/mac.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, xcbuildHook, libiconv, ncurses, Cocoa }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "pinentry-mac-0.9.4"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/qesteidutil/default.nix b/pkgs/tools/security/qesteidutil/default.nix index 5ce5672eb25..fac855f232a 100644 --- a/pkgs/tools/security/qesteidutil/default.nix +++ b/pkgs/tools/security/qesteidutil/default.nix @@ -3,7 +3,7 @@ , pkgconfig, pcsclite, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2018-08-21"; pname = "qesteidutil"; diff --git a/pkgs/tools/security/rarcrack/default.nix b/pkgs/tools/security/rarcrack/default.nix index 0227268cf43..65158b3c5fe 100644 --- a/pkgs/tools/security/rarcrack/default.nix +++ b/pkgs/tools/security/rarcrack/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, libxml2, file, p7zip, unrar, unzip}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rarcrack"; version = "0.2"; diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix index aaac975bb81..e0e2896f6ff 100644 --- a/pkgs/tools/security/sbsigntool/default.nix +++ b/pkgs/tools/security/sbsigntool/default.nix @@ -3,7 +3,7 @@ , openssl, libuuid, gnu-efi, libbfd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sbsigntool"; version = "0.9.1"; diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix index c9ba2a8ac6d..7189032454d 100644 --- a/pkgs/tools/security/secp256k1/default.nix +++ b/pkgs/tools/security/secp256k1/default.nix @@ -15,7 +15,7 @@ let inherit (stdenv.lib) optionals; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "secp256k1"; # I can't find any version numbers, so we're just using the date of the diff --git a/pkgs/tools/security/ssss/default.nix b/pkgs/tools/security/ssss/default.nix index 3bbcdafcdcd..157e007c534 100644 --- a/pkgs/tools/security/ssss/default.nix +++ b/pkgs/tools/security/ssss/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gmp }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ssss-0.5"; src = fetchurl { diff --git a/pkgs/tools/security/tpm-luks/default.nix b/pkgs/tools/security/tpm-luks/default.nix index ca78c5d73ff..94d833ca746 100644 --- a/pkgs/tools/security/tpm-luks/default.nix +++ b/pkgs/tools/security/tpm-luks/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, autoreconfHook, gawk, trousers, cryptsetup, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tpm-luks"; version = "git-2015-07-11"; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index d33cdeb1c56..87f2e922ff7 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -6,23 +6,23 @@ let sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { - "x86_64-linux" = fetchurl { + x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; sha256 = "293b88f4d31f6bcdcc8b508eccb7b856a0423270adebfa0f52f04144c5a22ae0"; }; - "i686-linux" = fetchurl { + i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; sha256 = "9f2fb99e08fa3d25af1497516d08b5d2d8a73bcacd5354ddec024e9628795867"; }; - "x86_64-darwin" = fetchurl { + x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; sha256 = "a0a7a242f8299ac4a00af8aa10ccedaf63013c8a068f56eadfb9d730b87155ea"; }; - "i686-darwin" = fetchurl { + i686-darwin = fetchurl { url = "${base}/vault_${version}_darwin_386.zip"; sha256 = "50542cfb37abb06e8bb6b8ba41f5ca7d72a4d6a4396d4e3f4a8391bed14f63be"; }; - "aarch64-linux" = fetchurl { + aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; sha256 = "c243dce14b2e48e3667c2aa5b7fb37009dd7043b56032d6ebe50dd456715fd3f"; }; @@ -32,7 +32,7 @@ in stdenv.mkDerivation { pname = "vault-bin"; inherit version; - src = sources."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}"); + src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); nativeBuildInputs = [ unzip ]; diff --git a/pkgs/tools/system/bar/default.nix b/pkgs/tools/system/bar/default.nix index cd4770bf609..a295da844af 100644 --- a/pkgs/tools/system/bar/default.nix +++ b/pkgs/tools/system/bar/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "bar-1.11.1"; src = fetchurl { diff --git a/pkgs/tools/system/collectd/data.nix b/pkgs/tools/system/collectd/data.nix index 0874aa7410c..378eb62d6cc 100644 --- a/pkgs/tools/system/collectd/data.nix +++ b/pkgs/tools/system/collectd/data.nix @@ -1,6 +1,6 @@ { stdenv, collectd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (collectd) meta version; pname = "collectd-data"; diff --git a/pkgs/tools/system/colorls/default.nix b/pkgs/tools/system/colorls/default.nix index 62670fa11a0..1631b9f7218 100644 --- a/pkgs/tools/system/colorls/default.nix +++ b/pkgs/tools/system/colorls/default.nix @@ -1,6 +1,6 @@ { lib, bundlerApp, ruby, bundlerUpdateScript }: -bundlerApp rec { +bundlerApp { pname = "colorls"; gemdir = ./.; diff --git a/pkgs/tools/system/das_watchdog/default.nix b/pkgs/tools/system/das_watchdog/default.nix index c8f7e77b156..29767c879ff 100644 --- a/pkgs/tools/system/das_watchdog/default.nix +++ b/pkgs/tools/system/das_watchdog/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, libgtop, xmessage, which, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "das_watchdog"; version = "git-2015-09-12"; diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix index 4018801f249..6927c64bf48 100644 --- a/pkgs/tools/system/datefudge/default.nix +++ b/pkgs/tools/system/datefudge/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "datefudge"; version = "1.22"; diff --git a/pkgs/tools/system/dog/default.nix b/pkgs/tools/system/dog/default.nix index 25f2673c0ac..8bb84c562b6 100644 --- a/pkgs/tools/system/dog/default.nix +++ b/pkgs/tools/system/dog/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "dog-1.7"; src = fetchurl { diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix index 187c046875f..d1d2b7a3e76 100644 --- a/pkgs/tools/system/hardlink/default.nix +++ b/pkgs/tools/system/hardlink/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pcre2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "hardlink"; version = "1.3-4"; diff --git a/pkgs/tools/system/illum/default.nix b/pkgs/tools/system/illum/default.nix index 9d89e0714c4..767fccbd388 100644 --- a/pkgs/tools/system/illum/default.nix +++ b/pkgs/tools/system/illum/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, pkgconfig, ninja, libevdev, libev }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.4"; pname = "illum"; diff --git a/pkgs/tools/system/ior/default.nix b/pkgs/tools/system/ior/default.nix index 83c0a287533..6217f601121 100644 --- a/pkgs/tools/system/ior/default.nix +++ b/pkgs/tools/system/ior/default.nix @@ -5,7 +5,7 @@ let sha256 = "039rh4z3lsj4vqjsqgakk0b7dkrdrkkzj0p1cjikpc9gn36zpghc"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ior"; inherit version; diff --git a/pkgs/tools/system/mq-cli/default.nix b/pkgs/tools/system/mq-cli/default.nix index 078cc614bb4..930bf8382c6 100644 --- a/pkgs/tools/system/mq-cli/default.nix +++ b/pkgs/tools/system/mq-cli/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, lib, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "mq-cli-${version}"; + pname = "mq-cli"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/system/pcstat/default.nix b/pkgs/tools/system/pcstat/default.nix index b5842ad37c3..5a1bad1092d 100644 --- a/pkgs/tools/system/pcstat/default.nix +++ b/pkgs/tools/system/pcstat/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "pcstat-unstable"; version = "2017-05-28"; diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 4c011a0b212..21487e66bcd 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -5,7 +5,7 @@ , perl ? null # For building web manuals }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "plan9port"; version = "2019-02-25"; diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 79b86f1383c..0764844dbfc 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub , talloc, docutils, swig, python, coreutils, enablePython ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "proot"; version = "20190510"; diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/tools/system/ps_mem/default.nix index 3e7bb301a6b..6fe35f6dcf3 100644 --- a/pkgs/tools/system/ps_mem/default.nix +++ b/pkgs/tools/system/ps_mem/default.nix @@ -3,7 +3,7 @@ let version = "3.12"; pname = "ps_mem"; -in pythonPackages.buildPythonApplication rec { +in pythonPackages.buildPythonApplication { name = "${pname}-${version}"; src = fetchFromGitHub { diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/tools/system/systemd-journal2gelf/default.nix index 4c4ad91e727..0a2b7ab4f3b 100644 --- a/pkgs/tools/system/systemd-journal2gelf/default.nix +++ b/pkgs/tools/system/systemd-journal2gelf/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoModule, fetchFromGitHub }: -buildGoModule rec { +buildGoModule { pname = "SystemdJournal2Gelf-unstable"; version = "20190702"; diff --git a/pkgs/tools/text/agrep/default.nix b/pkgs/tools/text/agrep/default.nix index a37531572d7..902067b3d53 100644 --- a/pkgs/tools/text/agrep/default.nix +++ b/pkgs/tools/text/agrep/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "agrep"; version = "3.41.5"; diff --git a/pkgs/tools/text/coloursum/default.nix b/pkgs/tools/text/coloursum/default.nix index 49db5e13d72..212f071f276 100644 --- a/pkgs/tools/text/coloursum/default.nix +++ b/pkgs/tools/text/coloursum/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "coloursum-${version}"; + pname = "coloursum"; version = "0.1.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index f0947004b4b..7a5f6c8dd81 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -19,11 +19,11 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - name = "gawk-4.2.1"; + name = "gawk-5.0.1"; src = fetchurl { url = "mirror://gnu/gawk/${name}.tar.xz"; - sha256 = "0lam2zf3n7ak4pig8w46lhx9hzx50kj2v2yj1616mm26wy2rf4fi"; + sha256 = "15570p7g2x54asvr2fsc56sxzmm08fbk4mzpcs5n92fp9vq8cklf"; }; # When we do build separate interactive version, it makes sense to always include man. diff --git a/pkgs/tools/text/jsawk/default.nix b/pkgs/tools/text/jsawk/default.nix index 18336fcf059..c7f4002e2d3 100644 --- a/pkgs/tools/text/jsawk/default.nix +++ b/pkgs/tools/text/jsawk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, spidermonkey }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "jsawk"; version = "1.5-pre"; src = fetchFromGitHub { diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index de395f183d1..3123d31a7b5 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform, CoreServices, darwin }: rustPlatform.buildRustPackage rec { - name = "mdbook-${version}"; + pname = "mdbook"; version = "0.3.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/text/mecab/base.nix b/pkgs/tools/text/mecab/base.nix index 7509f3e9c48..e97980ef3d2 100644 --- a/pkgs/tools/text/mecab/base.nix +++ b/pkgs/tools/text/mecab/base.nix @@ -1,6 +1,6 @@ { fetchurl }: -rec { +{ version = "0.996"; src = fetchurl { diff --git a/pkgs/tools/text/mecab/ipadic.nix b/pkgs/tools/text/mecab/ipadic.nix index 991d0735bab..3b011787c7c 100644 --- a/pkgs/tools/text/mecab/ipadic.nix +++ b/pkgs/tools/text/mecab/ipadic.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, mecab-nodic }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mecab-ipadic"; version = "2.7.0-20070801"; diff --git a/pkgs/tools/text/papertrail/default.nix b/pkgs/tools/text/papertrail/default.nix index 05213ff1a87..be85511a92b 100644 --- a/pkgs/tools/text/papertrail/default.nix +++ b/pkgs/tools/text/papertrail/default.nix @@ -1,7 +1,7 @@ { stdenv, bundlerEnv, ruby, bundlerUpdateScript }: let - papertrail-env = bundlerEnv rec { + papertrail-env = bundlerEnv { name = "papertrail-env"; inherit ruby; gemfile = ./Gemfile; diff --git a/pkgs/tools/text/patchutils/0.3.3.nix b/pkgs/tools/text/patchutils/0.3.3.nix index b324137be6a..f50354199c3 100644 --- a/pkgs/tools/text/patchutils/0.3.3.nix +++ b/pkgs/tools/text/patchutils/0.3.3.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "0.3.3"; sha256 = "0g5df00cj4nczrmr4k791l7la0sq2wnf8rn981fsrz1f3d2yix4i"; patches = [ ./drop-comments.patch ]; # we would get into a cycle when using fetchpatch on this one diff --git a/pkgs/tools/text/patchutils/default.nix b/pkgs/tools/text/patchutils/default.nix index eab0e98f95c..902773f40fa 100644 --- a/pkgs/tools/text/patchutils/default.nix +++ b/pkgs/tools/text/patchutils/default.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "0.3.4"; sha256 = "0xp8mcfyi5nmb5a2zi5ibmyshxkb1zv1dgmnyn413m7ahgdx8mfg"; }) diff --git a/pkgs/tools/text/podiff/default.nix b/pkgs/tools/text/podiff/default.nix index efe19a1b5ce..a71ef2f06bd 100644 --- a/pkgs/tools/text/podiff/default.nix +++ b/pkgs/tools/text/podiff/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "podiff"; version = "1.1"; diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix index 9edbaff9929..3437400269c 100644 --- a/pkgs/tools/text/recode/default.nix +++ b/pkgs/tools/text/recode/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python, perl, intltool, flex, autoreconfHook , texinfo, libiconv, libintl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "recode-3.7-2fd838565"; src = fetchFromGitHub { diff --git a/pkgs/tools/text/staccato/default.nix b/pkgs/tools/text/staccato/default.nix index f88ac6951bf..a68d2266b43 100644 --- a/pkgs/tools/text/staccato/default.nix +++ b/pkgs/tools/text/staccato/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "staccato-${version}"; + pname = "staccato"; version = "0.1.6"; src = fetchFromGitHub { diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix index 388dcc6b583..807f53ae42e 100644 --- a/pkgs/tools/text/xml/jing-trang/default.nix +++ b/pkgs/tools/text/xml/jing-trang/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, jre_headless, jdk, ant, saxon }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "jing-trang"; version = "20151127"; diff --git a/pkgs/tools/text/xml/xml2/default.nix b/pkgs/tools/text/xml/xml2/default.nix index 40013c7f46d..3be952358b6 100644 --- a/pkgs/tools/text/xml/xml2/default.nix +++ b/pkgs/tools/text/xml/xml2/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libxml2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "xml2-0.5"; src = fetchurl { diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix index 479085be0e1..cf44782432c 100644 --- a/pkgs/tools/text/xsv/default.nix +++ b/pkgs/tools/text/xsv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { - name = "xsv-${version}"; + pname = "xsv"; version = "0.13.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/text/yaml-merge/default.nix b/pkgs/tools/text/yaml-merge/default.nix index 00673341cfc..95a94cee7c4 100644 --- a/pkgs/tools/text/yaml-merge/default.nix +++ b/pkgs/tools/text/yaml-merge/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name= "yaml-merge-2016-02-16"; src = fetchFromGitHub { diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix index fbd9bc3fa20..15e5ddf2f19 100644 --- a/pkgs/tools/text/zimreader/default.nix +++ b/pkgs/tools/text/zimreader/default.nix @@ -2,7 +2,7 @@ , zimlib, cxxtools, tntnet }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "zimreader-0.92"; src = fetchFromGitHub { diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index d18a5e2c744..83aa667f58f 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -111,7 +111,7 @@ let }; # there are no archives or tags, using latest commit in master branch as per 2013-09-22 - matplotlibFilterSrc = let commit = "75f0d009629f93f33fab04b83faca20cc35dd358"; in fetchurl rec { + matplotlibFilterSrc = let commit = "75f0d009629f93f33fab04b83faca20cc35dd358"; in fetchurl { name = "mplw-${commit}.tar.gz"; url = "https://api.github.com/repos/lvv/mplw/tarball/${commit}"; sha256 = "0yfhkm2dr8gnp0fcg25x89hwiymkri2m5cyqzmzragzwj0hbmcf1"; diff --git a/pkgs/tools/typesetting/kindlegen/default.nix b/pkgs/tools/typesetting/kindlegen/default.nix index 2c0e2f29d24..ff63ece3417 100644 --- a/pkgs/tools/typesetting/kindlegen/default.nix +++ b/pkgs/tools/typesetting/kindlegen/default.nix @@ -5,24 +5,24 @@ let fileVersion = builtins.replaceStrings [ "." ] [ "_" ] version; sha256 = { - "x86_64-linux" = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q"; - "i686-linux" = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q"; - "x86_64-darwin" = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs"; - "i686-darwin" = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs"; - "x86_64-cygwin" = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h"; - "i686-cygwin" = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h"; - }."${stdenv.hostPlatform.system}" or (throw "system #{stdenv.hostPlatform.system.} is not supported"); + x86_64-linux = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q"; + i686-linux = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q"; + x86_64-darwin = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs"; + i686-darwin = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs"; + x86_64-cygwin = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h"; + i686-cygwin = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h"; + }.${stdenv.hostPlatform.system} or (throw "system #{stdenv.hostPlatform.system.} is not supported"); url = { - "x86_64-linux" = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz"; - "i686-linux" = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz"; - "x86_64-darwin" = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip"; - "i686-darwin" = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip"; - "x86_64-cygwin" = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip"; - "i686-cygwin" = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip"; - }."${stdenv.hostPlatform.system}" or (throw "system #{stdenv.hostPlatform.system.} is not supported"); - -in stdenv.mkDerivation rec { + x86_64-linux = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz"; + i686-linux = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz"; + x86_64-darwin = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip"; + i686-darwin = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip"; + x86_64-cygwin = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip"; + i686-cygwin = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip"; + }.${stdenv.hostPlatform.system} or (throw "system #{stdenv.hostPlatform.system.} is not supported"); + +in stdenv.mkDerivation { pname = "kindlegen"; inherit version; diff --git a/pkgs/tools/typesetting/multimarkdown/default.nix b/pkgs/tools/typesetting/multimarkdown/default.nix index cd78f63ef78..4cdbac7d638 100644 --- a/pkgs/tools/typesetting/multimarkdown/default.nix +++ b/pkgs/tools/typesetting/multimarkdown/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, perl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "multimarkdown"; version = "4.7.1"; diff --git a/pkgs/tools/typesetting/pdf2htmlEX/default.nix b/pkgs/tools/typesetting/pdf2htmlEX/default.nix index ad9684910c0..dee6ec3c6ff 100644 --- a/pkgs/tools/typesetting/pdf2htmlEX/default.nix +++ b/pkgs/tools/typesetting/pdf2htmlEX/default.nix @@ -3,7 +3,7 @@ }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "pdf2htmlEX-0.14.6"; src = fetchFromGitHub { diff --git a/pkgs/tools/typesetting/pdfsandwich/default.nix b/pkgs/tools/typesetting/pdfsandwich/default.nix index 31184e11399..f8b17be01dd 100644 --- a/pkgs/tools/typesetting/pdfsandwich/default.nix +++ b/pkgs/tools/typesetting/pdfsandwich/default.nix @@ -1,6 +1,6 @@ { stdenv, ocaml, makeWrapper, fetchsvn, ghostscript, imagemagick, perl, poppler_utils, tesseract, unpaper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.1.7"; pname = "pdfsandwich"; diff --git a/pkgs/tools/typesetting/psutils/default.nix b/pkgs/tools/typesetting/psutils/default.nix index 25f12838be0..39beab751a7 100644 --- a/pkgs/tools/typesetting/psutils/default.nix +++ b/pkgs/tools/typesetting/psutils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "psutils-17"; src = fetchurl { diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index a7886f317c1..98c80da5b2c 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -2,7 +2,7 @@ , darwin, fontconfig, harfbuzz, openssl, pkgconfig }: rustPlatform.buildRustPackage rec { - name = "tectonic-${version}"; + pname = "tectonic"; version = "0.1.11"; src = fetchFromGitHub { diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index c27c68741fc..f250dfb69de 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -17,7 +17,7 @@ let year = "2018"; version = year; # keep names simple for now - common = rec { + common = { src = fetchurl { urls = [ "http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${year}/texlive-${year}0414-source.tar.xz" diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index a3b58e7274d..651ff88b6f2 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -84,8 +84,8 @@ let # the fake derivations are used for filtering of hyphenation patterns else { inherit pname version; tlType = "run"; } )] - ++ lib.optional (attrs.sha512 ? "doc") (mkPkgV "doc") - ++ lib.optional (attrs.sha512 ? "source") (mkPkgV "source") + ++ lib.optional (attrs.sha512 ? doc) (mkPkgV "doc") + ++ lib.optional (attrs.sha512 ? source) (mkPkgV "source") ++ lib.optional (bin ? ${pname}) ( bin.${pname} // { inherit pname; tlType = "bin"; } ) ++ combinePkgs (attrs.deps or {}); diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix index a08f32ce9c2..5ee1adda483 100644 --- a/pkgs/tools/typesetting/tikzit/default.nix +++ b/pkgs/tools/typesetting/tikzit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qmake, qttools, qtbase, libsForQt5, flex, bison }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tikzit"; version = "2.1.4"; diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index b136e9c5ab7..a4089636b95 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchhg, autoreconfHook, zlib, Cocoa }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "atomicparsley"; version = "0.9.6"; diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix index 752a6f31432..8fe2a70dcb4 100644 --- a/pkgs/tools/video/dvgrab/default.nix +++ b/pkgs/tools/video/dvgrab/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, stdenv, libunwind, libraw1394, libjpeg, libiec61883, libdv , libavc1394, pkgconfig, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "dvgrab-2016-05-16"; src = fetchFromGitHub { diff --git a/pkgs/tools/video/untrunc/default.nix b/pkgs/tools/video/untrunc/default.nix index a87015ecf96..c7b76e0cb6e 100644 --- a/pkgs/tools/video/untrunc/default.nix +++ b/pkgs/tools/video/untrunc/default.nix @@ -1,6 +1,6 @@ { stdenv, gcc, libav_12, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "untrunc"; version = "2018.01.13"; diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix index 41140949593..c09da3dd231 100644 --- a/pkgs/tools/video/vncrec/default.nix +++ b/pkgs/tools/video/vncrec/default.nix @@ -2,7 +2,7 @@ , libXaw, libXext, libSM, libICE, libXpm, libXp }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "vncrec-0.2"; # version taken from Arch AUR src = fetchurl { diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 76813f4f246..580c2f9a01f 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -2,7 +2,7 @@ let version = "0.7.9"; -in pythonPackages.buildPythonApplication rec { +in pythonPackages.buildPythonApplication { pname = "cloud-init"; inherit version; namePrefix = ""; diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix index 5b310992afb..cb31a66ea72 100644 --- a/pkgs/tools/virtualization/euca2ools/default.nix +++ b/pkgs/tools/virtualization/euca2ools/default.nix @@ -2,7 +2,7 @@ let inherit (python2Packages) buildPythonApplication boto m2crypto; -in buildPythonApplication rec { +in buildPythonApplication { name = "euca2ools-2.1.4"; namePrefix = ""; diff --git a/pkgs/tools/virtualization/marathonctl/default.nix b/pkgs/tools/virtualization/marathonctl/default.nix index 8dbeecc5605..10103be2630 100644 --- a/pkgs/tools/virtualization/marathonctl/default.nix +++ b/pkgs/tools/virtualization/marathonctl/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "marathonctl-unstable"; version = "2017-03-06"; diff --git a/pkgs/tools/virtualization/udocker/default.nix b/pkgs/tools/virtualization/udocker/default.nix index 7d06b59b013..5f4d982d86d 100644 --- a/pkgs/tools/virtualization/udocker/default.nix +++ b/pkgs/tools/virtualization/udocker/default.nix @@ -5,7 +5,7 @@ buildPythonApplication rec { version = "1.1.3"; pname = "udocker"; - src = fetchFromGitHub rec { + src = fetchFromGitHub { owner = "indigo-dc"; repo = "udocker" ; rev = "v${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 106080ae519..4ac7927bf8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2377,7 +2377,7 @@ in m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { }; - mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc rec { + mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { python = python2; inherit (python2Packages) gyp; protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); @@ -2525,7 +2525,7 @@ in curl = callPackage ../tools/networking/curl { }; - curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { }; + curl_unix_socket = callPackage ../tools/networking/curl-unix-socket { }; curlie = callPackage ../tools/networking/curlie { }; @@ -3043,7 +3043,7 @@ in m17n = callPackage ../tools/inputmethods/fcitx-engines/fcitx-m17n { }; - mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc rec { + mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc { python = python2; inherit (python2Packages) gyp; protobuf = pkgs.protobuf3_6.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); @@ -4689,12 +4689,7 @@ in makefile2graph = callPackage ../development/tools/analysis/makefile2graph { }; - # See https://github.com/NixOS/nixpkgs/issues/15849. I'm switching on isLinux because - # it looks like gnulib is broken on non-linux, so it seems likely that this would cause - # trouble on bsd and/or cygwin as well. - man = if stdenv.isLinux then man-db else man-old; - - man-old = callPackage ../tools/misc/man { }; + man = man-db; man-db = callPackage ../tools/misc/man-db { }; @@ -4879,7 +4874,7 @@ in mt-st = callPackage ../tools/backup/mt-st {}; - multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in rec { + multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in { multitrandata = callPackage ../tools/text/multitran/data { }; libbtree = callPackage ../tools/text/multitran/libbtree { }; @@ -7347,6 +7342,24 @@ in then callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {} else callPackage adoptopenjdk-bin-11-packages-darwin.jre-openj9 {}; + adoptopenjdk-bin-8-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk8-linux.nix; + adoptopenjdk-bin-8-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk8-darwin.nix; + + adoptopenjdk-hotspot-bin-8 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-8-packages-linux.jdk-hotspot {} + else callPackage adoptopenjdk-bin-8-packages-darwin.jdk-hotspot {}; + adoptopenjdk-jre-hotspot-bin-8 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-8-packages-linux.jre-hotspot {} + else callPackage adoptopenjdk-bin-8-packages-darwin.jre-hotspot {}; + + adoptopenjdk-openj9-bin-8 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-8-packages-linux.jdk-openj9 {} + else callPackage adoptopenjdk-bin-8-packages-darwin.jdk-openj9 {}; + + adoptopenjdk-jre-openj9-bin-8 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-8-packages-linux.jre-openj9 {} + else callPackage adoptopenjdk-bin-8-packages-darwin.jre-openj9 {}; + adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11; adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11; @@ -7930,15 +7943,15 @@ in hugs = callPackage ../development/interpreters/hugs { }; - bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; }; + openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; - openjfx11 = - if stdenv.isDarwin then - null + openjfx12 = callPackage ../development/compilers/openjdk/openjfx/12.nix { }; + + openjdk8-bootstrap = + if adoptopenjdk-hotspot-bin-8.meta.available then + adoptopenjdk-hotspot-bin-8 else - callPackage ../development/compilers/openjdk/openjfx/11.nix { - openjdk = openjdk11; - }; + callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; }; /* legacy jdk for use as needed by older apps */ openjdk8 = @@ -7946,10 +7959,21 @@ in callPackage ../development/compilers/openjdk/darwin/8.nix { } else callPackage ../development/compilers/openjdk/8.nix { - bootjdk = bootjdk.override { version = "8"; }; inherit (gnome2) GConf gnome_vfs; }; + openjdk8_headless = + if stdenv.isDarwin || stdenv.isAarch64 then + openjdk8 + else + openjdk8.override { headless = true; }; + + openjdk11-bootstrap = + if adoptopenjdk-hotspot-bin-11.meta.available then + adoptopenjdk-hotspot-bin-11 + else + callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; }; + /* currently maintained LTS JDK */ openjdk11 = if stdenv.isDarwin then @@ -7960,62 +7984,43 @@ in inherit (gnome2) GConf gnome_vfs; }; - openjfx12 = + openjdk11_headless = if stdenv.isDarwin then - null + openjdk11 else - callPackage ../development/compilers/openjdk/openjfx/12.nix { - openjdk = openjdk12; - bootjdk = openjdk11; - }; + openjdk11.override { headless = true; }; /* current JDK */ openjdk12 = if stdenv.isDarwin then - callPackage ../development/compilers/openjdk/darwin/default.nix { } + callPackage ../development/compilers/openjdk/darwin { } else - callPackage ../development/compilers/openjdk/default.nix { + callPackage ../development/compilers/openjdk { openjfx = openjfx12; inherit (gnome2) GConf gnome_vfs; - bootjdk = openjdk11; }; + openjdk12_headless = + if stdenv.isDarwin then + openjdk12 + else + openjdk12.override { headless = true; }; + openjdk = openjdk8; + openjdk_headless = openjdk8_headless; - jdk8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; }; - jre8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" - (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } - (openjdk8.jre // { outputs = [ "jre" ]; })); - jre8_headless = - if stdenv.isAarch32 || stdenv.isAarch64 then - oraclejre8 - else if stdenv.isDarwin then - jre8 - else - lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}-headless" - (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } - ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); + jdk8 = openjdk8; + jre8 = openjdk8.jre; + jre8_headless = openjdk8_headless.jre; - jdk11 = openjdk11 // { outputs = [ "out" ]; }; - jdk11_headless = - if stdenv.isDarwin then - jdk11 - else - lib.setName "openjdk-${lib.getVersion pkgs.openjdk11}-headless" - (lib.addMetaAttrs {} - ((openjdk11.override { minimal = true; }) // {})); + jdk11 = openjdk11; + jdk11_headless = openjdk11_headless; - jdk12 = openjdk12 // { outputs = [ "out" ]; }; - jdk12_headless = - if stdenv.isDarwin then - jdk12 - else - lib.setName "openjdk-${lib.getVersion pkgs.openjdk12}-headless" - (lib.addMetaAttrs {} - ((openjdk12.override { minimal = true; }) // {})); + jdk12 = openjdk12; + jdk12_headless = openjdk12_headless; jdk = jdk8; - jre = if stdenv.isAarch32 || stdenv.isAarch64 then adoptopenjdk-jre-bin else jre8; + jre = jre8; jre_headless = jre8_headless; inherit (callPackages ../development/compilers/graalvm { }) mx jvmci8 graalvm8; @@ -8946,7 +8951,7 @@ in ruby_2_5 ruby_2_6; - ruby = ruby_2_5; + ruby = ruby_2_6; rubyPackages_2_3 = recurseIntoAttrs ruby_2_3.gems; rubyPackages_2_4 = recurseIntoAttrs ruby_2_4.gems; @@ -12554,7 +12559,7 @@ in libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; - libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: rec { + libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: { src = pkgs.fetchurl { url = "https://github.com/jbeder/yaml-cpp/archive/release-0.3.0.tar.gz"; sha256 = "12aszqw6svwlnb6nzhsbqhz3c7vnd5ahd0k6xlj05w8lm83hx3db"; @@ -19187,7 +19192,7 @@ in links2 = callPackage ../applications/networking/browsers/links2 { }; - linphone = callPackage ../applications/networking/instant-messengers/linphone rec { + linphone = callPackage ../applications/networking/instant-messengers/linphone { polarssl = mbedtls_1_3; }; @@ -21164,6 +21169,7 @@ in libva = null; libwebp = null; xwayland = null; + pipewire = null; }; chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 {}; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index df9d3dbcff5..7496449c044 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -82,7 +82,7 @@ rec { # Each field in this tuple represents all Beam packages in nixpkgs built with # appropriate Erlang/OTP version. - packages = rec { + packages = { # Packages built with default Erlang version. erlang = packagesWith interpreters.erlang; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index e89a7d9df2a..f06b4f1c286 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -430,14 +430,14 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - Deedle = fetchNuGet rec { + Deedle = fetchNuGet { baseName = "Deedle"; version = "1.2.5"; sha256 = "0g19ll6bp97ixprcnpwwvshr1n9jxxf9xjhkxp0r63mg46z48jnw"; outputFiles = [ "*" ]; }; - ExcelDna = buildDotnetPackage rec { + ExcelDna = buildDotnetPackage { baseName = "Excel-DNA"; version = "0.32.0"; @@ -496,7 +496,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - ExtCore = buildDotnetPackage rec { + ExtCore = buildDotnetPackage { baseName = "ExtCore"; version = "0.8.46"; @@ -564,7 +564,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - FSharpCompilerService = buildDotnetPackage rec { + FSharpCompilerService = buildDotnetPackage { baseName = "FSharp.Compiler.Service"; version = "0.0.90"; @@ -667,7 +667,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { # }; # }; - GitVersionTree = buildDotnetPackage rec { + GitVersionTree = buildDotnetPackage { baseName = "GitVersionTree"; version = "2013-10-01"; @@ -927,7 +927,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - UnionArgParser = buildDotnetPackage rec { + UnionArgParser = buildDotnetPackage { baseName = "UnionArgParser"; version = "0.8.7"; diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index 5b5b32b89da..a36c89fac0a 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -134,7 +134,7 @@ rec { zlib = (pkgs.zlib.override { stdenv = pkgs.emscriptenStdenv; }).overrideDerivation - (old: rec { + (old: { buildInputs = old.buildInputs ++ [ pkgconfig ]; # we need to reset this setting! NIX_CFLAGS_COMPILE=""; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 86e8228f187..49bfc58adf0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -105,7 +105,7 @@ in { (pkgs.lib.attrNames compiler); in pkgs.recurseIntoAttrs (pkgs.lib.genAttrs integerSimpleGhcNames - (name: compiler."${name}".override { enableIntegerSimple = true; })); + (name: compiler.${name}.override { enableIntegerSimple = true; })); }; # Default overrides that are applied to all package sets. @@ -176,9 +176,9 @@ in { integerSimpleGhcNames = pkgs.lib.filter (name: ! builtins.elem name integerSimpleExcludes) (pkgs.lib.attrNames packages); - in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages."${name}".override { - ghc = bh.compiler.integer-simple."${name}"; - buildHaskellPackages = bh.packages.integer-simple."${name}"; + in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages.${name}.override { + ghc = bh.compiler.integer-simple.${name}; + buildHaskellPackages = bh.packages.integer-simple.${name}; overrides = _self : _super : { integer-simple = null; integer-gmp = null; diff --git a/pkgs/top-level/haxe-packages.nix b/pkgs/top-level/haxe-packages.nix index 35b0b42da3f..06b82a478a8 100644 --- a/pkgs/top-level/haxe-packages.nix +++ b/pkgs/top-level/haxe-packages.nix @@ -99,7 +99,7 @@ let hxnodejs_6 = let libname = "hxnodejs"; version = "6.9.0"; - in stdenv.mkDerivation rec { + in stdenv.mkDerivation { name = "${libname}-${version}"; src = fetchFromGitHub { owner = "HaxeFoundation"; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 2d34bdaabc0..c9e9305666e 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -64,17 +64,18 @@ in with self; { getLuaPathList = majorVersion: [ - "lib/lua/${majorVersion}/?.lua" "share/lua/${majorVersion}/?.lua" - "share/lua/${majorVersion}/?/init.lua" "lib/lua/${majorVersion}/?/init.lua" + "share/lua/${majorVersion}/?.lua" + "share/lua/${majorVersion}/?/init.lua" ]; getLuaCPathList = majorVersion: [ - "lib/lua/${majorVersion}/?.so" "share/lua/${majorVersion}/?.so" "share/lua/${majorVersion}/?/init.so" + "lib/lua/${majorVersion}/?.so" ]; # helper functions for dealing with LUA_PATH and LUA_CPATH - getPath = lib : type : "${lib}/lib/lua/${lua.luaversion}/?.${type};${lib}/share/lua/${lua.luaversion}/?.${type}"; - getLuaPath = lib : getPath lib "lua"; - getLuaCPath = lib : getPath lib "so"; + getPath = drv: pathListForVersion: + lib.concatMapStringsSep ";" (path: "${drv}/${path}") (pathListForVersion lua.luaversion); + getLuaPath = drv: getPath drv getLuaPathList; + getLuaCPath = drv: getPath drv getLuaCPathList; #define build lua package function buildLuaPackage = callPackage ../development/lua-modules/generic { diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 6f30bd06a81..288971403f1 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -11,7 +11,7 @@ with pkgs; -releaseTools.sourceTarball rec { +releaseTools.sourceTarball { name = "nixpkgs-tarball"; src = nixpkgs; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 879ffc9f441..fc6d7674338 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -15,7 +15,7 @@ let isPhp73 = pkgs.lib.versionAtLeast php.version "7.3"; - apcu = buildPecl rec { + apcu = buildPecl { version = "5.1.17"; pname = "apcu"; @@ -29,7 +29,7 @@ let outputs = [ "out" "dev" ]; }; - apcu_bc = buildPecl rec { + apcu_bc = buildPecl { version = "1.0.5"; pname = "apcu_bc"; @@ -38,7 +38,7 @@ let buildInputs = [ apcu (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ]; }; - ast = buildPecl rec { + ast = buildPecl { version = "1.0.3"; pname = "ast"; @@ -142,7 +142,7 @@ let ]; }; - event = buildPecl rec { + event = buildPecl { version = "2.5.3"; pname = "event"; @@ -167,7 +167,7 @@ let }; }; - igbinary = buildPecl rec { + igbinary = buildPecl { version = "3.0.1"; pname = "igbinary"; @@ -178,7 +178,7 @@ let outputs = [ "out" "dev" ]; }; - imagick = buildPecl rec { + imagick = buildPecl { version = "3.4.4"; pname = "imagick"; @@ -189,7 +189,7 @@ let buildInputs = [ (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ]; }; - mailparse = buildPecl rec { + mailparse = buildPecl { version = "3.0.3"; pname = "mailparse"; @@ -232,7 +232,7 @@ let ] ++ lib.optional (pkgs.stdenv.isDarwin) pkgs.darwin.apple_sdk.frameworks.Security; }; - oci8 = buildPecl rec { + oci8 = buildPecl { version = "2.2.0"; pname = "oci8"; @@ -245,14 +245,14 @@ let ''; }; - pcs = buildPecl rec { + pcs = buildPecl { version = "1.3.3"; pname = "pcs"; sha256 = "0d4p1gpl8gkzdiv860qzxfz250ryf0wmjgyc8qcaaqgkdyh5jy5p"; }; - pdo_sqlsrv = buildPecl rec { + pdo_sqlsrv = buildPecl { version = "5.6.1"; pname = "pdo_sqlsrv"; @@ -427,7 +427,7 @@ let pinba = if isPhp73 then pinba73 else pinba7; - pinba7 = assert !isPhp73; buildPecl rec { + pinba7 = assert !isPhp73; buildPecl { version = "1.1.1"; pname = "pinba"; @@ -448,7 +448,7 @@ let }; }; - pinba73 = assert isPhp73; buildPecl rec { + pinba73 = assert isPhp73; buildPecl { version = "1.1.2-dev"; pname = "pinba"; @@ -469,7 +469,7 @@ let }; }; - protobuf = buildPecl rec { + protobuf = buildPecl { version = "3.9.0"; pname = "protobuf"; @@ -529,7 +529,7 @@ let buildInputs = with pkgs; [ pcre.dev ]; }; - pthreads32-dev = assert (pkgs.config.php.zts or false); assert isPhp73; buildPecl rec { + pthreads32-dev = assert (pkgs.config.php.zts or false); assert isPhp73; buildPecl { version = "3.2.0-dev"; pname = "pthreads"; @@ -543,14 +543,14 @@ let buildInputs = with pkgs; [ pcre2.dev ]; }; - redis = buildPecl rec { + redis = buildPecl { version = "5.0.2"; pname = "redis"; sha256 = "0b5pw17lzqknhijfymksvf8fm1zilppr97ypb31n599jw3mxf62f"; }; - sqlsrv = buildPecl rec { + sqlsrv = buildPecl { version = "5.6.1"; pname = "sqlsrv"; @@ -559,7 +559,7 @@ let buildInputs = [ pkgs.unixODBC ]; }; - v8 = buildPecl rec { + v8 = buildPecl { version = "0.2.2"; pname = "v8"; @@ -570,7 +570,7 @@ let meta.broken = true; }; - v8js = assert !isPhp73; buildPecl rec { + v8js = assert !isPhp73; buildPecl { version = "2.1.0"; pname = "v8js"; @@ -581,7 +581,7 @@ let meta.broken = true; }; - xdebug = buildPecl rec { + xdebug = buildPecl { version = "2.7.1"; pname = "xdebug"; @@ -591,7 +591,7 @@ let checkTarget = "test"; }; - yaml = buildPecl rec { + yaml = buildPecl { version = "2.0.4"; pname = "yaml"; @@ -604,7 +604,7 @@ let nativeBuildInputs = [ pkgs.pkgconfig ]; }; - zmq = assert !isPhp73; buildPecl rec { + zmq = assert !isPhp73; buildPecl { version = "1.1.3"; pname = "zmq"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8aecd2f07e1..aa4d6521c00 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2673,7 +2673,7 @@ in { pycares = callPackage ../development/python-modules/pycares { }; - pycuda = callPackage ../development/python-modules/pycuda rec { + pycuda = callPackage ../development/python-modules/pycuda { cudatoolkit = pkgs.cudatoolkit_7_5; inherit (pkgs.stdenv) mkDerivation; }; @@ -3982,10 +3982,10 @@ in { blas = pkgs.openblasCompat; }; numpy_2 = numpy_.overridePythonAttrs(oldAttrs: rec { - version = "1.16.4"; + version = "1.16.5"; src = oldAttrs.src.override { inherit version; - sha256 = "1ivrwh66cmly7xh1dl7pybizfz5rcicn4kkkx5g29v4gll9bwhkj"; + sha256 = "8bb452d94e964b312205b0de1238dd7209da452343653ab214b5d681780e7a0c"; }; }); in if pythonOlder "3.5" then numpy_2 else numpy_; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 17239c6d879..1ed3601270f 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -14,7 +14,7 @@ with import ./release-lib.nix { inherit supportedSystems; }; officialRelease = false; }; -} // (mapTestOn (rec { +} // (mapTestOn ({ aspell = all; at = linux; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 2068478872b..da81a696337 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -185,7 +185,7 @@ let }; }; - } // (mapTestOn ((packagePlatforms pkgs) // rec { + } // (mapTestOn ((packagePlatforms pkgs) // { haskell.compiler = packagePlatforms pkgs.haskell.compiler; haskellPackages = packagePlatforms pkgs.haskellPackages; idrisPackages = packagePlatforms pkgs.idrisPackages; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 9f4b63293ef..4fe067694dc 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -169,9 +169,9 @@ let then "localSystem" else "crossSystem"} = { parsed = stdenv.hostPlatform.parsed // { abi = { - "gnu" = lib.systems.parse.abis.musl; - "gnueabi" = lib.systems.parse.abis.musleabi; - "gnueabihf" = lib.systems.parse.abis.musleabihf; + gnu = lib.systems.parse.abis.musl; + gnueabi = lib.systems.parse.abis.musleabi; + gnueabihf = lib.systems.parse.abis.musleabihf; }.${stdenv.hostPlatform.parsed.abi.name} or lib.systems.parse.abis.musl; }; @@ -217,9 +217,9 @@ let crossSystem = { parsed = stdenv.hostPlatform.parsed // { abi = { - "gnu" = lib.systems.parse.abis.musl; - "gnueabi" = lib.systems.parse.abis.musleabi; - "gnueabihf" = lib.systems.parse.abis.musleabihf; + gnu = lib.systems.parse.abis.musl; + gnueabi = lib.systems.parse.abis.musleabi; + gnueabihf = lib.systems.parse.abis.musleabihf; }.${stdenv.hostPlatform.parsed.abi.name} or lib.systems.parse.abis.musl; }; |