diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 20:21:58 +0700 |
|---|---|---|
| committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-16 17:58:11 +0700 |
| commit | badf51221db8fae81bf9948c39eaf8342dfd5597 (patch) | |
| tree | 34eeb35ca97f0b081da465e9ddd6c120a9d2b7df | |
| parent | a9bb54359eeedf2594fdf191de5b673fd1dd102d (diff) | |
| download | nixpkgs-badf51221db8fae81bf9948c39eaf8342dfd5597.tar nixpkgs-badf51221db8fae81bf9948c39eaf8342dfd5597.tar.gz nixpkgs-badf51221db8fae81bf9948c39eaf8342dfd5597.tar.bz2 nixpkgs-badf51221db8fae81bf9948c39eaf8342dfd5597.tar.lz nixpkgs-badf51221db8fae81bf9948c39eaf8342dfd5597.tar.xz nixpkgs-badf51221db8fae81bf9948c39eaf8342dfd5597.tar.zst nixpkgs-badf51221db8fae81bf9948c39eaf8342dfd5597.zip | |
treewide: stdenv.lib -> lib
977 files changed, 2613 insertions, 2613 deletions
diff --git a/pkgs/applications/accessibility/mousetweaks/default.nix b/pkgs/applications/accessibility/mousetweaks/default.nix index 769ea241de8..e1449131f16 100644 --- a/pkgs/applications/accessibility/mousetweaks/default.nix +++ b/pkgs/applications/accessibility/mousetweaks/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "005fhmvb45sa9mq17dpa23n1xnspiissx5rnpiy7hiqmy3g5rg8f"; }; diff --git a/pkgs/applications/audio/AMB-plugins/default.nix b/pkgs/applications/audio/AMB-plugins/default.nix index eac2b4c783b..8b03a97d128 100644 --- a/pkgs/applications/audio/AMB-plugins/default.nix +++ b/pkgs/applications/audio/AMB-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ladspaH +{ lib, stdenv, fetchurl, ladspaH }: stdenv.mkDerivation rec { @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { ''; version = version; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/FIL-plugins/default.nix b/pkgs/applications/audio/FIL-plugins/default.nix index 89bda1387d9..98fc3495d8f 100644 --- a/pkgs/applications/audio/FIL-plugins/default.nix +++ b/pkgs/applications/audio/FIL-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ladspaH +{ lib, stdenv, fetchurl, ladspaH }: stdenv.mkDerivation rec { @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { ''; version = version; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix index baeae7ae01f..ade595732c3 100644 --- a/pkgs/applications/audio/MMA/default.nix +++ b/pkgs/applications/audio/MMA/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, python3, alsaUtils, timidity }: +{ lib, stdenv, fetchurl, makeWrapper, python3, alsaUtils, timidity }: stdenv.mkDerivation rec { version = "20.12"; @@ -62,8 +62,8 @@ meta = { description = "Creates MIDI tracks for a soloist to perform over from a user supplied file containing chords"; homepage = "https://www.mellowood.ca/mma/index.html"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index a90051136cb..1c5fc571814 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -38,7 +38,7 @@ in for cmd in abcde cddb-tool abcde-musicbrainz-tool; do wrapProgram "$out/bin/$cmd" \ --prefix PERL5LIB : "$PERL5LIB" \ - --prefix PATH ":" ${stdenv.lib.makeBinPath [ + --prefix PATH ":" ${lib.makeBinPath [ "$out" which libcdio-paranoia cddiscid wget vorbis-tools id3v2 eyeD3 lame flac glyr ]} diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix index c4982025999..000108b6de1 100644 --- a/pkgs/applications/audio/aeolus/default.nix +++ b/pkgs/applications/audio/aeolus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libclthreads, zita-alsa-pcmi, alsaLib, libjack2 +{ lib, stdenv, fetchurl, libclthreads, zita-alsa-pcmi, alsaLib, libjack2 , libclxclient, libX11, libXft, readline }: @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = { description = "Synthetized (not sampled) pipe organ emulator"; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.nico202 ]; + license = lib.licenses.lgpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.nico202 ]; }; } diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index d541afd2de3..438159201de 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -22,7 +22,7 @@ let }; nativeBuildInputs = [ unzip ]; installPhase = "cp -r . $out"; - meta.license = stdenv.lib.licenses.unfree; + meta.license = lib.licenses.unfree; }; wine-wow64 = wine.override { diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix index 99a09e7ee33..c4a7829157d 100644 --- a/pkgs/applications/audio/ario/default.nix +++ b/pkgs/applications/audio/ario/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gtk3, intltool, +{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, intltool, wrapGAppsHook, libxml2, curl, mpd_clientlib, dbus-glib, libsoup, avahi, taglib }: @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "GTK client for MPD (Music player daemon)"; homepage = "http://ario-player.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.garrison ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.garrison ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix index 610085a137a..2e849912edb 100644 --- a/pkgs/applications/audio/asunder/default.nix +++ b/pkgs/applications/audio/asunder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, gtk2, libcddb, intltool, pkgconfig, cdparanoia +{ lib, stdenv, fetchurl, makeWrapper, gtk2, libcddb, intltool, pkgconfig, cdparanoia , mp3Support ? false, lame , oggSupport ? true, vorbis-tools , flacSupport ? true, flac @@ -9,7 +9,7 @@ #, aacSupport ? false, TODO: neroAacEnc }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "2.9.7"; diff --git a/pkgs/applications/audio/aucatctl/default.nix b/pkgs/applications/audio/aucatctl/default.nix index ad9fefb68b9..6670e06a21d 100644 --- a/pkgs/applications/audio/aucatctl/default.nix +++ b/pkgs/applications/audio/aucatctl/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { }; buildInputs = [ sndio ] - ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.targetPlatform.isBSD) + ++ lib.optional (!stdenv.isDarwin && !stdenv.targetPlatform.isBSD) libbsd; outputs = [ "out" "man" ]; preBuild = '' makeFlagsArray+=("PREFIX=$out") - '' + stdenv.lib.optionalString + '' + lib.optionalString (!stdenv.isDarwin && !stdenv.targetPlatform.isBSD) '' makeFlagsArray+=(LDADD="-lsndio -lbsd") diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix index a66bb50f082..c1701671bee 100644 --- a/pkgs/applications/audio/audio-recorder/default.nix +++ b/pkgs/applications/audio/audio-recorder/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { glib dbus gtk3 librsvg libappindicator-gtk3 ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav - ]) ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; + ]) ++ lib.optional pulseaudioSupport libpulseaudio; meta = with lib; { description = "Audio recorder for GNOME and Unity Desktops"; diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix index 5bc7f843258..ffda8b6734d 100644 --- a/pkgs/applications/audio/aumix/default.nix +++ b/pkgs/applications/audio/aumix/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gettext, ncurses +{lib, stdenv, fetchurl, gettext, ncurses , gtkGUI ? false , pkgconfig ? null , gtk2 ? null}: @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { the command line or a script. ''; homepage = "http://www.jpj.net/~trevor/aumix.html"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/axoloti/libusb1.nix b/pkgs/applications/audio/axoloti/libusb1.nix index e95b391fc78..f00167026b4 100644 --- a/pkgs/applications/audio/axoloti/libusb1.nix +++ b/pkgs/applications/audio/axoloti/libusb1.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig ]; propagatedBuildInputs = - stdenv.lib.optional stdenv.isLinux systemd ++ - stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; + lib.optional stdenv.isLinux systemd ++ + lib.optionals stdenv.isDarwin [ libobjc IOKit ]; patches = [ (fetchpatch { @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { }) ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; - preFixup = stdenv.lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.isLinux '' sed 's,-ludev,-L${lib.getLib systemd}/lib -ludev,' -i $out/lib/libusb-1.0.la ''; diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index 8e9a566c172..592b0fb0730 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -13,7 +13,7 @@ }: let - inherit (stdenv.lib) optional optionals; + inherit (lib) optional optionals; in mkDerivation rec { diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix index 2f695b6ed7b..29c5130f575 100644 --- a/pkgs/applications/audio/baudline/default.nix +++ b/pkgs/applications/audio/baudline/default.nix @@ -3,7 +3,7 @@ }: let - rpath = stdenv.lib.makeLibraryPath + rpath = lib.makeLibraryPath [ libXmu libXt libX11 libXext libXxf86vm libjack2 ]; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix index 7230bf63287..b94e8d2e6f2 100644 --- a/pkgs/applications/audio/cadence/default.nix +++ b/pkgs/applications/audio/cadence/default.nix @@ -98,8 +98,8 @@ mkDerivation rec { meta = { homepage = "https://github.com/falkTX/Cadence/"; description = "Collection of tools useful for audio production"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ worldofpeace ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ worldofpeace ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/applications/audio/caps/default.nix index dc8511bf500..e0f71fa2646 100644 --- a/pkgs/applications/audio/caps/default.nix +++ b/pkgs/applications/audio/caps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "caps"; version = "0.9.26"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { resource demands and meaningful control interfaces. ''; homepage = "http://www.quitte.de/dsp/caps.html"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.astsmtl ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.astsmtl ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 883daa2ddef..3800e351fab 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -5,7 +5,7 @@ withGtk2 ? true, gtk2 ? null, withGtk3 ? true, gtk3 ? null }: -with stdenv.lib; +with lib; assert withFrontend -> python3Packages ? pyqt5; assert withQt -> qtbase != null; diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix index 013cf9ef707..0360922c819 100644 --- a/pkgs/applications/audio/caudec/default.nix +++ b/pkgs/applications/audio/caudec/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation { postFixup = '' for executable in $(cd $out/bin && ls); do - wrapProgram $out/bin/$executable \ - --prefix PATH : "${stdenv.lib.makeBinPath [ bc findutils sox procps opusTools lame flac ]}" + wrapProgram $out/bin/$executable \ + --prefix PATH : "${lib.makeBinPath [ bc findutils sox procps opusTools lame flac ]}" done ''; diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix index 5dcb178dc79..109ce1295b4 100644 --- a/pkgs/applications/audio/cd-discid/default.nix +++ b/pkgs/applications/audio/cd-discid/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" "INSTALL=install" ]; buildInputs = [] - ++ stdenv.lib.optional stdenv.isDarwin IOKit; + ++ lib.optional stdenv.isDarwin IOKit; meta = with lib; { homepage = "http://linukz.org/cd-discid.shtml"; diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 54d55d1c1b6..29359b097d2 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80"; }; - patches = stdenv.lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.isDarwin [ (fetchurl { url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/osx_interface.patch"; sha256 = "1n86kzm2ssl8fdf5wlhp6ncb2bf6b9xlb5vg0mhc85r69prqzjiy"; @@ -17,19 +17,19 @@ stdenv.mkDerivation rec { url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/patch-paranoia_paranoia.c.10.4.diff"; sha256 = "17l2qhn8sh4jy6ryy5si6ll6dndcm0r537rlmk4a6a8vkn852vad"; }) - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./utils.patch + ] ++ lib.optional stdenv.hostPlatform.isMusl ./utils.patch ++ [./fix_private_keyword.patch]; - nativeBuildInputs = stdenv.lib.optional stdenv.isAarch64 autoreconfHook; + nativeBuildInputs = lib.optional stdenv.isAarch64 autoreconfHook; - propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Carbon IOKit ]; hardeningDisable = [ "format" ]; - preConfigure = "unset CC" + stdenv.lib.optionalString stdenv.isAarch64 ''; + preConfigure = "unset CC" + lib.optionalString stdenv.isAarch64 ''; cp ${gnu-config}/config.sub configure.sub cp ${gnu-config}/config.guess configure.guess ''; diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 500fb329356..b7b42b0aa7d 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -48,10 +48,10 @@ let sqlite taglib ] - ++ stdenv.lib.optionals (withIpod) [libgpod libplist usbmuxd] - ++ stdenv.lib.optionals (withMTP) [libmtp] - ++ stdenv.lib.optionals (withCD) [libcdio] - ++ stdenv.lib.optionals (withCloud) [sparsehash]; + ++ lib.optionals (withIpod) [libgpod libplist usbmuxd] + ++ lib.optionals (withMTP) [libmtp] + ++ lib.optionals (withCD) [libcdio] + ++ lib.optionals (withCloud) [sparsehash]; postPatch = '' sed -i src/CMakeLists.txt \ diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix index 03c693da15a..0724632a63e 100644 --- a/pkgs/applications/audio/clerk/default.nix +++ b/pkgs/applications/audio/clerk/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { installPhase = '' DESTDIR=$out PREFIX=/ make install wrapProgram $out/bin/clerk \ - --prefix PATH : "${stdenv.lib.makeBinPath [ rofi mpc_cli perl util-linux libnotify ]}" + --prefix PATH : "${lib.makeBinPath [ rofi mpc_cli perl util-linux libnotify ]}" ''; meta = with lib; { diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 2c8bf47cee9..5da6c63a81e 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -39,7 +39,7 @@ #, vtxSupport ? true, libayemu ? null }: -with stdenv.lib; +with lib; assert samplerateSupport -> jackSupport; @@ -120,8 +120,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses ] - ++ stdenv.lib.optional stdenv.cc.isClang clangGCC - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreAudio ] + ++ lib.optional stdenv.cc.isClang clangGCC + ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio ] ++ flatten (concatMap (a: a.deps) opts); makeFlags = [ "LD=$(CC)" ]; diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/applications/audio/cmusfm/default.nix index c07b887192a..307e06602e7 100644 --- a/pkgs/applications/audio/cmusfm/default.nix +++ b/pkgs/applications/audio/cmusfm/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { + Inside cmus run `:set status_display_program=cmusfm` to set up cmusfm ''; homepage = "https://github.com/Arkq/cmusfm/"; - maintainers = with stdenv.lib.maintainers; [ CharlesHD ]; + maintainers = with lib.maintainers; [ CharlesHD ]; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/applications/audio/crip/default.nix b/pkgs/applications/audio/crip/default.nix index 0181ede26dd..c61f838bc3a 100644 --- a/pkgs/applications/audio/crip/default.nix +++ b/pkgs/applications/audio/crip/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , makeWrapper @@ -16,7 +16,7 @@ , which }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "crip-3.9"; @@ -60,8 +60,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://bach.dynet.com/crip/"; description = "Terminal-based ripper/encoder/tagger tool for creating Ogg Vorbis/FLAC files"; - license = stdenv.lib.licenses.gpl1; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl1; + platforms = lib.platforms.linux; maintainers = [ maintainers.endgame ]; }; } diff --git a/pkgs/applications/audio/csound/csound-manual/default.nix b/pkgs/applications/audio/csound/csound-manual/default.nix index 5cc8d71383b..ecd6685e217 100644 --- a/pkgs/applications/audio/csound/csound-manual/default.nix +++ b/pkgs/applications/audio/csound/csound-manual/default.nix @@ -1,5 +1,5 @@ { - stdenv, fetchFromGitHub, docbook_xsl, + lib, stdenv, fetchFromGitHub, docbook_xsl, docbook_xml_dtd_45, python, pygments, libxslt }: @@ -37,8 +37,8 @@ stdenv.mkDerivation { meta = { description = "The Csound Canonical Reference Manual"; homepage = "https://github.com/csound/manual"; - license = stdenv.lib.licenses.fdl12Plus; - maintainers = [ stdenv.lib.maintainers.hlolli ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.fdl12Plus; + maintainers = [ lib.maintainers.hlolli ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 5a6a290af76..a63f7518494 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp - ++ stdenv.lib.optional (libjack2 != null) "-DJACK_HEADER=${libjack2}/include/jack/jack.h"; + ++ lib.optional (libjack2 != null) "-DJACK_HEADER=${libjack2}/include/jack/jack.h"; nativeBuildInputs = [ cmake flex bison gettext ]; buildInputs = [ libsndfile libsamplerate boost ] diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 0259f522d80..800458e7925 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { sha256 = "161b0ll8v4cjgwwmk137hzvh0jidlkx56vjkpnr70f0x4jzv2nll"; }; - buildInputs = with stdenv.lib; [ jansson ] + buildInputs = with lib; [ jansson ] ++ optional gtk2Support gtk2 ++ optionals gtk3Support [ gtk3 gsettings-desktop-schemas ] ++ optional vorbisSupport libvorbis @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { intltool libtool pkgconfig - ] ++ stdenv.lib.optional gtk3Support wrapGAppsHook; + ] ++ lib.optional gtk3Support wrapGAppsHook; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 5ea0871b62b..6f5431cf1d8 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1mbxnqrw1fwcgraa1bgik25vdzvf97vma5pzknbwbqq5ly9fwlgw"; }; diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix index 505e5a604ca..0de66b24e70 100644 --- a/pkgs/applications/audio/ecasound/default.nix +++ b/pkgs/applications/audio/ecasound/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , alsaLib @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = { description = "Software package designed for multitrack audio processing"; - license = with stdenv.lib.licenses; [ gpl2 lgpl21 ]; + license = with lib.licenses; [ gpl2 lgpl21 ]; homepage = "http://nosignal.fi/ecasound/"; }; } diff --git a/pkgs/applications/audio/eflite/default.nix b/pkgs/applications/audio/eflite/default.nix index 30a35501771..6a974abb8aa 100644 --- a/pkgs/applications/audio/eflite/default.nix +++ b/pkgs/applications/audio/eflite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, flite, alsaLib, debug ? false }: +{ lib, stdenv, fetchurl, fetchpatch, flite, alsaLib, debug ? false }: stdenv.mkDerivation rec { pname = "eflite"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ./format.patch ]; - CFLAGS = stdenv.lib.optionalString debug " -DDEBUG=2"; + CFLAGS = lib.optionalString debug " -DDEBUG=2"; meta = { homepage = "http://eflite.sourceforge.net"; @@ -44,8 +44,8 @@ stdenv.mkDerivation rec { a free text-to-speech engine developed at the CMU Speech Center as an off-shoot of Festival. ''; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ jhhuh ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jhhuh ]; }; } diff --git a/pkgs/applications/audio/ekho/default.nix b/pkgs/applications/audio/ekho/default.nix index 86bf4faaa17..8897abd7007 100644 --- a/pkgs/applications/audio/ekho/default.nix +++ b/pkgs/applications/audio/ekho/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { sha256 = "0ym6lpcpsvwvsiwlzkl1509a2hljwcw7synngrmqjq1n49ww00nj"; }; - preConfigure = with stdenv.lib; '' + preConfigure = with lib; '' NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE ${optionalString stdenv.is64bit "-D_x86_64"}" NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DEKHO_DATA_PATH=\"$out/share/ekho-data\"" ''; diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index 6c627c835ae..3531132f2fd 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, fftw, gtkmm2, libxcb, lv2, pkg-config +{ lib, stdenv, fetchurl, fetchpatch, cmake, fftw, gtkmm2, libxcb, lv2, pkg-config , xorg }: stdenv.mkDerivation rec { pname = "eq10q"; @@ -44,8 +44,8 @@ stdenv.mkDerivation rec { Nice GUI with powerful metering for every plugin. ''; homepage = "http://eq10q.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix index e027bb03cfc..c7c975ef953 100644 --- a/pkgs/applications/audio/espeak/edit.nix +++ b/pkgs/applications/audio/espeak/edit.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { -e "s|@prefix@|$out|" \ -i "$file" done - '' + stdenv.lib.optionalString (portaudio.api_version == 19) '' + '' + lib.optionalString (portaudio.api_version == 19) '' cp src/portaudio19.h src/portaudio.h ''; diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix index efa97738d3c..365055523ea 100644 --- a/pkgs/applications/audio/faust/faust1.nix +++ b/pkgs/applications/audio/faust/faust1.nix @@ -5,7 +5,7 @@ , pkgconfig }: -with stdenv.lib.strings; +with lib.strings; let diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 4c0229e8f34..52a291603f8 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -16,7 +16,7 @@ , which }: -with stdenv.lib.strings; +with lib.strings; let @@ -173,7 +173,7 @@ let propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; - libPath = stdenv.lib.makeLibraryPath propagatedBuildInputs; + libPath = lib.makeLibraryPath propagatedBuildInputs; postFixup = '' diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index f173d2fe02b..e22067c38fc 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, fftw, qtbase, qtmultimedia, qmake, itstool, wrapQtAppsHook +{ lib, stdenv, mkDerivation, fetchFromGitHub, fftw, qtbase, qtmultimedia, qmake, itstool, wrapQtAppsHook , alsaSupport ? true, alsaLib ? null , jackSupport ? false, libjack2 ? null , portaudioSupport ? false, portaudio ? null }: @@ -7,7 +7,7 @@ assert alsaSupport -> alsaLib != null; assert jackSupport -> libjack2 != null; assert portaudioSupport -> portaudio != null; -with stdenv.lib; +with lib; mkDerivation rec { pname = "fmit"; diff --git a/pkgs/applications/audio/fmsynth/default.nix b/pkgs/applications/audio/fmsynth/default.nix index d957c7ec33d..d8741525da5 100644 --- a/pkgs/applications/audio/fmsynth/default.nix +++ b/pkgs/applications/audio/fmsynth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtkmm2, lv2, lvtk, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, gtkmm2, lv2, lvtk, pkgconfig }: stdenv.mkDerivation { pname = "fmsynth-unstable"; version = "2015-02-07"; @@ -42,8 +42,8 @@ stdenv.mkDerivation { - Hard real-time constraints ''; homepage = "https://github.com/Themaister/libfmsynth"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index 071a4a9caab..f484a76e75a 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { '' ; homepage = "http://freewheeling.sourceforge.net"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.sepi ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.sepi ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index b231b4a69ed..c1b8b808a1d 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' sed -i -e 's@__LINUX_ALSA__@__MACOSX_CORE__@' -e 's@asound@@' CMakeLists.txt ''; nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 ] - ++ stdenv.lib.optional stdenv.isLinux alsaLib - ++ stdenv.lib.optionals stdenv.isDarwin [ + ++ lib.optional stdenv.isLinux alsaLib + ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio CoreMIDI @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { Cocoa ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin [ + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin [ "-framework CoreAudio" "-framework CoreMIDI" "-framework CoreServices" diff --git a/pkgs/applications/audio/gmu/default.nix b/pkgs/applications/audio/gmu/default.nix index bfe9f72d664..3e2087162f5 100644 --- a/pkgs/applications/audio/gmu/default.nix +++ b/pkgs/applications/audio/gmu/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, SDL_gfx, SDL_image, tremor, flac, mpg123, libmikmod +{lib, stdenv, fetchurl, SDL, SDL_gfx, SDL_image, tremor, flac, mpg123, libmikmod , speex, ncurses , keymap ? "default" , conf ? "unknown" @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://wejp.k.vu/projects/gmu"; description = "Open source music player for portable gaming consoles and handhelds"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/applications/audio/goattracker/default.nix b/pkgs/applications/audio/goattracker/default.nix index 76b5617d23c..30bb4099233 100644 --- a/pkgs/applications/audio/goattracker/default.nix +++ b/pkgs/applications/audio/goattracker/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , unzip , copyDesktopItems @@ -8,7 +8,7 @@ , isStereo ? false }: -with stdenv.lib; +with lib; let pname = "goattracker" + optionalString isStereo "-stereo"; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix index a202b3ad280..e10a961a9e6 100644 --- a/pkgs/applications/audio/google-musicmanager/default.nix +++ b/pkgs/applications/audio/google-musicmanager/default.nix @@ -50,12 +50,12 @@ stdenv.mkDerivation rec { postFixup = '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$(patchelf --print-rpath $out/opt/google/musicmanager/minidump_upload):${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" \ + --set-rpath "$(patchelf --print-rpath $out/opt/google/musicmanager/minidump_upload):${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" \ $out/opt/google/musicmanager/minidump_upload patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$(patchelf --print-rpath $out/opt/google/musicmanager/MusicManager):$out/lib:${stdenv.lib.makeLibraryPath [ + --set-rpath "$(patchelf --print-rpath $out/opt/google/musicmanager/MusicManager):$out/lib:${lib.makeLibraryPath [ flac expat libidn diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix index 509d3ddcf75..0be1cc45717 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -1,4 +1,4 @@ -{ stdenv, alsaLib, atk, at-spi2-atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype +{ lib, stdenv, alsaLib, atk, at-spi2-atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype , fetchurl, GConf, gdk-pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr , nss, pango, udev, xorg }: @@ -69,14 +69,14 @@ stdenv.mkDerivation { wrapProgram $out/bin/google-play-music-desktop-player \ --prefix LD_LIBRARY_PATH : "$out/share/google-play-music-desktop-player" \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath deps}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath deps}" ''; meta = { homepage = "https://www.googleplaymusicdesktopplayer.com/"; description = "A beautiful cross platform Desktop Player for Google Play Music"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; platforms = [ "x86_64-linux" ]; - maintainers = [ stdenv.lib.maintainers.SuprDewd ]; + maintainers = [ lib.maintainers.SuprDewd ]; }; } diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 08263026959..dea1f5fe7bc 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { ./disable-autoupdate.patch ]; - postPatch = with stdenv.lib; '' + postPatch = with lib; '' sed -i -re 's,^( *gpodder_dir *= *).*,\1"'"$out"'",' bin/gpodder ''; diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index e2ba4ee2244..80008080ead 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = { description = "Virtual Pipe Organ Software"; homepage = "https://sourceforge.net/projects/ourorgan"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.puzzlewolf ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.puzzlewolf ]; }; } diff --git a/pkgs/applications/audio/gtklick/default.nix b/pkgs/applications/audio/gtklick/default.nix index a81834c1fff..ddd09ce4452 100644 --- a/pkgs/applications/audio/gtklick/default.nix +++ b/pkgs/applications/audio/gtklick/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, gettext, klick}: +{ lib, stdenv, fetchurl, pythonPackages, gettext, klick}: pythonPackages.buildPythonApplication rec { pname = "gtklick"; @@ -29,6 +29,6 @@ pythonPackages.buildPythonApplication rec { meta = { homepage = "http://das.nasophon.de/gtklick/"; description = "Simple metronome with an easy-to-use GTK interface"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 41c7db959e0..3f95ae82528 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -37,7 +37,7 @@ }: let - inherit (stdenv.lib) optional; + inherit (lib) optional; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix index d20bbb8e573..1bf3ba6480b 100644 --- a/pkgs/applications/audio/helm/default.nix +++ b/pkgs/applications/audio/helm/default.nix @@ -72,7 +72,7 @@ Simple arpeggiator Effects: Formant filter, stutter, delay ''; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/i-score/default.nix b/pkgs/applications/audio/i-score/default.nix index daedb9b9820..2592c38e142 100644 --- a/pkgs/applications/audio/i-score/default.nix +++ b/pkgs/applications/audio/i-score/default.nix @@ -22,7 +22,7 @@ qttools, qtwebsockets, rtaudio, - stdenv + lib, stdenv }: stdenv.mkDerivation rec { @@ -78,8 +78,8 @@ stdenv.mkDerivation rec { meta = { description = "An interactive sequencer for the intermedia arts"; homepage = "http://i-score.org/"; - license = stdenv.lib.licenses.cecill20; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.cecill20; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/industrializer/default.nix b/pkgs/applications/audio/industrializer/default.nix index 593458506d8..f638eba3210 100644 --- a/pkgs/applications/audio/industrializer/default.nix +++ b/pkgs/applications/audio/industrializer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , alsaLib , audiofile @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { After a sound is rendered, it can be played and then saved to a .WAV file. ''; homepage = "https://sourceforge.net/projects/industrializer/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix index 0cf21c6a8c8..f5134745a9c 100644 --- a/pkgs/applications/audio/jack-capture/default.nix +++ b/pkgs/applications/audio/jack-capture/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "http://archive.notam02.no/arkiv/src"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix index ffd9ec5cbc3..c6b971275d4 100644 --- a/pkgs/applications/audio/jack-oscrolloscope/default.nix +++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = "http://das.nasophon.de/jack_oscrolloscope"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index d13dbcc1688..a65c8034f89 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libjack2, ladspaH, gtk2, alsaLib, libxml2, lrdf }: +{ lib, stdenv, fetchurl, pkgconfig, libjack2, ladspaH, gtk2, alsaLib, libxml2, lrdf }: stdenv.mkDerivation rec { name = "jack-rack-1.4.7"; src = fetchurl { @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { computer into an effects box. ''; homepage = "http://jack-rack.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.astsmtl ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.astsmtl ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index d049cf81b11..499badac6d2 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjack2, pkgconfig }: +{ lib, stdenv, fetchurl, libjack2, pkgconfig }: stdenv.mkDerivation rec { name = "jackmeter-0.4"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { description = "Console jack loudness meter"; homepage = "https://www.aelius.com/njh/jackmeter/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.marcweber ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix index 4cc48b89f9c..55427ccfda4 100644 --- a/pkgs/applications/audio/jamulus/default.nix +++ b/pkgs/applications/audio/jamulus/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchFromGitHub, fetchpatch, pkg-config, qtscript, qmake, libjack2 +{ mkDerivation, lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, qtscript, qmake, libjack2 }: mkDerivation rec { @@ -7,7 +7,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "corrados"; repo = "jamulus"; - rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; + rev = "r${lib.replaceStrings [ "." ] [ "_" ] version}"; sha256 = "11rwgd2car7ziqa0vancb363m4ca94pj480jfxywd6d81139jl15"; }; @@ -20,8 +20,8 @@ mkDerivation rec { description = "Enables musicians to perform real-time jam sessions over the internet"; longDescription = "You also need to enable JACK and should enable several real-time optimizations. See project website for details"; homepage = "https://github.com/corrados/jamulus/wiki"; - license = stdenv.lib.licenses.gpl2; # linked in git repo, at least - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.seb314 ]; + license = lib.licenses.gpl2; # linked in git repo, at least + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.seb314 ]; }; } diff --git a/pkgs/applications/audio/japa/default.nix b/pkgs/applications/audio/japa/default.nix index 426fea21107..f45395eefa6 100644 --- a/pkgs/applications/audio/japa/default.nix +++ b/pkgs/applications/audio/japa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, libjack2, fftwFloat, libclthreads, libclxclient, libX11, libXft, zita-alsa-pcmi, }: +{ lib, stdenv, fetchurl, alsaLib, libjack2, fftwFloat, libclthreads, libclxclient, libX11, libXft, zita-alsa-pcmi, }: stdenv.mkDerivation rec { version = "0.9.2"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { description = "A 'perceptual' or 'psychoacoustic' audio spectrum analyser for JACK and ALSA"; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/index.html"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/applications/audio/klick/default.nix index 9ff063c1c80..05ac14eec09 100644 --- a/pkgs/applications/audio/klick/default.nix +++ b/pkgs/applications/audio/klick/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sconsPackages, pkgconfig +{ lib, stdenv, fetchurl, sconsPackages, pkgconfig , libsamplerate, libsndfile, liblo, libjack2, boost }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://das.nasophon.de/klick/"; description = "Advanced command-line metronome for JACK"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix index 76acd1daba7..47a36ed1b5d 100644 --- a/pkgs/applications/audio/ladspa-sdk/default.nix +++ b/pkgs/applications/audio/ladspa-sdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "ladspa-sdk"; version = "1.15"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { three example programs (applyplugin, analyseplugin and listplugins). ''; homepage = "http://www.ladspa.org/ladspa_sdk/overview.html"; - license = stdenv.lib.licenses.lgpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl2; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/ladspa-sdk/ladspah.nix b/pkgs/applications/audio/ladspa-sdk/ladspah.nix index d51aa3b75e1..b497e91927b 100644 --- a/pkgs/applications/audio/ladspa-sdk/ladspah.nix +++ b/pkgs/applications/audio/ladspa-sdk/ladspah.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "ladspa.h"; version = "1.15"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { For the full SDK, use the ladspa-sdk package. ''; homepage = "http://www.ladspa.org/ladspa_sdk/overview.html"; - license = stdenv.lib.licenses.lgpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.lgpl2; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix index 241a89caa0b..e8e6accefdb 100644 --- a/pkgs/applications/audio/librespot/default.nix +++ b/pkgs/applications/audio/librespot/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./cargo-lock.patch ]; - cargoBuildFlags = with stdenv.lib; [ + cargoBuildFlags = with lib; [ "--no-default-features" "--features" (concatStringsSep "," (filter (x: x != "") [ @@ -31,9 +31,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl ] ++ stdenv.lib.optional withALSA alsaLib - ++ stdenv.lib.optional withPulseAudio libpulseaudio - ++ stdenv.lib.optional withPortAudio portaudio; + buildInputs = [ openssl ] ++ lib.optional withALSA alsaLib + ++ lib.optional withPulseAudio libpulseaudio + ++ lib.optional withPortAudio portaudio; doCheck = false; diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix index f229e15871e..17a28315f19 100644 --- a/pkgs/applications/audio/lingot/default.nix +++ b/pkgs/applications/audio/lingot/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkg-config , intltool @@ -31,15 +31,15 @@ stdenv.mkDerivation rec { alsaLib libpulseaudio fftw - ] ++ stdenv.lib.optional jackSupport libjack2; + ] ++ lib.optional jackSupport libjack2; - configureFlags = stdenv.lib.optional (!jackSupport) "--disable-jack"; + configureFlags = lib.optional (!jackSupport) "--disable-jack"; meta = { description = "Not a Guitar-Only tuner"; homepage = "https://www.nongnu.org/lingot/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [ viric ]; + license = lib.licenses.gpl2Plus; + platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [ viric ]; }; } diff --git a/pkgs/applications/audio/linuxband/default.nix b/pkgs/applications/audio/linuxband/default.nix index cd9ca5e2674..92933d21d13 100644 --- a/pkgs/applications/audio/linuxband/default.nix +++ b/pkgs/applications/audio/linuxband/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, MMA, libjack2, libsmf, python2Packages }: +{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, MMA, libjack2, libsmf, python2Packages }: let inherit (python2Packages) pyGtkGlade pygtksourceview python; @@ -30,8 +30,8 @@ in stdenv.mkDerivation rec { meta = { description = "A GUI front-end for MMA: Type in the chords, choose the groove and it will play an accompaniment"; homepage = "http://linuxband.org/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix index 9772425535f..638f54da515 100644 --- a/pkgs/applications/audio/littlegptracker/default.nix +++ b/pkgs/applications/audio/littlegptracker/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { buildInputs = [ SDL ] - ++ stdenv.lib.optional stdenv.isDarwin Foundation - ++ stdenv.lib.optional stdenv.isLinux jack2; + ++ lib.optional stdenv.isDarwin Foundation + ++ lib.optional stdenv.isLinux jack2; patches = [ # Remove outdated (pre-64bit) checks that would fail on modern platforms @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { preBuild = "cd projects"; makeFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" ] - ++ stdenv.lib.optionals stdenv.isLinux [ "PLATFORM=DEB" ] - ++ stdenv.lib.optionals stdenv.isDarwin [ "PLATFORM=OSX" ]; + ++ lib.optionals stdenv.isLinux [ "PLATFORM=DEB" ] + ++ lib.optionals stdenv.isDarwin [ "PLATFORM=OSX" ]; NIX_CFLAGS_COMPILE = [ "-fpermissive" ] ++ - stdenv.lib.optional stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing"; + lib.optional stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing"; - NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin "-framework Foundation"; + NIX_LDFLAGS = lib.optional stdenv.isDarwin "-framework Foundation"; installPhase = let extension = if stdenv.isDarwin then "app" else "deb-exe"; in "install -Dm555 lgpt.${extension} $out/bin/lgpt"; diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index e32b2e54f47..f4cb5e80890 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, makeWrapper +{ lib, stdenv, fetchFromGitHub, pkgconfig, makeWrapper , libsndfile, jack2Full , libGLU, libGL, lv2, cairo , ladspaH, php }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildFlags = [ "release" ]; - meta = with stdenv.lib; + meta = with lib; { description = "Collection of open-source audio plugins"; longDescription = '' Compatible with follwing formats: diff --git a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix index e16198696a6..d7f0a7fb20e 100644 --- a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "A compressor with character. For jack and lv2"; homepage = "https://github.com/magnetophon/CharacterCompressor"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; }; } diff --git a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix index 1ccc9f3fcd5..7a917d79c57 100644 --- a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "A group of compressors mixed into a bus, sidechained from that mix bus. For jack and lv2"; homepage = "https://github.com/magnetophon/CompBus"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; }; } diff --git a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix index d5ed7e85b69..5ac71172325 100644 --- a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "A chorus algorithm that maintains constant and symmetric detuning depth (in cents), regardless of modulation rate. For jack and lv2"; homepage = "https://github.com/magnetophon/constant-detune-chorus"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; }; } diff --git a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix index 6d119394d5d..277b186fd4a 100644 --- a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "A fast yet clean lookahead limiter for jack and lv2"; homepage = "https://magnetophon.github.io/LazyLimiter/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.magnetophon ]; }; } diff --git a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix index 0eb68e65eae..de7e573cbee 100644 --- a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Mid-side multiband distortion for jack and lv2"; homepage = "https://github.com/magnetophon/MBdistortion"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.magnetophon ]; }; } diff --git a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix index be8ad72d28d..80c5bb89eee 100644 --- a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Tap a rhythm into your delay! For jack and lv2"; homepage = "https://github.com/magnetophon/RhythmDelay"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; }; } diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix index dce2db4cb77..9bd4076f130 100644 --- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { description = "Turn your voice into a synthesizer"; homepage = "https://github.com/magnetophon/VoiceOfFaust"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; }; } diff --git a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix index 172b5ed3891..a90492f4235 100644 --- a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { description = "A collection of bread and butter compressors"; homepage = "https://github.com/magnetophon/faustCompressors"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; }; } diff --git a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix index 11d51d756ab..414e350caa0 100644 --- a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "Some simple utility lv2 plugins"; homepage = "https://github.com/magnetophon/pluginUtils"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; }; } diff --git a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix index 360cee243c3..7dcdf985c82 100644 --- a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "A multiband compressor made from shelving filters."; homepage = "https://github.com/magnetophon/shelfMultiBand"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; }; } diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/pkgs/applications/audio/meters_lv2/default.nix index cd9523d2710..86a608db4c8 100644 --- a/pkgs/applications/audio/meters_lv2/default.nix +++ b/pkgs/applications/audio/meters_lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig , lv2, libGLU, libGL, gtk2, cairo, pango, fftwFloat, libjack2 }: let @@ -36,7 +36,7 @@ stdenv.mkDerivation { preConfigure = "makeFlagsArray=( PREFIX=$out )"; meter_VERSION = version; - meta = with stdenv.lib; + meta = with lib; { description = "Collection of audio level meters with GUI in LV2 plugin format"; homepage = "http://x42.github.io/meters.lv2/"; maintainers = with maintainers; [ ehmry ]; diff --git a/pkgs/applications/audio/mi2ly/default.nix b/pkgs/applications/audio/mi2ly/default.nix index bc74a73b643..b4f7668394f 100644 --- a/pkgs/applications/audio/mi2ly/default.nix +++ b/pkgs/applications/audio/mi2ly/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: let s = # Generated upstream information rec { @@ -33,9 +33,9 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = "MIDI to Lilypond converter"; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; broken = true; # 2018-04-11 }; } diff --git a/pkgs/applications/audio/midisheetmusic/default.nix b/pkgs/applications/audio/midisheetmusic/default.nix index 1f408f6f628..bff9e807b43 100644 --- a/pkgs/applications/audio/midisheetmusic/default.nix +++ b/pkgs/applications/audio/midisheetmusic/default.nix @@ -47,8 +47,8 @@ in stdenv.mkDerivation { cp bin/Debug/MidiSheetMusic.exe $out/bin/.MidiSheetMusic.exe makeWrapper ${mono}/bin/mono $out/bin/midisheetmusic.mono.exe \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ gtk2 cups ]} \ - --prefix PATH : ${stdenv.lib.makeBinPath [ timidity ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk2 cups ]} \ + --prefix PATH : ${lib.makeBinPath [ timidity ]} \ --add-flags $out/bin/.MidiSheetMusic.exe ''; diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix index 9be303cb652..4d39616c99d 100644 --- a/pkgs/applications/audio/mikmod/default.nix +++ b/pkgs/applications/audio/mikmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libmikmod, ncurses }: +{ lib, stdenv, fetchurl, libmikmod, ncurses }: stdenv.mkDerivation rec { name = "mikmod-3.2.8"; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { meta = { description = "Tracker music player for the terminal"; homepage = "http://mikmod.shlomifish.org/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix index e33e69ad78c..52079e1f441 100644 --- a/pkgs/applications/audio/mimic/default.nix +++ b/pkgs/applications/audio/mimic/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, autoreconfHook, fetchFromGitHub, pkgconfig +{ config, lib, stdenv, autoreconfHook, fetchFromGitHub, pkgconfig , alsaLib, libtool, icu , pulseaudioSupport ? config.pulseaudio or false, libpulseaudio }: @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { alsaLib libtool icu - ] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; + ] ++ lib.optional pulseaudioSupport libpulseaudio; meta = { description = "Mycroft's TTS engine, based on CMU's Flite (Festival Lite)"; homepage = "https://mimic.mycroft.ai/"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.noneucat ]; + license = lib.licenses.free; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.noneucat ]; }; } diff --git a/pkgs/applications/audio/mimms/default.nix b/pkgs/applications/audio/mimms/default.nix index 47e9fa306dc..793ee3d263a 100644 --- a/pkgs/applications/audio/mimms/default.nix +++ b/pkgs/applications/audio/mimms/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pythonPackages, libmms }: +{ fetchurl, lib, stdenv, pythonPackages, libmms }: pythonPackages.buildPythonApplication rec { pname = "mimms"; @@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec { meta = { homepage = "https://savannah.nongnu.org/projects/mimms/"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; description = "An mms (e.g. mms://) stream downloader"; longDescription = '' diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 96a4ab9fdaa..b2621a4ef11 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -25,7 +25,7 @@ }: let - opt = stdenv.lib.optional; + opt = lib.optional; mkFlag = c: f: if c then "--with-${f}" else "--without-${f}"; in stdenv.mkDerivation rec { @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { ++ opt midiSupport timidity ++ opt modplugSupport libmodplug ++ opt mp3Support libmad - ++ stdenv.lib.optionals musepackSupport [ libmpc libmpcdec taglib ] + ++ lib.optionals musepackSupport [ libmpc libmpcdec taglib ] ++ opt vorbisSupport libvorbis ++ opt speexSupport speex ++ opt (ffmpegSupport && !withffmpeg4) ffmpeg_3 diff --git a/pkgs/applications/audio/mooSpace/default.nix b/pkgs/applications/audio/mooSpace/default.nix index f6958c5e974..b7d7502d25a 100644 --- a/pkgs/applications/audio/mooSpace/default.nix +++ b/pkgs/applications/audio/mooSpace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "mooSpace"; version = "unstable-2020-06-10"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Variable reverb audio effect, jack and lv2"; homepage = "https://github.com/modularev/mooSpace"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; }; } diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index 55b7646af07..63a28eb0f58 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication rec { requests setuptools tornado - ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python + ] ++ lib.optional (!stdenv.isDarwin) dbus-python ); # There are no tests diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix index d7795524529..d7dd5f102db 100644 --- a/pkgs/applications/audio/mp3blaster/default.nix +++ b/pkgs/applications/audio/mp3blaster/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libvorbis - ] ++ stdenv.lib.optional stdenv.isDarwin SDL; + ] ++ lib.optional stdenv.isDarwin SDL; NIX_CFLAGS_COMPILE = toString ([ "-Wno-narrowing" - ] ++ stdenv.lib.optionals stdenv.cc.isClang [ + ] ++ lib.optionals stdenv.cc.isClang [ "-Wno-reserved-user-defined-literal" ]); diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix index 69ca271d27d..28ea6793f0d 100644 --- a/pkgs/applications/audio/mp3info/default.nix +++ b/pkgs/applications/audio/mp3info/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ncurses, pkgconfig, gtk2 }: +{ fetchurl, lib, stdenv, ncurses, pkgconfig, gtk2 }: stdenv.mkDerivation rec { name = "mp3info-0.8.5a"; @@ -37,9 +37,9 @@ stdenv.mkDerivation rec { homepage = "http://www.ibiblio.org/mp3info/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/mp3val/default.nix b/pkgs/applications/audio/mp3val/default.nix index 636fb7d9b9a..dc1a3085831 100644 --- a/pkgs/applications/audio/mp3val/default.nix +++ b/pkgs/applications/audio/mp3val/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "mp3val"; @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { common types of tags (ID3v1, ID3v2, APEv2). ''; homepage = "http://mp3val.sourceforge.net/index.shtml"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.devhell ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.devhell ]; }; } diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index a00ac7868b3..fcf438e5f0e 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1qbi0i9cq54rj8z2kapk8x8g1jkw2jz781niwb9i7kw4xfhvy5zx"; }; - buildInputs = [ mpd_clientlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ mpd_clientlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; nativeBuildInputs = [ meson ninja pkgconfig sphinx ]; diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix index ef5cb169a2c..7ce8af1de23 100644 --- a/pkgs/applications/audio/mpc123/default.nix +++ b/pkgs/applications/audio/mpc123/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gettext, libmpcdec, libao }: +{ fetchurl, lib, stdenv, gettext, libmpcdec, libao }: let version = "0.2.4"; in stdenv.mkDerivation rec { @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { description = "A Musepack (.mpc) audio player"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index f3203566a13..0b46cffd19c 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , makeWrapper @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ perl ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; + buildInputs = [ perl ] ++ lib.optional (!stdenv.isDarwin) alsaLib; - configureFlags = stdenv.lib.optional + configureFlags = lib.optional (stdenv.hostPlatform ? mpg123) "--with-cpu=${stdenv.hostPlatform.mpg123.cpu}"; @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { meta = { description = "Fast console MPEG Audio Player and decoder library"; homepage = "http://mpg123.org"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.ftrvxmtrx ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index 1f98d31eb9c..0079947438c 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { configureFlags = [ ("--enable-alsa=" + (if stdenv.isLinux then "yes" else "no")) ] - ++ (stdenv.lib.optional (defaultAudio != null) + ++ (lib.optional (defaultAudio != null) "--with-default-audio=${defaultAudio}"); buildInputs = [libao libid3tag libmad zlib] - ++ stdenv.lib.optional stdenv.isLinux alsaLib; + ++ lib.optional stdenv.isLinux alsaLib; installTargets = [ "install" "install-man" ]; diff --git a/pkgs/applications/audio/munt/default.nix b/pkgs/applications/audio/munt/default.nix index 8d8ab419fdb..6d010c6cd95 100644 --- a/pkgs/applications/audio/munt/default.nix +++ b/pkgs/applications/audio/munt/default.nix @@ -15,7 +15,7 @@ in mkDerivation rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = with stdenv.lib.versions; "libmt32emu_${major version}_${minor version}_${patch version}"; + rev = with lib.versions; "libmt32emu_${major version}_${minor version}_${patch version}"; sha256 = "0bszhkbz24hhx32f973l6h5lkyn4lxhqrckiwmv765d1sba8n5bk"; }; diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index fba80928b0d..882fbaf3477 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ncurses pulseaudio taglib - ] ++ stdenv.lib.optional systemdSupport systemd; + ] ++ lib.optional systemdSupport systemd; cmakeFlags = [ "-DDISABLE_STRIP=true" diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix index cc709822d9e..4e069e001da 100644 --- a/pkgs/applications/audio/mympd/default.nix +++ b/pkgs/applications/audio/mympd/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , pkg-config @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://jcorporation.github.io/mympd"; description = "A standalone and mobile friendly web mpd client with a tiny footprint and advanced features"; - maintainers = [ stdenv.lib.maintainers.doronbehar ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.doronbehar ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 2deff6162fb..4f0449401dd 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -4,7 +4,7 @@ , pcre ? null }: -with stdenv.lib; +with lib; assert pcreSupport -> pcre != null; diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 33308ebc61a..7f645ac7986 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, mpd_clientlib, ncurses, pkgconfig, readline +{ lib, stdenv, fetchurl, boost, mpd_clientlib, ncurses, pkgconfig, readline , libiconv, icu, curl , outputsSupport ? true # outputs screen , visualizerSupport ? false, fftw ? null # visualizer screen @@ -9,7 +9,7 @@ assert visualizerSupport -> (fftw != null); assert taglibSupport -> (taglib != null); -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "ncmpcpp"; version = "0.9.1"; diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix index 9b4b147c230..fbdfb78cab0 100644 --- a/pkgs/applications/audio/non/default.nix +++ b/pkgs/applications/audio/non/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, python2, cairo, libjpeg, ntk, libjack2 +{ lib, stdenv, fetchFromGitHub, pkgconfig, python2, cairo, libjpeg, ntk, libjack2 , libsndfile, ladspaH, liblo, libsigcxx, lrdf, wafHook }: @@ -20,8 +20,8 @@ stdenv.mkDerivation { meta = { description = "Lightweight and lightning fast modular Digital Audio Workstation"; homepage = "http://non.tuxfamily.org"; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.nico202 ]; + license = lib.licenses.lgpl21; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.nico202 ]; }; } diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index 486a9827511..ff7a40d5993 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -17,9 +17,9 @@ in stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib mpg123 libogg libvorbis portaudio libsndfile flac ] - ++ stdenv.lib.optional usePulseAudio libpulseaudio; + ++ lib.optional usePulseAudio libpulseaudio; - configureFlags = stdenv.lib.optional (!usePulseAudio) "--without-pulseaudio"; + configureFlags = lib.optional (!usePulseAudio) "--without-pulseaudio"; meta = with lib; { description = "A cross-platform command-line based module file player"; diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix index b8253b078be..f16e8e7a02d 100644 --- a/pkgs/applications/audio/opus-tools/default.nix +++ b/pkgs/applications/audio/opus-tools/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libogg, libao, pkgconfig, flac, opusfile, libopusenc}: +{lib, stdenv, fetchurl, libogg, libao, pkgconfig, flac, opusfile, libopusenc}: stdenv.mkDerivation rec { name = "opus-tools-0.2"; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { meta = { description = "Tools to work with opus encoded audio streams"; homepage = "https://www.opus-codec.org/"; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix index ac679d6dd94..5f622877552 100644 --- a/pkgs/applications/audio/patchage/default.nix +++ b/pkgs/applications/audio/patchage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, alsaLib, boost, dbus-glib, fetchsvn, ganv, glibmm +{ lib, stdenv, alsaLib, boost, dbus-glib, fetchsvn, ganv, glibmm , gtkmm2, libjack2, pkgconfig, python2, wafHook }: @@ -19,8 +19,8 @@ stdenv.mkDerivation { meta = { description = "Modular patch bay for Jack and ALSA systems"; homepage = "http://non.tuxfamily.org"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.nico202 ]; + license = lib.licenses.lgpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.nico202 ]; }; } diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index ffc56e54586..198fa1033ab 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { homepage = "http://freedesktop.org/software/pulseaudio/pavucontrol/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = with maintainers; [ abbradar globin ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix index 56f1ec518de..03df731aef5 100644 --- a/pkgs/applications/audio/pd-plugins/cyclone/default.nix +++ b/pkgs/applications/audio/pd-plugins/cyclone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, puredata }: +{ lib, stdenv, fetchFromGitHub, puredata }: stdenv.mkDerivation rec { pname = "cyclone"; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { description = "A library of PureData classes, bringing some level of compatibility between Max/MSP and Pd environments"; homepage = "http://puredata.info/downloads/cyclone"; - license = stdenv.lib.licenses.tcltk; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.tcltk; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/pd-plugins/gem/default.nix b/pkgs/applications/audio/pd-plugins/gem/default.nix index a44ba689a61..aeb58911623 100644 --- a/pkgs/applications/audio/pd-plugins/gem/default.nix +++ b/pkgs/applications/audio/pd-plugins/gem/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , autoreconfHook @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { meta = { description = "Graphics Environment for Multimedia"; homepage = "http://puredata.info/downloads/gem"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.raboof ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.raboof ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix index be5a385d308..9b50b40a5bb 100644 --- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix +++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, puredata }: +{ lib, stdenv, fetchurl, unzip, puredata }: stdenv.mkDerivation { name = "helmholtz"; @@ -39,8 +39,8 @@ stdenv.mkDerivation { meta = { description = "Time domain pitch tracker for Pure Data"; homepage = "http://www.katjaas.nl/helmholtz/helmholtz.html"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/pkgs/applications/audio/pd-plugins/maxlib/default.nix index aec793c4ee8..1fc3475bc6a 100644 --- a/pkgs/applications/audio/pd-plugins/maxlib/default.nix +++ b/pkgs/applications/audio/pd-plugins/maxlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, puredata }: +{ lib, stdenv, fetchFromGitHub, puredata }: stdenv.mkDerivation rec { pname = "maxlib"; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { description = "A library of non-tilde externals for puredata, by Miller Puckette"; homepage = "http://puredata.info/downloads/maxlib"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix index cefee430ad5..71f5e9438e1 100644 --- a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix +++ b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, puredata }: +{ lib, stdenv, fetchurl, puredata }: stdenv.mkDerivation { pname = "mrpeach"; @@ -55,8 +55,8 @@ stdenv.mkDerivation { meta = { description = "A collection of Pd objectclasses for OSC-messages"; homepage = "http://puredata.info/downloads/osc"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix index 7a5014664d5..1eb6eb38931 100644 --- a/pkgs/applications/audio/pd-plugins/puremapping/default.nix +++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, puredata }: +{ lib, stdenv, fetchurl, unzip, puredata }: stdenv.mkDerivation rec { pname = "puremapping"; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "Set of externals to facilitate the use of sensors within Pure Data and to create complex relations between input and output of a dynamic system"; homepage = "http://www.chnry.net/ch/?090-Pure-Mapping&lang=en"; - license = stdenv.lib.licenses.gpl1; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl1; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/pd-plugins/timbreid/default.nix b/pkgs/applications/audio/pd-plugins/timbreid/default.nix index e68610a0226..e5e67ec44dd 100644 --- a/pkgs/applications/audio/pd-plugins/timbreid/default.nix +++ b/pkgs/applications/audio/pd-plugins/timbreid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, puredata, fftw }: +{ lib, stdenv, fetchurl, unzip, puredata, fftw }: stdenv.mkDerivation rec { version = "0.7.0"; @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = { description = "A collection of audio feature analysis externals for puredata"; homepage = "http://williambrent.conflations.com/pages/research.html"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix index 4f826908136..67c7cd18be8 100644 --- a/pkgs/applications/audio/pd-plugins/zexy/default.nix +++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, puredata }: +{ lib, stdenv, fetchurl, autoconf, automake, puredata }: stdenv.mkDerivation rec { pname = "zexy"; @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { meta = { description = "The swiss army knife for puredata"; homepage = "http://puredata.info/downloads/zexy"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 8a7c1b32245..733cb702c7e 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -22,7 +22,7 @@ in pythonPackages.buildPythonApplication rec { }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] - ++ stdenv.lib.optionals (pyqt5.multimediaEnabled) [ + ++ lib.optionals (pyqt5.multimediaEnabled) [ qt5.qtmultimedia.bin gst_all_1.gstreamer gst_all_1.gst-vaapi @@ -49,7 +49,7 @@ in pythonPackages.buildPythonApplication rec { preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") '' - + stdenv.lib.optionalString (pyqt5.multimediaEnabled) '' + + lib.optionalString (pyqt5.multimediaEnabled) '' makeWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") '' ; diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 5abab029bc9..b87e48768f1 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, gtk2, pkgconfig }: +{ lib, stdenv, fetchurl, alsaLib, gtk2, pkgconfig }: stdenv.mkDerivation rec { pname = "praat"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Doing phonetics by computer"; homepage = "https://www.fon.hum.uva.nl/praat/"; - license = stdenv.lib.licenses.gpl2Plus; # Has some 3rd-party code in it though - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; # Has some 3rd-party code in it though + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 011ef8d12e5..6a093c91daf 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ SDL2 ] ++ stdenv.lib.optional stdenv.isLinux alsaLib; + buildInputs = [ SDL2 ] ++ lib.optional stdenv.isLinux alsaLib; passthru.tests = { pt2-clone-opens = nixosTests.pt2-clone; diff --git a/pkgs/applications/audio/pulseaudio-ctl/default.nix b/pkgs/applications/audio/pulseaudio-ctl/default.nix index 245c58a2119..843c131ea65 100644 --- a/pkgs/applications/audio/pulseaudio-ctl/default.nix +++ b/pkgs/applications/audio/pulseaudio-ctl/default.nix @@ -2,7 +2,7 @@ , bc, dbus, gawk, gnused, libnotify, pulseaudio }: let - path = stdenv.lib.makeBinPath [ bc dbus gawk gnused libnotify pulseaudio ]; + path = lib.makeBinPath [ bc dbus gawk gnused libnotify pulseaudio ]; pname = "pulseaudio-ctl"; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix index 3c80a521286..a19a03d4bd2 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/default.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix @@ -32,12 +32,12 @@ pythonPackages.buildPythonApplication { dbus-python docopt requests setproctitle protobuf psutil futures chardet notify2 netifaces pyroute2 pygobject2 lxml setuptools ] ++ [ zeroconf ] - ++ stdenv.lib.optional mp3Support lame - ++ stdenv.lib.optional opusSupport opusTools - ++ stdenv.lib.optional faacSupport faac - ++ stdenv.lib.optional flacSupport flac - ++ stdenv.lib.optional soxSupport sox - ++ stdenv.lib.optional vorbisSupport vorbis-tools; + ++ lib.optional mp3Support lame + ++ lib.optional opusSupport opusTools + ++ lib.optional faacSupport faac + ++ lib.optional flacSupport flac + ++ lib.optional soxSupport sox + ++ lib.optional vorbisSupport vorbis-tools; # upstream has no tests checkPhase = '' diff --git a/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix b/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix index e28aabe8dab..0e3eeac984a 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ netifaces six enum-compat ifaddr ] - ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; + ++ lib.optionals (pythonOlder "3.5") [ typing ]; meta = with lib; { description = "A pure python implementation of multicast DNS service discovery"; diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index f0f3ad60b41..a2c69818137 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -94,15 +94,15 @@ in stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --set LV2_PATH "${stdenv.lib.makeSearchPath "lib/lv2" lv2Plugins}" - --set LADSPA_PATH "${stdenv.lib.makeSearchPath "lib/ladspa" ladspaPlugins}" + --set LV2_PATH "${lib.makeSearchPath "lib/lv2" lv2Plugins}" + --set LADSPA_PATH "${lib.makeSearchPath "lib/ladspa" ladspaPlugins}" ) ''; # Meson is no longer able to pick up Boost automatically. # https://github.com/NixOS/nixpkgs/issues/86131 - BOOST_INCLUDEDIR = "${stdenv.lib.getDev boost}/include"; - BOOST_LIBRARYDIR = "${stdenv.lib.getLib boost}/lib"; + BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; + BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; meta = with lib; { description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications"; diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 51972e6bfeb..719ddd28e2a 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -13,7 +13,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "rncbc"; repo = "qjackctl"; - rev = "${pname}_${stdenv.lib.replaceChars ["."] ["_"] version}"; + rev = "${pname}_${lib.replaceChars ["."] ["_"] version}"; sha256 = "044kgwk7pfywad4myza0s2kvfkl21zkqq5wgny7n3c43qlcgs3zr"; }; diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix index ee983f78014..30062955bb5 100644 --- a/pkgs/applications/audio/qmidiroute/default.nix +++ b/pkgs/applications/audio/qmidiroute/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.lebastr ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 00da41e308a..571097ad478 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -6,7 +6,7 @@ webkitgtk ? null, keybinder3 ? null, gtksourceview ? null, libmodplug ? null, kakasi ? null, libappindicator-gtk3 ? null }: -let optionals = stdenv.lib.optionals; in +let optionals = lib.optionals; in python3.pkgs.buildPythonApplication rec { pname = "quodlibet${tag}"; version = "4.3.0"; @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; - pytestFlags = stdenv.lib.optionals (xineBackend || !withGstPlugins) [ + pytestFlags = lib.optionals (xineBackend || !withGstPlugins) [ "--ignore=tests/plugin/test_replaygain.py" ] ++ [ # requires networking @@ -65,7 +65,7 @@ python3.pkgs.buildPythonApplication rec { runHook postCheck ''; - preFixup = stdenv.lib.optionalString (kakasi != null) "gappsWrapperArgs+=(--prefix PATH : ${kakasi}/bin)"; + preFixup = lib.optionalString (kakasi != null) "gappsWrapperArgs+=(--prefix PATH : ${kakasi}/bin)"; meta = with lib; { description = "GTK-based audio player written in Python, using the Mutagen tagging library"; diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 9c5e6a931a9..746092977db 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isAarch64; # single failure that I can't explain preFixup = '' - gappsWrapperArgs+=(--suffix PATH : ${stdenv.lib.makeBinPath [ dbus ]}) + gappsWrapperArgs+=(--suffix PATH : ${lib.makeBinPath [ dbus ]}) wrapProgram $out/bin/rt2rtng --prefix PYTHONPATH : $PYTHONPATH ''; diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 09f8bcfd6b6..a58fd289e24 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "6.19"; src = fetchurl { - url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; + url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; sha256 = "1cdy5ilpfidz7xyqn2i41szr24ilcmpl35aw1vbashf0b6dg48la"; }; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { rm $out/opt/REAPER/uninstall-reaper.sh wrapProgram $out/opt/REAPER/reaper \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libpulseaudio libjack2 ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libpulseaudio libjack2 ]}" mkdir $out/bin ln -s $out/opt/REAPER/reaper $out/bin/ diff --git a/pkgs/applications/audio/redoflacs/default.nix b/pkgs/applications/audio/redoflacs/default.nix index 879acdf3a17..999dc90a6e4 100644 --- a/pkgs/applications/audio/redoflacs/default.nix +++ b/pkgs/applications/audio/redoflacs/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/redoflacs \ - --prefix PATH : ${stdenv.lib.makeBinPath ([ flac sox ])} + --prefix PATH : ${lib.makeBinPath ([ flac sox ])} ''; meta = with lib; { diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 0ae65cb8c37..2159fa630d9 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib +{ lib, stdenv, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib , mpg123, releasePath ? null }: -with stdenv.lib; +with lib; # To use the full release version: # 1) Sign into https://backstage.renoise.com and download the release version to some stable location. @@ -19,15 +19,15 @@ stdenv.mkDerivation rec { src = if stdenv.hostPlatform.system == "x86_64-linux" then if releasePath == null then - fetchurl { - urls = [ - "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" - "https://web.archive.org/web/https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" - ]; - sha256 = "1v249kmyidx55kppk3sry7yg6hl1a91ixhnwz36h4y134fs7bkrl"; - } + fetchurl { + urls = [ + "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" + "https://web.archive.org/web/https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" + ]; + sha256 = "1v249kmyidx55kppk3sry7yg6hl1a91ixhnwz36h4y134fs7bkrl"; + } else - releasePath + releasePath else throw "Platform is not supported by Renoise"; buildInputs = [ alsaLib libjack2 libX11 libXcursor libXext libXrandr ]; diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index c07d73530b5..ae45ca62eb9 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "142xcvw4l19jyr5i72nbnrihs953pvrrzcbijjn9dxmxszbv03pf"; }; diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index 02c8f28da65..3b5708529e0 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook python ]; - buildInputs = [ SDL ] ++ stdenv.lib.optional stdenv.isLinux alsaLib; + buildInputs = [ SDL ] ++ lib.optional stdenv.isLinux alsaLib; meta = with lib; { description = "Music tracker application, free reimplementation of Impulse Tracker"; diff --git a/pkgs/applications/audio/shntool/default.nix b/pkgs/applications/audio/shntool/default.nix index de18f3c2ce8..8b4f736ab1c 100644 --- a/pkgs/applications/audio/shntool/default.nix +++ b/pkgs/applications/audio/shntool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flac }: +{ lib, stdenv, fetchurl, flac }: stdenv.mkDerivation { version = "3.0.10"; @@ -14,8 +14,8 @@ stdenv.mkDerivation { meta = { description = "Multi-purpose WAVE data processing and reporting utility"; homepage = "http://www.etree.org/shnutils/shntool/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 76ea4efeace..bbabaffa7f3 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig , gtk2, alsaLib , fftw, gsl }: @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { meta = { description = "Sound editor"; homepage = "http://ccrma.stanford.edu/software/snd"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.free; - maintainers = with stdenv.lib.maintainers; [ ]; + platforms = lib.platforms.linux; + license = lib.licenses.free; + maintainers = with lib.maintainers; [ ]; }; diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index afb02768960..bc098cedaf4 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, wrapGAppsHook, gettext +{ lib, stdenv, fetchFromGitHub, wrapGAppsHook, gettext , python3Packages, gnome3, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }: let @@ -74,8 +74,8 @@ in buildPythonApplication rec { - Available in 24 languages ''; homepage = "https://www.nongnu.org/sonata/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.rvl ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.rvl ]; }; } diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index e8ab895579c..08cbef146f1 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "19qg4xv0f9rkq34lragkmhii1llxsa87llbl28i759b0ks4f6sny"; }; diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix index 741211bd90d..f849e2fe7be 100644 --- a/pkgs/applications/audio/soundscape-renderer/default.nix +++ b/pkgs/applications/audio/soundscape-renderer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchgit , autoreconfHook , help2man @@ -47,8 +47,8 @@ stdenv.mkDerivation { meta = { homepage = "http://spatialaudio.net/ssr/"; description = "The SoundScape Renderer (SSR) is a tool for real-time spatial audio reproduction"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.fridh ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.fridh ]; }; } diff --git a/pkgs/applications/audio/soundtracker/default.nix b/pkgs/applications/audio/soundtracker/default.nix index aa78bbf3de8..71fc763a5c5 100644 --- a/pkgs/applications/audio/soundtracker/default.nix +++ b/pkgs/applications/audio/soundtracker/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { jack2 audiofile goocanvas - ] ++ stdenv.lib.optional stdenv.isLinux alsaLib; + ] ++ lib.optional stdenv.isLinux alsaLib; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/spectrojack/default.nix b/pkgs/applications/audio/spectrojack/default.nix index 35534750d0c..c5e3211a646 100644 --- a/pkgs/applications/audio/spectrojack/default.nix +++ b/pkgs/applications/audio/spectrojack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libjack2, fftwFloat, gtk2 }: +{ lib, stdenv, fetchurl, pkgconfig, libjack2, fftwFloat, gtk2 }: stdenv.mkDerivation rec { pname = "spectrojack"; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "A little spectrogram/audiogram/sonogram/whatever for JACK"; homepage = "http://sed.free.fr/spectrojack"; - license = stdenv.lib.licenses.publicDomain; - maintainers = with stdenv.lib.maintainers; [ sleexyz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.publicDomain; + maintainers = with lib.maintainers; [ sleexyz ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/audio/split2flac/default.nix b/pkgs/applications/audio/split2flac/default.nix index 689e9e1cb24..92f0753fd78 100644 --- a/pkgs/applications/audio/split2flac/default.nix +++ b/pkgs/applications/audio/split2flac/default.nix @@ -9,7 +9,7 @@ let wrapSplit2flac = format: '' makeWrapper $out/bin/.split2flac-wrapped $out/bin/split2${format} \ --set SPLIT2FLAC_FORMAT ${format} \ - --prefix PATH : ${stdenv.lib.makeBinPath [ + --prefix PATH : ${lib.makeBinPath [ shntool cuetools flac faac mp4v2 wavpack mac imagemagick libiconv enca lame pythonPackages.mutagen vorbis-tools diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index 55a725e59b0..6f43dc3f03e 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "100c7x603qyhav3p24clwfal4ngh0258x9lqsi84kcj4wq2f3i8f"; - nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ pkgconfig python3 ]; + nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkgconfig python3 ]; buildInputs = [ ] - ++ stdenv.lib.optionals stdenv.isLinux [ openssl libxcb ] - ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; + ++ lib.optionals stdenv.isLinux [ openssl libxcb ] + ++ lib.optionals stdenv.isDarwin [ AppKit Security ]; postInstall = '' for shell in bash fish zsh; do diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index bfc8757445c..43ecb67d64a 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -135,7 +135,7 @@ stdenv.mkDerivation { --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $rpath $out/share/spotify/spotify - librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir" + librarypath="${lib.makeLibraryPath deps}:$libdir" wrapProgram $out/share/spotify/spotify \ --prefix LD_LIBRARY_PATH : "$librarypath" \ --prefix PATH : "${gnome3.zenity}/bin" diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index 737b8656c6a..4d52648a847 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -26,16 +26,16 @@ rustPackages_1_45.rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--no-default-features" "--features" - "${stdenv.lib.optionalString withALSA "alsa_backend,"}${stdenv.lib.optionalString withPulseAudio "pulseaudio_backend,"}${stdenv.lib.optionalString withPortAudio "portaudio_backend,"}${stdenv.lib.optionalString withMpris "dbus_mpris,"}${stdenv.lib.optionalString withKeyring "dbus_keyring,"}" + "${lib.optionalString withALSA "alsa_backend,"}${lib.optionalString withPulseAudio "pulseaudio_backend,"}${lib.optionalString withPortAudio "portaudio_backend,"}${lib.optionalString withMpris "dbus_mpris,"}${lib.optionalString withKeyring "dbus_keyring,"}" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] - ++ stdenv.lib.optional withALSA alsaLib - ++ stdenv.lib.optional withPulseAudio libpulseaudio - ++ stdenv.lib.optional withPortAudio portaudio - ++ stdenv.lib.optional (withMpris || withKeyring) dbus; + ++ lib.optional withALSA alsaLib + ++ lib.optional withPulseAudio libpulseaudio + ++ lib.optional withPortAudio portaudio + ++ lib.optional (withMpris || withKeyring) dbus; doCheck = false; diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index d5c84888eeb..6bb3bef8a50 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -9,8 +9,8 @@ }: let - concatStringsSep = stdenv.lib.concatStringsSep; - optional = stdenv.lib.optional; + concatStringsSep = lib.concatStringsSep; + optional = lib.optional; opts = [ "-DLINKALL" ] ++ optional dsdSupport "-DDSD" ++ optional (!faad2Support) "-DNO_FAAD" diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index 12397f2fdbf..abc31d9f180 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, unzip, alsaLib, libX11, libXi, SDL2 }: let - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc alsaLib libX11 libXi SDL2 ]; + libPath = lib.makeLibraryPath [ stdenv.cc.cc alsaLib libX11 libXi SDL2 ]; arch = if stdenv.isAarch64 then "arm64" diff --git a/pkgs/applications/audio/tap-plugins/default.nix b/pkgs/applications/audio/tap-plugins/default.nix index 2b04b450dec..c0b2c64822f 100644 --- a/pkgs/applications/audio/tap-plugins/default.nix +++ b/pkgs/applications/audio/tap-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ladspa-sdk, pkgs, ... }: +{ lib, stdenv, fetchurl, ladspa-sdk, pkgs, ... }: stdenv.mkDerivation rec { pname = "tap-plugins"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace /usr/local "$out" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tom's Audio Processing plugins"; longDescription = '' A number of LADSPA plugins including: TAP AutoPanner, TAP Chorus/Flanger, TAP DeEsser, diff --git a/pkgs/applications/audio/timemachine/default.nix b/pkgs/applications/audio/timemachine/default.nix index 8be43346bc0..399c39acf08 100644 --- a/pkgs/applications/audio/timemachine/default.nix +++ b/pkgs/applications/audio/timemachine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, gtk2 +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, gtk2 , libjack2, libsndfile }: @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { meta = { description = "JACK audio recorder"; homepage = "http://plugin.org.uk/timemachine/"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.nico202 ]; + license = lib.licenses.lgpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.nico202 ]; }; } diff --git a/pkgs/applications/audio/uade123/default.nix b/pkgs/applications/audio/uade123/default.nix index 09e066dadac..44c8b0ecfb5 100644 --- a/pkgs/applications/audio/uade123/default.nix +++ b/pkgs/applications/audio/uade123/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { description = "Plays old Amiga tunes through UAE emulation and cloned m68k-assembler Eagleplayer API"; homepage = "http://zakalwe.fi/uade/"; license = licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.gnidorah ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ lib.maintainers.gnidorah ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index 27844841482..8e836417f47 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -36,7 +36,7 @@ let sha256 = "17kd0lh2x3x12bxkyhq6z8sg6vxln8m9qirf0basvcsmylr6rb64"; }; in -with stdenv.lib; stdenv.mkDerivation rec { +with lib; stdenv.mkDerivation rec { pname = "VCV-Rack"; version = "1.1.6"; diff --git a/pkgs/applications/audio/wavegain/default.nix b/pkgs/applications/audio/wavegain/default.nix index d9b13f53273..f4ef7f6d8a5 100644 --- a/pkgs/applications/audio/wavegain/default.nix +++ b/pkgs/applications/audio/wavegain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "wavegain-1.3.1"; @@ -17,8 +17,8 @@ stdenv.mkDerivation { meta = { description = "ReplayGain for wave files"; homepage = "https://github.com/MestreLion/wavegain"; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.robbinch ]; + license = lib.licenses.lgpl21; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.robbinch ]; }; } diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index 227091dd581..8a46a06efce 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -3,7 +3,7 @@ python3.pkgs.buildPythonApplication rec { pname = "whipper"; - version = "0.9.1.dev7+g${stdenv.lib.substring 0 7 src.rev}"; + version = "0.9.1.dev7+g${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "whipper-team"; @@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec { ]; makeWrapperArgs = [ - "--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ accuraterip-checksum cdrdao util-linux flac sox ]) + "--prefix" "PATH" ":" (lib.makeBinPath [ accuraterip-checksum cdrdao util-linux flac sox ]) ]; preBuild = '' diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index d3726eab7ff..485e0de1ee7 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig , libltc, libsndfile, libsamplerate, ftgl, freefont_ttf, libjack2 , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { sed -i 's|/usr/include/zita-convolver.h|${zita-convolver}/include/zita-convolver.h|g' ./convoLV2/Makefile ''; - meta = with stdenv.lib; + meta = with lib; { description = "Collection of LV2 plugins by Robin Gareus"; homepage = "https://github.com/x42/x42-plugins"; maintainers = with maintainers; [ magnetophon ]; diff --git a/pkgs/applications/audio/yasr/default.nix b/pkgs/applications/audio/yasr/default.nix index fed2ee0d8f7..21313b9c059 100644 --- a/pkgs/applications/audio/yasr/default.nix +++ b/pkgs/applications/audio/yasr/default.nix @@ -1,4 +1,4 @@ -{stdenv,fetchurl}: +{lib, stdenv,fetchurl}: stdenv.mkDerivation rec { pname = "yasr"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { homepage = "http://yasr.sourceforge.net"; description = "A general-purpose console screen reader"; longDescription = "Yasr is a general-purpose console screen reader for GNU/Linux and other Unix-like operating systems."; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ jhhuh ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ jhhuh ]; }; } diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix index 72c17aed52e..c12c060864d 100644 --- a/pkgs/applications/audio/ympd/default.nix +++ b/pkgs/applications/audio/ympd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, mpd_clientlib, openssl }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, mpd_clientlib, openssl }: stdenv.mkDerivation rec { pname = "ympd"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.ympd.org"; description = "Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS"; - maintainers = [ stdenv.lib.maintainers.siddharthist ]; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2; + maintainers = [ lib.maintainers.siddharthist ]; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/applications/backup/areca/default.nix b/pkgs/applications/backup/areca/default.nix index 2cf0113cb5a..b50ebdd4a87 100644 --- a/pkgs/applications/backup/areca/default.nix +++ b/pkgs/applications/backup/areca/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { substituteInPlace jni/com_myJava_file_metadata_posix_jni_wrapper_FileAccessWrapper.c --replace attr/xattr.h sys/xattr.h sed -i "s#^PROGRAM_DIR.*#PROGRAM_DIR=$out#g" bin/areca_run.sh - sed -i "s#^LIBRARY_PATH.*#LIBRARY_PATH=$out/lib:${stdenv.lib.makeLibraryPath [ swt acl ]}#g" bin/areca_run.sh + sed -i "s#^LIBRARY_PATH.*#LIBRARY_PATH=$out/lib:${lib.makeLibraryPath [ swt acl ]}#g" bin/areca_run.sh # https://sourceforge.net/p/areca/bugs/563/ substituteInPlace bin/areca_run.sh --replace '[ "$JAVA_IMPL" = "java" ]' \ diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index d2b69a32ab5..a0a7f728315 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -1,8 +1,8 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, openssl, db53, boost +{ lib, stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, openssl, db53, boost , zlib, miniupnpc, qtbase ? null , qttools ? null, util-linux, protobuf, qrencode, libevent , withGui, python3, jemalloc, zeromq4 }: -with stdenv.lib; +with lib; mkDerivation rec { diff --git a/pkgs/applications/blockchains/bitcoin-classic.nix b/pkgs/applications/blockchains/bitcoin-classic.nix index 417262f6f4d..a9bf3f4715b 100644 --- a/pkgs/applications/blockchains/bitcoin-classic.nix +++ b/pkgs/applications/blockchains/bitcoin-classic.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost +{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost , zlib, miniupnpc, qtbase ? null, qttools ? null, util-linux, protobuf, qrencode, libevent , withGui }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { diff --git a/pkgs/applications/blockchains/bitcoin-gold.nix b/pkgs/applications/blockchains/bitcoin-gold.nix index c108304ee37..c4b7f90cd93 100644 --- a/pkgs/applications/blockchains/bitcoin-gold.nix +++ b/pkgs/applications/blockchains/bitcoin-gold.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , openssl , boost @@ -16,7 +16,7 @@ , wrapQtAppsHook ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { diff --git a/pkgs/applications/blockchains/bitcoin-unlimited.nix b/pkgs/applications/blockchains/bitcoin-unlimited.nix index 8a2b9e370f5..ac1c1841806 100644 --- a/pkgs/applications/blockchains/bitcoin-unlimited.nix +++ b/pkgs/applications/blockchains/bitcoin-unlimited.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost +{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost , zlib, miniupnpc, util-linux, protobuf, qrencode, libevent, python3 , withGui, wrapQtAppsHook ? null, qtbase ? null, qttools ? null , Foundation, ApplicationServices, AppKit }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version; diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix index 80e935f2b1a..55eef089e0e 100644 --- a/pkgs/applications/blockchains/bitcoin.nix +++ b/pkgs/applications/blockchains/bitcoin.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkgconfig , autoreconfHook @@ -18,7 +18,7 @@ , withGui }: -with stdenv.lib; +with lib; let version = "0.20.1"; majorMinorVersion = versions.majorMinor version; diff --git a/pkgs/applications/blockchains/btcdeb/default.nix b/pkgs/applications/blockchains/btcdeb/default.nix index 39d2197626a..cd162a8f4b3 100644 --- a/pkgs/applications/blockchains/btcdeb/default.nix +++ b/pkgs/applications/blockchains/btcdeb/default.nix @@ -1,11 +1,11 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , pkgconfig , openssl }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "btcdeb-unstable"; version = "200806"; diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix index b17876325d5..2f3fca79c8d 100644 --- a/pkgs/applications/blockchains/clightning.nix +++ b/pkgs/applications/blockchains/clightning.nix @@ -1,7 +1,7 @@ -{ stdenv, python3, pkgconfig, which, libtool, autoconf, automake, +{ lib, stdenv, python3, pkgconfig, which, libtool, autoconf, automake, autogen, sqlite, gmp, zlib, fetchurl, unzip, fetchpatch, gettext }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "clightning"; version = "0.9.2"; diff --git a/pkgs/applications/blockchains/dashpay.nix b/pkgs/applications/blockchains/dashpay.nix index b55dd3b5b78..6b122d502c3 100644 --- a/pkgs/applications/blockchains/dashpay.nix +++ b/pkgs/applications/blockchains/dashpay.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, pkgconfig, autoreconfHook +{ fetchFromGitHub, lib, stdenv, pkgconfig, autoreconfHook , openssl, db48, boost, zlib, miniupnpc , qrencode, glib, protobuf, yasm, libevent , util-linux @@ -6,7 +6,7 @@ , disable_Wallet ? false , disable_Daemon ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "dashpay"; version = "0.12.2.3"; diff --git a/pkgs/applications/blockchains/digibyte.nix b/pkgs/applications/blockchains/digibyte.nix index 0d0fc081a11..97bf97bb340 100644 --- a/pkgs/applications/blockchains/digibyte.nix +++ b/pkgs/applications/blockchains/digibyte.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , openssl , boost @@ -15,7 +15,7 @@ , wrapQtAppsHook ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "digibyte"; diff --git a/pkgs/applications/blockchains/dogecoin.nix b/pkgs/applications/blockchains/dogecoin.nix index 527b307042c..2a01288e4de 100644 --- a/pkgs/applications/blockchains/dogecoin.nix +++ b/pkgs/applications/blockchains/dogecoin.nix @@ -1,10 +1,10 @@ -{ stdenv , fetchFromGitHub +{ lib, stdenv , fetchFromGitHub , pkgconfig, autoreconfHook , db5, openssl, boost, zlib, miniupnpc, libevent , protobuf, util-linux, qt4, qrencode , withGui }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "dogecoin" + (toString (optional (!withGui) "d")) + "-" + version; version = "1.14.2"; diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index 3fc3a9109c5..776253ac9cd 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -35,7 +35,7 @@ buildGoModule rec { # Fix for usb-related segmentation faults on darwin propagatedBuildInputs = - stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; + lib.optionals stdenv.isDarwin [ libobjc IOKit ]; meta = with lib; { homepage = "https://geth.ethereum.org/"; diff --git a/pkgs/applications/blockchains/litecoin.nix b/pkgs/applications/blockchains/litecoin.nix index 85adbec718f..342f14c7df6 100644 --- a/pkgs/applications/blockchains/litecoin.nix +++ b/pkgs/applications/blockchains/litecoin.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub +{ lib, stdenv, mkDerivation, fetchFromGitHub , pkgconfig, autoreconfHook , openssl, db48, boost, zlib, miniupnpc , glib, protobuf, util-linux, qrencode @@ -8,7 +8,7 @@ , zeromq }: -with stdenv.lib; +with lib; mkDerivation rec { diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index a34e834d4a7..5165c61b070 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, wrapQtAppsHook, makeDesktopItem +{ lib, stdenv, wrapQtAppsHook, makeDesktopItem , fetchFromGitHub , cmake, qttools, pkgconfig , qtbase, qtdeclarative, qtgraphicaleffects @@ -15,7 +15,7 @@ , python3 ? null }: -with stdenv.lib; +with lib; assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index c9134e3ec47..48d1952192d 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -10,7 +10,7 @@ , python3 ? null }: -with stdenv.lib; +with lib; assert stdenv.isDarwin -> IOKit != null; assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; diff --git a/pkgs/applications/blockchains/namecoin.nix b/pkgs/applications/blockchains/namecoin.nix index cbce1773104..77f72f4824b 100644 --- a/pkgs/applications/blockchains/namecoin.nix +++ b/pkgs/applications/blockchains/namecoin.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, qrencode, hexdump +{ lib, stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, qrencode, hexdump , withGui }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "nc0.20.1"; name = "namecoin" + toString (optional (!withGui) "d") + "-" + version; diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix index 563b2378f84..5bb5d295157 100644 --- a/pkgs/applications/blockchains/openethereum/default.nix +++ b/pkgs/applications/blockchains/openethereum/default.nix @@ -32,8 +32,8 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isLinux [ systemd ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ]; + ++ lib.optionals stdenv.isLinux [ systemd ] + ++ lib.optionals stdenv.isDarwin [ darwin.Security ]; cargoBuildFlags = [ "--features final" ]; @@ -45,6 +45,6 @@ rustPlatform.buildRustPackage rec { homepage = "http://parity.io/ethereum"; license = licenses.gpl3; maintainers = with maintainers; [ akru xrelkd ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/blockchains/particl/particl-core.nix b/pkgs/applications/blockchains/particl/particl-core.nix index f30e9a60980..cadd64b289b 100644 --- a/pkgs/applications/blockchains/particl/particl-core.nix +++ b/pkgs/applications/blockchains/particl/particl-core.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , autoreconfHook , boost , db48 @@ -13,7 +13,7 @@ , python3 }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "particl-core"; diff --git a/pkgs/applications/blockchains/pivx.nix b/pkgs/applications/blockchains/pivx.nix index dc80df74a45..92f548789bf 100644 --- a/pkgs/applications/blockchains/pivx.nix +++ b/pkgs/applications/blockchains/pivx.nix @@ -7,7 +7,7 @@ , disableDaemon ? false , withGui ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "pivx-${version}"; version = "4.1.1"; diff --git a/pkgs/applications/blockchains/vertcoin.nix b/pkgs/applications/blockchains/vertcoin.nix index 21104012f4d..d56126902b6 100644 --- a/pkgs/applications/blockchains/vertcoin.nix +++ b/pkgs/applications/blockchains/vertcoin.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , openssl , boost @@ -15,7 +15,7 @@ , wrapQtAppsHook ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "vertcoin"; diff --git a/pkgs/applications/blockchains/wasabibackend/default.nix b/pkgs/applications/blockchains/wasabibackend/default.nix index fd298debcb6..43deb6f3c6c 100644 --- a/pkgs/applications/blockchains/wasabibackend/default.nix +++ b/pkgs/applications/blockchains/wasabibackend/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { cp -r ${projectName}/bin/${projectConfiguration}/netcoreapp3.1/${projectRuntime}/publish $out/lib mkdir -p $out/bin makeWrapper $out/lib/WalletWasabi.Backend $out/bin/${pname} \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl zlib ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl zlib ]} \ --run "cd $out/lib" ''; diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index ae9c8fa3e88..d85e7dcfebf 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -11,7 +11,7 @@ }: let - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ curl dotnet-netcore fontconfig.lib diff --git a/pkgs/applications/blockchains/whirlpool-gui/default.nix b/pkgs/applications/blockchains/whirlpool-gui/default.nix index 3417f9b5185..c26270beef6 100644 --- a/pkgs/applications/blockchains/whirlpool-gui/default.nix +++ b/pkgs/applications/blockchains/whirlpool-gui/default.nix @@ -90,8 +90,8 @@ in stdenv.mkDerivation rec { ''; }; - passthru.prefetchYarnCache = stdenv.lib.overrideDerivation yarnCache (d: { - outputHash = stdenv.lib.fakeSha256; + passthru.prefetchYarnCache = lib.overrideDerivation yarnCache (d: { + outputHash = lib.fakeSha256; }); meta = with lib; { diff --git a/pkgs/applications/blockchains/wownero.nix b/pkgs/applications/blockchains/wownero.nix index 8d45e1a96b5..bc020de8be4 100644 --- a/pkgs/applications/blockchains/wownero.nix +++ b/pkgs/applications/blockchains/wownero.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchgit, cmake, boost, miniupnpc_2, openssl, unbound +{ lib, stdenv, fetchgit, cmake, boost, miniupnpc_2, openssl, unbound , readline, libsodium, rapidjson, fetchurl }: -with stdenv.lib; +with lib; let randomwowVersion = "1.1.7"; diff --git a/pkgs/applications/editors/aewan/default.nix b/pkgs/applications/editors/aewan/default.nix index 56a144bdfb8..b9d350cbd43 100644 --- a/pkgs/applications/editors/aewan/default.nix +++ b/pkgs/applications/editors/aewan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, ncurses }: +{ lib, stdenv, fetchurl, zlib, ncurses }: stdenv.mkDerivation rec { pname = "aewan"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Ascii-art Editor Without A Name"; homepage = "http://aewan.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/amp/default.nix b/pkgs/applications/editors/amp/default.nix index 54b3c646e25..88f22bf9e7d 100644 --- a/pkgs/applications/editors/amp/default.nix +++ b/pkgs/applications/editors/amp/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "09v991rl2w4c4jh7ga7q1lk6wyl2vr71j5cpniij8mcvszrz78qf"; nativeBuildInputs = [ cmake pkgconfig python3 ]; - buildInputs = [ openssl xorg.libxcb libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin + buildInputs = [ openssl xorg.libxcb libgit2 ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ curl Security AppKit ]); # Tests need to write to the theme directory in HOME. diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index d8f2d86daee..0ce0a37d876 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -72,7 +72,7 @@ let cp -r . $out wrapProgram $out/bin/studio.sh \ --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ - --prefix PATH : "${stdenv.lib.makeBinPath [ + --prefix PATH : "${lib.makeBinPath [ # Checked in studio.sh coreutils @@ -95,7 +95,7 @@ let git ps ]}" \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ # Crash at startup without these fontconfig diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 9d1d8d4113c..7a6d5b5cd91 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -15,7 +15,7 @@ let }; common = pname: {version, sha256, beta ? null}: - let fullVersion = version + stdenv.lib.optionalString (beta != null) "-beta${toString beta}"; + let fullVersion = version + lib.optionalString (beta != null) "-beta${toString beta}"; name = "${pname}-${fullVersion}"; in stdenv.mkDerivation { inherit name; @@ -89,4 +89,4 @@ let platforms = platforms.x86_64; }; }; -in stdenv.lib.mapAttrs common versions +in lib.mapAttrs common versions diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix index 9d5978e605a..95bf6f6d7aa 100644 --- a/pkgs/applications/editors/brackets/default.nix +++ b/pkgs/applications/editors/brackets/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, gconf , cups, libgcrypt_1_5, systemd, dbus, libXdamage, expat }: -with stdenv.lib; +with lib; let bracketsLibs = makeLibraryPath [ diff --git a/pkgs/applications/editors/code-browser/default.nix b/pkgs/applications/editors/code-browser/default.nix index 3eecc471db9..a4ae4a811bf 100644 --- a/pkgs/applications/editors/code-browser/default.nix +++ b/pkgs/applications/editors/code-browser/default.nix @@ -28,17 +28,17 @@ stdenv.mkDerivation rec { gtk3 pkg-config ] - ++ stdenv.lib.optionals withQt [ wrapQtAppsHook ]; - buildInputs = stdenv.lib.optionals withQt [ qtbase ] - ++ stdenv.lib.optionals withGtk [ gtk3 ]; + ++ lib.optionals withQt [ wrapQtAppsHook ]; + buildInputs = lib.optionals withQt [ qtbase ] + ++ lib.optionals withGtk [ gtk3 ]; makeFlags = [ "prefix=$(out)" "COPPER=${copper}/bin/copper-elf64" "with-local-libs" "QINC=${qtbase.dev}/include" ] - ++ stdenv.lib.optionals withQt [ "UI=qt" ] - ++ stdenv.lib.optionals withGtk [ "UI=gtk" ]; + ++ lib.optionals withQt [ "UI=qt" ] + ++ lib.optionals withGtk [ "UI=gtk" ]; meta = with lib; { description = "Folding text editor, designed to hierarchically structure any kind of text file and especially source code"; homepage = "https://tibleiz.net/code-browser/"; diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 4e2ac8a50f1..106ddb515ed 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, autoreconfHook, libtool, pkgconfig, file, zip, wxGTK, gtk2 +{ lib, stdenv, fetchurl, autoreconfHook, libtool, pkgconfig, file, zip, wxGTK, gtk2 , contribPlugins ? false, hunspell, gamin, boost }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { - name = "${pname}-${stdenv.lib.optionalString contribPlugins "full-"}${version}"; + name = "${pname}-${lib.optionalString contribPlugins "full-"}${version}"; version = "17.12"; pname = "codeblocks"; diff --git a/pkgs/applications/editors/dhex/default.nix b/pkgs/applications/editors/dhex/default.nix index c4f43e71fe6..743e55b0969 100644 --- a/pkgs/applications/editors/dhex/default.nix +++ b/pkgs/applications/editors/dhex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "dhex"; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { description = "A themeable hex editor with diff mode"; homepage = "http://www.dettus.net/dhex/"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [qknight]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [qknight]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 0282dc95f72..1ddb6707110 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,4 +1,4 @@ -{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender +{ lib, stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender , zlib, jdk, glib, gtk, libXtst, gsettings-desktop-schemas, webkitgtk , makeWrapper, perl, ... }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ fontconfig freetype glib gsettings-desktop-schemas gtk jdk libX11 libXrender libXtst makeWrapper zlib - ] ++ stdenv.lib.optional (webkitgtk != null) webkitgtk; + ] ++ lib.optional (webkitgtk != null) webkitgtk; buildCommand = '' # Unpack tarball. @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) libCairo=$out/eclipse/libcairo-swt.so patchelf --set-interpreter $interpreter $out/eclipse/eclipse - [ -f $libCairo ] && patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ]} $libCairo + [ -f $libCairo ] && patchelf --set-rpath ${lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ]} $libCairo # Create wrapper script. Pass -configuration to store # settings in ~/.eclipse/org.eclipse.platform_<version> rather @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk libXtst ] ++ stdenv.lib.optional (webkitgtk != null) webkitgtk)} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk libXtst ] ++ lib.optional (webkitgtk != null) webkitgtk)} \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 586e2343cd3..cff482e887d 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper +{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper , freetype, fontconfig, libX11, libXrender, zlib , glib, gtk3, gtk2, libXtst, jdk, jdk8, gsettings-desktop-schemas , webkitgtk ? null # for internal web browser @@ -148,7 +148,7 @@ in rec { pluginEnv = buildEnv { name = "eclipse-plugins"; paths = - with stdenv.lib; + with lib; filter (x: x ? isEclipsePlugin) (closePropagation plugins); }; @@ -156,11 +156,11 @@ in rec { # add the property indicating the plugin directory. dropinPropName = "org.eclipse.equinox.p2.reconciler.dropins.directory"; dropinProp = "-D${dropinPropName}=${pluginEnv}/eclipse/dropins"; - jvmArgsText = stdenv.lib.concatStringsSep "\n" (jvmArgs ++ [dropinProp]); + jvmArgsText = lib.concatStringsSep "\n" (jvmArgs ++ [dropinProp]); # Base the derivation name on the name of the underlying # Eclipse. - name = (stdenv.lib.meta.appendToName "with-plugins" eclipse).name; + name = (lib.meta.appendToName "with-plugins" eclipse).name; in runCommand name { buildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin $out/etc diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index 0fb48203b2f..3ceb037583a 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lzip +{ lib, stdenv, fetchurl, lzip }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -33,14 +33,14 @@ stdenv.mkDerivation (rec { full-screen editors such as GNU Emacs or GNU Moe. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/ed/"; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; -} // stdenv.lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { +} // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { # This may be moved above during a stdenv rebuild. preConfigure = '' configureFlagsArray+=("CC=$CC") diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix index df8f255de5e..f63598a7c5e 100644 --- a/pkgs/applications/editors/elvis/default.nix +++ b/pkgs/applications/editors/elvis/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, ncurses }: +{ fetchurl, fetchpatch, lib, stdenv, ncurses }: stdenv.mkDerivation { name = "elvis-2.2_0"; @@ -41,6 +41,6 @@ stdenv.mkDerivation { meta = { homepage = "http://elvis.the-little-red-haired-girl.org/"; description = "A vi clone for Unix and other operating systems"; - license = stdenv.lib.licenses.free; + license = lib.licenses.free; }; } diff --git a/pkgs/applications/editors/emacs-modes/cedet/default.nix b/pkgs/applications/editors/emacs-modes/cedet/default.nix index 45f20fccad9..9ba9e070d08 100644 --- a/pkgs/applications/editors/emacs-modes/cedet/default.nix +++ b/pkgs/applications/editors/emacs-modes/cedet/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { Development Environment), and COGRE (COnnected GRaph Editor). ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "http://cedet.sourceforge.net/"; diff --git a/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix b/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix index 5beaed58240..5eb81197c8b 100644 --- a/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix +++ b/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { description = "Popup descriptions of R objects"; homepage = "https://github.com/myuhe/ess-R-object-popup.el"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs-modes/helm-words/default.nix b/pkgs/applications/editors/emacs-modes/helm-words/default.nix index 00879463276..a8a1274737a 100644 --- a/pkgs/applications/editors/emacs-modes/helm-words/default.nix +++ b/pkgs/applications/editors/emacs-modes/helm-words/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Emacs major mode for jade and stylus"; homepage = "https://github.com/brianc/helm-words"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs-modes/hsc3/default.nix b/pkgs/applications/editors/emacs-modes/hsc3/default.nix index 6c2db85d794..972d3b8a6f9 100644 --- a/pkgs/applications/editors/emacs-modes/hsc3/default.nix +++ b/pkgs/applications/editors/emacs-modes/hsc3/default.nix @@ -23,6 +23,6 @@ in stdenv.mkDerivation { meta = { homepage = "http://rd.slavepianos.org/?t=hsc3"; description = "hsc3 mode package for Emacs"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } 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 93af03ce229..dba6e10a590 100644 --- a/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix +++ b/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "Insert org-mode links to items selected in various Mac apps"; homepage = "https://orgmode.org/worg/org-contrib/org-mac-link.html"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs-modes/perl-completion/default.nix b/pkgs/applications/editors/emacs-modes/perl-completion/default.nix index 7f2454c811a..815783aabea 100644 --- a/pkgs/applications/editors/emacs-modes/perl-completion/default.nix +++ b/pkgs/applications/editors/emacs-modes/perl-completion/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { meta = { description = "Minor mode provides useful features for editing perl codes"; homepage = "http://emacswiki.org/emacs/PerlCompletion"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs-modes/prolog/default.nix b/pkgs/applications/editors/emacs-modes/prolog/default.nix index 66ab9830237..7be3b1ca3c7 100644 --- a/pkgs/applications/editors/emacs-modes/prolog/default.nix +++ b/pkgs/applications/editors/emacs-modes/prolog/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { homepage = "http://bruda.ca/emacs/prolog_mode_for_emacs/"; description = "Prolog mode for Emacs"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/editors/emacs-modes/railgun/default.nix b/pkgs/applications/editors/emacs-modes/railgun/default.nix index 8ca8d1feaa1..4cf4d18d8cc 100644 --- a/pkgs/applications/editors/emacs-modes/railgun/default.nix +++ b/pkgs/applications/editors/emacs-modes/railgun/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { description = "Propel yourself through a rails project with the power of magnets"; homepage = "https://github.com/mbriggs/railgun.el"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix index 4320a88457a..d2785ef0363 100644 --- a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix +++ b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation { meta = { description = "Mark a rectangle of text with highlighting"; homepage = "http://emacswiki.org/emacs/RectangleMark"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix index 7e611d68a0a..710c33a96ec 100644 --- a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix +++ b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation { meta = { description = "Two-pane file manager for Emacs based on Dired and inspired by MC"; homepage = "http://www.emacswiki.org/emacs/Sunrise_Commander"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs-modes/tramp/default.nix b/pkgs/applications/editors/emacs-modes/tramp/default.nix index b87390d4609..f67efb80bf9 100644 --- a/pkgs/applications/editors/emacs-modes/tramp/default.nix +++ b/pkgs/applications/editors/emacs-modes/tramp/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { description = "Transparently access remote files from Emacs. Newer versions than built-in."; homepage = "https://www.gnu.org/software/tramp"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix b/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix index c771f5423a9..352c46718dd 100644 --- a/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix +++ b/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { meta = { description = "Integreate Emacs with Zeitgeist"; homepage = "http://zeitgeist-project.com/"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix index 871d8489f61..bffa5064389 100644 --- a/pkgs/applications/editors/flpsed/default.nix +++ b/pkgs/applications/editors/flpsed/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { postPatch = '' # replace the execvp call to ghostscript - sed -e '/exec_gs/ {n; s|"gs"|"${stdenv.lib.getBin ghostscript}/bin/gs"|}' \ + sed -e '/exec_gs/ {n; s|"gs"|"${lib.getBin ghostscript}/bin/gs"|}' \ -i src/GsWidget.cxx ''; diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 6c91595c99a..4c36dcfda11 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "06wcyfrwcjyj2vcqyw0z3sy1r4qxpcdpwqq1qmpsaphpz8acycjn"; }; diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index 692e07e52ca..d9e09bf0d89 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0xqd49pgi82dygqnxj08i1v22b0vwwhx3zvdinhrx4jny339yam8"; }; diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index 4dc7ea33cdd..d4710094e4f 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation { meta = with lib; { homepage = "http://gobby.0x539.de/"; description = "A GTK-based collaborative editor supporting multiple documents in one session and a multi-user chat"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ maintainers.phreedom ]; platforms = platforms.all; }; diff --git a/pkgs/applications/editors/hexedit/default.nix b/pkgs/applications/editors/hexedit/default.nix index 916dd4a1594..56b721842a3 100644 --- a/pkgs/applications/editors/hexedit/default.nix +++ b/pkgs/applications/editors/hexedit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "hexedit"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "View and edit files in hexadecimal or in ASCII"; homepage = "http://prigaux.chez.com/hexedit.html"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/howl/default.nix b/pkgs/applications/editors/howl/default.nix index 975016d5541..f3671cc7b3a 100644 --- a/pkgs/applications/editors/howl/default.nix +++ b/pkgs/applications/editors/howl/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk3, librsvg }: +{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, gtk3, librsvg }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "howl"; diff --git a/pkgs/applications/editors/jed/default.nix b/pkgs/applications/editors/jed/default.nix index e3be0139abf..7b197be0e6f 100644 --- a/pkgs/applications/editors/jed/default.nix +++ b/pkgs/applications/editors/jed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip +{ lib, stdenv, fetchzip , pkg-config , gpm , libXext @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { install -D src/objs/rgrep $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A programmable text editor written around S-Lang"; longDescription = '' JED is a freely available text editor for Unix, VMS, MSDOS, OS/2, BeOS, diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index 43dbd137f78..62f1178866c 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -5,7 +5,7 @@ { name, product, version, src, wmClass, jdk, meta }: -with stdenv.lib; +with lib; let loName = toLower product; hiName = toUpper product; @@ -71,8 +71,8 @@ with stdenv; lib.makeOverridable mkDerivation rec { item=${desktopItem} makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \ - --prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${stdenv.lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ + --prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ # Some internals want libstdc++.so.6 stdenv.cc.cc.lib libsecret libnotify @@ -86,6 +86,6 @@ with stdenv; lib.makeOverridable mkDerivation rec { ln -s "$item/share/applications" $out/share ''; -} // stdenv.lib.optionalAttrs (!(meta.license.free or true)) { +} // lib.optionalAttrs (!(meta.license.free or true)) { preferLocalBuild = true; } diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index d805d179647..3c1224b91e7 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -5,7 +5,7 @@ , vmopts ? null }: -with stdenv.lib; +with lib; let mkJetBrainsProduct = callPackage ./common.nix { inherit vmopts; }; @@ -271,7 +271,7 @@ in name = "clion-${version}"; version = "2020.3.1"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; sha256 = "1jfvwir79s0kcqmlx6bbkmc42bplgl7814mnqfcsdzni1qv62pws"; /* updated by script */ @@ -284,7 +284,7 @@ in name = "datagrip-${version}"; version = "2020.3.1"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; sha256 = "0jk7ywxk983ld5x71a59dh1hvlnli3sbvg7fbicahas5ml8clxfv"; /* updated by script */ @@ -297,7 +297,7 @@ in name = "goland-${version}"; version = "2020.3.1"; /* updated by script */ description = "Up and Coming Go IDE"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; sha256 = "12gi1a2bmafmy7qgqwv3a7b5b46dlhw4ahmkm5pkq6pmxl4y6dmk"; /* updated by script */ @@ -310,7 +310,7 @@ in name = "idea-community-${version}"; version = "2020.3.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; sha256 = "0am4h8w1dmjl08iphqy78ivb91vkrvskg95dgm24zcj0n8rwmaq6"; /* updated by script */ @@ -323,7 +323,7 @@ in name = "idea-ultimate-${version}"; version = "2020.3.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; sha256 = "1kwz0aq4b664awppakj4syppk218nynwxv4ngc7pa3k9v4g2sdah"; /* updated by script */ @@ -336,7 +336,7 @@ in name = "mps-${version}"; version = "2020.2.3"; /* updated by script */ description = "Create your own domain-specific language"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/mps/2020.2/MPS-${version}.tar.gz"; sha256 = "1wd3d8pc155m54y5p2056p0x93v2nv9457i7la53ibbs7rj1j7kw"; /* updated by script */ @@ -349,7 +349,7 @@ in name = "phpstorm-${version}"; version = "2020.3.1"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; sha256 = "1c5j3mbg8scsl4c90cjahdk5gs5q72y5a8fhkqa9zmy6di42k99x"; /* updated by script */ @@ -362,7 +362,7 @@ in name = "pycharm-community-${version}"; version = "2020.3.2"; /* updated by script */ description = "PyCharm Community Edition"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; sha256 = "1z3w6aah635fdrhrzp5af6sgj269jk7mv8vgdd83gxillkx9vq9k"; /* updated by script */ @@ -375,7 +375,7 @@ in name = "pycharm-professional-${version}"; version = "2020.3.2"; /* updated by script */ description = "PyCharm Professional Edition"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; sha256 = "1fbb8v40q7vgn5v5dyxb211abr8swnxa3gw18kh3vlk6yc2crzfw"; /* updated by script */ @@ -388,7 +388,7 @@ in name = "rider-${version}"; version = "2020.3.2"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; sha256 = "1dkgbd2nqkjcswf7j3pnrsaq9n5wk42abz2c4wgkrh1zrpgihd0j"; /* updated by script */ @@ -401,7 +401,7 @@ in name = "ruby-mine-${version}"; version = "2020.3.1"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; sha256 = "0drxzz6k0cmhir4szg8nwmsi9qh380vrryghmpvx9w83yrcain4c"; /* updated by script */ @@ -414,7 +414,7 @@ in name = "webstorm-${version}"; version = "2020.3.1"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; sha256 = "1bfq3xwnfz6f04d0lq584q7pg775a8y35b1b62w81dbfh43l4fj0"; /* updated by script */ diff --git a/pkgs/applications/editors/jove/default.nix b/pkgs/applications/editors/jove/default.nix index 4a22c4d4d95..0b60b9474bd 100644 --- a/pkgs/applications/editors/jove/default.nix +++ b/pkgs/applications/editors/jove/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , groff , ncurses , makeWrapper @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { --prefix PATH ":" "$out/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Jonathan's Own Version or Emacs"; homepage = "https://github.com/jonmacs/jove"; license = licenses.bsd2; diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index 53549986ed2..5f2cf75ff37 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchgit, dconf, gtksourceview3, at-spi2-core, gtksourceviewmm, +{ lib, stdenv, fetchgit, dconf, gtksourceview3, at-spi2-core, gtksourceviewmm, boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre, libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3, coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "juicipp"; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { lintIncludes = let p = "arguments.emplace_back(\"-I"; e = "\");"; - v = stdenv.lib.getVersion llvmPackages.clang; + v = lib.getVersion llvmPackages.clang; in p+llvmPackages.libcxx+"/include/c++/v1"+e +p+llvmPackages.clang-unwrapped+"/lib/clang/"+v+"/include/"+e @@ -61,11 +61,11 @@ stdenv.mkDerivation rec { sed -i 's|liblldb LIBLLDB_LIBRARIES|liblldb LIBNOTHING|g' CMakeLists.txt sed -i 's|> arguments;|> arguments; ${lintIncludes}|g' src/source_clang.cc ''; - cmakeFlags = [ "-DLIBLLDB_LIBRARIES=${stdenv.lib.makeLibraryPath [ llvmPackages.lldb ]}/liblldb.so" ]; + cmakeFlags = [ "-DLIBLLDB_LIBRARIES=${lib.makeLibraryPath [ llvmPackages.lldb ]}/liblldb.so" ]; postInstall = '' mv $out/bin/juci $out/bin/.juci makeWrapper "$out/bin/.juci" "$out/bin/juci" \ - --set PATH "${stdenv.lib.makeBinPath [ ctags coreutils llvmPackages.clang.cc cmake gnumake llvmPackages.clang.bintools llvmPackages.clang ]}" \ + --set PATH "${lib.makeBinPath [ ctags coreutils llvmPackages.clang.cc cmake gnumake llvmPackages.clang.bintools llvmPackages.clang ]}" \ --set NO_AT_BRIDGE 1 \ --set ASPELL_CONF "dict-dir ${aspellDicts.en}/lib/aspell" ''; diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 67a2ac5fac7..3c0a8bafa7e 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, ncurses, asciidoc, docbook_xsl, libxslt, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, ncurses, asciidoc, docbook_xsl, libxslt, pkgconfig }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "kakoune-unwrapped"; diff --git a/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix b/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix index 4b67f760976..c81244ba133 100644 --- a/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix +++ b/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { cp -r rc $out/share/kak/autoload/plugins/auto-pairs ''; - meta = with stdenv.lib; + meta = with lib; { description = "Kakoune extension to enable automatic closing of pairs"; homepage = "https://github.com/alexherbo2/auto-pairs.kak"; license = licenses.unlicense; diff --git a/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix b/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix index eaf20aeadf8..9db9d4fab73 100644 --- a/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix +++ b/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { cp -r buffers.kak $out/share/kak/autoload/plugins ''; - meta = with stdenv.lib; + meta = with lib; { description = "Ease navigation between opened buffers in Kakoune"; homepage = "https://github.com/Delapouite/kakoune-buffers"; license = licenses.mit; diff --git a/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix b/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix index 8a91f829c0c..1f6a4ea561f 100644 --- a/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix +++ b/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fzf }: -assert stdenv.lib.asserts.assertOneOf "fzf" fzf.pname [ "fzf" "skim" ]; +assert lib.asserts.assertOneOf "fzf" fzf.pname [ "fzf" "skim" ]; stdenv.mkDerivation { name = "kak-fzf"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { cp -r rc $out/share/kak/autoload/plugins/fzf ''; - meta = with stdenv.lib; + meta = with lib; { description = "Kakoune plugin that brings integration with fzf"; homepage = "https://github.com/andreyorst/fzf.kak"; license = licenses.mit; diff --git a/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix b/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix index d328e47f7e1..6bd67da4228 100644 --- a/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix +++ b/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { cp -r rc $out/share/kak/autoload/plugins/powerline ''; - meta = with stdenv.lib; + meta = with lib; { description = "Kakoune modeline, but with passion"; homepage = "https://github.com/andreyorst/powerline.kak"; license = licenses.mit; diff --git a/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix b/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix index 8fd5fba7d7e..40cd1bc9d27 100644 --- a/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix +++ b/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { cp -r rc $out/share/kak/autoload/plugins/prelude ''; - meta = with stdenv.lib; + meta = with lib; { description = "Prelude of shell blocks for Kakoune."; homepage = "https://github.com/alexherbo2/prelude.kak"; license = licenses.unlicense; diff --git a/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix b/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix index 7658ba0f7ad..ccc80ac8d81 100644 --- a/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix +++ b/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { cp -r vertical-selection.kak $out/share/kak/autoload/plugins ''; - meta = with stdenv.lib; + meta = with lib; { description = "Select up and down lines that match the same pattern in Kakoune"; homepage = "https://github.com/occivink/kakoune-vertical-selection"; license = licenses.unlicense; diff --git a/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix b/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix index f2fb1f5d57c..deeaa8a9f15 100644 --- a/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix +++ b/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sed -e 's,[|] *lua,|${lua5_3}/bin/lua,' quickscope.kak >$out/share/kak/autoload/plugins/quickscope.kak ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Highlight f and t jump positions"; homepage = "https://sr.ht/~voroskoi/quickscope.kak/"; license = licenses.unlicense; diff --git a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix index 27cf579734e..4bd377444d0 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { It is used for some KDevelop-languagesupport-plugins (Ruby, PHP, CSS...). ''; homepage = "https://www.kdevelop.org"; - license = with stdenv.lib.licenses; [ lgpl2Plus ]; + license = with lib.licenses; [ lgpl2Plus ]; }; } diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix index d7f00a2e18a..e0704cdbc85 100644 --- a/pkgs/applications/editors/kodestudio/default.nix +++ b/pkgs/applications/editors/kodestudio/default.nix @@ -111,7 +111,7 @@ in # Wrap preload libXss wrapProgram $out/bin/kodestudio \ - --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 + --prefix LD_PRELOAD : ${lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 ''; meta = with lib; { diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index ff5b6e3862e..52acc8ee50b 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -4,7 +4,7 @@ }: let - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 nss fontconfig gdk-pixbuf cairo cups expat libgpgerror alsaLib nspr gnome2.GConf xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix index deeb9b36c71..2dd9174d6dd 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/pkgs/applications/editors/manuskript/default.nix @@ -1,4 +1,4 @@ -{ stdenv, zlib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: +{ lib, stdenv, zlib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: python3Packages.buildPythonApplication rec { pname = "manuskript"; @@ -55,8 +55,8 @@ python3Packages.buildPythonApplication rec { outline your story. Organize your ideas about the world your characters live in. ''; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.steveej ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.steveej ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index 9b576795be0..ed6695b9979 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { 2a3,5 > export MONO_GAC_PREFIX=${gnome-sharp}:${gtk-sharp-2_0}:\$MONO_GAC_PREFIX > export PATH=${mono}/bin:\$PATH - > export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ glib gnome2.libgnomeui gnome2.gnome_vfs gnome-sharp gtk-sharp-2_0 gtk-sharp-2_0.gtk ]}:\$LD_LIBRARY_PATH + > export LD_LIBRARY_PATH=${lib.makeLibraryPath [ glib gnome2.libgnomeui gnome2.gnome_vfs gnome-sharp gtk-sharp-2_0 gtk-sharp-2_0.gtk ]}:\$LD_LIBRARY_PATH > EOF done diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index e7cd319b820..63be87ee86c 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/tuxguitar \ --set JAVA "${jdk}/bin/java" \ - --prefix LD_LIBRARY_PATH : "$out/lib/:${stdenv.lib.makeLibraryPath [ swt alsaLib jack2 fluidsynth libpulseaudio ]}" \ + --prefix LD_LIBRARY_PATH : "$out/lib/:${lib.makeLibraryPath [ swt alsaLib jack2 fluidsynth libpulseaudio ]}" \ --prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar" ''; diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 980b297cecc..cb53eb9d9d4 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, fetchFromGitHub, ncurses, texinfo, writeScript +{ lib, stdenv, fetchurl, fetchFromGitHub, ncurses, texinfo, writeScript , common-updater-scripts, git, nix, nixfmt, coreutils, gnused, nixosTests , gettext ? null, enableNls ? true, enableTiny ? false }: assert enableNls -> (gettext != null); -with stdenv.lib; +with lib; let nixSyntaxHighlight = fetchFromGitHub { @@ -30,8 +30,8 @@ in stdenv.mkDerivation rec { configureFlags = [ "--sysconfdir=/etc" - (stdenv.lib.enableFeature enableNls "nls") - (stdenv.lib.enableFeature enableTiny "tiny") + (lib.enableFeature enableNls "nls") + (lib.enableFeature enableTiny "tiny") ]; postInstall = '' @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { #!${stdenv.shell} set -o errexit PATH=${ - stdenv.lib.makeBinPath [ + lib.makeBinPath [ common-updater-scripts git nixfmt diff --git a/pkgs/applications/editors/nano/nanorc/default.nix b/pkgs/applications/editors/nano/nanorc/default.nix index 54442fc21f4..fcec55871aa 100644 --- a/pkgs/applications/editors/nano/nanorc/default.nix +++ b/pkgs/applications/editors/nano/nanorc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, writeScript, nixosTests, common-updater-scripts +{ lib, stdenv, fetchFromGitHub, writeScript, nixosTests, common-updater-scripts , coreutils, git, gnused, nix, nixfmt }: let @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { #!${stdenv.shell} set -o errexit PATH=${ - stdenv.lib.makeBinPath [ + lib.makeBinPath [ common-updater-scripts coreutils git @@ -51,8 +51,8 @@ in stdenv.mkDerivation rec { meta = { description = "Improved Nano Syntax Highlighting Files"; homepage = "https://github.com/scopatz/nanorc"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ nequissimus ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ nequissimus ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index feaba31734c..5a523c05d79 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ motif libXpm ]; # the linux config works fine on darwin too! - buildFlags = stdenv.lib.optional (stdenv.isLinux || stdenv.isDarwin) "linux"; + buildFlags = lib.optional (stdenv.isLinux || stdenv.isDarwin) "linux"; NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L${motif}/lib"; diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index b4ad25f60c2..427e11ca642 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv +{ lib, stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv , libuv, lua, ncurses, pkgconfig , unibilium, xsel, gperf , libvterm-neovim @@ -9,7 +9,7 @@ , nodejs ? null, fish ? null, python ? null }: -with stdenv.lib; +with lib; let neovimLuaEnv = lua.withPackages(ps: @@ -104,11 +104,11 @@ in # triggers on buffer overflow bug while running tests hardeningDisable = [ "fortify" ]; - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.isDarwin '' substituteInPlace src/nvim/CMakeLists.txt --replace " util" "" ''; - postInstall = stdenv.lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.isLinux '' sed -i -e "s|'xsel|'${xsel}/bin/xsel|g" $out/share/nvim/runtime/autoload/provider/clipboard.vim ''; diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index 06beff03f90..1d82e70f5c4 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ lib, stdenv, fetchFromGitHub, pythonPackages }: -with stdenv.lib; +with lib; pythonPackages.buildPythonApplication rec { pname = "neovim-remote"; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 111e84e6343..5c6c6c1a8d5 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -7,7 +7,7 @@ , pythonPackages , python3Packages }: -with stdenv.lib; +with lib; neovim: @@ -37,7 +37,7 @@ let [ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ]; in symlinkJoin { - name = "neovim-${stdenv.lib.getVersion neovim}"; + name = "neovim-${lib.getVersion neovim}"; # Remove the symlinks created by symlinkJoin which we need to perform # extra actions upon postBuild = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index eb4698c69d6..9206b296b9a 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, makeDesktopItem, which, unzip, libicns, imagemagick +{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, which, unzip, libicns, imagemagick , jdk, perl, python }: @@ -34,7 +34,7 @@ stdenv.mkDerivation { mkdir -pv $out/bin cp -a netbeans $out makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \ - --prefix PATH : ${stdenv.lib.makeBinPath [ jdk which ]} \ + --prefix PATH : ${lib.makeBinPath [ jdk which ]} \ --prefix JAVA_HOME : ${jdk.home} \ --add-flags "--jdkhome ${jdk.home}" @@ -61,8 +61,8 @@ stdenv.mkDerivation { meta = { description = "An integrated development environment for Java, C, C++ and PHP"; homepage = "https://netbeans.apache.org/"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ sander rszibele asbachb ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ sander rszibele asbachb ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix index ed08954f8ba..328aad29efa 100644 --- a/pkgs/applications/editors/nvi/default.nix +++ b/pkgs/applications/editors/nvi/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ncurses }: +{ fetchurl, lib, stdenv, ncurses }: stdenv.mkDerivation { name = "nvi-1.79"; @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.bostic.com/vi/"; description = "The Berkeley Vi Editor"; - license = stdenv.lib.licenses.free; + license = lib.licenses.free; broken = true; # since 2020-02-08 }; } diff --git a/pkgs/applications/editors/qxmledit/default.nix b/pkgs/applications/editors/qxmledit/default.nix index 4023861cc37..fa4e73a3768 100644 --- a/pkgs/applications/editors/qxmledit/default.nix +++ b/pkgs/applications/editors/qxmledit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "qxmledit-${version}" ; version = "0.9.15" ; - src = fetchFromGitHub ( stdenv.lib.importJSON ./qxmledit.json ) ; + src = fetchFromGitHub ( lib.importJSON ./qxmledit.json ) ; nativeBuildInputs = [ qmake ] ; buildInputs = [ qtbase qtxmlpatterns qtsvg qtscxml qtquick1 libGLU ] ; qmakeFlags = [ "CONFIG+=release" ] ; diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix index ec85ffde488..df5fed210e6 100644 --- a/pkgs/applications/editors/rehex/default.nix +++ b/pkgs/applications/editors/rehex/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { 'png2icns $@ $(ICONSET)/icon_16x16.png $(ICONSET)/icon_32x32.png $(ICONSET)/icon_128x128.png $(ICONSET)/icon_256x256.png $(ICONSET)/icon_512x512.png' ''; - nativeBuildInputs = stdenv.lib.optionals (stdenv.isDarwin) [ libicns ]; + nativeBuildInputs = lib.optionals (stdenv.isDarwin) [ libicns ]; buildInputs = [ capstone jansson ] - ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ wxGTK30 ]) - ++ (stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon Cocoa IOKit wxmac ])); + ++ (lib.optionals (!stdenv.isDarwin) [ wxGTK30 ]) + ++ (lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon Cocoa IOKit wxmac ])); - makeFlags = [ "prefix=$(out)" ] ++ (stdenv.lib.optionals stdenv.isDarwin [ "-f Makefile.osx" ]); + makeFlags = [ "prefix=$(out)" ] ++ (lib.optionals stdenv.isDarwin [ "-f Makefile.osx" ]); meta = with lib; { description = "Reverse Engineers' Hex Editor"; diff --git a/pkgs/applications/editors/sublime/2/default.nix b/pkgs/applications/editors/sublime/2/default.nix index b10008d0c49..e46d6ef97e4 100644 --- a/pkgs/applications/editors/sublime/2/default.nix +++ b/pkgs/applications/editors/sublime/2/default.nix @@ -1,6 +1,6 @@ -{ fetchurl, stdenv, glib, xorg, cairo, gtk2, makeDesktopItem }: +{ fetchurl, lib, stdenv, glib, xorg, cairo, gtk2, makeDesktopItem }: let - libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo]; + libPath = lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo]; in stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { echo ${libPath} patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ $out/sublime/sublime_text mkdir -p $out/share/icons @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = { description = "Sophisticated text editor for code, markup and prose"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index 82d824b4877..cc8b835c137 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -8,7 +8,7 @@ let pname = "sublimetext3"; - packageAttribute = "sublime3${stdenv.lib.optionalString dev "-dev"}"; + packageAttribute = "sublime3${lib.optionalString dev "-dev"}"; binaries = [ "sublime_text" "plugin_host" "crash_reporter" ]; primaryBinary = "sublime_text"; primaryBinaryAliases = [ "subl" "sublime" "sublime3" ]; @@ -26,7 +26,7 @@ let else "x64"; - libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ]; + libPath = lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ]; redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]; in let binaryPackage = stdenv.mkDerivation { @@ -66,7 +66,7 @@ in let for binary in ${ builtins.concatStringsSep " " binaries }; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ $binary done @@ -93,7 +93,7 @@ in let postFixup = '' wrapProgram $out/sublime_bash \ - --set LD_PRELOAD "${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1" + --set LD_PRELOAD "${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1" wrapProgram $out/${primaryBinary} \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ @@ -102,7 +102,7 @@ in let "''${gappsWrapperArgs[@]}" # Without this, plugin_host crashes, even though it has the rpath - wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl.out}/lib/libssl.so:${bzip2.out}/lib/libbz2.so + wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl.out}/lib/libssl.so:${bzip2.out}/lib/libbz2.so ''; }; in stdenv.mkDerivation (rec { @@ -131,7 +131,7 @@ in stdenv.mkDerivation (rec { passthru.updateScript = writeScript "${pname}-update-script" '' #!${stdenv.shell} set -o errexit - PATH=${stdenv.lib.makeBinPath [ common-updater-scripts curl gnugrep ]} + PATH=${lib.makeBinPath [ common-updater-scripts curl gnugrep ]} latestVersion=$(curl -s ${versionUrl}) @@ -140,7 +140,7 @@ in stdenv.mkDerivation (rec { exit 0 fi - for platform in ${stdenv.lib.concatStringsSep " " meta.platforms}; do + for platform in ${lib.concatStringsSep " " meta.platforms}; do # The script will not perform an update when the version attribute is up to date from previous platform run # We need to clear it before each run update-source-version ${packageAttribute}.${primaryBinary} 0 0000000000000000000000000000000000000000000000000000000000000000 --file=${versionFile} --version-key=buildVersion --system=$platform diff --git a/pkgs/applications/editors/texmacs/common.nix b/pkgs/applications/editors/texmacs/common.nix index 9479295e747..3ffcc8ecf45 100644 --- a/pkgs/applications/editors/texmacs/common.nix +++ b/pkgs/applications/editors/texmacs/common.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tex, extraFonts, chineseFonts, japaneseFonts, koreanFonts }: +{ lib, stdenv, fetchurl, tex, extraFonts, chineseFonts, japaneseFonts, koreanFonts }: rec { extraFontsSrc = fetchurl { url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-extra-fonts-1.0-noarch.tar.gz"; @@ -63,6 +63,6 @@ rec { collaborative authoring are planned for later. ''; homepage = "http://texmacs.org/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/editors/texmacs/darwin.nix b/pkgs/applications/editors/texmacs/darwin.nix index a5117f3a678..ff090dd3259 100644 --- a/pkgs/applications/editors/texmacs/darwin.nix +++ b/pkgs/applications/editors/texmacs/darwin.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, +{ lib, stdenv, callPackage, fetchurl, guile_1_8, qt4, zlib, freetype, CoreFoundation, Cocoa, gettext, libiconv, ghostscript, tex ? null, aspell ? null, @@ -49,12 +49,12 @@ stdenv.mkDerivation { "${ghostscript}/bin:" + (if aspell == null then "" else "${aspell}/bin:") + (if tex == null then "" else "${tex}/bin:") + - (if netpbm == null then "" else "${stdenv.lib.getBin netpbm}/bin:") + + (if netpbm == null then "" else "${lib.getBin netpbm}/bin:") + (if imagemagick == null then "" else "${imagemagick}/bin:"); enableParallelBuilding = true; meta = common.meta // { - platforms = stdenv.lib.platforms.darwin; + platforms = lib.platforms.darwin; }; } diff --git a/pkgs/applications/editors/vbindiff/default.nix b/pkgs/applications/editors/vbindiff/default.nix index 110b7caaf81..9a103867fbc 100644 --- a/pkgs/applications/editors/vbindiff/default.nix +++ b/pkgs/applications/editors/vbindiff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "vbindiff"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "A terminal visual binary diff viewer"; homepage = "https://www.cjmweb.net/vbindiff/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index aa8120470d1..eb015550c39 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -1,4 +1,4 @@ -{ source ? "default", callPackage, stdenv, ncurses, pkgconfig, gettext +{ source ? "default", callPackage, lib, stdenv, ncurses, pkgconfig, gettext , writeText, config, glib, gtk2-x11, gtk3-x11, lua, python3, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { default = common.src; # latest release }; - patches = [ ./cflags-prune.diff ] ++ stdenv.lib.optional ftNixSupport ./ft-nix-support.patch; + patches = [ ./cflags-prune.diff ] ++ lib.optional ftNixSupport ./ft-nix-support.patch; configureFlags = [ "--enable-gui=${guiSupport}" @@ -95,50 +95,50 @@ in stdenv.mkDerivation rec { "--disable-carbon_check" "--disable-gtktest" ] - ++ stdenv.lib.optional stdenv.isDarwin + ++ lib.optional stdenv.isDarwin (if darwinSupport then "--enable-darwin" else "--disable-darwin") - ++ stdenv.lib.optionals luaSupport [ + ++ lib.optionals luaSupport [ "--with-lua-prefix=${lua}" "--enable-luainterp" - ] ++ stdenv.lib.optional lua.pkgs.isLuaJIT [ + ] ++ lib.optional lua.pkgs.isLuaJIT [ "--with-luajit" ] - ++ stdenv.lib.optionals pythonSupport [ + ++ lib.optionals pythonSupport [ "--enable-python3interp=yes" "--with-python3-config-dir=${python3}/lib" # Disables Python 2 "--disable-pythoninterp" ] - ++ stdenv.lib.optional nlsSupport "--enable-nls" - ++ stdenv.lib.optional perlSupport "--enable-perlinterp" - ++ stdenv.lib.optional rubySupport "--enable-rubyinterp" - ++ stdenv.lib.optional tclSupport "--enable-tclinterp" - ++ stdenv.lib.optional multibyteSupport "--enable-multibyte" - ++ stdenv.lib.optional cscopeSupport "--enable-cscope" - ++ stdenv.lib.optional netbeansSupport "--enable-netbeans" - ++ stdenv.lib.optional ximSupport "--enable-xim"; + ++ lib.optional nlsSupport "--enable-nls" + ++ lib.optional perlSupport "--enable-perlinterp" + ++ lib.optional rubySupport "--enable-rubyinterp" + ++ lib.optional tclSupport "--enable-tclinterp" + ++ lib.optional multibyteSupport "--enable-multibyte" + ++ lib.optional cscopeSupport "--enable-cscope" + ++ lib.optional netbeansSupport "--enable-netbeans" + ++ lib.optional ximSupport "--enable-xim"; nativeBuildInputs = [ pkgconfig ] - ++ stdenv.lib.optional wrapPythonDrv makeWrapper - ++ stdenv.lib.optional nlsSupport gettext - ++ stdenv.lib.optional perlSupport perl - ++ stdenv.lib.optional (guiSupport == "gtk3") wrapGAppsHook + ++ lib.optional wrapPythonDrv makeWrapper + ++ lib.optional nlsSupport gettext + ++ lib.optional perlSupport perl + ++ lib.optional (guiSupport == "gtk3") wrapGAppsHook ; buildInputs = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib libICE ] - ++ stdenv.lib.optional (guiSupport == "gtk2") gtk2-x11 - ++ stdenv.lib.optional (guiSupport == "gtk3") gtk3-x11 - ++ stdenv.lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc ] - ++ stdenv.lib.optional luaSupport lua - ++ stdenv.lib.optional pythonSupport python3 - ++ stdenv.lib.optional tclSupport tcl - ++ stdenv.lib.optional rubySupport ruby; + ++ lib.optional (guiSupport == "gtk2") gtk2-x11 + ++ lib.optional (guiSupport == "gtk3") gtk3-x11 + ++ lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc ] + ++ lib.optional luaSupport lua + ++ lib.optional pythonSupport python3 + ++ lib.optional tclSupport tcl + ++ lib.optional rubySupport ruby; preConfigure = '' - '' + stdenv.lib.optionalString ftNixSupport '' + '' + lib.optionalString ftNixSupport '' cp ${vimPlugins.vim-nix.src}/ftplugin/nix.vim runtime/ftplugin/nix.vim cp ${vimPlugins.vim-nix.src}/indent/nix.vim runtime/indent/nix.vim cp ${vimPlugins.vim-nix.src}/syntax/nix.vim runtime/syntax/nix.vim @@ -150,20 +150,20 @@ in stdenv.mkDerivation rec { postInstall = '' ln -s $out/bin/vim $out/bin/vi - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' patchelf --set-rpath \ - "$(patchelf --print-rpath $out/bin/vim):${stdenv.lib.makeLibraryPath buildInputs}" \ + "$(patchelf --print-rpath $out/bin/vim):${lib.makeLibraryPath buildInputs}" \ "$out"/bin/vim if [[ -e "$out"/bin/gvim ]]; then patchelf --set-rpath \ - "$(patchelf --print-rpath $out/bin/vim):${stdenv.lib.makeLibraryPath buildInputs}" \ + "$(patchelf --print-rpath $out/bin/vim):${lib.makeLibraryPath buildInputs}" \ "$out"/bin/gvim fi ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc - '' + stdenv.lib.optionalString wrapPythonDrv '' + '' + lib.optionalString wrapPythonDrv '' wrapProgram "$out/bin/vim" --prefix PATH : "${python3}/bin" - '' + stdenv.lib.optionalString (guiSupport == "gtk3") '' + '' + lib.optionalString (guiSupport == "gtk3") '' rewrap () { rm -f "$out/bin/$1" diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 95d2076153c..9b141992435 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, callPackage, ncurses, gettext, pkgconfig +{ lib, stdenv, fetchurl, callPackage, ncurses, gettext, pkgconfig # default vimrc , vimrc ? fetchurl { name = "default-vimrc"; @@ -19,12 +19,12 @@ stdenv.mkDerivation { nativeBuildInputs = [ gettext pkgconfig ]; buildInputs = [ ncurses ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ]; configureFlags = [ "--enable-multibyte" "--enable-nls" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "vim_cv_toupper_broken=no" "--with-tlib=ncurses" "vim_cv_terminfo=yes" diff --git a/pkgs/applications/editors/vim/vimacs.nix b/pkgs/applications/editors/vim/vimacs.nix index cb77e60cf00..628b4c46cba 100644 --- a/pkgs/applications/editors/vim/vimacs.nix +++ b/pkgs/applications/editors/vim/vimacs.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { description = "Vim-Improved eMACS: Emacs emulation for Vim"; homepage = "http://algorithm.com.au/code/vimacs"; license = licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ millerjason ]; + maintainers = with lib.maintainers; [ millerjason ]; }; } diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index bd6eba94907..f1211269234 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { libtermkey lua lpeg - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ acl libselinux ]; @@ -51,10 +51,10 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "vis"; genericName = "Text editor"; - categories = stdenv.lib.concatStringsSep ";" [ + categories = lib.concatStringsSep ";" [ "Application" "Development" "IDE" ]; - mimeType = stdenv.lib.concatStringsSep ";" [ + mimeType = lib.concatStringsSep ";" [ "text/plain" "application/octet-stream" ]; startupNotify = "false"; diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix index 9b0fd592a6a..09037b2f0c3 100644 --- a/pkgs/applications/editors/wxhexeditor/default.nix +++ b/pkgs/applications/editors/wxhexeditor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext }: stdenv.mkDerivation rec { pname = "wxHexEditor"; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { wxHexEditor could edit HDD/SDD disk devices or partitions in raw up to exabyte sizes. ''; homepage = "http://www.wxhexeditor.org/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 81c86fb400e..7d36a2fd7f5 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkg-config ] # `help2man' wants to run Zile, which won't work when the # newly-produced binary can't be run at build-time. - ++ stdenv.lib.optional + ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) help2man; diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index c1b7841dc58..414c08d27f9 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "grass"; version = "7.6.1"; - src = with stdenv.lib; fetchFromGitHub { + src = with lib; fetchFromGitHub { owner = "OSGeo"; repo = "grass"; rev = "${name}_${replaceStrings ["."] ["_"] version}"; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ]; # Otherwise a very confusing "Can't load GDAL library" error - makeFlags = stdenv.lib.optional stdenv.isDarwin "GDAL_DYNAMIC="; + makeFlags = lib.optional stdenv.isDarwin "GDAL_DYNAMIC="; /* Ensures that the python script run at build time are actually executable; * otherwise, patchShebangs ignores them. */ @@ -103,8 +103,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://grass.osgeo.org/"; description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [mpickering]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [mpickering]; }; } diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index e4307e244ad..81e81c88537 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -52,7 +52,7 @@ mkDerivation rec { # See https://github.com/NixOS/nixpkgs/issues/85306 "-DLICENSING_PROVIDER:BOOL=OFF" "-DMapper_MANUAL_QTHELP:BOOL=OFF" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ # FindGDAL is broken and always finds /Library/Framework unless this is # specified "-DGDAL_INCLUDE_DIR=${gdal}/include" diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index c31701901ec..1e7390f8c83 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0s5byn8qyi1bm59j9vhwqaygw5cxipc7wbd3flh7n24nx0s8pr8c"; }; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; cargoSha256 = "09rz8f1xyc64qjbj6pgw8jxr2a7chghmdc6sfkbv7hdvx6vg4wvk"; diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index a994ae271c9..ec146767a6a 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-good gst_all_1.gst-libav gst_all_1.gst-plugins-base - ] ++ stdenv.lib.optional useUnrar unrar; + ] ++ lib.optional useUnrar unrar; NIX_LDFLAGS = "-lpthread"; diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index 462962d9e18..f842cf6f5c4 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { for i in $out/bin/eglretrace $out/bin/glretrace do echo "Patching RPath for $i" - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [libglvnd]}:$(patchelf --print-rpath $i)" $i + patchelf --set-rpath "${lib.makeLibraryPath [libglvnd]}:$(patchelf --print-rpath $i)" $i done wrapQtApp $out/bin/qapitrace diff --git a/pkgs/applications/graphics/autopanosiftc/default.nix b/pkgs/applications/graphics/autopanosiftc/default.nix index 5c649b384c7..129e3e54769 100644 --- a/pkgs/applications/graphics/autopanosiftc/default.nix +++ b/pkgs/applications/graphics/autopanosiftc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, libpng, libtiff, libjpeg, panotools, libxml2 }: +{lib, stdenv, fetchurl, cmake, libpng, libtiff, libjpeg, panotools, libxml2 }: stdenv.mkDerivation { name = "autopano-sift-C-2.5.1"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = "http://hugin.sourceforge.net/"; description = "Implementation in C of the autopano-sift algorithm for automatically stitching panoramas"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix index 54cc09a4d18..5e8e1e63344 100644 --- a/pkgs/applications/graphics/autotrace/default.nix +++ b/pkgs/applications/graphics/autotrace/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { autofig = callPackage ./autofig.nix {}; nativeBuildInputs = [ autoreconfHook glib autofig pkgconfig gettext ]; buildInputs = [ libpng12 imagemagick pstoedit ] - ++ stdenv.lib.optionals stdenv.isDarwin + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ gd ApplicationServices ]); postUnpack = '' diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 65fc56f81b1..7627d79554a 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "06xf5y2mljk3pd74ap9n90bhhidbzpg5c6wws361ygd4f3x86c46"; }; - libPath = stdenv.lib.makeLibraryPath (with xorg; [ + libPath = lib.makeLibraryPath (with xorg; [ stdenv.cc.cc.lib at-spi2-core.out gdk-pixbuf diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix index 4317cc78cda..0a4ed515511 100644 --- a/pkgs/applications/graphics/c3d/default.nix +++ b/pkgs/applications/graphics/c3d/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ itk4 ] - ++ stdenv.lib.optional stdenv.isDarwin Cocoa; + ++ lib.optional stdenv.isDarwin Cocoa; meta = with lib; { homepage = "https://github.com/pyushkevich/c3d"; diff --git a/pkgs/applications/graphics/comical/default.nix b/pkgs/applications/graphics/comical/default.nix index 800709de054..5c6ec804e62 100644 --- a/pkgs/applications/graphics/comical/default.nix +++ b/pkgs/applications/graphics/comical/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, wxGTK, util-linux, zlib }: +{lib, stdenv, fetchurl, wxGTK, util-linux, zlib }: stdenv.mkDerivation rec { name = "comical-0.8"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = { description = "Viewer of CBR and CBZ files, often used to store scanned comics"; homepage = "http://comical.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index c93b94ee183..550b23173fc 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt libsoup graphicsmagick json-glib openjpeg lua pugixml libwebp libsecret gnome3.adwaita-icon-theme osm-gps-map pcre isocodes - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ colord colord-gtk libX11 ocl-icd - ] ++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration - ++ stdenv.lib.optional stdenv.cc.isClang llvmPackages.openmp; + ] ++ lib.optional stdenv.isDarwin gtk-mac-integration + ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; cmakeFlags = [ "-DBUILD_USERMANUAL=False" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "-DUSE_COLORD=OFF" "-DUSE_KWALLET=OFF" ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # the wrappers: preFixup = let libPathEnvVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; - libPathPrefix = "$out/lib/darktable" + stdenv.lib.optionalString stdenv.isLinux ":${ocl-icd}/lib"; + libPathPrefix = "$out/lib/darktable" + lib.optionalString stdenv.isLinux ":${ocl-icd}/lib"; in '' for f in $out/share/darktable/kernels/*.cl; do sed -r "s|#include \"(.*)\"|#include \"$out/share/darktable/kernels/\1\"|g" -i "$f" diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index da6047a0256..2648828cfdc 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation { buildInputs = [ gtk2 libxml2 gettext python libxml2Python docbook5 libxslt docbook_xsl libart_lgpl ] - ++ stdenv.lib.optional withGNOME libgnomeui - ++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration-gtk2; + ++ lib.optional withGNOME libgnomeui + ++ lib.optional stdenv.isDarwin gtk-mac-integration-gtk2; nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool ] ++ (with perlPackages; [ perl XMLParser ]); @@ -25,7 +25,7 @@ stdenv.mkDerivation { preConfigure = '' NOCONFIGURE=1 ./autogen.sh # autoreconfHook is not enough ''; - configureFlags = stdenv.lib.optional withGNOME "--enable-gnome"; + configureFlags = lib.optional withGNOME "--enable-gnome"; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix index 5b324a5974d..9437d04108c 100644 --- a/pkgs/applications/graphics/displaycal/default.nix +++ b/pkgs/applications/graphics/displaycal/default.nix @@ -1,5 +1,5 @@ { python2 -, stdenv +, lib, stdenv , fetchurl , pkgconfig , libXext @@ -65,8 +65,8 @@ in buildPythonApplication rec { meta = { description = "Display Calibration and Characterization powered by Argyll CMS"; homepage = "https://displaycal.net/"; - license = stdenv.lib.licenses.gpl3; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [lib.maintainers.marcweber]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index a7fc17ce29b..1b475df92a6 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -29,7 +29,7 @@ mkDerivation rec { qtbase xorg.libXt libtiff - ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AGL; + ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AGL; configureFlags = [ "--disable-silent-rules" @@ -37,7 +37,7 @@ mkDerivation rec { "--with-x" "--with-tiff" # NOTE: 2019-09-19: experimental "--enable-npdjvu" fails - ] ++ stdenv.lib.optional stdenv.isDarwin "--enable-mac"; + ] ++ lib.optional stdenv.isDarwin "--enable-mac"; passthru = { mozillaPlugin = "/lib/mozilla/plugins"; diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index b491c3e3ead..b2997c2c474 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub }: +{ lib, stdenv, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "dosage"; @@ -23,6 +23,6 @@ python3Packages.buildPythonApplication rec { meta = { description = "A comic strip downloader and archiver"; homepage = "https://dosage.rocks/"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix index 7841e9d571b..12e4ec4496d 100644 --- a/pkgs/applications/graphics/exrdisplay/default.nix +++ b/pkgs/applications/graphics/exrdisplay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU, libGL, ctl }: +{ lib, stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU, libGL, ctl }: stdenv.mkDerivation { name ="openexr_viewers-2.2.1"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Application for viewing OpenEXR images on a display at various exposure settings"; homepage = "http://openexr.com"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.bsd3; + platforms = lib.platforms.linux; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index e90d0e13f22..2e01af5c4fc 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ vtk_9 ] - ++ stdenv.lib.optionals stdenv.isLinux [ libGL libX11 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; + ++ lib.optionals stdenv.isLinux [ libGL libX11 ] + ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; meta = with lib; { description = "Fast and minimalist 3D viewer using VTK"; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index a7d26f5300a..e1a488a4c27 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, makeWrapper +{ lib, stdenv, fetchurl, makeWrapper , xorg, imlib2, libjpeg, libpng , curl, libexif, jpegexiforient, perlPackages , enableAutoreload ? !stdenv.hostPlatform.isDarwin }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "feh"; diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/applications/graphics/fluxus/default.nix index 05260dc9812..acec5293101 100644 --- a/pkgs/applications/graphics/fluxus/default.nix +++ b/pkgs/applications/graphics/fluxus/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { "RacketPrefix=${racket}" "RacketInclude=${racket}/include/racket" "RacketLib=${racket}/lib/racket" - "LIBPATH=${stdenv.lib.makeLibraryPath libs}" + "LIBPATH=${lib.makeLibraryPath libs}" "DESTDIR=build" ]; configurePhase = '' diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix index a0356d12981..bf990c4d0ef 100644 --- a/pkgs/applications/graphics/freepv/default.nix +++ b/pkgs/applications/graphics/freepv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjpeg, libGLU, libGL, freeglut, zlib, cmake, libX11, libxml2, libpng, +{ lib, stdenv, fetchurl, libjpeg, libGLU, libGL, freeglut, zlib, cmake, libX11, libxml2, libpng, libXxf86vm }: stdenv.mkDerivation { @@ -30,6 +30,6 @@ stdenv.mkDerivation { meta = { description = "Open source panorama viewer using GL"; homepage = "http://freepv.sourceforge.net/"; - license = [ stdenv.lib.licenses.lgpl21 ]; + license = [ lib.licenses.lgpl21 ]; }; } diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix index e7eb2c4f92a..c6b77300cb3 100644 --- a/pkgs/applications/graphics/fstl/default.nix +++ b/pkgs/applications/graphics/fstl/default.nix @@ -14,7 +14,7 @@ mkDerivation rec { qmake qt/fstl.pro ''; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv fstl.app $out/Applications ''; diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix index f585a0c5d29..34391754e7f 100644 --- a/pkgs/applications/graphics/gcolor2/default.nix +++ b/pkgs/applications/graphics/gcolor2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk2, perlPackages, pkgconfig } : +{lib, stdenv, fetchurl, gtk2, perlPackages, pkgconfig } : let version = "0.4"; in stdenv.mkDerivation { @@ -27,8 +27,8 @@ stdenv.mkDerivation { meta = { description = "Simple GTK 2 color selector"; homepage = "http://gcolor2.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ notthemessiah ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ notthemessiah ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 7167700c244..f107d492434 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # Allow geeqie to find exiv2 and exiftran, necessary to # losslessly rotate JPEG images. sed -i $out/lib/geeqie/geeqie-rotate \ - -e '1 a export PATH=${stdenv.lib.makeBinPath [ exiv2 fbida ]}:$PATH' + -e '1 a export PATH=${lib.makeBinPath [ exiv2 fbida ]}:$PATH' ''; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index c2e8a47420e..b2a5b771211 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -189,9 +189,9 @@ in homepage = "http://lensfun.sebastiankraft.net/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + platforms = lib.platforms.gnu ++ lib.platforms.linux; }; }; diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix index 7e8ce913f02..094dcf0703e 100644 --- a/pkgs/applications/graphics/gimp/wrapper.nix +++ b/pkgs/applications/graphics/gimp/wrapper.nix @@ -4,7 +4,7 @@ let allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues gimpPlugins); selectedPlugins = lib.filter (pkg: pkg != gimpPlugins.gimp) (if plugins == null then allPlugins else plugins); extraArgs = map (x: x.wrapArgs or "") selectedPlugins; -versionBranch = stdenv.lib.versions.majorMinor gimp.version; +versionBranch = lib.versions.majorMinor gimp.version; in symlinkJoin { name = "gimp-with-plugins-${gimp.version}"; diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index c6b7b60c98e..37387e2a720 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "3.4.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0f2rki8i27pkd9r0gz03cdl1g4vnmvp0j49nhxqn275vi8lmgr0q"; }; diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index 425762fdaa9..b2923143017 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "installedTests" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1i64w69kk3sdf9vn7npnwrhy8qjwn0vizq200x3pgmbrfm3kjzv6"; }; diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 7c586374ec5..3c87e62e3d6 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tk }: +{ lib, stdenv, fetchurl, tk }: stdenv.mkDerivation rec { name = "gocr-0.52"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://jocr.sourceforge.net/"; description = "GPL Optical Character Recognition"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix index 2a2a6a67598..961cc7e49f7 100644 --- a/pkgs/applications/graphics/grafx2/default.nix +++ b/pkgs/applications/graphics/grafx2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, SDL_image, SDL_ttf, zlib, libpng, pkgconfig, lua5 }: +{ lib, stdenv, fetchurl, SDL, SDL_image, SDL_ttf, zlib, libpng, pkgconfig, lua5 }: stdenv.mkDerivation rec { @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { description = "Bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance"; homepage = "http://pulkomandy.tk/projects/GrafX2"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ stdenv.lib.maintainers.zoomulator ]; + maintainers = [ lib.maintainers.zoomulator ]; }; } diff --git a/pkgs/applications/graphics/graphicsmagick/compat.nix b/pkgs/applications/graphics/graphicsmagick/compat.nix index 9517aa78ee4..b715093308f 100644 --- a/pkgs/applications/graphics/graphicsmagick/compat.nix +++ b/pkgs/applications/graphics/graphicsmagick/compat.nix @@ -1,4 +1,4 @@ -{ stdenv, graphicsmagick }: +{ lib, stdenv, graphicsmagick }: stdenv.mkDerivation { pname = "graphicsmagick-imagemagick-compat"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = { description = "ImageMagick interface for GraphicsMagick"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.free; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index b8b21e71c93..5916cdd3b4a 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript +{ lib, stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 , libwebp, quantumdepth ? 8, fixDarwinDylibNames }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ xz ] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; postInstall = '' sed -i 's/-ltiff.*'\'/\'/ $out/bin/* @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.graphicsmagick.org"; description = "Swiss army knife of image processing"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 5125df7b7da..30c21149827 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, wrapGAppsHook, +{ lib, stdenv, fetchurl, perlPackages, wrapGAppsHook, # libs librsvg, sane-backends, sane-frontends, # runtime dependencies @@ -6,7 +6,7 @@ # test dependencies xvfb_run, liberation_ttf, file, tesseract }: -with stdenv.lib; +with lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index c97e28c9f9a..538e665be25 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { version = "3.10.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0gm7q6n9lnjsdqpx5b0cqjayhzwnplqb6p5pshzhbfp2zqd2g9ss"; }; diff --git a/pkgs/applications/graphics/guetzli/default.nix b/pkgs/applications/graphics/guetzli/default.nix index ccddf907e94..d888e55ed3d 100644 --- a/pkgs/applications/graphics/guetzli/default.nix +++ b/pkgs/applications/graphics/guetzli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, libpng, fetchFromGitHub, pkgconfig }: +{ lib, stdenv, libpng, fetchFromGitHub, pkgconfig }: let version = "1.0.1"; in @@ -23,8 +23,8 @@ stdenv.mkDerivation { description = "Perceptual JPEG encoder"; longDescription = "Guetzli is a JPEG encoder that aims for excellent compression density at high visual quality."; homepage = "https://github.com/google/guetzli"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.x86_64; - maintainers = [ stdenv.lib.maintainers.seppeljordan ]; + license = lib.licenses.asl20; + platforms = lib.platforms.x86_64; + maintainers = [ lib.maintainers.seppeljordan ]; }; } diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index be89d32e722..d70e3c5f0d5 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -122,15 +122,15 @@ stdenv.mkDerivation rec { potrace python3Env zlib - ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.isDarwin) [ gtkspell3 - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ cairo gtk-mac-integration ]; # Make sure PyXML modules can be found at run-time. - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkscape install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview ''; diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index 6a2a8dbc18f..161260bcea9 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript +{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript , libjpeg, libpng, qtbase, mkDerivation }: @@ -31,13 +31,13 @@ mkDerivation rec { meta = { description = "An editor for drawing figures"; homepage = "http://ipe.otfried.org"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; longDescription = '' Ipe is an extensible drawing editor for creating figures in PDF and Postscript format. It supports making small figures for inclusion into LaTeX-documents as well as presentations in PDF. ''; - maintainers = [ stdenv.lib.maintainers.ttuegel ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.ttuegel ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index 80abca80f87..4eaab036eb9 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; preFixup = let - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib alsaLib glib @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { libGLU libGL xorg.libX11 ]; - in stdenv.lib.optionalString (!stdenv.isDarwin) '' + in lib.optionalString (!stdenv.isDarwin) '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libPath}" \ diff --git a/pkgs/applications/graphics/krop/default.nix b/pkgs/applications/graphics/krop/default.nix index ee490676977..314e4c6ec14 100644 --- a/pkgs/applications/graphics/krop/default.nix +++ b/pkgs/applications/graphics/krop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, libsForQt5, ghostscript, qt5}: +{ lib, stdenv, fetchFromGitHub, python3Packages, libsForQt5, ghostscript, qt5}: python3Packages.buildPythonApplication rec { pname = "krop"; @@ -44,8 +44,8 @@ python3Packages.buildPythonApplication rec { your eReader does not support convenient scrolling. Krop also has a command line interface. ''; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ leenaars ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ leenaars ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/lazpaint/default.nix b/pkgs/applications/graphics/lazpaint/default.nix index 2756414d30d..4dae4dd3f9a 100644 --- a/pkgs/applications/graphics/lazpaint/default.nix +++ b/pkgs/applications/graphics/lazpaint/default.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { # Python is needed for scripts makeWrapper $out/share/lazpaint/lazpaint $out/bin/lazpaint \ - --prefix PATH : ${stdenv.lib.makeBinPath [ python3 ]} + --prefix PATH : ${lib.makeBinPath [ python3 ]} ''; meta = with lib; { diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index 9d2c6c4dd59..d90ef152401 100644 --- a/pkgs/applications/graphics/lightburn/default.nix +++ b/pkgs/applications/graphics/lightburn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, patchelf, fetchurl, p7zip +{ lib, stdenv, patchelf, fetchurl, p7zip , nss, nspr, libusb1 , qtbase, qtmultimedia, qtserialport , autoPatchelfHook, wrapQtAppsHook @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { meta = { description = "Layout, editing, and control software for your laser cutter"; homepage = "https://lightburnsoftware.com/"; - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ q3k ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ q3k ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/graphics/meh/default.nix b/pkgs/applications/graphics/meh/default.nix index 0b2e5bc3777..28f307d6cec 100644 --- a/pkgs/applications/graphics/meh/default.nix +++ b/pkgs/applications/graphics/meh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libX11, libXext, libjpeg, libpng, giflib }: +{ lib, stdenv, fetchFromGitHub, libX11, libXext, libjpeg, libpng, giflib }: stdenv.mkDerivation { name = "meh-unstable-2015-04-11"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "A minimal image viewer using raw XLib"; homepage = "https://www.johnhawthorn.com/meh/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/minidjvu/default.nix b/pkgs/applications/graphics/minidjvu/default.nix index 2af79659ced..40b28dd8566 100644 --- a/pkgs/applications/graphics/minidjvu/default.nix +++ b/pkgs/applications/graphics/minidjvu/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libtiff, gettext }: +{lib, stdenv, fetchurl, libtiff, gettext }: stdenv.mkDerivation { name = "minidjvu-0.8"; @@ -20,8 +20,8 @@ stdenv.mkDerivation { meta = { homepage = "http://djvu.sourceforge.net/djview4.html"; description = "Black-and-white djvu page encoder and decoder that use interpage information"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.viric ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix index e17664a018a..5bc67a8c63b 100644 --- a/pkgs/applications/graphics/mozjpeg/default.nix +++ b/pkgs/applications/graphics/mozjpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libpng, nasm }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libpng, nasm }: stdenv.mkDerivation rec { version = "3.3.1"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { The idea is to reduce transfer times for JPEGs on the Web, thus reducing page load times. ''; homepage = "https://github.com/mozilla/mozjpeg"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.aristid ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.aristid ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/applications/graphics/mtpaint/default.nix index c002e2a8d05..3565173285b 100644 --- a/pkgs/applications/graphics/mtpaint/default.nix +++ b/pkgs/applications/graphics/mtpaint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , pkg-config , freetype, giflib, gtk3, lcms2, libjpeg, libpng, libtiff, openjpeg, gifsicle }: @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { GNU/Linux, Windows and older PC hardware. ''; homepage = "http://mtpaint.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.vklquevs ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.vklquevs ]; }; } diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 3c571fedb83..73a4d631acb 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -53,7 +53,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://nomacs.org"; description = "Qt-based image viewer"; - maintainers = with stdenv.lib.maintainers; [ mindavi ]; + maintainers = with lib.maintainers; [ mindavi ]; license = licenses.gpl3Plus; repositories.git = "https://github.com/nomacs/nomacs.git"; inherit (qtbase.meta) platforms; diff --git a/pkgs/applications/graphics/ocrfeeder/default.nix b/pkgs/applications/graphics/ocrfeeder/default.nix index 95ff90a8eef..ff5d4bdf41d 100644 --- a/pkgs/applications/graphics/ocrfeeder/default.nix +++ b/pkgs/applications/graphics/ocrfeeder/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { version = "0.8.3"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "12f5gnq92ffnd5zaj04df7jrnsdz1zn4zcgpbf5p9qnd21i2y529"; }; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { --replace /usr/share/xml/iso-codes ${isocodes}/share/xml/iso-codes ''; - enginesPath = stdenv.lib.makeBinPath ([ + enginesPath = lib.makeBinPath ([ tesseract4 ] ++ extraOcrEngines); diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 8ff4d6f27e0..ad80d3a5404 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , qtbase , qtmultimedia @@ -44,8 +44,8 @@ mkDerivation rec { eigen boost glew opencsg cgal mpfr gmp glib harfbuzz lib3mf libzip double-conversion freetype fontconfig qtbase qtmultimedia qscintilla - ] ++ stdenv.lib.optionals stdenv.isLinux [ libGLU libGL ] - ++ stdenv.lib.optional stdenv.isDarwin qtmacextras + ] ++ lib.optionals stdenv.isLinux [ libGLU libGL ] + ++ lib.optional stdenv.isDarwin qtmacextras ; qmakeFlags = [ "VERSION=${version}" ]; @@ -53,7 +53,7 @@ mkDerivation rec { # src/lexer.l:36:10: fatal error: parser.hxx: No such file or directory enableParallelBuilding = false; # true by default due to qmake - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' mkdir $out/Applications mv $out/bin/*.app $out/Applications rmdir $out/bin || true @@ -80,8 +80,8 @@ mkDerivation rec { interested in creating computer-animated movies. ''; homepage = "http://openscad.org/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ bjornfor raskin gebner ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ bjornfor raskin gebner ]; }; } diff --git a/pkgs/applications/graphics/opentoonz/default.nix b/pkgs/applications/graphics/opentoonz/default.nix index 68830699699..d8a6a7c5f95 100644 --- a/pkgs/applications/graphics/opentoonz/default.nix +++ b/pkgs/applications/graphics/opentoonz/default.nix @@ -1,6 +1,6 @@ { boost, cmake, fetchFromGitHub, freeglut, freetype, glew, libjpeg, libmypaint , libpng, libtiff, libusb1, lz4, lzma, lzo, openblas, pkgconfig, qtbase -, qtmultimedia, qtscript, stdenv, superlu, wrapQtAppsHook, }: +, qtmultimedia, qtscript, lib, stdenv, superlu, wrapQtAppsHook, }: let source = import ./source.nix { inherit fetchFromGitHub; }; in stdenv.mkDerivation rec { inherit (source) src; @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { meta = { description = "Full-featured 2D animation creation software"; homepage = "https://opentoonz.github.io/"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ chkno ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ chkno ]; }; } diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index c03bdd8331b..50e0f3955f7 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libjpeg, libpng, libtiff, perl }: +{ fetchurl, lib, stdenv, libjpeg, libpng, libtiff, perl }: stdenv.mkDerivation rec { name = "libpano13-2.9.19"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://panotools.sourceforge.net/"; description = "Free software suite for authoring and displaying virtual reality panoramas"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 4f470b014af..fe49d5fa154 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch +{ mkDerivation, lib, stdenv, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch , qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools, qtgraphicaleffects , extra-cmake-modules, poppler, kimageformats, libarchive, libdevil }: @@ -40,7 +40,7 @@ mkDerivation rec { meta = { homepage = "https://photoqt.org/"; description = "Simple, yet powerful and good looking image viewer"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index b534763b245..c3dd9f548d2 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDotnetPackage, dotnetPackages, gtksharp, +{ lib, stdenv, fetchFromGitHub, buildDotnetPackage, dotnetPackages, gtksharp, gettext }: let @@ -21,7 +21,7 @@ buildDotnetPackage rec { }; # Remove version information from nodes <Reference Include="... Version=... "> - postPatch = with stdenv.lib; let + postPatch = with lib; let csprojFiles = [ "Pinta/Pinta.csproj" "Pinta.Core/Pinta.Core.csproj" @@ -76,8 +76,8 @@ buildDotnetPackage rec { meta = { homepage = "https://www.pinta-project.com/"; description = "Drawing/editing program modeled after Paint.NET"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/qscreenshot/default.nix b/pkgs/applications/graphics/qscreenshot/default.nix index 635da088e56..b3e555358be 100644 --- a/pkgs/applications/graphics/qscreenshot/default.nix +++ b/pkgs/applications/graphics/qscreenshot/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ dos2unix which qt ] - ++ stdenv.lib.optional stdenv.isDarwin Carbon; + ++ lib.optional stdenv.isDarwin Carbon; # Remove carriage returns that cause /bin/sh to abort preConfigure = '' diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index 73341cf2ea0..26522d78bcd 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -71,8 +71,8 @@ mkDerivationWith python3Packages.buildPythonApplication rec { makeWrapperArgs+=( --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" --set PYTHONPATH "$PYTHONPATH" - --prefix PATH : "${stdenv.lib.makeBinPath [ exiftool vmtouch ]}" - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libmediainfo ]}" + --prefix PATH : "${lib.makeBinPath [ exiftool vmtouch ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libmediainfo ]}" --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" "''${qtWrapperArgs[@]}" ) diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 14a46bbfcc8..7f9f4167c64 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau +{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau , libXdmcp, lcms2, libiptcdata, libcanberra-gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook , lensfun, librsvg }: @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { meta = { description = "RAW converter and digital photo processing software"; homepage = "http://www.rawtherapee.com/"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ jcumming mahe ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ jcumming mahe ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/rx/default.nix b/pkgs/applications/graphics/rx/default.nix index 9350d7c5cd7..78cc664accc 100644 --- a/pkgs/applications/graphics/rx/default.nix +++ b/pkgs/applications/graphics/rx/default.nix @@ -1,9 +1,9 @@ -{ stdenv, rustPlatform, fetchFromGitHub, makeWrapper +{ lib, stdenv, rustPlatform, fetchFromGitHub, makeWrapper , cmake, pkg-config , xorg ? null , libGL ? null }: -with stdenv.lib; +with lib; rustPlatform.buildRustPackage rec { pname = "rx"; diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 4ad5c24ddd6..0e768afdde1 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb-compat-0_1 }: +{ lib, stdenv, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb-compat-0_1 }: let - myPatchElf = file: with stdenv.lib; '' + myPatchElf = file: with lib; '' patchelf --set-interpreter \ ${stdenv.glibc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \ ${file} @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { done ''; - installPhase = with stdenv.lib; '' + installPhase = with lib; '' PATH_TO_BRSCAN4="opt/brother/scanner/brscan4" mkdir -p $out/$PATH_TO_BRSCAN4 cp -rp $PATH_TO_BRSCAN4/* $out/$PATH_TO_BRSCAN4 @@ -87,8 +87,8 @@ in stdenv.mkDerivation rec { meta = { description = "Brother brscan4 sane backend driver"; homepage = "http://www.brother.com"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; + platforms = lib.platforms.linux; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ jraygauthier ]; }; } diff --git a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix b/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix index 682e401c069..9ca0a702060 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libsaneUDevRuleNumber ? "49"}: +{ lib, stdenv, fetchurl, libsaneUDevRuleNumber ? "49"}: stdenv.mkDerivation rec { name = "brother-udev-rule-type1-1.0.0-1"; @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { meta = { description = "Brother type1 scanners udev rules"; homepage = "http://www.brother.com"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; + platforms = lib.platforms.linux; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ jraygauthier ]; }; } diff --git a/pkgs/applications/graphics/sane/backends/dsseries/default.nix b/pkgs/applications/graphics/sane/backends/dsseries/default.nix index 37ac0298706..8a01f70c6b0 100644 --- a/pkgs/applications/graphics/sane/backends/dsseries/default.nix +++ b/pkgs/applications/graphics/sane/backends/dsseries/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rpmextract }: +{ lib, stdenv, fetchurl, rpmextract }: stdenv.mkDerivation rec { pname = "libsane-dsseries"; @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { meta = { description = "Brother DSSeries SANE backend driver"; homepage = "http://www.brother.com"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ callahad ]; + platforms = lib.platforms.linux; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ callahad ]; }; } diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index cef48daca11..31ec8e8ddc7 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -39,19 +39,19 @@ stdenv.mkDerivation { enableParallelBuilding = true; configureFlags = [] - ++ stdenv.lib.optional (avahi != null) "--enable-avahi" - ++ stdenv.lib.optional (libusb1 != null) "--with-usb" + ++ lib.optional (avahi != null) "--enable-avahi" + ++ lib.optional (libusb1 != null) "--with-usb" ; postInstall = let compatFirmware = extraFirmware - ++ stdenv.lib.optional (gt68xxFirmware != null) { + ++ lib.optional (gt68xxFirmware != null) { src = gt68xxFirmware.fw; inherit (gt68xxFirmware) name; backend = "gt68xx"; } - ++ stdenv.lib.optional (snapscanFirmware != null) { + ++ lib.optional (snapscanFirmware != null) { src = snapscanFirmware; name = "your-firmwarefile.bin"; backend = "snapscan"; @@ -75,7 +75,7 @@ stdenv.mkDerivation { # net.conf conflicts with the file generated by the nixos module rm -f $out/etc/sane.d/net.conf - '' + stdenv.lib.concatStrings (builtins.map installFirmware compatFirmware); + '' + lib.concatStrings (builtins.map installFirmware compatFirmware); meta = with lib; { description = "SANE (Scanner Access Now Easy) backends"; diff --git a/pkgs/applications/graphics/sane/config.nix b/pkgs/applications/graphics/sane/config.nix index 2ef1e26f5ac..304df652f15 100644 --- a/pkgs/applications/graphics/sane/config.nix +++ b/pkgs/applications/graphics/sane/config.nix @@ -1,8 +1,8 @@ -{ stdenv }: +{ lib, stdenv }: { paths }: -with stdenv.lib; +with lib; let installSanePath = path: '' if [ -e "${path}/lib/sane" ]; then find "${path}/lib/sane" -maxdepth 1 -not -type d | while read backend; do diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index 86a1f201f82..8f5a10268e4 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ sane-backends libX11 gtk2 ] - ++ stdenv.lib.optional (libusb-compat-0_1 != null) libusb-compat-0_1; + ++ lib.optional (libusb-compat-0_1 != null) libusb-compat-0_1; nativeBuildInputs = [ pkgconfig ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index 04d19dee8a8..b9e45a76751 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkgconfig, libpng +{ lib, stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkgconfig, libpng , libusb-compat-0_1 ? null , gimpSupport ? false, gimp ? null }: @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 ] ++ (if libusb-compat-0_1 != null then [libusb-compat-0_1] else []) - ++ stdenv.lib.optional gimpSupport gimp; + ++ lib.optional gimpSupport gimp; meta = { homepage = "http://www.sane-project.org/"; description = "Graphical scanning frontend for sane"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [peti]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [peti]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix index 5e05072f7b5..291825770ac 100644 --- a/pkgs/applications/graphics/scantailor/default.nix +++ b/pkgs/applications/graphics/scantailor/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qt4, cmake, libjpeg, libtiff, boost }: +{lib, stdenv, fetchurl, qt4, cmake, libjpeg, libtiff, boost }: stdenv.mkDerivation { name = "scantailor-0.9.12.1"; @@ -15,9 +15,9 @@ stdenv.mkDerivation { homepage = "http://scantailor.org/"; description = "Interactive post-processing tool for scanned pages"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.viric ]; + platforms = lib.platforms.gnu ++ lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix index f5478f684fe..b7d6ecdef3d 100644 --- a/pkgs/applications/graphics/screencloud/default.nix +++ b/pkgs/applications/graphics/screencloud/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, pythonPackages }: +{ lib, stdenv, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, pythonPackages }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "screencloud"; version = "1.2.0"; @@ -69,8 +69,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://screencloud.net/"; description = "Client for Screencloud, an easy to use screenshot sharing tool"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ forkk ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ forkk ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 992a7f78799..347d66df987 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { version = "0.31.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0ywzr6vgcz8yy60v0jp55na9lgqi4dbh2vakfphkcml1gpah0r2l"; }; diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index d9877afad86..6a835fb3c71 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake, qt4, fftw }: +{ fetchurl, lib, stdenv, cmake, qt4, fftw }: let rev = "9895036d26"; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/Y-Vladimir/SmartDeblur"; description = "Tool for restoring blurry and defocused images"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index 4cf0ae55578..fec378d3843 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, libXft, imlib2, giflib, libexif, conf ? null }: +{ lib, stdenv, fetchFromGitHub, libXft, imlib2, giflib, libexif, conf ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "sxiv"; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { meta = { description = "Simple X Image Viewer"; homepage = "https://github.com/muennich/sxiv"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; maintainers = with maintainers; [ jfrankenau ]; }; } diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix index dc9d4ac2d59..66ff8675a31 100644 --- a/pkgs/applications/graphics/tesseract/tesseract3.nix +++ b/pkgs/applications/graphics/tesseract/tesseract3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , leptonica, libpng, libtiff, icu, pango, opencl-headers }: stdenv.mkDerivation rec { @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { description = "OCR engine"; homepage = "https://github.com/tesseract-ocr/tesseract"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ viric earvstedt ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ viric earvstedt ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix index d7c3cacc1f9..18d865ae81c 100644 --- a/pkgs/applications/graphics/tesseract/tesseract4.nix +++ b/pkgs/applications/graphics/tesseract/tesseract4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkgconfig , leptonica, libpng, libtiff, icu, pango, opencl-headers }: stdenv.mkDerivation rec { @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "OCR engine"; homepage = "https://github.com/tesseract-ocr/tesseract"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ viric earvstedt ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ viric earvstedt ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/graphics/tesseract/wrapper.nix b/pkgs/applications/graphics/tesseract/wrapper.nix index 365d68a9ee7..22751f38fe1 100644 --- a/pkgs/applications/graphics/tesseract/wrapper.nix +++ b/pkgs/applications/graphics/tesseract/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, tesseractBase, languages +{ lib, stdenv, makeWrapper, tesseractBase, languages # A list of languages like [ "eng" "spa" … ] or `null` for all available languages , enableLanguages ? null @@ -54,5 +54,5 @@ in if enableLanguagesHash == null then tesseract else - stdenv.lib.warn "Argument `enableLanguagesHash` is obsolete and can be removed." + lib.warn "Argument `enableLanguagesHash` is obsolete and can be removed." tesseract diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix index 8043f153083..0c5c8f3ff28 100644 --- a/pkgs/applications/graphics/unigine-valley/default.nix +++ b/pkgs/applications/graphics/unigine-valley/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl # Build-time dependencies , makeWrapper @@ -40,7 +40,7 @@ in buildInputs = [file makeWrapper]; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ stdenv.cc.cc # libstdc++.so.6 fontconfig freetype @@ -108,8 +108,8 @@ in meta = { description = "The Unigine Valley GPU benchmarking tool"; homepage = "https://unigine.com/products/benchmarks/valley/"; - license = stdenv.lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf - maintainers = [ stdenv.lib.maintainers.kierdavis ]; + license = lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf + maintainers = [ lib.maintainers.kierdavis ]; platforms = ["x86_64-linux" "i686-linux"]; }; } diff --git a/pkgs/applications/graphics/wings/default.nix b/pkgs/applications/graphics/wings/default.nix index 19c30f3ecc4..ef8d4b5096e 100644 --- a/pkgs/applications/graphics/wings/default.nix +++ b/pkgs/applications/graphics/wings/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, erlang, cl, libGL, libGLU, runtimeShell }: +{ fetchurl, lib, stdenv, erlang, cl, libGL, libGLU, runtimeShell }: stdenv.mkDerivation rec { name = "wings-2.2.4"; @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.wings3d.com/"; description = "Subdivision modeler inspired by Nendo and Mirai from Izware"; - license = stdenv.lib.licenses.tcltk; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.tcltk; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix index d03c29a58ec..65f6c46f7da 100644 --- a/pkgs/applications/graphics/write_stylus/default.nix +++ b/pkgs/applications/graphics/write_stylus/default.nix @@ -55,7 +55,7 @@ mkDerivation rec { homepage = "http://www.styluslabs.com/"; description = "Write is a word processor for handwriting"; platforms = platforms.linux; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; maintainers = with maintainers; [ oyren ]; }; } diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index 767f3aa920b..15c2d468fb4 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, aalib, gsl, libpng, libX11, xorgproto, libXext +{ lib, stdenv, fetchurl, aalib, gsl, libpng, libX11, xorgproto, libXext , libXt, zlib, gettext, intltool, perl }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://xaos.sourceforge.net/"; description = "Fractal viewer"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/graphics/xfractint/default.nix b/pkgs/applications/graphics/xfractint/default.nix index 08ef0cd7b58..cca061ed2a6 100644 --- a/pkgs/applications/graphics/xfractint/default.nix +++ b/pkgs/applications/graphics/xfractint/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11, libXft}: +{lib, stdenv, fetchurl, libX11, libXft}: stdenv.mkDerivation rec { pname = "xfractint"; version = "20.04p16"; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { description = ""; # Code cannot be used in commercial programs # Looks like the definition hinges on the price, not license - license = stdenv.lib.licenses.unfree; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.unfree; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://www.fractint.net/"; }; } diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 066e6cf2fb1..41af11ef338 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { ghostscript atk gtk2 glib fontconfig freetype libgnomecanvas pango libX11 xorgproto zlib poppler - ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.isDarwin) [ libgnomeprint libgnomeprintui ]; nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; NIX_LDFLAGS = "-lz" - + stdenv.lib.optionalString (!isGdkQuartzBackend) " -lX11"; + + lib.optionalString (!isGdkQuartzBackend) " -lX11"; desktopItem = makeDesktopItem { name = name; diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index c6aa330329c..1810a6c6b8e 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { portaudio zlib ] - ++ stdenv.lib.optional withLua lua; + ++ lib.optional withLua lua; buildFlags = "translations"; diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix index 598a9413826..c47c41a1cdc 100644 --- a/pkgs/applications/graphics/zgrviewer/default.nix +++ b/pkgs/applications/graphics/zgrviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, unzip, runtimeShell }: +{ lib, stdenv, fetchurl, jre, unzip, runtimeShell }: stdenv.mkDerivation rec { version = "0.9.0"; pname = "zgrviewer"; @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { meta = { # Quicker to unpack locally than load Hydra hydraPlatforms = []; - maintainers = with stdenv.lib.maintainers; [raskin]; - license = stdenv.lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [raskin]; + license = lib.licenses.lgpl21Plus; description = "GraphViz graph viewer/navigator"; - platforms = with stdenv.lib.platforms; unix; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index bfe6ba97e4c..57b25841c99 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -48,7 +48,7 @@ , systemd , zlib }: -with stdenv.lib; +with lib; let deps = [ alsaLib @@ -88,7 +88,7 @@ let systemd zlib ]; - rpath = stdenv.lib.makeLibraryPath deps ; + rpath = lib.makeLibraryPath deps ; in stdenv.mkDerivation rec { pname = "appgate-sdp"; @@ -156,7 +156,7 @@ stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "$ORIGIN:$out/opt/appgate/service/:$out/opt/appgate/:${rpath}" $binary done - wrapProgram $out/opt/appgate/appgate-driver --prefix PATH : ${stdenv.lib.makeBinPath [ iproute networkmanager dnsmasq ]} + wrapProgram $out/opt/appgate/appgate-driver --prefix PATH : ${lib.makeBinPath [ iproute networkmanager dnsmasq ]} wrapProgram $out/opt/appgate/linux/set_dns --set PYTHONPATH $PYTHONPATH ''; meta = with lib; { diff --git a/pkgs/applications/networking/browsers/asuka/default.nix b/pkgs/applications/networking/browsers/asuka/default.nix index 89718100ab5..8ea484d4a4c 100644 --- a/pkgs/applications/networking/browsers/asuka/default.nix +++ b/pkgs/applications/networking/browsers/asuka/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses openssl ] - ++ stdenv.lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.isDarwin Security; meta = with lib; { description = "Gemini Project client written in Rust with NCurses"; diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/applications/networking/browsers/browsh/default.nix index cf1ae25974e..aa57b9a17f6 100644 --- a/pkgs/applications/networking/browsers/browsh/default.nix +++ b/pkgs/applications/networking/browsers/browsh/default.nix @@ -55,7 +55,7 @@ in buildGoPackage rec { description = "A fully-modern text-based browser, rendering to TTY and browsers"; homepage = "https://www.brow.sh/"; maintainers = [ maintainers.kalbasit ]; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = lib.licenses.lgpl21; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index b9a42e825f3..22d21a5efa5 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -1,6 +1,6 @@ -{ stdenv, mkChromiumDerivation, channel, enableWideVine, ungoogled }: +{ lib, stdenv, mkChromiumDerivation, channel, enableWideVine, ungoogled }: -with stdenv.lib; +with lib; mkChromiumDerivation (base: rec { name = "chromium-browser"; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index d7b1a017d31..19930714f0c 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -39,7 +39,7 @@ buildFun: -with stdenv.lib; +with lib; let jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index fd89f316008..f8eee605b8e 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -158,9 +158,9 @@ in stdenv.mkDerivation { buildCommand = let browserBinary = "${chromiumWV}/libexec/chromium/chromium"; getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; - libPath = stdenv.lib.makeLibraryPath [ libva pipewire_0_2 ]; + libPath = lib.makeLibraryPath [ libva pipewire_0_2 ]; - in with stdenv.lib; '' + in with lib; '' mkdir -p "$out/bin" eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index eef1c5ef38c..355f5633172 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv, gcc +{ lib, stdenv, gcc , jshon , glib , nspr @@ -9,7 +9,7 @@ , upstream-info }: -with stdenv.lib; +with lib; let mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}"; @@ -81,8 +81,8 @@ let dontStrip = true; meta = { - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ taku0 ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ taku0 ]; platforms = platforms.x86_64; }; }; diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index 9da80576e95..8af0c1bc8e6 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "12ql8n1lypv3k5zqgwjxlw1md90ixz3ag6j1gghfnhjq3inf26yv"; }; - buildInputs = with stdenv.lib; + buildInputs = with lib; [ perl fltk openssl libjpeg libpng libXcursor libXi libXinerama ]; configureFlags = [ "--enable-ssl" ]; diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 114bc93f3b9..6e4c7d1dade 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -26,10 +26,10 @@ stdenv.mkDerivation rec { ncurses xlibsWrapper bzip2 zlib brotli zstd lzma openssl libidn tre expat libev ] - ++ stdenv.lib.optional stdenv.isLinux gpm - ++ stdenv.lib.optional enableGuile guile - ++ stdenv.lib.optional enablePython python - ++ stdenv.lib.optional enablePerl perl + ++ lib.optional stdenv.isLinux gpm + ++ lib.optional enableGuile guile + ++ lib.optional enablePython python + ++ lib.optional enablePerl perl ; nativeBuildInputs = [ autoreconfHook gettext pkgconfig ]; @@ -46,9 +46,9 @@ stdenv.mkDerivation rec { "--with-lzma" "--with-libev" "--with-terminfo" - ] ++ stdenv.lib.optional enableGuile "--with-guile" - ++ stdenv.lib.optional enablePython "--with-python" - ++ stdenv.lib.optional enablePerl "--with-perl" + ] ++ lib.optional enableGuile "--with-guile" + ++ lib.optional enablePython "--with-python" + ++ lib.optional enablePerl "--with-perl" ; meta = with lib; { diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 1bf97a8ad98..20101258da5 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -74,9 +74,9 @@ let policiesJson = writeText "no-update-firefox-policy.json" (builtins.toJSON { inherit policies; }); - defaultSource = stdenv.lib.findFirst (sourceMatches "en-US") {} sources; + defaultSource = lib.findFirst (sourceMatches "en-US") {} sources; - source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources; + source = lib.findFirst (sourceMatches systemLocale) defaultSource sources; name = "firefox-${channel}-bin-unwrapped-${version}"; @@ -89,7 +89,7 @@ stdenv.mkDerivation { phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ]; - libPath = stdenv.lib.makeLibraryPath + libPath = lib.makeLibraryPath [ stdenv.cc.cc alsaLib (lib.getDev alsaLib) @@ -131,7 +131,7 @@ stdenv.mkDerivation { (lib.getDev libpulseaudio) systemd ffmpeg - ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ + ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index f497a7f9a28..db9f46c63ef 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0qqdcghsdqm7l6kyi0k752ws3ak5crw85pqkcb11wy67j62yspi8"; }; - buildInputs = with stdenv.lib; + buildInputs = with lib; [ libev librsvg libpng libjpeg libtiff openssl xz bzip2 zlib ] ++ optionals stdenv.isLinux [ gpm ] ++ optionals enableX11 [ libX11 libXau libXt ] @@ -25,10 +25,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig bzip2 ]; configureFlags = [ "--with-ssl" ] - ++ stdenv.lib.optional (enableX11 || enableFB || enableDirectFB) "--enable-graphics" - ++ stdenv.lib.optional enableX11 "--with-x" - ++ stdenv.lib.optional enableFB "--with-fb" - ++ stdenv.lib.optional enableDirectFB "--with-directfb"; + ++ lib.optional (enableX11 || enableFB || enableDirectFB) "--enable-graphics" + ++ lib.optional enableX11 "--with-x" + ++ lib.optional enableFB "--with-fb" + ++ lib.optional enableDirectFB "--with-directfb"; meta = with lib; { homepage = "http://links.twibright.com/"; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index cd9898e420e..1a4f9b4ec7b 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -140,8 +140,8 @@ stdenv.mkDerivation rec { meta = { description = "Adobe Flash Player browser plugin"; homepage = "http://www.adobe.com/products/flashplayer/"; - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ taku0 ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ taku0 ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 09839b4c3c9..ed95d02ade4 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -96,8 +96,8 @@ stdenv.mkDerivation { meta = { description = "Adobe Flash Player standalone executable"; homepage = "https://www.adobe.com/support/flashplayer/debug_downloads.html"; - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ taku0 ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ taku0 ]; platforms = [ "x86_64-linux" ]; # Application crashed with an unhandled SIGSEGV # Not on all systems, though. Video driver problem? diff --git a/pkgs/applications/networking/browsers/netsurf/browser.nix b/pkgs/applications/networking/browsers/netsurf/browser.nix index 4dc3ee16957..00e70431abd 100644 --- a/pkgs/applications/networking/browsers/netsurf/browser.nix +++ b/pkgs/applications/networking/browsers/netsurf/browser.nix @@ -22,7 +22,7 @@ }: let - inherit (stdenv.lib) optional optionals; + inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "netsurf"; 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 4c705bb79d0..39a58454955 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -57,7 +57,7 @@ , extraPrefs ? "" }: -with stdenv.lib; +with lib; let libPath = makeLibraryPath libPkgs; diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 099d81c99f8..705b9ec7f70 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libsoup, webkitgtk, gtk3, glib-networking +{ lib, stdenv, fetchFromGitHub, pkgconfig, libsoup, webkitgtk, gtk3, glib-networking , gsettings-desktop-schemas, wrapGAppsHook }: @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { keyboard driven and does not detract you from your daily work. ''; homepage = "https://fanglingsu.github.io/vimb/"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; maintainers = []; - platforms = with stdenv.lib.platforms; linux; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index d19da31026e..562b6d9f734 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -39,11 +39,11 @@ in stdenv.mkDerivation rec { freetype fontconfig libXrender libuuid expat glib nss nspr libxml2 pango cairo gnome2.GConf libdrm mesa - ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; + ] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; - libPath = stdenv.lib.makeLibraryPath buildInputs - + stdenv.lib.optionalString (stdenv.is64bit) - (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs) + libPath = lib.makeLibraryPath buildInputs + + lib.optionalString (stdenv.is64bit) + (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs) + ":$out/opt/${vivaldiName}/lib"; buildPhase = '' @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libPath}" \ opt/${vivaldiName}/vivaldi-bin - '' + stdenv.lib.optionalString proprietaryCodecs '' + '' + lib.optionalString proprietaryCodecs '' ln -s ${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so opt/${vivaldiName}/libffmpeg.so.''${version%\.*\.*} '' + '' echo "Finished patching Vivaldi binaries" @@ -81,8 +81,8 @@ in stdenv.mkDerivation rec { done wrapProgram "$out/bin/vivaldi" \ --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \ - ${stdenv.lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"} - '' + stdenv.lib.optionalString enableWidevine '' + ${lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"} + '' + lib.optionalString enableWidevine '' ln -sf ${vivaldi-widevine}/share/google/chrome/WidevineCdm $out/opt/${vivaldiName}/WidevineCdm ''; diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index 82c4ce0f1be..03d1911333e 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -49,8 +49,8 @@ let description = "Web Debugging Proxy"; homepage = "https://www.charlesproxy.com/"; maintainers = [ maintainers.kalbasit ]; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = lib.licenses.unfree; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }; diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix index 96b8b6933d8..1c315447254 100644 --- a/pkgs/applications/networking/compactor/default.nix +++ b/pkgs/applications/networking/compactor/default.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/dns-stats/${pname}/raw/${version}/ChangeLog.txt"; license = [ licenses.boost licenses.mpl20 licenses.openssl ]; maintainers = with maintainers; [ fdns ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index bbb27672a7d..008592778aa 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cp -vR ./* $out/share/davmail makeWrapper $out/share/davmail/davmail $out/bin/davmail \ --prefix PATH : ${jre}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk2 libXtst ]} ''; meta = with lib; { diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index 5ff47f4859a..5ec94c819a6 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , substituteAll , pkgconfig , fetchurl @@ -63,8 +63,8 @@ stdenv.mkDerivation { meta = { homepage = "https://www.dropbox.com"; description = "Command line client for the dropbox daemon"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; # NOTE: Dropbox itself only works on linux, so this is ok. - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index cedfcbdb5d1..23f557a1e6d 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -25,7 +25,7 @@ buildRustPackage rec { meta = with lib; { description = "CloudFlare Dynamic DNS Client"; homepage = "https://github.com/colemickens/cfdyndns"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; maintainers = with maintainers; [ colemickens ]; platforms = with platforms; linux; }; diff --git a/pkgs/applications/networking/gnome-network-displays/default.nix b/pkgs/applications/networking/gnome-network-displays/default.nix index 5a865fddb59..8456720cb7a 100644 --- a/pkgs/applications/networking/gnome-network-displays/default.nix +++ b/pkgs/applications/networking/gnome-network-displays/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { version = "0.90.4"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "04snnfz5jxxpjkrwa7dchc2h4shszi8mq9g3ihvsvipgzjw3d498"; }; diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix index 405827d8c5d..7a8c3d395f6 100644 --- a/pkgs/applications/networking/ike/default.nix +++ b/pkgs/applications/networking/ike/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { installPhase = '' make install for file in "$out"/bin/* "$out"/sbin/*; do - wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${stdenv.lib.makeLibraryPath [ openssl gcc.cc stdenv.cc.libc libedit qt4 ]}" + wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${lib.makeLibraryPath [ openssl gcc.cc stdenv.cc.libc libedit qt4 ]}" done ''; diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix index c864754403c..b52a81932e4 100644 --- a/pkgs/applications/networking/insync/default.nix +++ b/pkgs/applications/networking/insync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, autoPatchelfHook }: +{ lib, stdenv, fetchurl, makeWrapper, autoPatchelfHook }: stdenv.mkDerivation rec { pname = "insync"; @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { meta = { platforms = ["x86_64-linux"]; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.benley ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.benley ]; homepage = "https://www.insynchq.com"; description = "Google Drive sync and backup with multiple account support"; longDescription = '' diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index 91c299d4fda..e14e5b57461 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; qtWrapperArgs = - [ ''--prefix PATH : ${stdenv.lib.makeBinPath [ wirelesstools iw ]}'' ]; + [ ''--prefix PATH : ${lib.makeBinPath [ wirelesstools iw ]}'' ]; meta = with lib; { description = "Graphical wireless scanning for Linux"; diff --git a/pkgs/applications/networking/mkchromecast/default.nix b/pkgs/applications/networking/mkchromecast/default.nix index b682c9e7351..ec2857753d7 100644 --- a/pkgs/applications/networking/mkchromecast/default.nix +++ b/pkgs/applications/networking/mkchromecast/default.nix @@ -23,7 +23,7 @@ let packages = [ nodejs ffmpeg youtube-dl -] ++ stdenv.lib.optionals stdenv.isLinux [ pulseaudio ]; +] ++ lib.optionals stdenv.isLinux [ pulseaudio ]; in python3Packages.buildPythonApplication rec { @@ -63,13 +63,13 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs = [ "\${qtWrapperArgs[@]}" - "--prefix PATH : ${stdenv.lib.makeBinPath packages}" + "--prefix PATH : ${lib.makeBinPath packages}" ]; postInstall = '' substituteInPlace $out/lib/${python3Packages.python.libPrefix}/site-packages/mkchromecast/video.py \ --replace '/usr/share/mkchromecast/nodejs/' '${placeholder "out"}/share/mkchromecast/nodejs/' - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' install -Dm 755 -t $out/bin bin/audiodevice substituteInPlace $out/lib/${python3Packages.python.libPrefix}/site-packages/mkchromecast/audio_devices.py \ --replace './bin/audiodevice' '${placeholder "out"}/bin/audiodevice' diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index e2f1f0e828d..5aa0861b4e9 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, gnutls, gsasl, libidn, Security }: +{ lib, stdenv, fetchurl, pkgconfig, gnutls, gsasl, libidn, Security }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "mpop"; diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 468e65cf4d8..fd6a011b1bd 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -21,13 +21,13 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ gnutls gsasl libidn2 ] - ++ stdenv.lib.optional stdenv.isDarwin Security - ++ stdenv.lib.optional withKeyring libsecret; + ++ lib.optional stdenv.isDarwin Security + ++ lib.optional withKeyring libsecret; nativeBuildInputs = [ autoreconfHook pkgconfig texinfo ]; configureFlags = - [ "--sysconfdir=/etc" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ]; + [ "--sysconfdir=/etc" ] ++ lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ]; postInstall = '' install -d $out/share/doc/${pname}/scripts diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index fd2fb4a8fb7..368bd716ce6 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, qt5 +{ lib, stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, qt5 , avahi, boost, libopus, libsndfile, protobuf, speex, libcap , alsaLib, python , rnnoise @@ -16,7 +16,7 @@ assert pulseSupport -> libpulseaudio != null; assert iceSupport -> zeroc-ice != null; assert grpcSupport -> (grpc != null && c-ares != null && abseil-cpp != null && which != null); -with stdenv.lib; +with lib; let generic = overrides: source: qt5.mkDerivation (source // overrides // { pname = overrides.type; diff --git a/pkgs/applications/networking/mumble/overlay.nix b/pkgs/applications/networking/mumble/overlay.nix index d3af518a3c5..bc960ac12d4 100644 --- a/pkgs/applications/networking/mumble/overlay.nix +++ b/pkgs/applications/networking/mumble/overlay.nix @@ -25,6 +25,6 @@ in stdenv.mkDerivation { ''; meta = { - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index ef022306d4b..5e53e61e040 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -20,16 +20,16 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig gettext intltool itstool libxml2 makeWrapper ]; buildInputs = [ gtk3 gmime2 libnotify gnutls ] - ++ stdenv.lib.optional spellChecking gtkspell3 - ++ stdenv.lib.optionals gnomeSupport [ libsecret gcr ]; + ++ lib.optional spellChecking gtkspell3 + ++ lib.optionals gnomeSupport [ libsecret gcr ]; configureFlags = [ "--with-dbus" "--with-gtk3" "--with-gnutls" "--enable-libnotify" - ] ++ stdenv.lib.optional spellChecking "--with-gtkspell" - ++ stdenv.lib.optional gnomeSupport "--enable-gkr"; + ] ++ lib.optional spellChecking "--with-gtkspell" + ++ lib.optional gnomeSupport "--enable-gkr"; postInstall = '' wrapProgram $out/bin/pan --suffix PATH : ${gnupg}/bin diff --git a/pkgs/applications/networking/nload/default.nix b/pkgs/applications/networking/nload/default.nix index 85a39f7e656..8b97bbf4635 100644 --- a/pkgs/applications/networking/nload/default.nix +++ b/pkgs/applications/networking/nload/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, ncurses }: +{ lib, stdenv, fetchurl, fetchpatch, ncurses }: stdenv.mkDerivation rec { version = "0.7.4"; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { transfered data and min/max network usage. ''; homepage = "http://www.roland-riegel.de/nload/index.html"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.devhell ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.devhell ]; }; } diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index 7c5ffabd860..8ca82c5b98f 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ qt4 boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext ] - ++ stdenv.lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.isDarwin libiconv; patches = [ (fetchpatch { diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index d50f5a67931..83cc191f1b3 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, ant, jdk, bash, coreutils, substituteAll }: +{ lib, stdenv, fetchurl, fetchFromGitHub, ant, jdk, bash, coreutils, substituteAll }: let freenet_ext = fetchurl { @@ -73,8 +73,8 @@ in stdenv.mkDerivation { meta = { description = "Decentralised and censorship-resistant network"; homepage = "https://freenetproject.org/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = with stdenv.lib.platforms; linux; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 3dbbbbe072d..2991550defc 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "6.8.9"; diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 786ba434b92..37bc1e372ac 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocamlPackages, zlib, bzip2, ncurses, file, gd, libpng, libjpeg }: +{ lib, stdenv, fetchurl, ocamlPackages, zlib, bzip2, ncurses, file, gd, libpng, libjpeg }: stdenv.mkDerivation ({ name = "mldonkey-3.1.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation ({ sha256 = "0g84islkj72ymp0zzppcj9n4r21h0vlghnq87hv2wg580mybadhv"; }; - preConfigure = stdenv.lib.optionalString (ocamlPackages.camlp4 != null) '' + preConfigure = lib.optionalString (ocamlPackages.camlp4 != null) '' substituteInPlace Makefile --replace '+camlp4' \ '${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4' ''; @@ -20,8 +20,8 @@ stdenv.mkDerivation ({ meta = { description = "Client for many p2p networks, with multiple frontends"; homepage = "http://mldonkey.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; }; } // (if !ocamlPackages.ocaml.nativeCompilers then { diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix index 08da6cdf6fa..6c09043a65b 100644 --- a/pkgs/applications/networking/p2p/stig/default.nix +++ b/pkgs/applications/networking/p2p/stig/default.nix @@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec { "--deselect=tests/client_test/ttypes_test.py::TestTimestamp::test_string__month_day_hour_minute_second" # TestScrollBarWithScrollable.test_wrapping_bug fails "--deselect=tests/tui_test/scroll_test.py::TestScrollBarWithScrollable::test_wrapping_bug" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "--deselect=tests/client_test/aiotransmission_test/api_torrent_test.py" "--deselect=tests/client_test/aiotransmission_test/rpc_test.py" ]; diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix index ae2c3c2469f..4eeac2db981 100644 --- a/pkgs/applications/networking/p2p/synapse-bt/default.nix +++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; + ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; cargoBuildFlags = [ "--all" ]; diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index 7152570b6ac..3ceeb4b002e 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { installPhase = '' patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ glib zlib dbus dbus-glib gtk2 gdk-pixbuf cairo pango ]} \ + --set-rpath ${lib.makeLibraryPath [ glib zlib dbus dbus-glib gtk2 gdk-pixbuf cairo pango ]} \ tixati install -D tixati $out/bin/tixati install -D tixati.desktop $out/share/applications/tixati.desktop diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index dbe3bb50e6d..4dbb54faabc 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, makeDesktopItem, unzip, fpc, lazarus, +{ lib, stdenv, fetchFromGitHub, pkgconfig, makeDesktopItem, unzip, fpc, lazarus, libX11, glib, gtk2, gdk-pixbuf, pango, atk, cairo, openssl }: stdenv.mkDerivation rec { @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "Transmission Remote GUI"; genericName = "BitTorrent Client"; - categories = stdenv.lib.concatStringsSep ";" [ + categories = lib.concatStringsSep ";" [ "Application" "Network" "FileTransfer" "P2P" "GTK" ]; startupNotify = "true"; - mimeType = stdenv.lib.concatStringsSep ";" [ + mimeType = lib.concatStringsSep ";" [ "application/x-bittorrent" "x-scheme-handler/magnet" ]; }; @@ -69,8 +69,8 @@ stdenv.mkDerivation rec { meta = { description = "A cross platform front-end for the Transmission Bit-Torrent client"; homepage = "https://sourceforge.net/p/transgui"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ ramkromberg ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ramkromberg ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/tremc/default.nix b/pkgs/applications/networking/p2p/tremc/default.nix index 4d3b3d3f374..dfbe66ac856 100644 --- a/pkgs/applications/networking/p2p/tremc/default.nix +++ b/pkgs/applications/networking/p2p/tremc/default.nix @@ -5,7 +5,7 @@ , useGeoIP ? false # Require /var/lib/geoip-databases/GeoIP.dat }: let - wrapperPath = with stdenv.lib; makeBinPath ( + wrapperPath = with lib; makeBinPath ( optional x11Support xclip ++ optional stdenv.isDarwin pbcopy ); @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { ipy pyperclip ] ++ - stdenv.lib.optional useGeoIP GeoIP; + lib.optional useGeoIP GeoIP; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 474d6a0c9f1..36b7451e441 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - ${stdenv.lib.optionalString enablePlayer '' + ${lib.optionalString enablePlayer '' substituteInPlace "./TriblerGUI/vlc.py" --replace "ctypes.CDLL(p)" "ctypes.CDLL('${libvlc}/lib/libvlc.so')" substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" \ --replace "if vlc and vlc.plugin_path" "if vlc" \ @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { --set NO_AT_BRIDGE 1 \ --run 'cd $_TRIBLERPATH' \ --add-flags "-O $out/run_tribler.py" \ - ${stdenv.lib.optionalString enablePlayer '' + ${lib.optionalString enablePlayer '' --prefix LD_LIBRARY_PATH : ${libvlc}/lib ''} diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index 03cb381f5eb..dfc63fff7e4 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkgconfig, python2 +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkgconfig, python2 , boost, db, openssl, geoip, libiconv, miniupnpc , srcOnly, fetchgit }: @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { meta = { homepage = "http://www.twister.net.co/"; description = "Peer-to-peer microblogging"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 50516eab2f0..a28c68a6583 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { postFixup = '' patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "${stdenv.lib.makeLibraryPath buildInputs}" \ + --set-rpath "${lib.makeLibraryPath buildInputs}" \ $out/bin/anydesk # pangox is not actually necessary (it was only added as a part of gtkglext) @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { $out/bin/anydesk wrapProgram $out/bin/anydesk \ - --prefix PATH : ${stdenv.lib.makeBinPath [ lsb-release ]} + --prefix PATH : ${lib.makeBinPath [ lsb-release ]} substituteInPlace $out/share/applications/*.desktop \ --subst-var out diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index 4c67105dafc..cdbdde31fac 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, openssl, libX11, krb5, libXcursor, libtasn1, nettle, gnutls, pkgconfig, autoreconfHook +{lib, stdenv, fetchFromGitHub, openssl, libX11, krb5, libXcursor, libtasn1, nettle, gnutls, pkgconfig, autoreconfHook , enableCredssp ? (!stdenv.isDarwin) } : @@ -15,18 +15,18 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [pkgconfig autoreconfHook]; buildInputs = [openssl libX11 libXcursor libtasn1 nettle gnutls] - ++ stdenv.lib.optional enableCredssp krb5; + ++ lib.optional enableCredssp krb5; configureFlags = [ "--with-ipv6" "--with-openssl=${openssl.dev}" "--disable-smartcard" - ] ++ stdenv.lib.optional (!enableCredssp) "--disable-credssp"; + ] ++ lib.optional (!enableCredssp) "--disable-credssp"; meta = { description = "Open source client for Windows Terminal Services"; homepage = "http://www.rdesktop.org/"; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + license = lib.licenses.gpl2; }; }) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 23b8cb31735..35ce055b3b0 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, cmake, ninja, pkgconfig, wrapGAppsHook +{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkgconfig, wrapGAppsHook , glib, gtk3, gettext, libxkbfile, libX11 , freerdp, libssh, libgcrypt, gnutls , pcre2, libdbusmenu-gtk3, libappindicator-gtk3 @@ -9,7 +9,7 @@ , gnome3 }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "remmina"; diff --git a/pkgs/applications/networking/remote/x2goserver/default.nix b/pkgs/applications/networking/remote/x2goserver/default.nix index f30b21464e3..314805a685c 100644 --- a/pkgs/applications/networking/remote/x2goserver/default.nix +++ b/pkgs/applications/networking/remote/x2goserver/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Remote desktop application, server component"; homepage = "http://x2go.org/"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; license = licenses.gpl2; maintainers = [ maintainers.averelld ]; }; diff --git a/pkgs/applications/networking/scaleft/default.nix b/pkgs/applications/networking/scaleft/default.nix index 67fb66feabb..6dca196948d 100644 --- a/pkgs/applications/networking/scaleft/default.nix +++ b/pkgs/applications/networking/scaleft/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ patchelf rpmextract ]; libPath = - stdenv.lib.makeLibraryPath + lib.makeLibraryPath [ stdenv.cc stdenv.cc.cc.lib ]; buildCommand = '' diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix index aba93e2d6d0..000a2fa0a4a 100644 --- a/pkgs/applications/networking/sniffers/etherape/default.nix +++ b/pkgs/applications/networking/sniffers/etherape/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { sha256 = "0w63vg2q6if3wvy2md66in8b6cdw9q40hny5xy6yrxky58l4kmg7"; }; - nativeBuildInputs = [ itstool pkgconfig (stdenv.lib.getBin libxml2) ]; + nativeBuildInputs = [ itstool pkgconfig (lib.getBin libxml2) ]; buildInputs = [ libtool gtk3 libpcap goocanvas2 popt ]; meta = with lib; { homepage = "http://etherape.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; platforms = with platforms; linux; maintainers = with maintainers; [ symphorien ]; }; diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix index 56260bd06fa..4c31d374676 100644 --- a/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/pkgs/applications/networking/sniffers/kismet/default.nix @@ -22,15 +22,15 @@ stdenv.mkDerivation rec { buildInputs = [ libpcap pcre libmicrohttpd libnl zlib sqlite protobuf protobufc libusb1 libcap binutils elfutils - ] ++ stdenv.lib.optionals withNetworkManager [ networkmanager glib ] - ++ stdenv.lib.optional withSensors lm_sensors - ++ stdenv.lib.optional withPython (python3.withPackages(ps: [ ps.setuptools ps.protobuf + ] ++ lib.optionals withNetworkManager [ networkmanager glib ] + ++ lib.optional withSensors lm_sensors + ++ lib.optional withPython (python3.withPackages(ps: [ ps.setuptools ps.protobuf ps.numpy ps.pyserial ])); configureFlags = [] - ++ stdenv.lib.optional (!withNetworkManager) "--disable-libnm" - ++ stdenv.lib.optional (!withPython) "--disable-python-tools" - ++ stdenv.lib.optional (!withSensors) "--disable-lmsensors"; + ++ lib.optional (!withNetworkManager) "--disable-libnm" + ++ lib.optional (!withPython) "--disable-python-tools" + ++ lib.optional (!withSensors) "--disable-lmsensors"; postConfigure = '' sed -e 's/-o $(INSTUSR)//' \ diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 0497472b90e..bd1757dfb48 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -7,7 +7,7 @@ assert withQt -> qt5 != null; -with stdenv.lib; +with lib; let version = "3.4.2"; @@ -47,7 +47,7 @@ in stdenv.mkDerivation { patches = [ ./wireshark-lookup-dumpcap-in-path.patch ] # https://code.wireshark.org/review/#/c/23728/ - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { + ++ lib.optional stdenv.hostPlatform.isMusl (fetchpatch { name = "fix-timeout.patch"; url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commitdiff_plain;h=8b5b843fcbc3e03e0fc45f3caf8cf5fc477e8613;hp=94af9724d140fd132896b650d10c4d060788e4f0"; sha256 = "1g2dm7lwsnanwp68b9xr9swspx7hfj4v3z44sz3yrfmynygk8zlv"; diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix index 90d8ea55331..edff4c78126 100644 --- a/pkgs/applications/networking/spideroak/default.nix +++ b/pkgs/applications/networking/spideroak/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, patchelf +{ lib, stdenv, fetchurl, makeWrapper, patchelf , fontconfig, freetype, glib, libICE, libSM , libX11, libXext, libXrender, zlib }: @@ -6,7 +6,7 @@ let sha256 = "6d6ca2b383bcc81af1217c696eb77864a2b6db7428f4b5bde5b5913ce705eec5"; - ldpath = stdenv.lib.makeLibraryPath [ + ldpath = lib.makeLibraryPath [ fontconfig freetype glib libICE libSM libX11 libXext libXrender zlib ]; @@ -53,8 +53,8 @@ in stdenv.mkDerivation { meta = { homepage = "https://spideroak.com"; description = "Secure online backup and sychronization"; - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ amorsillo ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ amorsillo ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index 73b40ea111a..335ba4a4de1 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -40,9 +40,9 @@ in stdenv.mkDerivation rec { meta = { homepage = "https://github.com/bit-team/backintime"; description = "Simple backup tool for Linux"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; longDescription = '' Back In Time is a simple backup tool (on top of rsync) for Linux inspired from “flyback project” and “TimeVault”. The backup is diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix index 847e5c21da8..35e89c0d0a0 100644 --- a/pkgs/applications/networking/sync/casync/default.nix +++ b/pkgs/applications/networking/sync/casync/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation { }; buildInputs = [ acl curl xz zstd ] - ++ stdenv.lib.optionals (fuseSupport) [ fuse ] - ++ stdenv.lib.optionals (selinuxSupport) [ libselinux ] - ++ stdenv.lib.optionals (udevSupport) [ udev ]; + ++ lib.optionals (fuseSupport) [ fuse ] + ++ lib.optionals (selinuxSupport) [ libselinux ] + ++ lib.optionals (udevSupport) [ udev ]; nativeBuildInputs = [ meson ninja pkgconfig python3 sphinx ]; checkInputs = [ glibcLocales rsync ]; @@ -33,9 +33,9 @@ stdenv.mkDerivation { ''; PKG_CONFIG_UDEV_UDEVDIR = "lib/udev"; - mesonFlags = stdenv.lib.optionals (!fuseSupport) [ "-Dfuse=false" ] - ++ stdenv.lib.optionals (!udevSupport) [ "-Dudev=false" ] - ++ stdenv.lib.optionals (!selinuxSupport) [ "-Dselinux=false" ]; + mesonFlags = lib.optionals (!fuseSupport) [ "-Dfuse=false" ] + ++ lib.optionals (!udevSupport) [ "-Dudev=false" ] + ++ lib.optionals (!selinuxSupport) [ "-Dselinux=false" ]; doCheck = true; preCheck = '' diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 75c6e877a1f..7057e5cc2c5 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -26,7 +26,7 @@ buildGoModule rec { rcloneBin = if stdenv.buildPlatform == stdenv.hostPlatform then "$out" - else stdenv.lib.getBin buildPackages.rclone; + else lib.getBin buildPackages.rclone; in '' installManPage rclone.1 diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index f8fe9b66696..c50ea08510a 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -24,15 +24,15 @@ stdenv.mkDerivation rec { patchesSrc = base.upstreamPatchTarball; - srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc; - patches = stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff"; + srcs = [mainSrc] ++ lib.optional enableCopyDevicesPatch patchesSrc; + patches = lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff"; buildInputs = [libiconv zlib popt] - ++ stdenv.lib.optional enableACLs acl - ++ stdenv.lib.optional enableZstd zstd - ++ stdenv.lib.optional enableLZ4 lz4 - ++ stdenv.lib.optional enableOpenSSL openssl - ++ stdenv.lib.optional enableXXHash xxHash; + ++ lib.optional enableACLs acl + ++ lib.optional enableZstd zstd + ++ lib.optional enableLZ4 lz4 + ++ lib.optional enableOpenSSL openssl + ++ lib.optional enableXXHash xxHash; nativeBuildInputs = [perl]; configureFlags = [ @@ -48,13 +48,13 @@ stdenv.mkDerivation rec { # The following PR should fix the cross-compilation issue. # Test using `nix-build -A pkgsCross.aarch64-multiplatform.rsync`. # https://github.com/WayneD/rsync/commit/b7fab6f285ff0ff3816b109a8c3131b6ded0b484 - ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-simd=no" + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-simd=no" ; passthru.tests = { inherit (nixosTests) rsyncd; }; meta = base.meta // { description = "A fast incremental file transfer utility"; - maintainers = with stdenv.lib.maintainers; [ peti ehmry kampfschlaefer ]; + maintainers = with lib.maintainers; [ peti ehmry kampfschlaefer ]; }; } diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix index 2ec940d52a8..5a4c2600569 100644 --- a/pkgs/applications/networking/sync/rsync/rrsync.nix +++ b/pkgs/applications/networking/sync/rsync/rrsync.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = base.meta // { description = "A helper to run rsync-only environments from ssh-logins"; - maintainers = [ stdenv.lib.maintainers.kampfschlaefer ]; + maintainers = [ lib.maintainers.kampfschlaefer ]; }; } diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 36e80350926..86126e86169 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses, gnugrep +{lib, stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses, gnugrep , enableX11 ? true}: let inherit (ocamlPackages) ocaml lablgtk; in @@ -25,7 +25,7 @@ stdenv.mkDerivation (rec { makeFlags = [ "INSTALLDIR=$(out)/bin/" "UISTYLE=${if enableX11 then "gtk2" else "text"}" - ] ++ stdenv.lib.optional (!ocaml.nativeCompilers) "NATIVE=false"; + ] ++ lib.optional (!ocaml.nativeCompilers) "NATIVE=false"; preInstall = "mkdir -p $out/bin"; @@ -41,9 +41,9 @@ stdenv.mkDerivation (rec { meta = { homepage = "https://www.cis.upenn.edu/~bcpierce/unison/"; description = "Bidirectional file synchronizer"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; unix; }; }) diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index 7e523128545..b8e850211cd 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -9,7 +9,7 @@ , withDebug ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "znc"; @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { ++ optional withZlib zlib; configureFlags = [ - (stdenv.lib.enableFeature withPerl "perl") - (stdenv.lib.enableFeature withPython "python") - (stdenv.lib.enableFeature withTcl "tcl") - (stdenv.lib.withFeatureAs withTcl "tcl" "${tcl}/lib") - (stdenv.lib.enableFeature withCyrus "cyrus") + (lib.enableFeature withPerl "perl") + (lib.enableFeature withPython "python") + (lib.enableFeature withTcl "tcl") + (lib.withFeatureAs withTcl "tcl" "${tcl}/lib") + (lib.enableFeature withCyrus "cyrus") ] ++ optional (!withIPv6) [ "--disable-ipv6" ] ++ optional withDebug [ "--enable-debug" ]; diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index 964afa459f4..5edb777ac51 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -11,7 +11,7 @@ let buildInputs = znc.buildInputs; - meta = a.meta // { platforms = stdenv.lib.platforms.unix; }; + meta = a.meta // { platforms = lib.platforms.unix; }; passthru.module_name = module_name; }); @@ -93,7 +93,7 @@ in { meta = { description = "ZNC FiSH module"; homepage = "https://github.com/dctrwatson/znc-fish"; - maintainers = [ stdenv.lib.maintainers.offline ]; + maintainers = [ lib.maintainers.offline ]; }; }; @@ -190,8 +190,8 @@ in { meta = { description = "Push notification service module for ZNC"; homepage = "https://github.com/jreese/znc-push"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ offline schneefux ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ offline schneefux ]; }; }; diff --git a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix index 4a6bdd9d1e9..3802f2bada8 100644 --- a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix +++ b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper, unzip }: +{ lib, stdenv, fetchurl, jre, makeWrapper, unzip }: stdenv.mkDerivation rec { pname = "astrolabe-generator"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { --add-flags "-jar $out/share/java/AstrolabeGenerator-${version}.jar" ''; - meta = with stdenv.lib;{ + meta = with lib;{ homepage = "https://www.astrolabeproject.com"; description = "A Java-based tool for generating EPS files for constructing astrolabes and related tools"; license = licenses.gpl3; diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 340641917e4..cbdd29b418d 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu +{ lib, stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu , lua, libGLU, libGL, pkgconfig, perl, autoreconfHook }: @@ -67,9 +67,9 @@ stdenv.mkDerivation { meta = { description = "Free space simulation"; homepage = "https://celestia.space/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.peti ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index e84a542f1a6..2174d38d8b4 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2-x11 , pkgconfig , python3 , gfortran , lesstif +{ lib, stdenv, fetchurl, gtk2-x11 , pkgconfig , python3 , gfortran , lesstif , cfitsio , getopt , perl , groff , which, darwin, ncurses }: @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig groff perl getopt gfortran which ]; buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ] - ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]); + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]); patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks"); + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks"); configurePhase='' substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out @@ -62,9 +62,9 @@ stdenv.mkDerivation rec { few parts in C/C++ (mainly keyboard interaction, plotting, widgets).''; homepage = "http://www.iram.fr/IRAMFR/GILDAS/gildas.html"; - license = stdenv.lib.licenses.free; - maintainers = [ stdenv.lib.maintainers.bzizou stdenv.lib.maintainers.smaret ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.free; + maintainers = [ lib.maintainers.bzizou lib.maintainers.smaret ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index 0a98563ed0e..baf9ed7fc18 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }: +{ lib, stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }: stdenv.mkDerivation rec { name = "gravit-0.5.1"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://gravit.slowchop.com"; description = "Beautiful OpenGL-based gravity simulator"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; longDescription = '' Gravit is a gravity simulator which runs under Linux, Windows and @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { view in 3D and zoom in and out. ''; - platforms = stdenv.lib.platforms.mesaPlatforms; - hydraPlatforms = stdenv.lib.platforms.linux; # darwin times out + platforms = lib.platforms.mesaPlatforms; + hydraPlatforms = lib.platforms.linux; # darwin times out }; } diff --git a/pkgs/applications/science/astronomy/openspace/default.nix b/pkgs/applications/science/astronomy/openspace/default.nix index ca8651aa9e6..17c721ac869 100644 --- a/pkgs/applications/science/astronomy/openspace/default.nix +++ b/pkgs/applications/science/astronomy/openspace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, makeWrapper, cmake +{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, cmake , curl, boost, gdal, glew, soil , libX11, libXi, libXxf86vm, libXcursor, libXrandr, libXinerama }: @@ -83,8 +83,8 @@ stdenv.mkDerivation rec { WARNING: This build is not very usable for now. ''; homepage = "https://www.openspaceproject.com/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; broken = true; # fails to build }; } diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix index 63a1feab42f..305eb158d13 100644 --- a/pkgs/applications/science/astronomy/xplanet/default.nix +++ b/pkgs/applications/science/astronomy/xplanet/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }) ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = with lib; { description = "Renders an image of the earth or other planets into the X root window"; diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index 7aa41bdf6f0..bdcd82ed432 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ itk4 vtk_7 ] ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; + buildInputs = [ itk4 vtk_7 ] ++ lib.optional stdenv.isDarwin [ Cocoa ]; cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ]; diff --git a/pkgs/applications/science/biology/bayescan/default.nix b/pkgs/applications/science/biology/bayescan/default.nix index 7c4f198b842..043ee3ca52d 100644 --- a/pkgs/applications/science/biology/bayescan/default.nix +++ b/pkgs/applications/science/biology/bayescan/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ unzip ]; - buildInputs = stdenv.lib.optional stdenv.cc.isClang llvmPackages.openmp; + buildInputs = lib.optional stdenv.cc.isClang llvmPackages.openmp; # Disable FORTIFY_SOURCE or the binary fails with "buffer overflow" hardeningDisable = [ "fortify" ]; @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "http://cmpg.unibe.ch/software/BayeScan"; license = licenses.gpl3; maintainers = [ maintainers.bzizou ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix index ea4f55ba475..f147c0422e4 100644 --- a/pkgs/applications/science/biology/cmtk/default.nix +++ b/pkgs/applications/science/biology/cmtk/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = with lib; { description = "Computational Morphometry Toolkit "; diff --git a/pkgs/applications/science/biology/conglomerate/default.nix b/pkgs/applications/science/biology/conglomerate/default.nix index 592ab2cd663..fe1c1f5511d 100644 --- a/pkgs/applications/science/biology/conglomerate/default.nix +++ b/pkgs/applications/science/biology/conglomerate/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { postFixup = '' for p in $out/bin/*; do - wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${stdenv.lib.makeBinPath [ coreutils minc_tools ]}"; + wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${lib.makeBinPath [ coreutils minc_tools ]}"; done ''; diff --git a/pkgs/applications/science/biology/emboss/default.nix b/pkgs/applications/science/biology/emboss/default.nix index 2eeb17520f2..5cbcd46ee07 100644 --- a/pkgs/applications/science/biology/emboss/default.nix +++ b/pkgs/applications/science/biology/emboss/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, readline, perl, libharu, libX11, libpng, libXt, zlib}: +{lib, stdenv, fetchurl, readline, perl, libharu, libX11, libpng, libXt, zlib}: stdenv.mkDerivation { name = "emboss-6.6.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { user community, including libraries. The software automatically copes with data in a variety of formats and even allows transparent retrieval of sequence data from the web.''; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "http://emboss.sourceforge.net/"; }; } diff --git a/pkgs/applications/science/biology/iv/default.nix b/pkgs/applications/science/biology/iv/default.nix index 82fe3694008..72cf9c86e65 100644 --- a/pkgs/applications/science/biology/iv/default.nix +++ b/pkgs/applications/science/biology/iv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, neuron-version +{ lib, stdenv, fetchurl, neuron-version , libX11, libXext, patchelf }: @@ -15,15 +15,15 @@ stdenv.mkDerivation rec postInstall = '' for dir in $out/*; do # */ if [ -d $dir/lib ]; then - mv $dir/* $out # */ + mv $dir/* $out # */ rmdir $dir break fi done - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' patchelf --add-needed ${libX11}/lib/libX11.so $out/lib/libIVhines.so ''; - meta = with stdenv.lib; + meta = with lib; { description = "InterViews graphical library for Neuron"; license = licenses.bsd3; homepage = "http://www.neuron.yale.edu/neuron"; diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/applications/science/biology/messer-slim/default.nix index 876cc8ebaa7..687a2a985f2 100644 --- a/pkgs/applications/science/biology/messer-slim/default.nix +++ b/pkgs/applications/science/biology/messer-slim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, gcc, gcc-unwrapped }: +{ lib, stdenv, fetchurl, cmake, gcc, gcc-unwrapped }: stdenv.mkDerivation rec { version = "3.2.1"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "An evolutionary simulation framework"; homepage = "https://messerlab.org/slim/"; - license = with stdenv.lib.licenses; [ gpl3 ]; - maintainers = with stdenv.lib.maintainers; [ bzizou ]; - platforms = stdenv.lib.platforms.all; + license = with lib.licenses; [ gpl3 ]; + maintainers = with lib.maintainers; [ bzizou ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/science/biology/minc-widgets/default.nix b/pkgs/applications/science/biology/minc-widgets/default.nix index 3af227d70a5..e8aef4138b0 100644 --- a/pkgs/applications/science/biology/minc-widgets/default.nix +++ b/pkgs/applications/science/biology/minc-widgets/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { postFixup = '' for p in $out/bin/*; do - wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${stdenv.lib.makeBinPath [ coreutils minc_tools ]}"; + wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${lib.makeBinPath [ coreutils minc_tools ]}"; done ''; diff --git a/pkgs/applications/science/biology/muscle/default.nix b/pkgs/applications/science/biology/muscle/default.nix index e7c1040e593..f4f6d0c46e0 100644 --- a/pkgs/applications/science/biology/muscle/default.nix +++ b/pkgs/applications/science/biology/muscle/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.unode ]; # NOTE: Supposed to be compatible with darwin/intel & PPC but currently fails. # Anyone with access to these platforms is welcome to give it a try - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 048a9a5644d..3dbc39684c2 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -24,16 +24,16 @@ stdenv.mkDerivation rec { sha256 = "0f26v3qvzblcdjg7isq0m9j2q8q7x3vhmkfllv8lsr3gyj44lljf"; }; - patches = (stdenv.lib.optional (stdenv.isDarwin) [ ./neuron-carbon-disable.patch ]); + patches = (lib.optional (stdenv.isDarwin) [ ./neuron-carbon-disable.patch ]); # With LLVM 3.8 and above, clang (really libc++) gets upset if you attempt to redefine these... - postPatch = stdenv.lib.optionalString stdenv.cc.isClang '' + postPatch = lib.optionalString stdenv.cc.isClang '' substituteInPlace src/gnu/neuron_gnu_builtin.h \ --replace 'double abs(double arg);' "" \ --replace 'float abs(float arg);' "" \ --replace 'short abs(short arg);' "" \ --replace 'long abs(long arg);' "" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' # we are darwin, but we don't have all the quirks the source wants to compensate for substituteInPlace src/nrnpython/setup.py.in --replace 'readline="edit"' 'readline="readline"' for f in src/nrnpython/*.[ch] ; do @@ -51,14 +51,14 @@ stdenv.mkDerivation rec { export prefix="''${prefix} --exec-prefix=''${out}" ''; - configureFlags = with stdenv.lib; + configureFlags = with lib; [ "--with-readline=${readline}" "--with-iv=${iv}" ] ++ optionals (python != null) [ "--with-nrnpython=${python.interpreter}" ] ++ (if mpi != null then ["--with-mpi" "--with-paranrn"] else ["--without-mpi"]); - postInstall = stdenv.lib.optionals (python != null) [ '' + postInstall = lib.optionals (python != null) [ '' ## standardise python neuron install dir if any if [[ -d $out/lib/python ]]; then mkdir -p ''${out}/${python.sitePackages} diff --git a/pkgs/applications/science/biology/obitools/obitools3.nix b/pkgs/applications/science/biology/obitools/obitools3.nix index 7ecee60c4b1..55a9612c62d 100644 --- a/pkgs/applications/science/biology/obitools/obitools3.nix +++ b/pkgs/applications/science/biology/obitools/obitools3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages, cmake, python3 }: +{ lib, stdenv, fetchurl, python3Packages, cmake, python3 }: let pythonPackages = python3Packages; @@ -26,7 +26,7 @@ pythonPackages.buildPythonApplication rec { doCheck = true; - meta = with stdenv.lib ; { + meta = with lib ; { description = "Management of analyses and data in DNA metabarcoding"; homepage = "https://git.metabarcoding.org/obitools/obitools3"; license = licenses.cecill20; diff --git a/pkgs/applications/science/biology/plink-ng/default.nix b/pkgs/applications/science/biology/plink-ng/default.nix index 0a31ff6ba4f..26c3e7ba66b 100644 --- a/pkgs/applications/science/biology/plink-ng/default.nix +++ b/pkgs/applications/science/biology/plink-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, blas, lapack, darwin}: +{ lib, stdenv, fetchFromGitHub, zlib, blas, lapack, darwin}: stdenv.mkDerivation rec { pname = "plink-ng"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "A comprehensive update to the PLINK association analysis toolset"; homepage = "https://www.cog-genomics.org/plink2"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/biology/poretools/default.nix b/pkgs/applications/science/biology/poretools/default.nix index a9f3fdb2467..454843e2f32 100755 --- a/pkgs/applications/science/biology/poretools/default.nix +++ b/pkgs/applications/science/biology/poretools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pythonPackages, fetchFromGitHub }: +{ lib, stdenv, pythonPackages, fetchFromGitHub }: pythonPackages.buildPythonPackage rec { pname = "poretools"; @@ -15,8 +15,8 @@ pythonPackages.buildPythonPackage rec { meta = { description = "a toolkit for working with nanopore sequencing data from Oxford Nanopore"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; homepage = "https://poretools.readthedocs.io/en/latest/"; - maintainers = [stdenv.lib.maintainers.rybern]; + maintainers = [lib.maintainers.rybern]; }; } diff --git a/pkgs/applications/science/biology/quast/default.nix b/pkgs/applications/science/biology/quast/default.nix index e3c3ea23c2c..553fb1de539 100644 --- a/pkgs/applications/science/biology/quast/default.nix +++ b/pkgs/applications/science/biology/quast/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages, zlib, bash, coreutils }: +{ lib, stdenv, fetchurl, python3Packages, zlib, bash, coreutils }: let pythonPackages = python3Packages; @@ -48,7 +48,7 @@ pythonPackages.buildPythonApplication rec { # Tests need to download data files, so manual run after packaging is needed doCheck = false; - meta = with stdenv.lib ; { + meta = with lib ; { description = "Evaluates genome assemblies by computing various metrics"; homepage = "https://github.com/ablab/quast"; license = licenses.gpl2; diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix index e4019295ece..4f9b5aca1b2 100644 --- a/pkgs/applications/science/biology/raxml/default.nix +++ b/pkgs/applications/science/biology/raxml/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1jqjzhch0rips0vp04prvb8vmc20c5pdmsqn8knadcf91yy859fh"; }; - buildInputs = stdenv.lib.optionals mpi [ pkgs.openmpi ]; + buildInputs = lib.optionals mpi [ pkgs.openmpi ]; # TODO darwin, AVX and AVX2 makefile targets buildPhase = if mpi then '' diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index 7dd78ee2e63..20d9565bce4 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ncurses htslib ]; configureFlags = [ "--with-htslib=${htslib}" ] - ++ stdenv.lib.optional (ncurses == null) "--without-curses"; + ++ lib.optional (ncurses == null) "--without-curses"; preCheck = '' patchShebangs test/ diff --git a/pkgs/applications/science/biology/stacks/default.nix b/pkgs/applications/science/biology/stacks/default.nix index 12c86516242..c208d80d576 100644 --- a/pkgs/applications/science/biology/stacks/default.nix +++ b/pkgs/applications/science/biology/stacks/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, zlib }: - +{ lib, stdenv, fetchurl, zlib }: + stdenv.mkDerivation rec { pname = "stacks"; version = "2.53"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Software pipeline for building loci from short-read sequences"; homepage = "http://catchenlab.life.illinois.edu/stacks/"; - maintainers = [ stdenv.lib.maintainers.bzizou ]; - license = stdenv.lib.licenses.gpl3; + maintainers = [ lib.maintainers.bzizou ]; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index 96dea10333b..14ceb91b06c 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, libGLU, libGL, libX11, doxygen }: +{ lib, stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, libGLU, libGL, libX11, doxygen }: stdenv.mkDerivation rec { name = "avogadro-1.1.1"; @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { meta = { description = "Molecule editor and visualizer"; maintainers = [ ]; - platforms = stdenv.lib.platforms.mesaPlatforms; + platforms = lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index bdebfc72e47..8d9ea7a3917 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, pkg-config, fftw, file, +{ lib, stdenv, fetchurl, gtk2, pkg-config, fftw, file, pythonSupport ? false, pythonPackages ? null, gnome2 ? null, openexrSupport ? true, openexr ? null, @@ -40,10 +40,10 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz"; sha256 = "0z83p3ifdkv5dds8s6fqqbycql1zmgppdc7ygqmm12z5zlrl9p12"; }; - + nativeBuildInputs = [ pkg-config file ]; - - buildInputs = with stdenv.lib; + + buildInputs = with lib; [ gtk2 fftw ] ++ optional openglSupport gnome2.gtkglext ++ optional openexrSupport openexr ++ @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { optional libuniqueSupport libunique ++ optional libzipSupport libzip; - propagatedBuildInputs = with stdenv.lib; + propagatedBuildInputs = with lib; optionals pythonSupport [ pygtk pygobject2 python gnome2.gtksourceview ]; # This patch corrects problems with python support, but should apply cleanly @@ -79,8 +79,8 @@ stdenv.mkDerivation rec { analysis of profilometry data or thickness maps from imaging spectrophotometry. ''; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = [ stdenv.lib.maintainers.cge ]; + license = lib.licenses.gpl2; + platforms = with lib.platforms; linux ++ darwin; + maintainers = [ lib.maintainers.cge ]; }; } diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index ddab526ebe7..666731106ac 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, dpkg, makeWrapper, coreutils, gawk, gnugrep, gnused, jre }: +{ lib, stdenv, fetchurl, dpkg, makeWrapper, coreutils, gawk, gnugrep, gnused, jre }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "marvin"; diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix index 717ff1dba82..c7b1f901046 100644 --- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ fftw blas lapack gfortran ] - ++ (stdenv.lib.optionals (mpi != null) [ mpi ]); + ++ (lib.optionals (mpi != null) [ mpi ]); configureFlags = if (mpi != null) then [ "LD=${mpi}/bin/mpif90" ] else [ "LD=${gfortran}/bin/gfortran" ]; diff --git a/pkgs/applications/science/chemistry/siesta/default.nix b/pkgs/applications/science/chemistry/siesta/default.nix index cb4667adcab..0df953f7106 100644 --- a/pkgs/applications/science/chemistry/siesta/default.nix +++ b/pkgs/applications/science/chemistry/siesta/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { }; buildInputs = [ blas lapack gfortran ] - ++ (stdenv.lib.optionals (mpi != null) [ mpi scalapack ]); + ++ (lib.optionals (mpi != null) [ mpi scalapack ]); enableParallelBuilding = true; diff --git a/pkgs/applications/science/electronics/adms/default.nix b/pkgs/applications/science/electronics/adms/default.nix index 0fcf4d25e2d..7b7e2a1af63 100644 --- a/pkgs/applications/science/electronics/adms/default.nix +++ b/pkgs/applications/science/electronics/adms/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, flex, bison, gperf, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, flex, bison, gperf, libxml2, perl, perlPackages, gd }: stdenv.mkDerivation rec { @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "automatic device model synthesizer"; homepage = "https://github.com/Qucs/adms"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [disassembler]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [disassembler]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/science/electronics/archimedes/default.nix b/pkgs/applications/science/electronics/archimedes/default.nix index 1377231c152..731f2db56af 100644 --- a/pkgs/applications/science/electronics/archimedes/default.nix +++ b/pkgs/applications/science/electronics/archimedes/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "archimedes-2.0.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU package for semiconductor device simulations"; homepage = "https://www.gnu.org/software/archimedes"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix index 8aade9dd2c8..49415ea0484 100644 --- a/pkgs/applications/science/electronics/bitscope/common.nix +++ b/pkgs/applications/science/electronics/bitscope/common.nix @@ -15,7 +15,7 @@ let wrapBinary = libPaths: binaryName: '' wrapProgram "$out/bin/${binaryName}" \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath libPaths}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libPaths}" ''; pkg = stdenv.mkDerivation (rec { inherit (attrs) version src; diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index 5cf9ab1ae6f..14c654bd697 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }: +{ mkDerivation, lib, stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }: mkDerivation rec { pname = "caneda"; @@ -17,8 +17,8 @@ mkDerivation rec { meta = { description = "Open source EDA software focused on easy of use and portability"; homepage = "http://caneda.org"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 130146e0d9a..58873b8a770 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -5,7 +5,7 @@ }: let - libPath = stdenv.lib.makeLibraryPath + libPath = lib.makeLibraryPath [ libXrender libXrandr libXcursor libX11 libXext libXi libxcb libGL glib nss nspr expat alsaLib qtbase qtdeclarative qtsvg qtlocation qtwebchannel qtwebengine diff --git a/pkgs/applications/science/electronics/eagle/eagle7.nix b/pkgs/applications/science/electronics/eagle/eagle7.nix index d826d2d2c24..2804fc3c8d7 100644 --- a/pkgs/applications/science/electronics/eagle/eagle7.nix +++ b/pkgs/applications/science/electronics/eagle/eagle7.nix @@ -5,7 +5,7 @@ let - libPath = stdenv.lib.makeLibraryPath + libPath = lib.makeLibraryPath [ zlib freetype fontconfig openssl libXrender libXrandr libXcursor libX11 libXext libXi libxcb cups ]; diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index f8a0adea482..91d6f5e77ab 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchpatch, fetchFromGitHub, qmake, pkgconfig +{ mkDerivation, lib, stdenv, fetchpatch, fetchFromGitHub, qmake, pkgconfig , qtbase, qtsvg, qttools, qtserialport, boost, libgit2 }: @@ -79,8 +79,8 @@ mkDerivation rec { meta = { description = "An open source prototyping tool for Arduino-based projects"; homepage = "https://fritzing.org/"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.robberer ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.robberer ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index ad5e9e55c57..aeca4326756 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, gtk3, gperf, pkgconfig, bzip2, tcl, tk, wrapGAppsHook, judy, xz }: +{ lib, stdenv, fetchurl, glib, gtk3, gperf, pkgconfig, bzip2, tcl, tk, wrapGAppsHook, judy, xz }: stdenv.mkDerivation rec { pname = "gtkwave"; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { description = "VCD/Waveform viewer for Unix and Win32"; homepage = "http://gtkwave.sourceforge.net"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ thoughtpolice ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index 47f901c0ba5..c16f6bf122b 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja pkgconfig ]; buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog fmt graphviz wrapQtAppsHook ] ++ (with python3Packages; [ python pybind11 ]) - ++ stdenv.lib.optional stdenv.cc.isClang llvmPackages.openmp; + ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; - cmakeFlags = with stdenv.lib.versions; [ + cmakeFlags = with lib.versions; [ "-DHAL_VERSION_RETURN=${version}" "-DHAL_VERSION_MAJOR=${major version}" "-DHAL_VERSION_MINOR=${minor version}" diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 7f11f483a9d..c2da57d1833 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , cmake , libGLU @@ -43,11 +43,11 @@ , gtk3 }: -assert stdenv.lib.asserts.assertMsg (!(withOCE && stdenv.isAarch64)) "OCE fails a test on Aarch64"; -assert stdenv.lib.asserts.assertMsg (!(withOCC && withOCE)) +assert lib.asserts.assertMsg (!(withOCE && stdenv.isAarch64)) "OCE fails a test on Aarch64"; +assert lib.asserts.assertMsg (!(withOCC && withOCE)) "Only one of OCC and OCE may be enabled"; let - inherit (stdenv.lib) optional optionals; + inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "kicad-base"; @@ -140,7 +140,7 @@ stdenv.mkDerivation rec { the libraries are passed via an env var in the wrapper, default.nix ''; homepage = "https://www.kicad-pcb.org/"; - license = stdenv.lib.licenses.agpl3; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.agpl3; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 48a5779d207..88bb7978881 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , gnome3 , wxGTK30 @@ -70,13 +70,13 @@ # } assert withNgspice -> libngspice != null; -assert stdenv.lib.assertMsg (!ngspiceSupport) +assert lib.assertMsg (!ngspiceSupport) "`nspiceSupport` was renamed to `withNgspice` for the sake of consistency with other kicad nix arguments."; -assert stdenv.lib.assertMsg (!oceSupport) +assert lib.assertMsg (!oceSupport) "`oceSupport` was renamed to `withOCE` for the sake of consistency with other kicad nix arguments."; -assert stdenv.lib.assertMsg (!scriptingSupport) +assert lib.assertMsg (!scriptingSupport) "`scriptingSupport` was renamed to `withScripting` for the sake of consistency with other kicad nix arguments."; -assert stdenv.lib.assertMsg (!withOCCT) +assert lib.assertMsg (!withOCCT) "`withOCCT` was renamed to `withOCC` for the sake of consistency with upstream cmake options."; let baseName = if (stable) then "kicad" else "kicad-unstable"; @@ -151,7 +151,7 @@ let python = python3; wxPython = python.pkgs.wxPython_4_0; - inherit (stdenv.lib) concatStringsSep flatten optionalString optionals; + inherit (lib) concatStringsSep flatten optionalString optionals; in stdenv.mkDerivation rec { @@ -251,11 +251,11 @@ stdenv.mkDerivation rec { KiCad is an open source software suite for Electronic Design Automation. The Programs handle Schematic Capture, and PCB Layout with Gerber output. ''; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; # berce seems inactive... - maintainers = with stdenv.lib.maintainers; [ evils kiwi berce ]; + maintainers = with lib.maintainers; [ evils kiwi berce ]; # kicad is cross platform - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; # despite that, nipkgs' wxGTK for darwin is "wxmac" # and wxPython_4_0 does not account for this # adjusting this package to downgrade to python2Packages.wxPython (wxPython 3), diff --git a/pkgs/applications/science/electronics/kicad/libraries.nix b/pkgs/applications/science/electronics/kicad/libraries.nix index b045a7d1068..e98f2e49576 100644 --- a/pkgs/applications/science/electronics/kicad/libraries.nix +++ b/pkgs/applications/science/electronics/kicad/libraries.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , cmake , gettext , libSrc @@ -15,8 +15,8 @@ let nativeBuildInputs = [ cmake ]; meta = rec { - license = stdenv.lib.licenses.cc-by-sa-40; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.cc-by-sa-40; + platforms = lib.platforms.all; # the 3d models are a ~1 GiB download and occupy ~5 GiB in store. # this would exceed the hydra output limit hydraPlatforms = if (name == "packages3d") then [ ] else platforms; diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix index a50609e84a8..de79abc3e51 100644 --- a/pkgs/applications/science/electronics/qfsm/default.nix +++ b/pkgs/applications/science/electronics/qfsm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, cmake, graphviz, pkg-config }: +{ lib, stdenv, fetchurl, qt4, cmake, graphviz, pkg-config }: stdenv.mkDerivation rec { name = "qfsm-0.54.0"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Graphical editor for finite state machines"; homepage = "http://qfsm.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix index 9b143f1c3f1..a5f2cf394b4 100644 --- a/pkgs/applications/science/electronics/qucs/default.nix +++ b/pkgs/applications/science/electronics/qucs/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, flex, bison, qt4, libX11, cmake, gperf, adms }: +{lib, stdenv, fetchFromGitHub, flex, bison, qt4, libX11, cmake, gperf, adms }: stdenv.mkDerivation rec { version = "0.0.19"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { description = "Integrated circuit simulator"; homepage = "http://qucs.sourceforge.net"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index e6f91261603..9bb04a3189e 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, tcl, tk, libX11, glibc, which, yacc, flex, imake, xorgproto, gccmakedep }: +{ lib, stdenv, fetchurl, tcl, tk, libX11, glibc, which, yacc, flex, imake, xorgproto, gccmakedep }: let - libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc.dev}/include"; - libiconvLib = stdenv.lib.optionalString stdenv.isLinux "${glibc.out}/lib"; + libiconvInc = lib.optionalString stdenv.isLinux "${glibc.dev}/include"; + libiconvLib = lib.optionalString stdenv.isLinux "${glibc.out}/lib"; in stdenv.mkDerivation rec { name = "tkgate-1.8.7"; @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { meta = { description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor"; homepage = "http://www.tkgate.org/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.peti ]; - hydraPlatforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.peti ]; + hydraPlatforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index 081ca65f315..dd76e9364c5 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "steveicarus"; repo = pname; - rev = "v${stdenv.lib.replaceStrings ["."] ["_"] version}"; + rev = "v${lib.replaceStrings ["."] ["_"] version}"; sha256 = "0nzcyi6l2zv9wxzsv9i963p3igyjds0n55x0ph561mc3pfbc7aqp"; }; diff --git a/pkgs/applications/science/electronics/vhd2vl/default.nix b/pkgs/applications/science/electronics/vhd2vl/default.nix index 4014f53f649..adce3055107 100644 --- a/pkgs/applications/science/electronics/vhd2vl/default.nix +++ b/pkgs/applications/science/electronics/vhd2vl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "17va2pil4938j8c93anhy45zzgnvq3k71a7glj02synfrsv6fs8n"; }; - patches = stdenv.lib.optionals (!stdenv.isAarch64) [ + patches = lib.optionals (!stdenv.isAarch64) [ # fix build with verilog 11.0 - https://github.com/ldoolitt/vhd2vl/pull/15 # for some strange reason, this is not needed for aarch64 (fetchpatch { diff --git a/pkgs/applications/science/electronics/xcircuit/default.nix b/pkgs/applications/science/electronics/xcircuit/default.nix index d7bdf5c67c0..013f5a098bc 100644 --- a/pkgs/applications/science/electronics/xcircuit/default.nix +++ b/pkgs/applications/science/electronics/xcircuit/default.nix @@ -4,7 +4,7 @@ let version = "3.10.12"; name = "xcircuit-${version}"; - inherit (stdenv.lib) getBin; + inherit (lib) getBin; in stdenv.mkDerivation { inherit name version; diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/applications/science/electronics/xoscope/default.nix index f8a68f31f46..26fbadc6159 100644 --- a/pkgs/applications/science/electronics/xoscope/default.nix +++ b/pkgs/applications/science/electronics/xoscope/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk2, pkgconfig}: +{lib, stdenv, fetchurl, gtk2, pkgconfig}: stdenv.mkDerivation rec { name = "xoscope-2.0"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "Oscilloscope through the sound card"; homepage = "http://xoscope.sourceforge.net"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/science/geometry/tetgen/1.4.nix b/pkgs/applications/science/geometry/tetgen/1.4.nix index 9dd25473683..245d4c12bfe 100644 --- a/pkgs/applications/science/geometry/tetgen/1.4.nix +++ b/pkgs/applications/science/geometry/tetgen/1.4.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "tetgen-1.4.3"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator"; homepage = "http://tetgen.org/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix index d12e8e35844..c921c05c58e 100644 --- a/pkgs/applications/science/geometry/tetgen/default.nix +++ b/pkgs/applications/science/geometry/tetgen/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: let version = "1.5.1"; in stdenv.mkDerivation { @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit version; description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator"; homepage = "http://tetgen.org/"; - license = stdenv.lib.licenses.agpl3Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.agpl3Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix index 3d9a2e9bd67..14ceb53f9bb 100644 --- a/pkgs/applications/science/logic/abella/default.nix +++ b/pkgs/applications/science/logic/abella/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rsync, ocamlPackages }: +{ lib, stdenv, fetchurl, rsync, ocamlPackages }: stdenv.mkDerivation rec { pname = "abella"; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { objects with binding. ''; homepage = "http://abella-prover.org/"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ bcdarwin ciil ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ bcdarwin ciil ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/science/logic/aiger/default.nix b/pkgs/applications/science/logic/aiger/default.nix index aa5a59ed298..15c45466b13 100644 --- a/pkgs/applications/science/logic/aiger/default.nix +++ b/pkgs/applications/science/logic/aiger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, picosat }: +{ lib, stdenv, fetchurl, picosat }: stdenv.mkDerivation rec { pname = "aiger"; @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { meta = { description = "And-Inverter Graph (AIG) utilities"; homepage = "http://fmv.jku.at/aiger/"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ thoughtpolice ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix index 6f8120c7b8e..fe2f30a55a3 100644 --- a/pkgs/applications/science/logic/avy/default.nix +++ b/pkgs/applications/science/logic/avy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, zlib, boost }: +{ lib, stdenv, fetchgit, cmake, zlib, boost }: stdenv.mkDerivation rec { pname = "avy"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib boost.out boost.dev ]; NIX_CFLAGS_COMPILE = toString ([ "-Wno-narrowing" ] # Squelch endless stream of warnings on same few things - ++ stdenv.lib.optionals stdenv.cc.isClang [ + ++ lib.optionals stdenv.cc.isClang [ "-Wno-empty-body" "-Wno-tautological-compare" "-Wc++11-compat-deprecated-writable-strings" @@ -40,9 +40,9 @@ stdenv.mkDerivation rec { meta = { description = "AIGER model checking for Property Directed Reachability"; homepage = "https://arieg.bitbucket.io/avy/"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ thoughtpolice ]; + platforms = lib.platforms.linux; # See pkgs/applications/science/logic/glucose/default.nix # (The error is different due to glucose-fenv.patch, but the same) badPlatforms = [ "aarch64-linux" ]; diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index 2898ce4e1f6..6916379bdea 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { in # tests modelgen and modelgensmt2 spawn boolector in another processes and # macOS strips DYLD_LIBRARY_PATH, hardcode it for testing - stdenv.lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.isDarwin '' cp -r bin bin.back install_name_tool -change libboolector.dylib $(pwd)/lib/libboolector.dylib bin/boolector '' + '' @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { patchShebangs .. ''; - postCheck = stdenv.lib.optionalString stdenv.isDarwin '' + postCheck = lib.optionalString stdenv.isDarwin '' rm -rf bin mv bin.back bin ''; diff --git a/pkgs/applications/science/logic/btor2tools/default.nix b/pkgs/applications/science/logic/btor2tools/default.nix index 355274d1e1c..992d8b1de58 100644 --- a/pkgs/applications/science/logic/btor2tools/default.nix +++ b/pkgs/applications/science/logic/btor2tools/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0mfqmkgvyw8fa2c09kww107dmk180ch1hp98r5kv41vnc04iqb0s"; }; - nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; installPhase = '' mkdir -p $out $dev/include/btor2parser/ $lib/lib diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index fae17a5e09f..54842dd4769 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -49,7 +49,7 @@ let args.version; version = fetched.version; coq-version = args.coq-version or (if version != "dev" then versions.majorMinor version else "dev"); - versionAtLeast = v: (coq-version == "dev") || (stdenv.lib.versionAtLeast coq-version v); + versionAtLeast = v: (coq-version == "dev") || (lib.versionAtLeast coq-version v); ideFlags = optionalString (buildIde && !versionAtLeast "8.10") "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt"; csdpPatch = if csdp != null then '' diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/applications/science/logic/cryptoverif/default.nix index 78861786def..4c9ce3e9595 100644 --- a/pkgs/applications/science/logic/cryptoverif/default.nix +++ b/pkgs/applications/science/logic/cryptoverif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml }: +{ lib, stdenv, fetchurl, ocaml }: stdenv.mkDerivation rec { pname = "cryptoverif"; @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { meta = { description = "Cryptographic protocol verifier in the computational model"; homepage = "https://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/"; - license = stdenv.lib.licenses.cecill-b; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.cecill-b; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/applications/science/logic/ekrhyper/default.nix b/pkgs/applications/science/logic/ekrhyper/default.nix index e1eb9a2dcc3..38cc0f06088 100644 --- a/pkgs/applications/science/logic/ekrhyper/default.nix +++ b/pkgs/applications/science/logic/ekrhyper/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, perl}: +{lib, stdenv, fetchurl, ocaml, perl}: let s = # Generated upstream information rec { @@ -25,8 +25,8 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = "Automated first-order theorem prover"; - license = stdenv.lib.licenses.gpl2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/logic/gappa/default.nix b/pkgs/applications/science/logic/gappa/default.nix index 2ca1bcd3098..73f34f60fc4 100644 --- a/pkgs/applications/science/logic/gappa/default.nix +++ b/pkgs/applications/science/logic/gappa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp, mpfr, boost }: +{ lib, stdenv, fetchurl, gmp, mpfr, boost }: stdenv.mkDerivation { name = "gappa-1.3.5"; @@ -16,8 +16,8 @@ stdenv.mkDerivation { meta = { homepage = "http://gappa.gforge.inria.fr/"; description = "Verifying and formally proving properties on numerical programs dealing with floating-point or fixed-point arithmetic"; - license = with stdenv.lib.licenses; [ cecill20 gpl2 ]; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; - platforms = stdenv.lib.platforms.all; + license = with lib.licenses; [ cecill20 gpl2 ]; + maintainers = with lib.maintainers; [ vbgl ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 9472d4b9b29..6c22c949483 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl polyml z3 ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ nettools java ]; + ++ lib.optionals (!stdenv.isDarwin) [ nettools java ]; sourceRoot = dirname; diff --git a/pkgs/applications/science/logic/jonprl/default.nix b/pkgs/applications/science/logic/jonprl/default.nix index 3ee05a478bc..379a9a48354 100644 --- a/pkgs/applications/science/logic/jonprl/default.nix +++ b/pkgs/applications/science/logic/jonprl/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, stdenv, smlnj, which }: +{ fetchgit, lib, stdenv, smlnj, which }: stdenv.mkDerivation rec { pname = "jonprl"; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { Inspired by Nuprl ''; homepage = "https://github.com/jonsterling/JonPRL"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ puffnfresh ]; + platforms = lib.platforms.linux; broken = true; }; } diff --git a/pkgs/applications/science/logic/lci/default.nix b/pkgs/applications/science/logic/lci/default.nix index 4775384a3dd..a0897135fbb 100644 --- a/pkgs/applications/science/logic/lci/default.nix +++ b/pkgs/applications/science/logic/lci/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, readline}: +{lib, stdenv, fetchurl, readline}: stdenv.mkDerivation rec { version = "0.6"; pname = "lci"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { buildInputs = [readline]; meta = { description = ''Lambda calculus interpreter''; - maintainers = with stdenv.lib.maintainers; [raskin]; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.gpl3; + maintainers = with lib.maintainers; [raskin]; + platforms = with lib.platforms; linux; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 5bf33a8a359..53423549a72 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { postPatch = "patchShebangs ."; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' substituteInPlace $out/bin/leanpkg \ --replace "greadlink" "${coreutils}/bin/readlink" ''; diff --git a/pkgs/applications/science/logic/leo3/binary.nix b/pkgs/applications/science/logic/leo3/binary.nix index 29a9adf94c4..dda18c49b72 100644 --- a/pkgs/applications/science/logic/leo3/binary.nix +++ b/pkgs/applications/science/logic/leo3/binary.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openjdk, runtimeShell}: +{lib, stdenv, fetchurl, openjdk, runtimeShell}: stdenv.mkDerivation rec { pname = "leo3"; version = "1.2"; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "An automated theorem prover for classical higher-order logic with choice"; - license = stdenv.lib.licenses.bsd3; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd3; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://page.mi.fu-berlin.de/lex/leo3/"; }; } diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix index ce86b252311..1ca22cf769c 100644 --- a/pkgs/applications/science/logic/logisim/default.nix +++ b/pkgs/applications/science/logic/logisim/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper }: let version = "2.7.1"; in stdenv.mkDerivation { pname = "logisim"; inherit version; - + src = fetchurl { url = "mirror://sourceforge/project/circuit/2.7.x/${version}/logisim-generic-${version}.jar"; sha256 = "1hkvc9zc7qmvjbl9579p84hw3n8wl3275246xlzj136i5b0phain"; }; - + phases = [ "installPhase" ]; nativeBuildInputs = [makeWrapper]; @@ -19,11 +19,11 @@ stdenv.mkDerivation { mkdir -pv $out/bin makeWrapper ${jre}/bin/java $out/bin/logisim --add-flags "-jar $src" ''; - + meta = { homepage = "http://ozark.hendrix.edu/~burch/logisim"; description = "Educational tool for designing and simulating digital logic circuits"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/science/logic/ltl2ba/default.nix b/pkgs/applications/science/logic/ltl2ba/default.nix index b5d13db3b9a..30c13c6036f 100644 --- a/pkgs/applications/science/logic/ltl2ba/default.nix +++ b/pkgs/applications/science/logic/ltl2ba/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, lib, stdenv }: stdenv.mkDerivation rec { pname = "ltl2ba"; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "Fast translation from LTL formulae to Buchi automata"; homepage = "http://www.lsv.ens-cachan.fr/~gastin/ltl2ba"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.darwin ++ lib.platforms.linux; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/applications/science/logic/mcy/default.nix b/pkgs/applications/science/logic/mcy/default.nix index eba910e07eb..dc1094f3e27 100644 --- a/pkgs/applications/science/logic/mcy/default.nix +++ b/pkgs/applications/science/logic/mcy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , yosys, symbiyosys, python3 }: @@ -44,8 +44,8 @@ stdenv.mkDerivation { meta = { description = "Mutation-based coverage testing for hardware designs, with Yosys"; homepage = "https://github.com/YosysHQ/mcy"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ thoughtpolice ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix index 19fba6e2993..259cdcea443 100644 --- a/pkgs/applications/science/logic/monosat/default.nix +++ b/pkgs/applications/science/logic/monosat/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchpatch, fetchFromGitHub, cmake, zlib, gmp, jdk8, +{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, zlib, gmp, jdk8, # The JDK we use on Darwin currenly makes extensive use of rpaths which are # annoying and break the python library, so let's not bother for now includeJava ? !stdenv.hostPlatform.isDarwin, includeGplCode ? true }: -with stdenv.lib; +with lib; let boolToCmake = x: if x then "ON" else "OFF"; diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index 15a9fa5ccab..3542dab9382 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, ocaml, opaline }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, ocaml, opaline }: stdenv.mkDerivation rec { pname = "ott"; @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { target-system terms. ''; homepage = "http://www.cl.cam.ac.uk/~pes20/ott"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ jwiegley ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jwiegley ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/science/logic/otter/default.nix b/pkgs/applications/science/logic/otter/default.nix index a7eec20548c..2ad066e53f7 100644 --- a/pkgs/applications/science/logic/otter/default.nix +++ b/pkgs/applications/science/logic/otter/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, tcsh, libXaw, libXt, libX11}: +{lib, stdenv, fetchurl, tcsh, libXaw, libXt, libX11}: let s = # Generated upstream information rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation { find . -perm -0100 -type f | xargs sed -i -e "s@/bin/rm@$(type -P rm)@g" find . -perm -0100 -type f | xargs sed -i -e "s@/bin/mv@$(type -P mv)@g" - sed -i -e "s/^XLIBS *=.*/XLIBS=-lXaw -lXt -lX11/" source/formed/Makefile + sed -i -e "s/^XLIBS *=.*/XLIBS=-lXaw -lXt -lX11/" source/formed/Makefile make all make -C examples all @@ -45,9 +45,9 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = "A reliable first-order theorem prover"; - license = stdenv.lib.licenses.publicDomain ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.publicDomain ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; broken = true; }; } diff --git a/pkgs/applications/science/logic/petrinizer/default.nix b/pkgs/applications/science/logic/petrinizer/default.nix index d277e0e1521..5118795978d 100644 --- a/pkgs/applications/science/logic/petrinizer/default.nix +++ b/pkgs/applications/science/logic/petrinizer/default.nix @@ -1,6 +1,6 @@ { mkDerivation, callPackage, buildPackages , async, base, bytestring, containers, fetchFromGitLab, mtl -, parallel-io, parsec, stdenv, stm, transformers +, parallel-io, parsec, lib, stdenv, stm, transformers }: let z3 = callPackage ./z3.nix { gomp = null; z3 = buildPackages.z3; }; @@ -26,6 +26,6 @@ mkDerivation rec { transformers ]; description = "Safety and Liveness Analysis of Petri Nets with SMT solvers"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ raskin ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ raskin ]; } diff --git a/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix b/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix index ed10e9f3db1..96e216417df 100644 --- a/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix +++ b/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix @@ -1,7 +1,7 @@ { mkDerivation, array, async, base, bytestring, containers , crackNum, deepseq, directory, doctest, filepath, generic-deriving , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random -, stdenv, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck +, lib, stdenv, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck , template-haskell, time, z3 }: mkDerivation { @@ -22,5 +22,5 @@ mkDerivation { testSystemDepends = [ z3 ]; homepage = "http://leventerkok.github.com/sbv/"; description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; } diff --git a/pkgs/applications/science/logic/petrinizer/z3.nix b/pkgs/applications/science/logic/petrinizer/z3.nix index 4d868054c09..3574954c376 100644 --- a/pkgs/applications/science/logic/petrinizer/z3.nix +++ b/pkgs/applications/science/logic/petrinizer/z3.nix @@ -1,5 +1,5 @@ { mkDerivation, fetchpatch -, base, containers, gomp, hspec, QuickCheck, stdenv +, base, containers, gomp, hspec, QuickCheck, lib, stdenv , transformers, z3 }: mkDerivation { @@ -13,7 +13,7 @@ mkDerivation { testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/IagoAbal/haskell-z3"; description = "Bindings for the Z3 Theorem Prover"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; doCheck = false; patches = [ (fetchpatch { diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix index b13d871580c..48def5fc2e4 100644 --- a/pkgs/applications/science/logic/picosat/default.nix +++ b/pkgs/applications/science/logic/picosat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "picosat"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configurePhase = "./configure.sh --shared --trace"; - makeFlags = stdenv.lib.optional stdenv.isDarwin + makeFlags = lib.optional stdenv.isDarwin "SONAME=-Wl,-install_name,$(out)/lib/libpicosat.so"; installPhase = '' @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { meta = { description = "SAT solver with proof and core support"; homepage = "http://fmv.jku.at/picosat/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ roconnor thoughtpolice ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ roconnor thoughtpolice ]; }; } diff --git a/pkgs/applications/science/logic/potassco/clingcon.nix b/pkgs/applications/science/logic/potassco/clingcon.nix index b74583ca1a2..4d64a813e62 100644 --- a/pkgs/applications/science/logic/potassco/clingcon.nix +++ b/pkgs/applications/science/logic/potassco/clingcon.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , bison @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "Extension of clingo to handle constraints over integers"; - license = stdenv.lib.licenses.gpl3; # for now GPL3, next version MIT! - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; # for now GPL3, next version MIT! + platforms = lib.platforms.unix; homepage = "https://potassco.org/"; downloadPage = "https://github.com/potassco/clingcon/releases/"; changelog = "https://github.com/potassco/clingcon/releases/tag/v${version}"; diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix index fd6b2c8d14c..f473c4f5366 100644 --- a/pkgs/applications/science/logic/potassco/clingo.nix +++ b/pkgs/applications/science/logic/potassco/clingo.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, cmake }: +{ lib, stdenv, fetchzip, cmake }: stdenv.mkDerivation rec { pname = "clingo"; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "ASP system to ground and solve logic programs"; - license = stdenv.lib.licenses.mit; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; homepage = "https://potassco.org/"; downloadPage = "https://github.com/potassco/clingo/releases/"; }; diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix index fcdff855848..7fedca72b69 100644 --- a/pkgs/applications/science/logic/prover9/default.nix +++ b/pkgs/applications/science/logic/prover9/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "prover9-2009-11a"; @@ -39,7 +39,7 @@ stdenv.mkDerivation { for first-order and equational logic. Prover9 is a successor of the Otter Prover. This is the LADR command-line version. ''; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; maintainers = []; }; } diff --git a/pkgs/applications/science/logic/proverif/default.nix b/pkgs/applications/science/logic/proverif/default.nix index 4242bb0599e..ba46d87581e 100644 --- a/pkgs/applications/science/logic/proverif/default.nix +++ b/pkgs/applications/science/logic/proverif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocamlPackages }: +{ lib, stdenv, fetchurl, ocamlPackages }: stdenv.mkDerivation rec { pname = "proverif"; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { description = "Cryptographic protocol verifier in the Dolev-Yao model"; homepage = "https://prosecco.gforge.inria.fr/personal/bblanche/proverif/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/applications/science/logic/redprl/default.nix b/pkgs/applications/science/logic/redprl/default.nix index 49245c73f2c..43a2ec7e97e 100644 --- a/pkgs/applications/science/logic/redprl/default.nix +++ b/pkgs/applications/science/logic/redprl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, mlton }: +{ lib, stdenv, fetchgit, mlton }: stdenv.mkDerivation { name = "redprl-2017-03-28"; src = fetchgit { @@ -21,8 +21,8 @@ stdenv.mkDerivation { meta = { description = "A proof assistant for Nominal Computational Type Theory"; homepage = "http://www.redprl.org/"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.acowley ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.acowley ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/science/logic/sad/default.nix b/pkgs/applications/science/logic/sad/default.nix index 77613a13571..8e4d19973ef 100644 --- a/pkgs/applications/science/logic/sad/default.nix +++ b/pkgs/applications/science/logic/sad/default.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation { The system for automated deduction is intended for automated processing of formal mathematical texts written in a special language called ForTheL (FORmal THEory Language) or in a traditional first-order language ''; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.schmitthenner ]; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.schmitthenner ]; homepage = "http://nevidal.org/sad.en.html"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; broken = true; # ghc-8.4.4 is gone from Nixpkgs }; } diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index 6c2b03b5b37..02d9408383a 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, zlib, which, eprover, makeWrapper, coq}: +{lib, stdenv, fetchurl, ocaml, zlib, which, eprover, makeWrapper, coq}: stdenv.mkDerivation rec { pname = "satallax"; version = "2.7"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/libexec/satallax" cp picosat-*/picosat picosat-*/picomus "$out/libexec/satallax" - ( + ( cd minisat export MROOT=$PWD cd core @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/doc/satallax" "$out/bin" "$out/lib" "$out/lib/satallax" cp bin/satallax.opt "$out/bin/satallax" wrapProgram "$out/bin/satallax" \ - --suffix PATH : "${stdenv.lib.makeBinPath [ coq eprover ]}:$out/libexec/satallax" \ + --suffix PATH : "${lib.makeBinPath [ coq eprover ]}:$out/libexec/satallax" \ --add-flags "-M" --add-flags "$out/lib/satallax/modes" cp LICENSE README "$out/share/doc/satallax" @@ -61,9 +61,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = ''Automated theorem prover for higher-order logic''; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; downloadPage = "http://www.ps.uni-saarland.de/~cebrown/satallax/downloads.php"; homepage = "http://www.ps.uni-saarland.de/~cebrown/satallax/index.php"; updateWalker = true; diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix index 71b26f8023a..1dd6dc1cfc8 100644 --- a/pkgs/applications/science/logic/saw-tools/default.nix +++ b/pkgs/applications/science/logic/saw-tools/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, gmp4, ncurses, zlib, clang }: +{ lib, stdenv, fetchurl, gmp4, ncurses, zlib, clang }: let - libPath = stdenv.lib.makeLibraryPath + libPath = lib.makeLibraryPath [ stdenv.cc.libc stdenv.cc.cc gmp4 @@ -53,8 +53,8 @@ stdenv.mkDerivation { meta = { description = "Tools for software verification and analysis"; homepage = "https://saw.galois.com"; - license = stdenv.lib.licenses.unfreeRedistributable; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.unfreeRedistributable; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/applications/science/logic/statverif/default.nix b/pkgs/applications/science/logic/statverif/default.nix index e0efb28819d..07365eef33f 100644 --- a/pkgs/applications/science/logic/statverif/default.nix +++ b/pkgs/applications/science/logic/statverif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml }: +{ lib, stdenv, fetchurl, ocaml }: stdenv.mkDerivation rec { pname = "statverif"; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { meta = { description = "Verification of stateful processes (via Proverif)"; homepage = "https://markryan.eu/research/statverif/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index 9cf8b0845d4..1f2ad4634de 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , bash, python3, yosys , yices, boolector, z3, aiger }: @@ -51,8 +51,8 @@ stdenv.mkDerivation { meta = { description = "Tooling for Yosys-based verification flows"; homepage = "https://symbiyosys.readthedocs.io/"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice emily ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ thoughtpolice emily ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix index 14944f5e19b..c4ba334b85f 100644 --- a/pkgs/applications/science/logic/tlaplus/default.nix +++ b/pkgs/applications/science/logic/tlaplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub, makeWrapper , adoptopenjdk-bin, jre, ant }: @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { meta = { description = "An algorithm specification language with model checking tools"; homepage = "http://lamport.azurewebsites.net/tla/tla.html"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/applications/science/logic/tlaplus/tlaps.nix b/pkgs/applications/science/logic/tlaplus/tlaps.nix index 3872d3a9826..89bdd979fea 100644 --- a/pkgs/applications/science/logic/tlaplus/tlaps.nix +++ b/pkgs/applications/science/logic/tlaplus/tlaps.nix @@ -1,5 +1,5 @@ { fetchurl -, stdenv +, lib, stdenv , ocaml, isabelle, cvc3, perl, wget, which }: @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { consistent abstraction over the various “backend” verifiers. ''; homepage = "https://tla.msr-inria.inria.fr/tlaps/content/Home.html"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd2; + platforms = lib.platforms.unix; maintainers = [ ]; }; diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index c9e97375b6c..1c33d923289 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -75,7 +75,7 @@ in stdenv.mkDerivation { ''; # http://lamport.azurewebsites.net/tla/license.html license = with lib.licenses; [ mit ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/applications/science/logic/twelf/default.nix index 975b989bd94..73fe423673b 100644 --- a/pkgs/applications/science/logic/twelf/default.nix +++ b/pkgs/applications/science/logic/twelf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, smlnj, rsync }: +{ lib, stdenv, fetchurl, pkgconfig, smlnj, rsync }: stdenv.mkDerivation rec { pname = "twelf"; @@ -44,8 +44,8 @@ stdenv.mkDerivation rec { Standard ML. ''; homepage = "http://twelf.org/wiki/Main_Page"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ jwiegley ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jwiegley ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index 49618d2586b..2d625a1c1b2 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, gtk2, gdk-pixbuf, atk, pango, glib, cairo, freetype +{ lib, stdenv, fetchurl, gtk2, gdk-pixbuf, atk, pango, glib, cairo, freetype , fontconfig, libxml2, gnome2 }: let - libPath = stdenv.lib.makeLibraryPath + libPath = lib.makeLibraryPath [ stdenv.cc.libc stdenv.cc.cc gtk2 gdk-pixbuf atk pango glib cairo freetype fontconfig libxml2 gnome2.gtksourceview ] + ":${stdenv.cc.cc.lib}/lib64:$out/libexec"; @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { meta = { description = "Verification for C and Java programs via separation logic"; homepage = "http://people.cs.kuleuven.be/~bart.jacobs/verifast/"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; platforms = [ "x86_64-linux" ]; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix index 9ce6592d998..cb0d668f536 100644 --- a/pkgs/applications/science/logic/workcraft/default.nix +++ b/pkgs/applications/science/logic/workcraft/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { pname = "workcraft"; @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://workcraft.org/"; description = "Framework for interpreted graph modeling, verification and synthesis"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ timor ]; + platforms = lib.platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ timor ]; inherit version; }; } diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index a01a07b8954..67009657363 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # Includes a fix for the embedded soname being libyices.so.2.5, but # only installing the libyices.so.2.5.x file. installPhase = let - ver_XdotY = stdenv.lib.versions.majorMinor version; + ver_XdotY = lib.versions.majorMinor version; in '' make install LDCONFIG=true ln -sfr $out/lib/libyices.so.{${version},${ver_XdotY}} diff --git a/pkgs/applications/science/logic/z3/4.4.0.nix b/pkgs/applications/science/logic/z3/4.4.0.nix index a5388572db6..9b7dabeb720 100644 --- a/pkgs/applications/science/logic/z3/4.4.0.nix +++ b/pkgs/applications/science/logic/z3/4.4.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python }: +{ lib, stdenv, fetchFromGitHub, python }: stdenv.mkDerivation rec { name = "z3-${version}"; @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { meta = { description = "A high-performance theorem prover and SMT solver"; homepage = "https://github.com/Z3Prover/z3"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.x86_64; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ttuegel ]; + license = lib.licenses.mit; + platforms = lib.platforms.x86_64; + maintainers = with lib.maintainers; [ thoughtpolice ttuegel ]; }; } diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 48512eff530..cd58740186f 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, fixDarwinDylibNames +{ lib, stdenv, fetchFromGitHub, python, fixDarwinDylibNames , javaBindings ? false , ocamlBindings ? false , pythonBindings ? true @@ -9,7 +9,7 @@ assert javaBindings -> jdk != null; assert ocamlBindings -> ocaml != null && findlib != null && zarith != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "z3"; @@ -59,8 +59,8 @@ stdenv.mkDerivation rec { meta = { description = "A high-performance theorem prover and SMT solver"; homepage = "https://github.com/Z3Prover/z3"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ttuegel ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ thoughtpolice ttuegel ]; }; } diff --git a/pkgs/applications/science/logic/z3/tptp.nix b/pkgs/applications/science/logic/z3/tptp.nix index 34449542abb..c63fad93f07 100644 --- a/pkgs/applications/science/logic/z3/tptp.nix +++ b/pkgs/applications/science/logic/z3/tptp.nix @@ -1,4 +1,4 @@ -{stdenv, z3, cmake}: +{lib, stdenv, z3, cmake}: stdenv.mkDerivation rec { pname = "z3-tptp"; version = z3.version; @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { inherit version; inherit (z3.meta) license homepage platforms; description = ''TPTP wrapper for Z3 prover''; - maintainers = [stdenv.lib.maintainers.raskin]; + maintainers = [lib.maintainers.raskin]; }; } diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/applications/science/machine-learning/sc2-headless/default.nix index 7bcc915daec..9438cd972f9 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/default.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/default.nix @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { ''; meta = { - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; description = "Starcraft II headless linux client for machine learning research"; license = { fullName = "BLIZZARD® STARCRAFT® II AI AND MACHINE LEARNING LICENSE"; diff --git a/pkgs/applications/science/math/LiE/default.nix b/pkgs/applications/science/math/LiE/default.nix index f5f3bb0a42b..9b16fc1d67f 100644 --- a/pkgs/applications/science/math/LiE/default.nix +++ b/pkgs/applications/science/math/LiE/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , bison, readline }: stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { description = "A Computer algebra package for Lie group computations"; homepage = "http://wwwmathlabo.univ-poitiers.fr/~maavl/LiE/"; - license = stdenv.lib.licenses.lgpl3; # see the website + license = lib.licenses.lgpl3; # see the website longDescription = '' LiE is a computer algebra system that is specialised in computations @@ -19,7 +19,7 @@ stdenv.mkDerivation { characteristics, we refer to the following sources of information. ''; # take from the website - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; maintainers = [ ]; # this package is probably not going to change anyway }; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 2191511a9c5..d9fbc626e00 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -25,14 +25,14 @@ stdenv.mkDerivation rec { bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses pango pcre2 perl readline texLive xz zlib less texinfo graphviz icu pkgconfig bison imake which blas lapack curl tcl tk jdk - ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; + ] ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; patches = [ ./no-usr-local-search-paths.patch ./fix-failing-test.patch ]; - prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace "-install_name libR.dylib" "-install_name $out/lib/R/lib/libR.dylib" ''; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { preConfigure = '' configureFlagsArray=( --disable-lto - --with${stdenv.lib.optionalString (!withRecommendedPackages) "out"}-recommended-packages + --with${lib.optionalString (!withRecommendedPackages) "out"}-recommended-packages --with-blas="-L${blas}/lib -lblas" --with-lapack="-L${lapack}/lib -llapack" --with-readline @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { --with-jpeglib --with-libtiff --with-ICU - ${stdenv.lib.optionalString enableStrictBarrier "--enable-strict-barrier"} + ${lib.optionalString enableStrictBarrier "--enable-strict-barrier"} ${if static then "--enable-R-static-lib" else "--enable-R-shlib"} AR=$(type -p ar) AWK=$(type -p gawk) @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { JAVA_HOME="${jdk}" RANLIB=$(type -p ranlib) R_SHELL="${stdenv.shell}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' --disable-R-framework OBJC="clang" CPPFLAGS="-isystem ${libcxx}/include/c++/v1" diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix index 5df2d20549c..8cbf90a7187 100644 --- a/pkgs/applications/science/math/bcal/default.nix +++ b/pkgs/applications/science/math/bcal/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, python3Packages, readline, bc }: +{ lib, stdenv, fetchFromGitHub, python3Packages, readline, bc }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "bcal"; diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index 39213aff09a..068f9f0ea3c 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, makeWrapper, openjdk, gtk2, xorg, glibcLocales, releasePath ? null }: # To use this package, you need to download your own cplex installer from IBM -# and override the releasePath attribute to point to the location of the file. +# and override the releasePath attribute to point to the location of the file. # # Note: cplex creates an individual build for each license which screws # somewhat with the use of functions like requireFile as the hash will be @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "cplex"; version = "128"; - + src = if releasePath == null then throw '' This nix expression requires that the cplex installer is already - downloaded to your machine. Get it from IBM: - https://developer.ibm.com/docloud/blog/2017/12/20/cplex-optimization-studio-12-8-now-available/ + downloaded to your machine. Get it from IBM: + https://developer.ibm.com/docloud/blog/2017/12/20/cplex-optimization-studio-12-8-now-available/ Set `cplex.releasePath = /path/to/download;` in your ~/.config/nixpkgs/config.nix for `nix-*` commands, or @@ -49,9 +49,9 @@ stdenv.mkDerivation rec { $out/bin ''; - fixupPhase = - let - libraryPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc gtk2 xorg.libXtst ]; + fixupPhase = + let + libraryPath = lib.makeLibraryPath [ stdenv.cc.cc gtk2 xorg.libXtst ]; in '' interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { --set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive; done - for pgm in $out/cplex/bin/x86-64_linux/cplex $out/cpoptimizer/bin/x86-64_linux/cpoptimizer $out/opl/oplide/jre/bin/*; + for pgm in $out/cplex/bin/x86-64_linux/cplex $out/cpoptimizer/bin/x86-64_linux/cpoptimizer $out/opl/oplide/jre/bin/*; do if grep ELF $pgm > /dev/null; then @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { libArch = "x86-64_linux"; libSuffix = "${version}0"; }; - + meta = with lib; { description = "Optimization solver for mathematical programming"; homepage = "https://www.ibm.com/be-en/marketplace/ibm-ilog-cplex"; diff --git a/pkgs/applications/science/math/csdp/default.nix b/pkgs/applications/science/math/csdp/default.nix index ef9d5e733ca..02c4c134f92 100644 --- a/pkgs/applications/science/math/csdp/default.nix +++ b/pkgs/applications/science/math/csdp/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation { license = lib.licenses.cpl10; maintainers = [ lib.maintainers.roconnor ]; description = "A C Library for Semidefinite Programming"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/science/math/ecm/default.nix b/pkgs/applications/science/math/ecm/default.nix index 3e8e5879950..c59b1a8729a 100644 --- a/pkgs/applications/science/math/ecm/default.nix +++ b/pkgs/applications/science/math/ecm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp, m4 }: +{ lib, stdenv, fetchurl, gmp, m4 }: let pname = "ecm"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { }; # See https://trac.sagemath.org/ticket/19233 - configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-asm-redc"; + configureFlags = lib.optional stdenv.isDarwin "--disable-asm-redc"; buildInputs = [ m4 gmp ]; @@ -23,9 +23,9 @@ stdenv.mkDerivation { meta = { description = "Elliptic Curve Method for Integer Factorization"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "http://ecm.gforge.inria.fr/"; - maintainers = [ stdenv.lib.maintainers.roconnor ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + maintainers = [ lib.maintainers.roconnor ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix index 879ad96a936..5f7fe58465d 100644 --- a/pkgs/applications/science/math/eukleides/default.nix +++ b/pkgs/applications/science/math/eukleides/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, flex, texinfo, readline, texLive }: +{ lib, stdenv, fetchurl, bison, flex, texinfo, readline, texLive }: let name = "eukleides"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Geometry Drawing Language"; homepage = "http://www.eukleides.org/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; longDescription = '' Eukleides is a computer language devoted to elementary plane @@ -31,7 +31,7 @@ stdenv.mkDerivation { circles and conics. ''; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.peti ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix index 39ca53c47e6..a29d4036728 100644 --- a/pkgs/applications/science/math/fricas/default.nix +++ b/pkgs/applications/science/math/fricas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sbcl, libX11, libXpm, libICE, libSM, libXt, libXau, libXdmcp }: +{ lib, stdenv, fetchurl, sbcl, libX11, libXpm, libICE, libSM, libXt, libXau, libXdmcp }: let version = "1.3.4"; @@ -19,9 +19,9 @@ stdenv.mkDerivation { meta = { homepage = "http://fricas.sourceforge.net/"; description = "An advanced computer algebra system"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.sprock ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.sprock ]; }; } diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/applications/science/math/geogebra/geogebra6.nix index 7bd58264893..4ed66d96930 100644 --- a/pkgs/applications/science/math/geogebra/geogebra6.nix +++ b/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -1,4 +1,4 @@ -{ stdenv, unzip, fetchurl, electron_6, makeWrapper, geogebra }: +{ lib, stdenv, unzip, fetchurl, electron_6, makeWrapper, geogebra }: let pname = "geogebra"; version = "6-0-609-0"; @@ -6,7 +6,7 @@ let srcIcon = geogebra.srcIcon; desktopItem = geogebra.desktopItem; - meta = with stdenv.lib; geogebra.meta // { + meta = with lib; geogebra.meta // { license = licenses.geogebra; maintainers = with maintainers; [ voidless ]; platforms = with platforms; linux ++ darwin; @@ -38,7 +38,7 @@ let installPhase = '' mkdir -p $out/libexec/geogebra/ $out/bin cp -r GeoGebra-linux-x64/{resources,locales} "$out/" - makeWrapper ${stdenv.lib.getBin electron_6}/bin/electron $out/bin/geogebra --add-flags "$out/resources/app" + makeWrapper ${lib.getBin electron_6}/bin/electron $out/bin/geogebra --add-flags "$out/resources/app" install -Dm644 "${desktopItem}/share/applications/"* \ -t $out/share/applications/ diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix index 7e2a4625d30..fd657963c39 100644 --- a/pkgs/applications/science/math/gfan/default.nix +++ b/pkgs/applications/science/math/gfan/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gmp, mpir, cddlib}: +{lib, stdenv, fetchurl, gmp, mpir, cddlib}: stdenv.mkDerivation rec { pname = "gfan"; version = "0.6.2"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { ./gfan-0.6.2-cddlib-prefix.patch ]; - postPatch = stdenv.lib.optionalString stdenv.cc.isClang '' + postPatch = lib.optionalString stdenv.cc.isClang '' substituteInPlace Makefile --replace "-fno-guess-branch-probability" "" ''; @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = ''A software package for computing Gröbner fans and tropical varieties''; - license = stdenv.lib.licenses.gpl2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; homepage = "http://home.math.au.dk/jensen/software/gfan/gfan.html"; }; } diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index 7825fc1d9a2..8c391e25322 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1d0h1yb7qvh9x7wwv9yrzmcp712f49w1iljkxp4y6g9pzsmg1mmv"; }; - patches = stdenv.lib.optionals (!enableGUI) [ + patches = lib.optionals (!enableGUI) [ # when enableGui is false, giac is compiled without fltk. That means some # outputs differ in the make check. Patch around this: (fetchpatch { @@ -41,9 +41,9 @@ stdenv.mkDerivation rec { readline gettext libpng libao perl ecm # gfortran.cc default output contains static libraries compiled without -fPIC # we want libgfortran.so.3 instead - (stdenv.lib.getLib gfortran.cc) + (lib.getLib gfortran.cc) lapack blas - ] ++ stdenv.lib.optionals enableGUI [ + ] ++ lib.optionals enableGUI [ libGL libGLU fltk xorg.libX11 ]; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { # xcas Phys and Turtle menus are broken with split outputs # and interactive use is likely to need docs - outputs = [ "out" ] ++ stdenv.lib.optional (!enableGUI) "doc"; + outputs = [ "out" ] ++ lib.optional (!enableGUI) "doc"; doCheck = true; preCheck = '' @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { "--enable-gc" "--enable-png" "--enable-gsl" "--enable-lapack" "--enable-pari" "--enable-ntl" "--enable-gmpxx" # "--enable-cocoa" "--enable-ao" "--enable-ecm" "--enable-glpk" - ] ++ stdenv.lib.optionals enableGUI [ + ] ++ lib.optionals enableGUI [ "--enable-gui" "--with-x" ]; @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { mv "$out/share/giac/doc" "$doc/share/giac" mv "$out/share/giac/examples" "$doc/share/giac" fi - '' + stdenv.lib.optionalString (!enableGUI) '' + '' + lib.optionalString (!enableGUI) '' for i in pixmaps application-registry applications icons; do rm -r "$out/share/$i"; done; diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index e20e15edeff..c55e8d9adff 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ cln ]; - buildInputs = [ readline ] ++ stdenv.lib.optional stdenv.isDarwin gmp; + buildInputs = [ readline ] ++ lib.optional stdenv.isDarwin gmp; nativeBuildInputs = [ pkgconfig python ]; diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 09d0d524168..599d4bac8e7 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocamlPackages, libGLU, libGL, freeglut +{ lib, stdenv, fetchurl, ocamlPackages, libGLU, libGL, freeglut , libmysqlclient, mpfr, gmp, libtiff, libjpeg, libpng, giflib }: @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { homepage = "https://raffalli.eu/~christophe/glsurf/"; description = "A program to draw implicit surfaces and curves"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }; } diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 1b6dc2ae007..4ed9c963ba3 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, blas, lapack, gfortran, gmm, fltk, libjpeg +{ lib, stdenv, fetchurl, cmake, blas, lapack, gfortran, gmm, fltk, libjpeg , zlib, libGL, libGLU, xorg, opencascade-occt }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { description = "A three-dimensional finite element mesh generator"; homepage = "http://gmsh.info/"; platforms = [ "x86_64-linux" ]; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/science/math/gurobi/default.nix b/pkgs/applications/science/math/gurobi/default.nix index f2f406991e3..6066d0325f5 100644 --- a/pkgs/applications/science/math/gurobi/default.nix +++ b/pkgs/applications/science/math/gurobi/default.nix @@ -6,7 +6,7 @@ in stdenv.mkDerivation rec { pname = "gurobi"; version = "${majorVersion}.0"; - src = with stdenv.lib; fetchurl { + src = with lib; fetchurl { url = "http://packages.gurobi.com/${versions.majorMinor version}/gurobi${version}_linux64.tar.gz"; sha256 = "1yjqbzqnq4jjkjm616d36bgd3rmqr0a1ii17n0prpdjzmdlq63dz"; }; diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix index 277fb1984c4..9a8f05bc575 100644 --- a/pkgs/applications/science/math/mathematica/10.nix +++ b/pkgs/applications/science/math/mathematica/10.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , coreutils , patchelf , requireFile @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = requireFile rec { name = "Mathematica_${version}_LINUX.sh"; - message = '' + message = '' This nix expression requires that ${name} is already part of the store. Find the file on your Mathematica CD and add it to the nix store with nix-store --add-fixed sha256 <FILE>. @@ -69,9 +69,9 @@ stdenv.mkDerivation rec { libSM ]); - ldpath = stdenv.lib.makeLibraryPath buildInputs - + stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") - (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs); + ldpath = lib.makeLibraryPath buildInputs + + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") + (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs); phases = "unpackPhase installPhase fixupPhase"; @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { echo "patching $f executable <<" patchelf --shrink-rpath "$f" patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ "$f" \ && patchelf --shrink-rpath "$f" \ @@ -131,6 +131,6 @@ stdenv.mkDerivation rec { meta = { description = "Wolfram Mathematica computational software system"; homepage = "http://www.wolfram.com/mathematica/"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; } diff --git a/pkgs/applications/science/math/mathematica/11.nix b/pkgs/applications/science/math/mathematica/11.nix index 1c698a5e542..b8270cca908 100644 --- a/pkgs/applications/science/math/mathematica/11.nix +++ b/pkgs/applications/science/math/mathematica/11.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , coreutils , patchelf , requireFile @@ -26,7 +26,7 @@ let l10n = import ./l10ns.nix { - lib = stdenv.lib; + lib = lib; inherit requireFile lang; majorVersion = "11"; }; @@ -70,9 +70,9 @@ stdenv.mkDerivation rec { libSM ]); - ldpath = stdenv.lib.makeLibraryPath buildInputs - + stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") - (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs); + ldpath = lib.makeLibraryPath buildInputs + + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") + (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs); phases = "unpackPhase installPhase fixupPhase"; @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { echo "patching $f executable <<" patchelf --shrink-rpath "$f" patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ "$f" \ && patchelf --shrink-rpath "$f" \ @@ -145,6 +145,6 @@ stdenv.mkDerivation rec { meta = { description = "Wolfram Mathematica computational software system"; homepage = "http://www.wolfram.com/mathematica/"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; } diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index d0967485c01..43d7853e3d9 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , coreutils , patchelf , requireFile @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = requireFile { name = "Mathematica_9.0.0_LINUX.sh"; - message = '' + message = '' This nix expression requires that Mathematica_9.0.0_LINUX.sh is already part of the store. Find the file on your Mathematica CD and add it to the nix store with nix-store --add-fixed sha256 <FILE>. @@ -59,9 +59,9 @@ stdenv.mkDerivation rec { libxcb ]); - ldpath = stdenv.lib.makeLibraryPath buildInputs - + stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") - (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs); + ldpath = lib.makeLibraryPath buildInputs + + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") + (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs); phases = "unpackPhase installPhase fixupPhase"; @@ -117,6 +117,6 @@ stdenv.mkDerivation rec { meta = { description = "Wolfram Mathematica computational software system"; homepage = "http://www.wolfram.com/mathematica/"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; } diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index e91ad5e5f8c..497592f1c06 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -28,7 +28,7 @@ let l10n = import ./l10ns.nix { - lib = stdenv.lib; + lib = lib; inherit requireFile lang; }; in @@ -74,9 +74,9 @@ stdenv.mkDerivation rec { libSM ]); - ldpath = stdenv.lib.makeLibraryPath buildInputs - + stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") - (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs); + ldpath = lib.makeLibraryPath buildInputs + + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") + (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs); unpackPhase = '' echo "=== Extracting makeself archive ===" @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { echo "patching $f executable <<" patchelf --shrink-rpath "$f" patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ "$f" \ && patchelf --shrink-rpath "$f" \ @@ -144,7 +144,7 @@ stdenv.mkDerivation rec { ''; dontBuild = true; - + # This is primarily an IO bound build; there's little benefit to building remotely. preferLocalBuild = true; diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index cdc81a87646..01f086c92c7 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python, makeWrapper, autoreconfHook +{ lib, stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python, makeWrapper, autoreconfHook , rlwrap ? null, tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false }: @@ -7,8 +7,8 @@ let version = "5.44.0"; searchPath = - stdenv.lib.makeBinPath - (stdenv.lib.filter (x: x != null) [ sbcl ecl rlwrap tk gnuplot ]); + lib.makeBinPath + (lib.filter (x: x != null) [ sbcl ecl rlwrap tk gnuplot ]); in stdenv.mkDerivation ({ inherit version; @@ -21,7 +21,7 @@ stdenv.mkDerivation ({ nativeBuildInputs = [ autoreconfHook ]; - buildInputs = stdenv.lib.filter (x: x != null) [ + buildInputs = lib.filter (x: x != null) [ sbcl ecl texinfo perl python makeWrapper gnuplot # required in the test suite ]; @@ -40,7 +40,7 @@ stdenv.mkDerivation ({ ln -s ../maxima/${version}/emacs $out/share/emacs/site-lisp ln -s ../maxima/${version}/doc $out/share/doc/maxima '' - + (stdenv.lib.optionalString ecl-fasl '' + + (lib.optionalString ecl-fasl '' cp src/binary-ecl/maxima.fas* "$out/lib/maxima/${version}/binary-ecl/" '') ; @@ -63,7 +63,7 @@ stdenv.mkDerivation ({ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx"; }) - ] ++ stdenv.lib.optionals ecl-fasl [ + ] ++ lib.optionals ecl-fasl [ # build fasl, needed for ECL support (fetchpatch { url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/maxima.system.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; @@ -94,7 +94,7 @@ stdenv.mkDerivation ({ meta = { description = "Computer algebra system"; homepage = "http://maxima.sourceforge.net"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; longDescription = '' Maxima is a fairly complete computer algebra system written in @@ -103,7 +103,7 @@ stdenv.mkDerivation ({ symbolic integration, 3D plotting, and an ODE solver. ''; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.peti ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.peti ]; }; }) diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix index db7a1c14906..679b29cb062 100644 --- a/pkgs/applications/science/math/msieve/default.nix +++ b/pkgs/applications/science/math/msieve/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, gmp, ecm }: +{lib, stdenv, fetchurl, zlib, gmp, ecm }: stdenv.mkDerivation { name = "msieve-1.53"; @@ -22,9 +22,9 @@ stdenv.mkDerivation { meta = { description = "A C library implementing a suite of algorithms to factor large integers"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; homepage = "http://msieve.sourceforge.net/"; - maintainers = [ stdenv.lib.maintainers.roconnor ]; - platforms = [ "x86_64-linux" ] ++ stdenv.lib.platforms.darwin; + maintainers = [ lib.maintainers.roconnor ]; + platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin; }; } diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix index b5b9577d493..97b5f88e55b 100644 --- a/pkgs/applications/science/math/palp/default.nix +++ b/pkgs/applications/science/math/palp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "format" ]; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + patchPhase = lib.optionalString stdenv.isDarwin '' substituteInPlace GNUmakefile --replace gcc cc ''; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { for file in poly class cws nef mori; do cp -p $file.x "$out/bin/$file-${dim}d.x" done - '' + stdenv.lib.optionalString doSymlink '' + '' + lib.optionalString doSymlink '' cd "$out/bin" for file in poly class cws nef mori; do ln -sf $file-6d.x $file.x diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index dd965e17c73..a99cbbbe0df 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { # Versions with current majorMinor values are at http://pari.math.u-bordeaux.fr/pub/pari/unix/${pname}-${version}.tar.gz - url = "https://pari.math.u-bordeaux.fr/pub/pari/OLD/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; + url = "https://pari.math.u-bordeaux.fr/pub/pari/OLD/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; sha256 = "sha256-v8iPxPc1L0hA5uNSxy8DacvqikVAOxg0piafNwmXCxw="; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libX11 tex perl - ] ++ stdenv.lib.optionals withThread [ + ] ++ lib.optionals withThread [ libpthreadstubs ]; @@ -34,14 +34,14 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gmp=${gmp.dev}" "--with-readline=${readline.dev}" - ] ++ stdenv.lib.optional stdenv.isDarwin "--host=x86_64-darwin" - ++ stdenv.lib.optional withThread "--mt=pthread"; + ] ++ lib.optional stdenv.isDarwin "--host=x86_64-darwin" + ++ lib.optional withThread "--mt=pthread"; preConfigure = '' export LD=$CC ''; - postConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + postConfigure = lib.optionalString stdenv.isDarwin '' echo 'echo x86_64-darwin' > config/arch-osname ''; diff --git a/pkgs/applications/science/math/pcalc/default.nix b/pkgs/applications/science/math/pcalc/default.nix index f372357fe7d..1ee45ca266a 100644 --- a/pkgs/applications/science/math/pcalc/default.nix +++ b/pkgs/applications/science/math/pcalc/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, bison, flex }: +{ lib, stdenv, fetchgit, bison, flex }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "pcalc"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { homepage = "http://pcalc.sourceforge.net/"; description = "Programmer's calculator"; license = licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ ftrvxmtrx ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with lib.maintainers; [ ftrvxmtrx ]; + platforms = lib.platforms.linux; inherit version; }; } diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix index 55293e6c8a7..242f2e2cea5 100644 --- a/pkgs/applications/science/math/perseus/default.nix +++ b/pkgs/applications/science/math/perseus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation { name = "perseus-4-beta"; @@ -33,8 +33,8 @@ stdenv.mkDerivation { matrices and so forth. ''; homepage = "http://www.sas.upenn.edu/~vnanda/perseus/index.html"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [erikryb]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [erikryb]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/applications/science/math/polymake/default.nix index d4f13f84f81..552881c5f1a 100644 --- a/pkgs/applications/science/math/polymake/default.nix +++ b/pkgs/applications/science/math/polymake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , ninja, libxml2, libxslt, readline, perl, gmp, mpfr, boost , bliss, ppl, singular, cddlib, lrs, nauty , ant, openjdk @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "Software for research in polyhedral geometry"; - license = stdenv.lib.licenses.gpl2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://www.polymake.org/doku.php"; }; } diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/applications/science/math/pspp/default.nix index d6c5b58f0d5..9d76ef75d26 100644 --- a/pkgs/applications/science/math/pspp/default.nix +++ b/pkgs/applications/science/math/pspp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk3, gsl +{ lib, stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk3, gsl , pkgconfig, gtksourceview, pango, gettext, dconf , makeWrapper, gsettings-desktop-schemas, hicolor-icon-theme , texinfo, ssw, python3 @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$out/share" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" ''; meta = { homepage = "https://www.gnu.org/software/pspp/"; description = "A free replacement for SPSS, a program for statistical analysis of sampled data"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; longDescription = '' PSPP is a program for statistical analysis of sampled data. It is @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { more traditional syntax commands. ''; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/science/math/ratpoints/default.nix b/pkgs/applications/science/math/ratpoints/default.nix index fb205a69f03..823c8abf529 100644 --- a/pkgs/applications/science/math/ratpoints/default.nix +++ b/pkgs/applications/science/math/ratpoints/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, gmp }: +{ lib, stdenv, fetchurl, fetchpatch, gmp }: stdenv.mkDerivation rec { pname = "ratpoints"; version = "2.1.3.p4"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; makeFlags = [ "CC=cc" ]; - buildFlags = stdenv.lib.optional stdenv.isDarwin ["CCFLAGS2=-lgmp -lc -lm" "CCFLAGS=-UUSE_SSE"]; + buildFlags = lib.optional stdenv.isDarwin ["CCFLAGS2=-lgmp -lc -lm" "CCFLAGS=-UUSE_SSE"]; installFlags = [ "INSTALL_DIR=$(out)" ]; preInstall = ''mkdir -p "$out"/{bin,share,lib,include}''; @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = ''A program to find rational points on hyperelliptic curves''; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; homepage = "http://www.mathe2.uni-bayreuth.de/stoll/programs/"; updateWalker = true; }; diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/applications/science/math/ripser/default.nix index 1c8ced5ed22..21f0d003391 100644 --- a/pkgs/applications/science/math/ripser/default.nix +++ b/pkgs/applications/science/math/ripser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub +{ lib, stdenv, fetchurl, fetchFromGitHub , assembleReductionMatrix ? false , useCoefficients ? false , indicateProgress ? false @@ -6,14 +6,14 @@ , fileFormat ? "lowerTriangularCsv" }: -with stdenv.lib; +with lib; assert assertOneOf "fileFormat" fileFormat ["lowerTriangularCsv" "upperTriangularCsv" "dipha"]; assert useGoogleHashmap -> sparsehash != null; let - inherit (stdenv.lib) optional; + inherit (lib) optional; version = "1.0"; in stdenv.mkDerivation { @@ -60,8 +60,8 @@ stdenv.mkDerivation { meta = { description = "A lean C++ code for the computation of Vietoris–Rips persistence barcodes"; homepage = "https://github.com/Ripser/ripser"; - license = stdenv.lib.licenses.lgpl3; - maintainers = with stdenv.lib.maintainers; [erikryb]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [erikryb]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix index b9256e32f8b..106f9eea309 100644 --- a/pkgs/applications/science/math/sage/sage.nix +++ b/pkgs/applications/science/math/sage/sage.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" makeWrapper "${sage-with-env}/bin/sage" "$out/bin/sage" \ --set SAGE_DOC_SRC_OVERRIDE "${src}/src/doc" ${ - stdenv.lib.optionalString withDoc "--set SAGE_DOC_OVERRIDE ${sagedoc}/share/doc/sage" + lib.optionalString withDoc "--set SAGE_DOC_OVERRIDE ${sagedoc}/share/doc/sage" } \ --prefix JUPYTER_PATH : "${kernel-specs}" ''; diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix index 24b3feef51e..95c6c23fb09 100644 --- a/pkgs/applications/science/math/scilab/default.nix +++ b/pkgs/applications/science/math/scilab/default.nix @@ -35,14 +35,14 @@ stdenv.mkDerivation rec { # do not compile with PVM library "--without-pvm" # compile with GTK - (stdenv.lib.enableFeature withGtk "gtk") - (stdenv.lib.enableFeature withGtk "gtk2") + (lib.enableFeature withGtk "gtk") + (lib.enableFeature withGtk "gtk2") # compile with ocaml - (stdenv.lib.withFeature withOCaml "ocaml") + (lib.withFeature withOCaml "ocaml") # do not compile Java interface "--without-java" # use the X Window System - (stdenv.lib.withFeature withX "x") + (lib.withFeature withX "x") # compile with TCL/TK ] ++ lib.optionals withTk [ "--with-tk" diff --git a/pkgs/applications/science/math/scotch/default.nix b/pkgs/applications/science/math/scotch/default.nix index 75a6b2dba68..6f8753ff38a 100644 --- a/pkgs/applications/science/math/scotch/default.nix +++ b/pkgs/applications/science/math/scotch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, openmpi, flex, zlib}: +{ lib, stdenv, fetchurl, bison, openmpi, flex, zlib}: stdenv.mkDerivation rec { version = "6.0.4"; @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { meta = { description = "Graph and mesh/hypergraph partitioning, graph clustering, and sparse matrix ordering"; longDescription = '' - Scotch is a software package for graph and mesh/hypergraph partitioning, graph clustering, + Scotch is a software package for graph and mesh/hypergraph partitioning, graph clustering, and sparse matrix ordering. ''; homepage = "http://www.labri.fr/perso/pelegrin/scotch"; - license = stdenv.lib.licenses.cecill-c; - maintainers = [ stdenv.lib.maintainers.bzizou ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.cecill-c; + maintainers = [ lib.maintainers.bzizou ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index c4fc19d6c6b..179801da379 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, jre, unzip, makeWrapper }: +{ lib, stdenv, fetchurl, jre, unzip, makeWrapper }: stdenv.mkDerivation rec { pname = "weka"; version = "3.9.2"; src = fetchurl { - url = "mirror://sourceforge/weka/${stdenv.lib.replaceChars ["."]["-"] "${pname}-${version}"}.zip"; + url = "mirror://sourceforge/weka/${lib.replaceChars ["."]["-"] "${pname}-${version}"}.zip"; sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31"; }; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.cs.waikato.ac.nz/ml/weka/"; description = "Collection of machine learning algorithms for data mining tasks"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.mimame ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.mimame ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix index 06aab669df5..05d1f780bf3 100644 --- a/pkgs/applications/science/math/yacas/default.nix +++ b/pkgs/applications/science/math/yacas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, perl +{ lib, stdenv, fetchFromGitHub, cmake, perl , enableGui ? false, qt5 , enableJupyter ? false, boost, jsoncpp, openssl, zmqpp }: @@ -24,16 +24,16 @@ stdenv.mkDerivation rec { # Perl is only for the documentation nativeBuildInputs = [ cmake perl ]; buildInputs = [ - ] ++ stdenv.lib.optionals enableGui (with qt5; [ qtbase qtwebkit ]) - ++ stdenv.lib.optionals enableJupyter [ boost jsoncpp openssl zmqpp ] + ] ++ lib.optionals enableGui (with qt5; [ qtbase qtwebkit ]) + ++ lib.optionals enableJupyter [ boost jsoncpp openssl zmqpp ] ; meta = { description = "Easy to use, general purpose Computer Algebra System"; homepage = "http://www.yacas.org/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; broken = enableGui || enableJupyter; }; } diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix index b4e56591f9c..c6bfd6361f2 100644 --- a/pkgs/applications/science/medicine/aliza/default.nix +++ b/pkgs/applications/science/medicine/aliza/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, rpmextract, makeWrapper, patchelf, qt4, zlib, libX11, libXt, libSM, libICE, libXext, libGLU, libGL }: +{ lib, stdenv, fetchurl, rpmextract, makeWrapper, patchelf, qt4, zlib, libX11, libXt, libSM, libICE, libXext, libGLU, libGL }: -with stdenv.lib; +with lib; stdenv.mkDerivation { pname = "aliza"; version = "1.98.32"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { ''; postInstall = let - libs = stdenv.lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt libGLU libGL ]; + libs = lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt libGLU libGL ]; in '' ${patchelf}/bin/patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ diff --git a/pkgs/applications/science/medicine/dcmtk/default.nix b/pkgs/applications/science/medicine/dcmtk/default.nix index 817ab578a82..0312043306a 100644 --- a/pkgs/applications/science/medicine/dcmtk/default.nix +++ b/pkgs/applications/science/medicine/dcmtk/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, zlib, libtiff, libxml2, openssl, libiconv, libpng, cmake }: +{ lib, stdenv, fetchFromGitHub, zlib, libtiff, libxml2, openssl, libiconv, libpng, cmake }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "dcmtk"; version = "3.6.5"; diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 802abae80e1..e549fda1162 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, autoconf, automake, pkgconfig, m4, curl, +{ fetchFromGitHub, lib, stdenv, autoconf, automake, pkgconfig, m4, curl, libGLU, libGL, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK30, xcbutil, sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "Free software for distributed and grid computing"; homepage = "https://boinc.berkeley.edu/"; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.linux; # arbitrary choice + license = lib.licenses.lgpl2Plus; + platforms = lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix index 647492bbe31..db98e0db348 100644 --- a/pkgs/applications/science/misc/cytoscape/default.nix +++ b/pkgs/applications/science/misc/cytoscape/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper, substituteAll, coreutils }: +{ lib, stdenv, fetchurl, jre, makeWrapper, substituteAll, coreutils }: stdenv.mkDerivation rec { pname = "cytoscape"; @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.cytoscape.org"; description = "A general platform for complex network analysis and visualization"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [stdenv.lib.maintainers.mimame]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl21; + maintainers = [lib.maintainers.mimame]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index 18def1d24e2..3198b40711d 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, boost, lua, zlib, bzip2 +{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, boost, lua, zlib, bzip2 , xylib, readline, gnuplot, swig3 }: let @@ -21,8 +21,8 @@ stdenv.mkDerivation { meta = { description = "Curve fitting and peak fitting software"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "http://fityk.nieto.pl/"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/misc/foldingathome/client.nix b/pkgs/applications/science/misc/foldingathome/client.nix index bf7145113f5..cc3d5445b59 100644 --- a/pkgs/applications/science/misc/foldingathome/client.nix +++ b/pkgs/applications/science/misc/foldingathome/client.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , autoPatchelfHook , buildFHSUserEnv , dpkg @@ -9,7 +9,7 @@ , extraPkgs ? [] }: let - majMin = stdenv.lib.versions.majorMinor version; + majMin = lib.versions.majorMinor version; version = "7.6.13"; fahclient = stdenv.mkDerivation rec { @@ -52,8 +52,8 @@ buildFHSUserEnv { meta = { description = "Folding@home client"; homepage = "https://foldingathome.org/"; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.zimbatm ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.zimbatm ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/science/misc/foldingathome/control.nix b/pkgs/applications/science/misc/foldingathome/control.nix index 85be61f6686..832c6311759 100644 --- a/pkgs/applications/science/misc/foldingathome/control.nix +++ b/pkgs/applications/science/misc/foldingathome/control.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , autoPatchelfHook , dpkg , fahviewer @@ -7,7 +7,7 @@ , python2 }: let - majMin = stdenv.lib.versions.majorMinor version; + majMin = lib.versions.majorMinor version; version = "7.6.21"; python = python2.withPackages @@ -53,8 +53,8 @@ stdenv.mkDerivation rec { meta = { description = "Folding@home control"; homepage = "https://foldingathome.org/"; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.zimbatm ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.zimbatm ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/science/misc/foldingathome/viewer.nix b/pkgs/applications/science/misc/foldingathome/viewer.nix index a383de621f2..52ca9c9e623 100644 --- a/pkgs/applications/science/misc/foldingathome/viewer.nix +++ b/pkgs/applications/science/misc/foldingathome/viewer.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , autoPatchelfHook , dpkg , fetchurl @@ -10,7 +10,7 @@ , zlib }: let - majMin = stdenv.lib.versions.majorMinor version; + majMin = lib.versions.majorMinor version; version = "7.6.21"; in stdenv.mkDerivation rec { @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { meta = { description = "Folding@home viewer"; homepage = "https://foldingathome.org/"; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.zimbatm ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.zimbatm ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix index 36de6a1d4c5..7741f7ba65b 100644 --- a/pkgs/applications/science/misc/golly/beta.nix +++ b/pkgs/applications/science/misc/golly/beta.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit +{lib, stdenv, fetchgit , wxGTK, perl, python2, zlib, libGLU, libGL, libX11 , automake, autoconf }: @@ -43,9 +43,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "Cellular automata simulation program"; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; downloadPage = "https://sourceforge.net/projects/golly/files/golly"; }; } diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index 1478bb64318..be61ec86b32 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, wxGTK, perl, python2, zlib, libGLU, libGL, libX11}: +{lib, stdenv, fetchurl, wxGTK, perl, python2, zlib, libGLU, libGL, libX11}: stdenv.mkDerivation rec { pname = "golly"; version = "3.3"; @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "Cellular automata simulation program"; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; downloadPage = "https://sourceforge.net/projects/golly/files/golly"; }; } diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/applications/science/misc/megam/default.nix index 8bb64932f20..6c55027d3c6 100644 --- a/pkgs/applications/science/misc/megam/default.nix +++ b/pkgs/applications/science/misc/megam/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ocaml, makeWrapper, ncurses }: +{ fetchurl, lib, stdenv, ocaml, makeWrapper, ncurses }: let version = "0.92"; in stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; patches = [ ./ocaml-includes.patch ./ocaml-3.12.patch ]; - + buildInputs = [ ocaml ncurses ]; nativeBuildInputs = [ makeWrapper ]; @@ -42,6 +42,6 @@ stdenv.mkDerivation { license = "non-commercial"; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix index 8b027b52687..a18131993e5 100644 --- a/pkgs/applications/science/misc/openmodelica/default.nix +++ b/pkgs/applications/science/misc/openmodelica/default.nix @@ -5,7 +5,7 @@ doxygen, boost, openscenegraph, gnome2, xorg, git, bash, gtk2, makeWrapper }: let - fakegit = import ./fakegit.nix {inherit stdenv fetchgit fetchsvn bash;} ; + fakegit = import ./fakegit.nix { inherit lib stdenv fetchgit fetchsvn bash; }; in @@ -38,7 +38,7 @@ stdenv.mkDerivation { for e in $(cd $out/bin && ls); do wrapProgram $out/bin/$e \ --prefix PATH : "${gnumake}/bin" \ - --prefix LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ lapack blas ]}" + --prefix LIBRARY_PATH : "${lib.makeLibraryPath [ lapack blas ]}" done ''; diff --git a/pkgs/applications/science/misc/openmodelica/fakegit.nix b/pkgs/applications/science/misc/openmodelica/fakegit.nix index de69626cd3e..47cca7c7491 100644 --- a/pkgs/applications/science/misc/openmodelica/fakegit.nix +++ b/pkgs/applications/science/misc/openmodelica/fakegit.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, fetchsvn, bash } : +{ lib, stdenv, fetchgit, fetchsvn, bash }: let mkscript = path : text : '' @@ -11,9 +11,9 @@ let sed -i "s@%out@$out@g" ${path} chmod +x ${path} ''; - + hashname = r: let - rpl = stdenv.lib.replaceChars [":" "/"] ["_" "_"]; + rpl = lib.replaceChars [":" "/"] ["_" "_"]; in (rpl r.url) + "-" + (rpl r.rev); @@ -24,7 +24,7 @@ stdenv.mkDerivation { buildCommand = '' mkdir -pv $out/repos - ${stdenv.lib.concatMapStrings + ${lib.concatMapStrings (r : '' cp -r ${fetchgit r} $out/repos/${hashname r} '' @@ -55,7 +55,7 @@ stdenv.mkDerivation { chmod u+w -R $DEST ''} - ${stdenv.lib.concatMapStrings + ${lib.concatMapStrings (r : '' cp -r ${fetchsvn r} $out/repos/${hashname r} '' diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index 5db6092fa36..bf21983adcd 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake +{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake , libjpeg ? null , zlib ? null , libpng ? null @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { meta = { description = "A library for computer-vision scientists and targeted for the Multiple View Geometry community"; homepage = "https://openmvg.readthedocs.io/en/latest/"; - license = stdenv.lib.licenses.mpl20; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ mdaiter ]; + license = lib.licenses.mpl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ mdaiter ]; }; } diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index d8e6ae06a24..144827413b5 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ pcre python2 zlib libxml2 lz4 lzma gsl_1 xxHash ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] - ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] + ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] + ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; patches = [ @@ -30,14 +30,14 @@ stdenv.mkDerivation rec { preConfigure = '' patchShebangs build/unix/ - ln -s ${stdenv.lib.getDev stdenv.cc.libc}/include/AvailabilityMacros.h cint/cint/include/ + ln -s ${lib.getDev stdenv.cc.libc}/include/AvailabilityMacros.h cint/cint/include/ '' # Fix CINTSYSDIR for "build" version of rootcint # This is probably a bug that breaks out-of-source builds + '' substituteInPlace cint/cint/src/loadfile.cxx\ --replace 'env = "cint";' 'env = "'`pwd`'/cint";' - '' + stdenv.lib.optionalString noSplash '' + '' + lib.optionalString noSplash '' substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true" ''; @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { "-Dxml=ON" "-Dxrootd=OFF" ] - ++ stdenv.lib.optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; + ++ lib.optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; setupHook = ./setup-hook.sh; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 8bfde114beb..425d3e1e4b9 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { --replace 'set(lcgpackages ' '#set(lcgpackages ' patchShebangs build/unix/ - '' + stdenv.lib.optionalString noSplash '' + '' + lib.optionalString noSplash '' substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true" ''; @@ -70,8 +70,8 @@ stdenv.mkDerivation rec { "-Dxml=ON" "-Dxrootd=OFF" ] - ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.lib.getDev stdenv.cc.libc}/include" - ++ stdenv.lib.optionals stdenv.isDarwin [ + ++ lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${lib.getDev stdenv.cc.libc}/include" + ++ lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" "-DCMAKE_DISABLE_FIND_PACKAGE_Python2=TRUE" diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 7cc702f2d53..771e79311c9 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, cmake, perl, python3, boost, valgrind +{ lib, stdenv, fetchFromGitLab, cmake, perl, python3, boost, valgrind # Optional requirements # Lua 5.3 needed and not available now #, luaSupport ? false, lua5 @@ -10,7 +10,7 @@ , moreTests ? false }: -with stdenv.lib; +with lib; let optionOnOff = option: if option then "on" else "off"; diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index f29cd41169d..62d638717f8 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libxml2, freetype, libGLU, libGL, glew, qt4 +{ fetchurl, lib, stdenv, libxml2, freetype, libGLU, libGL, glew, qt4 , cmake, makeWrapper, libjpeg, python }: let version = "5.2.1"; in @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { homepage = "http://tulip.labri.fr/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index 6f7735db82e..ed9d1852875 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -1,4 +1,4 @@ -{ fetchsvn, stdenv, cmake, qt4, libGLU, libGL }: +{ fetchsvn, lib, stdenv, cmake, qt4, libGLU, libGL }: # ViTE 1.1 has several bugs, so use the SVN version. let @@ -38,8 +38,8 @@ stdenv.mkDerivation { ''; homepage = "http://vite.gforge.inria.fr/"; - license = stdenv.lib.licenses.cecill20; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.cecill20; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 6a243c1d917..c40faddbbf9 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ fftw perl hwloc ] - ++ (stdenv.lib.optionals mpiEnabled [ openmpi ]); + ++ (lib.optionals mpiEnabled [ openmpi ]); cmakeFlags = [ "-DGMX_SIMD:STRING=${SIMD cpuAcceleration}" diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index 561bb119f12..123afef03e8 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { }; buildInputs = [ fftw libpng blas lapack gzip ] - ++ (stdenv.lib.optionals withMPI [ mpi ]); + ++ (lib.optionals withMPI [ mpi ]); configurePhase = '' cd src - for pack in ${stdenv.lib.concatStringsSep " " packages}; do make "yes-$pack" SHELL=$SHELL; done + for pack in ${lib.concatStringsSep " " packages}; do make "yes-$pack" SHELL=$SHELL; done ''; # Must do manual build due to LAMMPS requiring a seperate build for diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix index 2c4757d92e4..34e4d989e95 100644 --- a/pkgs/applications/science/physics/sacrifice/default.nix +++ b/pkgs/applications/science/physics/sacrifice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, hepmc2, lhapdf, pythia, makeWrapper }: +{ lib, stdenv, fetchurl, boost, hepmc2, lhapdf, pythia, makeWrapper }: stdenv.mkDerivation { pname = "sacrifice"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { preConfigure = '' substituteInPlace configure --replace HAVE_LCG=yes HAVE_LCG=no '' - + stdenv.lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace LIB_SUFFIX=\"so\" LIB_SUFFIX=\"dylib\" ''; @@ -40,9 +40,9 @@ stdenv.mkDerivation { meta = { description = "A standalone contribution to AGILe for steering Pythia 8"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "https://agile.hepforge.org/trac/wiki/Sacrifice"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index 0713825ccef..d0a0585e69f 100644 --- a/pkgs/applications/science/physics/xfitter/default.nix +++ b/pkgs/applications/science/physics/xfitter/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # # gfortran: error: unrecognized command line option '-stdlib=libc++' # - stdenv.lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.isDarwin '' substituteInPlace src/Makefile.in \ --replace "F77LD = \$(F77)" "F77LD = \$(CXXLD)" \ ''; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ apfel apfelgrid applgrid blas lhapdf lapack mela root5 qcdnum libtirpc ] # pdf2yaml requires fmemopen and open_memstream which are not readily available on Darwin - ++ stdenv.lib.optional (!stdenv.isDarwin) libyaml + ++ lib.optional (!stdenv.isDarwin) libyaml ; propagatedBuildInputs = [ lynx ]; diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix index 3ac8267d8ae..8beecf2def9 100644 --- a/pkgs/applications/science/programming/fdr/default.nix +++ b/pkgs/applications/science/programming/fdr/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { sha256 = "0n2yqichym5xdawlgk3r7yha88k7ycnx6585jfrcm7043sls1i88"; }; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ stdenv.cc.cc python27Packages.python qtbase diff --git a/pkgs/applications/science/programming/plm/default.nix b/pkgs/applications/science/programming/plm/default.nix index 852502e73b0..dd61c3668cc 100644 --- a/pkgs/applications/science/programming/plm/default.nix +++ b/pkgs/applications/science/programming/plm/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Free cross-platform programming exerciser"; license = licenses.gpl3; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; broken = true; }; } diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix index aa0062f8f3a..3b33096dc68 100644 --- a/pkgs/applications/science/robotics/yarp/default.nix +++ b/pkgs/applications/science/robotics/yarp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, ace +{ lib, stdenv, fetchFromGitHub, cmake, ace }: stdenv.mkDerivation rec { @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { meta = { description = "Yet Another Robot Platform"; homepage = "http://yarp.it"; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.nico202 ]; + license = lib.licenses.lgpl21; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.nico202 ]; }; } diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/applications/search/doodle/default.nix index 9bf00801600..83dbb651144 100644 --- a/pkgs/applications/search/doodle/default.nix +++ b/pkgs/applications/search/doodle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libextractor, gettext }: +{ lib, stdenv, fetchurl, libextractor, gettext }: stdenv.mkDerivation rec { name = "doodle-0.7.1"; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://grothoff.org/christian/doodle/"; description = "Tool to quickly index and search documents on a computer"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 6d6f58fb5e2..99e323d16da 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -85,7 +85,7 @@ mkDerivation rec { substituteInPlace $f --replace /usr/bin/perl ${lib.getBin perl}/bin/perl fi done - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' substituteInPlace $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"' ''; diff --git a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix index 739ad07adbf..97812decbf3 100644 --- a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix +++ b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, mkDerivation, qtbase, qtquick1, qmltermwidget +{ lib, stdenv, fetchFromGitHub, mkDerivation, qtbase, qtquick1, qmltermwidget , qtquickcontrols, qtgraphicaleffects, qmake }: mkDerivation rec { @@ -25,7 +25,7 @@ mkDerivation rec { mv $out/usr/share $out/share mv $out/usr/bin $out/bin rmdir $out/usr - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' ln -s $out/bin/cool-retro-term.app/Contents/MacOS/cool-retro-term $out/bin/cool-retro-term ''; @@ -39,8 +39,8 @@ mkDerivation rec { eye-candy, customizable, and reasonably lightweight. ''; homepage = "https://github.com/Swordfish90/cool-retro-term"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ skeidel ]; + license = lib.licenses.gpl3Plus; + platforms = with lib.platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ skeidel ]; }; } diff --git a/pkgs/applications/terminal-emulators/germinal/default.nix b/pkgs/applications/terminal-emulators/germinal/default.nix index 12d82290b1a..1bbe87853f7 100644 --- a/pkgs/applications/terminal-emulators/germinal/default.nix +++ b/pkgs/applications/terminal-emulators/germinal/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { fixupPhase = '' runHook preFixup wrapProgram $out/bin/germinal \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ tmux ]}" \ + --prefix PATH ":" "${lib.makeBinPath [ tmux ]}" \ "''${gappsWrapperArgs[@]}" runHook postFixup ''; diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix index bdb3e65ed98..f90be38ebd1 100644 --- a/pkgs/applications/terminal-emulators/guake/default.nix +++ b/pkgs/applications/terminal-emulators/guake/default.nix @@ -63,7 +63,7 @@ python3.pkgs.buildPythonApplication rec { ]; preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libutempter ]}") + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libutempter ]}") ''; meta = with lib; { diff --git a/pkgs/applications/terminal-emulators/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix index e5ea0a67f93..092d4a0e09e 100644 --- a/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/pkgs/applications/terminal-emulators/hyper/default.nix @@ -4,7 +4,7 @@ , libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }: let - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ stdenv.cc.cc gtk2 gnome2.GConf atk glib pango gdk-pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat udev libpulseaudio diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index b7541f2528d..fbafa1c6bc9 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -35,7 +35,7 @@ buildPythonApplication rec { harfbuzz ncurses lcms2 - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ Cocoa CoreGraphics Foundation @@ -45,7 +45,7 @@ buildPythonApplication rec { libpng python3 zlib - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ fontconfig libunistring libcanberra libX11 libXrandr libXinerama libXcursor libxkbcommon libXi libXext wayland-protocols wayland dbus @@ -54,12 +54,12 @@ buildPythonApplication rec { nativeBuildInputs = [ pkgconfig sphinx ncurses installShellFiles - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ imagemagick libicns # For the png2icns tool. ]; - propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux libGL; + propagatedBuildInputs = lib.optional stdenv.isLinux libGL; outputs = [ "out" "terminfo" ]; @@ -68,7 +68,7 @@ buildPythonApplication rec { ]; # Causes build failure due to warning - hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "strictoverflow"; + hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; dontConfigure = true; @@ -80,7 +80,7 @@ buildPythonApplication rec { '' else '' ${python.interpreter} setup.py linux-package \ --update-check-interval=0 \ - --egl-library='${stdenv.lib.getLib libGL}/lib/libEGL.so.1' \ + --egl-library='${lib.getLib libGL}/lib/libEGL.so.1' \ --startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \ --canberra-library='${libcanberra}/lib/libcanberra.so' ''; @@ -110,7 +110,7 @@ buildPythonApplication rec { '' else '' cp -r linux-package/{bin,share,lib} $out ''} - wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick xsel ncurses.dev ]}" + wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick xsel ncurses.dev ]}" runHook postInstall installShellCompletion --cmd kitty \ diff --git a/pkgs/applications/terminal-emulators/lilyterm/default.nix b/pkgs/applications/terminal-emulators/lilyterm/default.nix index 96029259f15..9822b180b23 100644 --- a/pkgs/applications/terminal-emulators/lilyterm/default.nix +++ b/pkgs/applications/terminal-emulators/lilyterm/default.nix @@ -29,7 +29,7 @@ let }; in -with stdenv.lib; +with lib; stdenv.mkDerivation rec { inherit pname; diff --git a/pkgs/applications/terminal-emulators/lxterminal/default.nix b/pkgs/applications/terminal-emulators/lxterminal/default.nix index 8c002bd14b0..0b992cd2689 100644 --- a/pkgs/applications/terminal-emulators/lxterminal/default.nix +++ b/pkgs/applications/terminal-emulators/lxterminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk3, vte, wrapGAppsHook +{ lib, stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk3, vte, wrapGAppsHook , libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs }: @@ -43,8 +43,8 @@ stdenv.mkDerivation { unnecessary dependencies. ''; homepage = "https://wiki.lxde.org/en/LXTerminal"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.velovix ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.velovix ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix index 6512f402ffb..fe1ddf57679 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem +{ lib, stdenv, fetchurl, makeDesktopItem , libX11, libXt, libXft, libXrender , ncurses, fontconfig, freetype , pkgconfig, gdk-pixbuf, perl @@ -23,7 +23,7 @@ let }; in -with stdenv.lib; +with lib; stdenv.mkDerivation { name = "${pname}-unwrapped-${version}"; @@ -64,7 +64,7 @@ stdenv.mkDerivation { mkdir -p $terminfo/share/terminfo export TERMINFO=$terminfo/share/terminfo '' - + stdenv.lib.optionalString perlSupport '' + + lib.optionalString perlSupport '' # make urxvt find its perl file lib/perl5/site_perl # is added to PERL5LIB automatically mkdir -p $out/$(dirname ${perl.libPrefix}) diff --git a/pkgs/applications/terminal-emulators/st/default.nix b/pkgs/applications/terminal-emulators/st/default.nix index a91229f2921..77ec7c7bee7 100644 --- a/pkgs/applications/terminal-emulators/st/default.nix +++ b/pkgs/applications/terminal-emulators/st/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses +{ lib, stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses , libXft, conf ? null, patches ? [], extraLibs ? []}: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "st"; diff --git a/pkgs/applications/terminal-emulators/st/xst.nix b/pkgs/applications/terminal-emulators/st/xst.nix index 3e29abee5d6..c183bc391de 100644 --- a/pkgs/applications/terminal-emulators/st/xst.nix +++ b/pkgs/applications/terminal-emulators/st/xst.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libX11, ncurses, libXext, libXft, fontconfig }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, libX11, ncurses, libXext, libXft, fontconfig }: -with stdenv.lib; +with lib; let version = "0.7.2"; diff --git a/pkgs/applications/terminal-emulators/terminus/default.nix b/pkgs/applications/terminal-emulators/terminus/default.nix index 4c38e530247..67c660275f5 100644 --- a/pkgs/applications/terminal-emulators/terminus/default.nix +++ b/pkgs/applications/terminal-emulators/terminus/default.nix @@ -5,7 +5,7 @@ , nss, nspr, alsaLib, cups, expat, systemd, libpulseaudio }: let - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ stdenv.cc.cc gtk2 atk glib pango gdk-pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib cups expat systemd libpulseaudio diff --git a/pkgs/applications/terminal-emulators/termite/default.nix b/pkgs/applications/terminal-emulators/termite/default.nix index 20d1ad675a8..67724d8ec0f 100644 --- a/pkgs/applications/terminal-emulators/termite/default.nix +++ b/pkgs/applications/terminal-emulators/termite/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { url = "https://github.com/thestinger/termite/commit/7e9a93b421b9596f8980645a46ac2ad5468dac06.patch"; sha256 = "0vph2m5919f7w1xnc8i6z0j44clsm1chxkfg7l71nahxyfw5yh4j"; }) - ] ++ stdenv.lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch; + ] ++ lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch; makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index a30afa1ce68..8fce22089e9 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -34,7 +34,7 @@ let zlib fontconfig freetype - ] ++ stdenv.lib.optionals (stdenv.isLinux) [ + ] ++ lib.optionals (stdenv.isLinux) [ libX11 xcbutil libxcb @@ -47,7 +47,7 @@ let wayland libGLU libGL - ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.isDarwin) [ Foundation CoreGraphics Cocoa @@ -78,12 +78,12 @@ rustPlatform.buildRustPackage { buildInputs = runtimeDeps; installPhase = '' - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' for artifact in wezterm wezterm-gui wezterm-mux-server strip-ansi-escapes; do patchelf --set-rpath "${lib.makeLibraryPath runtimeDeps}" $releaseDir/$artifact install -D $releaseDir/$artifact -t $out/bin done - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' mkdir -p "$out/Applications" OUT_APP="$out/Applications/WezTerm.app" cp -r assets/macos/WezTerm.app "$OUT_APP" diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index d06a66edf1a..a8bc41dfa6c 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkgconfig +{ lib, stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkgconfig , makeWrapper, nixosTests, writeScript, common-updater-scripts, git, nixfmt, nix , gnused, coreutils, enableDecLocator ? true }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; patches = [ ./sixel-256.support.patch ] - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { + ++ lib.optional stdenv.hostPlatform.isMusl (fetchpatch { name = "posix-ptys.patch"; url = "https://git.alpinelinux.org/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1"; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { "--enable-mini-luit" "--with-tty-group=tty" "--with-app-defaults=$(out)/lib/X11/app-defaults" - ] ++ stdenv.lib.optional enableDecLocator "--enable-dec-locator"; + ] ++ lib.optional enableDecLocator "--enable-dec-locator"; # Work around broken "plink.sh". NIX_LDFLAGS = "-lXmu -lXt -lICE -lX11 -lfontconfig"; @@ -79,14 +79,14 @@ stdenv.mkDerivation rec { updateScript = let # Tags that end in letters are unstable - suffixes = stdenv.lib.concatStringsSep " " + suffixes = lib.concatStringsSep " " (map (c: "-c versionsort.suffix='${c}'") - (stdenv.lib.stringToCharacters "abcdefghijklmnopqrstuvwxyz")); + (lib.stringToCharacters "abcdefghijklmnopqrstuvwxyz")); in writeScript "update.sh" '' #!${stdenv.shell} set -o errexit PATH=${ - stdenv.lib.makeBinPath [ + lib.makeBinPath [ common-updater-scripts git nixfmt @@ -112,8 +112,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://invisible-island.net/xterm"; - license = with stdenv.lib.licenses; [ mit ]; - maintainers = with stdenv.lib.maintainers; [ nequissimus vrthra ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ nequissimus vrthra ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/terminal-emulators/xtermcontrol/default.nix b/pkgs/applications/terminal-emulators/xtermcontrol/default.nix index f7c0edf2242..821d922c6d9 100644 --- a/pkgs/applications/terminal-emulators/xtermcontrol/default.nix +++ b/pkgs/applications/terminal-emulators/xtermcontrol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "3.7"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { To complete the feature set; xtermcontrol lets advanced users issue any xterm control sequence of their choosing. ''; homepage = "http://thrysoee.dk/xtermcontrol"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.derchris ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.derchris ]; }; } diff --git a/pkgs/applications/terminal-emulators/yaft/default.nix b/pkgs/applications/terminal-emulators/yaft/default.nix index e66f397a383..5471ee45e0a 100644 --- a/pkgs/applications/terminal-emulators/yaft/default.nix +++ b/pkgs/applications/terminal-emulators/yaft/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses }: +{ lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { version = "0.2.9"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/uobikiemukot/yaft"; description = "Yet another framebuffer terminal"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.matthiasbeyer ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/version-management/bitkeeper/default.nix b/pkgs/applications/version-management/bitkeeper/default.nix index 78f62ebcf25..875f9dfa485 100644 --- a/pkgs/applications/version-management/bitkeeper/default.nix +++ b/pkgs/applications/version-management/bitkeeper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, gperf, bison, groff +{ lib, stdenv, fetchurl, perl, gperf, bison, groff , pkgconfig, libXft, pcre , libtomcrypt, libtommath, lz4 }: @@ -48,9 +48,9 @@ stdenv.mkDerivation rec { scales up to very large projects and down to tiny ones. ''; homepage = "https://www.bitkeeper.org/"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ wscott thoughtpolice ]; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ wscott thoughtpolice ]; broken = true; # seems to fail on recent glibc versions }; } diff --git a/pkgs/applications/version-management/commitizen/node-composition.nix b/pkgs/applications/version-management/commitizen/node-composition.nix index 17879f381d5..0769168a78f 100644 --- a/pkgs/applications/version-management/commitizen/node-composition.nix +++ b/pkgs/applications/version-management/commitizen/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; + inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/commitizen/node-env.nix b/pkgs/applications/version-management/commitizen/node-env.nix index 04e3ee097fa..262df27e464 100644 --- a/pkgs/applications/version-management/commitizen/node-env.nix +++ b/pkgs/applications/version-management/commitizen/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}: +{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}: let python = if nodejs ? python then nodejs.python else python2; @@ -38,8 +38,8 @@ let }; includeDependencies = {dependencies}: - stdenv.lib.optionalString (dependencies != []) - (stdenv.lib.concatMapStrings (dependency: + lib.optionalString (dependencies != []) + (lib.concatMapStrings (dependency: '' # Bundle the dependencies of the package mkdir -p node_modules @@ -100,7 +100,7 @@ let cd "$DIR/${packageName}" ${includeDependencies { inherit dependencies; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ''; pinpointDependencies = {dependencies, production}: @@ -161,12 +161,12 @@ let '' node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - ${stdenv.lib.optionalString (dependencies != []) + ${lib.optionalString (dependencies != []) '' if [ -d node_modules ] then cd node_modules - ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} cd .. fi ''} @@ -183,7 +183,7 @@ let cd "${packageName}" ${pinpointDependencies { inherit dependencies production; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} fi ''; @@ -344,8 +344,8 @@ let cd "${packageName}" runHook preRebuild - ${stdenv.lib.optionalString bypassCache '' - ${stdenv.lib.optionalString reconstructLock '' + ${lib.optionalString bypassCache '' + ${lib.optionalString reconstructLock '' if [ -f package-lock.json ] then echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" @@ -361,14 +361,14 @@ let node ${addIntegrityFieldsScript} ''} - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild if [ "''${dontNpmInstall-}" != "1" ] then # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. rm -f npm-shrinkwrap.json - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install fi ''; @@ -396,8 +396,8 @@ let stdenv.mkDerivation ({ name = "node_${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) util-linux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) util-linux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit nodejs; @@ -470,8 +470,8 @@ let name = "node-dependencies-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) util-linux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) util-linux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit dontStrip; # Stripping may fail a build for some package deployments @@ -491,7 +491,7 @@ let # Create fake package.json to make the npm commands work properly cp ${src}/package.json . chmod 644 package.json - ${stdenv.lib.optionalString bypassCache '' + ${lib.optionalString bypassCache '' if [ -f ${src}/package-lock.json ] then cp ${src}/package-lock.json . @@ -500,13 +500,13 @@ let # Go to the parent folder to make sure that all packages are pinpointed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} # Expose the executables that were installed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} mv ${packageName} lib ln -s $out/lib/node_modules/.bin $out/bin @@ -516,7 +516,7 @@ let stdenv.mkDerivation { name = "node-shell-${name}-${version}"; - buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs; + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) util-linux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell <<EOF @@ -529,14 +529,14 @@ let # Provide the dependencies in a development shell through the NODE_PATH environment variable inherit nodeDependencies; - shellHook = stdenv.lib.optionalString (dependencies != []) '' + shellHook = lib.optionalString (dependencies != []) '' export NODE_PATH=${nodeDependencies}/lib/node_modules export PATH="${nodeDependencies}/bin:$PATH" ''; }; in { - buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist; - buildNodePackage = stdenv.lib.makeOverridable buildNodePackage; - buildNodeShell = stdenv.lib.makeOverridable buildNodeShell; + buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; + buildNodePackage = lib.makeOverridable buildNodePackage; + buildNodeShell = lib.makeOverridable buildNodeShell; } diff --git a/pkgs/applications/version-management/cvsps/default.nix b/pkgs/applications/version-management/cvsps/default.nix index 133d8d7cbb4..f87e3f7cdaf 100644 --- a/pkgs/applications/version-management/cvsps/default.nix +++ b/pkgs/applications/version-management/cvsps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cvs, zlib }: +{ lib, stdenv, fetchurl, fetchpatch, cvs, zlib }: stdenv.mkDerivation rec { pname = "cvsps"; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { same time (using a single "cvs commit" command). ''; homepage = "http://www.cobite.com/cvsps/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/cvsq/default.nix b/pkgs/applications/version-management/cvsq/default.nix index a39c9ede524..dfffdb08238 100644 --- a/pkgs/applications/version-management/cvsq/default.nix +++ b/pkgs/applications/version-management/cvsq/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , makeWrapper , cvs @@ -28,15 +28,15 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/bin/cvsq --replace "/bin/sh" "${stdenv.shell}" substituteInPlace $out/bin/lcvs --replace "/bin/sh" "${stdenv.shell}" - wrapProgram $out/bin/cvsq --prefix PATH : ${stdenv.lib.makeBinPath + wrapProgram $out/bin/cvsq --prefix PATH : ${lib.makeBinPath [ cvs nettools findutils rsync coreutils diffutils ]} - wrapProgram $out/bin/cvsq-branch --prefix PATH : ${stdenv.lib.makeBinPath + wrapProgram $out/bin/cvsq-branch --prefix PATH : ${lib.makeBinPath [ cvs nettools findutils rsync coreutils diffutils ]} - wrapProgram $out/bin/cvsq-merge --prefix PATH : ${stdenv.lib.makeBinPath + wrapProgram $out/bin/cvsq-merge --prefix PATH : ${lib.makeBinPath [ cvs nettools findutils rsync coreutils diffutils ]} - wrapProgram $out/bin/cvsq-switch --prefix PATH : ${stdenv.lib.makeBinPath + wrapProgram $out/bin/cvsq-switch --prefix PATH : ${lib.makeBinPath [ cvs nettools findutils rsync coreutils diffutils ]} - wrapProgram $out/bin/lcvs --prefix PATH : ${stdenv.lib.makeBinPath + wrapProgram $out/bin/lcvs --prefix PATH : ${lib.makeBinPath [ cvs nettools findutils rsync coreutils diffutils ]} ''; @@ -60,8 +60,8 @@ stdenv.mkDerivation rec { be used for commits (that's what cvsq is for). ''; homepage = "https://www.linta.de/~aehlig/cvsq/"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ clkamp ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ clkamp ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index d68535e0a4c..987e7dcdaad 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -29,12 +29,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ installShellFiles tcl ]; buildInputs = [ zlib openssl readline sqlite which ed ] - ++ stdenv.lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.isDarwin libiconv; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; configureFlags = [ "--disable-internal-sqlite" ] - ++ stdenv.lib.optional withJson "--json"; + ++ lib.optional withJson "--json"; preCheck = '' export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 79c118a200c..831db07ffea 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt +{ lib, stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt , docbook_xsl, pkgconfig, luajit , coreutils, gnused, groff, docutils , gzip, bzip2, lzip, xz, zstd @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath" for script in $out/lib/cgit/filters/*.sh $out/lib/cgit/filters/html-converters/txt2html; do - wrapProgram $script --prefix PATH : '${stdenv.lib.makeBinPath [ coreutils gnused ]}' + wrapProgram $script --prefix PATH : '${lib.makeBinPath [ coreutils gnused ]}' done ''; @@ -75,8 +75,8 @@ stdenv.mkDerivation rec { homepage = "https://git.zx2c4.com/cgit/about/"; repositories.git = "git://git.zx2c4.com/cgit"; description = "Web frontend for git repositories"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ bjornfor ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ bjornfor ]; }; } 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 22d289d549a..f4b7d38bebc 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,4 +1,4 @@ -{ stdenv, fetchgit, ruby, gnugrep, diffutils, git, darcs }: +{ lib, stdenv, fetchgit, ruby, gnugrep, diffutils, git, darcs }: stdenv.mkDerivation { pname = "darcs-to-git"; @@ -74,7 +74,7 @@ stdenv.mkDerivation { meta = { description = "Converts a Darcs repository into a Git repository"; homepage = "http://www.sanityinc.com/articles/converting-darcs-repositories-to-git"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix index 96f72f2d69c..c6fbf3b9569 100644 --- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ghq"; @@ -28,7 +28,7 @@ buildGoModule rec { meta = { description = "Remote repository management made easy"; homepage = "https://github.com/x-motemen/ghq"; - maintainers = with stdenv.lib.maintainers; [ sigma ]; - license = stdenv.lib.licenses.mit; + maintainers = with lib.maintainers; [ sigma ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix index c4824b6c66f..2d6d7401e28 100644 --- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; cargoSha256 = "0h0vlz4qd8i9bf1mgjr618zbdwfp6bmy7ql9a1xzjmfdpkl3cgk9"; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix index 55a9dd18f72..95e583585f1 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "git-annex-remote-b2"; - version = "20151212-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20151212-${lib.strings.substring 0 7 rev}"; rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba"; goPackagePath = "github.com/encryptio/git-annex-remote-b2"; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix index ea44d7278f3..843a8d34881 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp git-annex-remote-rclone $out/bin wrapProgram "$out/bin/git-annex-remote-rclone" \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ rclone ]}" + --prefix PATH ":" "${lib.makeBinPath [ rclone ]}" ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix index bcfc33e55e4..7ad040a7c17 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoconf, automake, libtool, gmp }: +{ lib, stdenv, fetchgit, autoconf, automake, libtool, gmp }: stdenv.mkDerivation rec { pname = "git-annex-utils"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { Currently there is only one utility gadu, a du like utility for annexed files. ''; homepage = "http://git-annex.mysteryvortex.com/git-annex-utils.html"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ woffs ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ woffs ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix b/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix index 4895a2e399b..ba4cd42d29d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "git-appraise-unstable"; @@ -17,7 +17,7 @@ buildGoPackage rec { meta = { description = "Distributed code review system for Git repos"; homepage = "https://github.com/google/git-appraise"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.vdemeester ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.vdemeester ]; }; } 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 cd35c98a969..6cadd92eb3d 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 @@ -1,4 +1,4 @@ -{ fetchFromGitHub, python2Packages, stdenv, git, graphviz }: +{ fetchFromGitHub, python2Packages, lib, stdenv, git, graphviz }: python2Packages.buildPythonApplication rec { pname = "git-big-picture"; @@ -17,14 +17,14 @@ python2Packages.buildPythonApplication rec { postFixup = '' wrapProgram $out/bin/git-big-picture \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath buildInputs } + --prefix PATH ":" ${ lib.makeBinPath buildInputs } ''; meta = { description = "Tool for visualization of Git repositories"; homepage = "https://github.com/esc/git-big-picture"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.nthorne ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.nthorne ]; }; } 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 e41a8b3a525..0117b6cb3b6 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 @@ -38,7 +38,7 @@ buildRustPackage rec { openssl_1_0_2 libssh zlib - ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.isDarwin) [ curl libiconv CoreFoundation diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix index f08f57ee8be..d55ad89ca56 100644 --- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -16,14 +16,14 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig makeWrapper installShellFiles ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; postInstall = '' installManPage git-gone.1 ''; postFixup = '' - wrapProgram $out/bin/git-gone --prefix PATH : "${stdenv.lib.makeBinPath [ git ]}" + wrapProgram $out/bin/git-gone --prefix PATH : "${lib.makeBinPath [ git ]}" ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix index 4ef97a30a1f..884eed2e2ef 100644 --- a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix @@ -17,7 +17,7 @@ buildRustPackage rec { nativeBuildInputs = [ pkgconfig installShellFiles ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix index 2b76fb3dea5..1d669bfe49c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0jc6mhszxmwsdjk73wkfi0jjp9vkzzl9kk0dbnry6w7dyr5if8cc"; - buildInputs = [ ncurses5 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = [ ncurses5 ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; cargoParallelTestThreads = false; diff --git a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix index d5278d9d241..942a12e239b 100644 --- a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, git, perl, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, git, perl, makeWrapper }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "git-octopus"; diff --git a/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/pkgs/applications/version-management/git-and-tools/git-open/default.nix index ac28e555950..3ba53e837fa 100644 --- a/pkgs/applications/version-management/git-and-tools/git-open/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-open/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp git-open $out/bin wrapProgram $out/bin/git-open \ - --prefix PATH : "${stdenv.lib.makeBinPath [ git xdg_utils gnugrep ]}" + --prefix PATH : "${lib.makeBinPath [ git xdg_utils gnugrep ]}" ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix index b3a371063f3..2ecc5d872b8 100644 --- a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp git-recent $out/bin wrapProgram $out/bin/git-recent \ - --prefix PATH : "${stdenv.lib.makeBinPath [ git less util-linux ]}" + --prefix PATH : "${lib.makeBinPath [ git less util-linux ]}" ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix index 16efc8cbca1..d6a35a28d66 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installPhase = '' prefix="$out" ./install.sh wrapProgram "$out/bin/git-remote-gcrypt" \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg curl rsync coreutils + --prefix PATH ":" "${lib.makeBinPath [ gnupg curl rsync coreutils gawk gnused gnugrep ]}" ''; diff --git a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix b/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix index 7bc4a05e53c..037de14658d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - wrapProgram $out/bin/git-reparent --prefix PATH : "${stdenv.lib.makeBinPath [ git gnused ]}" + wrapProgram $out/bin/git-reparent --prefix PATH : "${lib.makeBinPath [ git gnused ]}" ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix index fe67aca55d1..eea7bed011b 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix @@ -29,8 +29,8 @@ in stdenv.mkDerivation { meta = { description = "A bash-tool to store your private data inside a git repository"; homepage = "https://git-secret.io"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.lo1tuma ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.lo1tuma ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix index 90c2b884226..154a4048e0a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -m444 -Dt $out/share/man/man1 git-secrets.1 wrapProgram $out/bin/git-secrets \ - --prefix PATH : "${stdenv.lib.makeBinPath [ git coreutils ]}" + --prefix PATH : "${lib.makeBinPath [ git coreutils ]}" ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-standup/default.nix b/pkgs/applications/version-management/git-and-tools/git-standup/default.nix index 541baee50a7..2bbf7840138 100644 --- a/pkgs/applications/version-management/git-and-tools/git-standup/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-standup/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install -Dm755 -t $out/bin git-standup wrapProgram $out/bin/git-standup \ - --prefix PATH : "${stdenv.lib.makeBinPath [ git ]}" + --prefix PATH : "${lib.makeBinPath [ git ]}" ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-subset/default.nix b/pkgs/applications/version-management/git-and-tools/git-subset/default.nix index dd6902af243..204ded65fd3 100644 --- a/pkgs/applications/version-management/git-and-tools/git-subset/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-subset/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ curl libiconv Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl libiconv Security ]; meta = with lib; { description = "Super fast Git tree filtering"; diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix index bba35509555..87cb7452c75 100644 --- a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, coreutils, gnugrep, gnused, makeWrapper, git +{ lib, stdenv, fetchFromGitHub, coreutils, gnugrep, gnused, makeWrapper, git }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp -a git-sync $out/bin/git-sync ''; - wrapperPath = with stdenv.lib; makeBinPath [ + wrapperPath = with lib; makeBinPath [ coreutils git gnugrep @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = { description = "A script to automatically synchronize a git repository"; homepage = "https://github.com/simonthum/git-sync"; - maintainers = with stdenv.lib.maintainers; [ imalison ]; - license = stdenv.lib.licenses.cc0; - platforms = with stdenv.lib.platforms; unix; + maintainers = with lib.maintainers; [ imalison ]; + license = lib.licenses.cc0; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-test/default.nix b/pkgs/applications/version-management/git-and-tools/git-test/default.nix index de345f17cf0..624ce561690 100644 --- a/pkgs/applications/version-management/git-and-tools/git-test/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-test/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -m444 -Dt $out/share/man/man1 git-test.1 wrapProgram $out/bin/git-test \ - --prefix PATH : "${stdenv.lib.makeBinPath [ git ]}" + --prefix PATH : "${lib.makeBinPath [ git ]}" ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix b/pkgs/applications/version-management/git-and-tools/git-trim/default.nix index d827797b33a..d470b63a0b7 100644 --- a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-trim/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; postInstall = '' install -Dm644 -t $out/share/man/man1/ docs/git-trim.1 diff --git a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix index aa869c754dc..9bb680a489d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0zkns037vgy96ybmn80px515ivz6yhj5br5mwbvxgl73va92wd9v"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; meta = with lib; { description = "Sync personal and work git repositories from multiple providers"; 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 8c7f323cbb6..d7258dd3660 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, buildPackages +{ fetchurl, lib, stdenv, buildPackages , fetchpatch , curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc @@ -38,7 +38,7 @@ stdenv.mkDerivation { sha256 = "06ad6dylgla34k9am7d5z8y3rryc8ln3ibq5z0d74rcm20hm0wsm"; }; - outputs = [ "out" ] ++ stdenv.lib.optional withManual "doc"; + outputs = [ "out" ] ++ lib.optional withManual "doc"; hardeningDisable = [ "format" ]; @@ -66,20 +66,20 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ gettext perlPackages.perl ] - ++ stdenv.lib.optionals withManual [ asciidoctor texinfo xmlto docbook2x + ++ lib.optionals withManual [ asciidoctor texinfo xmlto docbook2x docbook_xsl docbook_xsl_ns docbook_xml_dtd_45 libxslt ]; buildInputs = [curl openssl zlib expat cpio makeWrapper libiconv] - ++ stdenv.lib.optionals perlSupport [ perlPackages.perl ] - ++ stdenv.lib.optionals guiSupport [tcl tk] - ++ stdenv.lib.optionals withpcre2 [ pcre2 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ] - ++ stdenv.lib.optionals withLibsecret [ pkgconfig glib libsecret ]; + ++ lib.optionals perlSupport [ perlPackages.perl ] + ++ lib.optionals guiSupport [tcl tk] + ++ lib.optionals withpcre2 [ pcre2 ] + ++ lib.optionals stdenv.isDarwin [ darwin.Security ] + ++ lib.optionals withLibsecret [ pkgconfig glib libsecret ]; # required to support pthread_cancel() - NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.cc.isClang) "-lgcc_s" - + stdenv.lib.optionalString (stdenv.isFreeBSD) "-lthr"; + NIX_LDFLAGS = lib.optionalString (!stdenv.cc.isClang) "-lgcc_s" + + lib.optionalString (stdenv.isFreeBSD) "-lthr"; - configureFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_fread_reads_directories=yes" "ac_cv_snprintf_returns_bogus=no" "ac_cv_iconv_omits_bom=no" @@ -96,11 +96,11 @@ stdenv.mkDerivation { ] ++ (if perlSupport then ["PERL_PATH=${perlPackages.perl}/bin/perl"] else ["NO_PERL=1"]) ++ (if pythonSupport then ["PYTHON_PATH=${python3}/bin/python"] else ["NO_PYTHON=1"]) - ++ stdenv.lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="] + ++ lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="] ++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc"]) - ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"] - ++ stdenv.lib.optional withpcre2 "USE_LIBPCRE2=1" - ++ stdenv.lib.optional (!nlsSupport) "NO_GETTEXT=1" + ++ lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"] + ++ lib.optional withpcre2 "USE_LIBPCRE2=1" + ++ lib.optional (!nlsSupport) "NO_GETTEXT=1" # git-gui refuses to start with the version of tk distributed with # macOS Catalina. We can prevent git from building the .app bundle # by specifying an invalid tk framework. The postInstall step will @@ -108,16 +108,16 @@ stdenv.mkDerivation { # acceptable version. # # See https://github.com/Homebrew/homebrew-core/commit/dfa3ccf1e7d3901e371b5140b935839ba9d8b706 - ++ stdenv.lib.optional stdenv.isDarwin "TKFRAMEWORK=/nonexistent"; + ++ lib.optional stdenv.isDarwin "TKFRAMEWORK=/nonexistent"; postBuild = '' make -C contrib/subtree - '' + (stdenv.lib.optionalString perlSupport '' + '' + (lib.optionalString perlSupport '' make -C contrib/diff-highlight - '') + (stdenv.lib.optionalString stdenv.isDarwin '' + '') + (lib.optionalString stdenv.isDarwin '' make -C contrib/credential/osxkeychain - '') + (stdenv.lib.optionalString withLibsecret '' + '') + (lib.optionalString withLibsecret '' make -C contrib/credential/libsecret ''); @@ -129,11 +129,11 @@ stdenv.mkDerivation { installFlags = [ "NO_INSTALL_HARDLINKS=1" ]; - preInstall = (stdenv.lib.optionalString stdenv.isDarwin '' + preInstall = (lib.optionalString stdenv.isDarwin '' mkdir -p $out/bin ln -s $out/share/git/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin/ rm -f $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain.o - '') + (stdenv.lib.optionalString withLibsecret '' + '') + (lib.optionalString withLibsecret '' mkdir -p $out/bin ln -s $out/share/git/contrib/credential/libsecret/git-credential-libsecret $out/bin/ rm -f $PWD/contrib/credential/libsecret/git-credential-libsecret.o @@ -146,7 +146,7 @@ stdenv.mkDerivation { } # Install git-subtree. - make -C contrib/subtree install ${stdenv.lib.optionalString withManual "USE_ASCIIDOCTOR=1 install-doc"} + make -C contrib/subtree install ${lib.optionalString withManual "USE_ASCIIDOCTOR=1 install-doc"} rm -rf contrib/subtree # Install contrib stuff. @@ -170,7 +170,7 @@ stdenv.mkDerivation { '${gnugrep}/bin/grep', '${gnused}/bin/sed', '${gawk}/bin/awk', '${coreutils}/bin/cut', '${coreutils}/bin/basename', '${coreutils}/bin/dirname', '${coreutils}/bin/wc', '${coreutils}/bin/tr' - ${stdenv.lib.optionalString perlSupport ", '${perlPackages.perl}/bin/perl'"} + ${lib.optionalString perlSupport ", '${perlPackages.perl}/bin/perl'"} ); } foreach $c (@a) { @@ -186,7 +186,7 @@ stdenv.mkDerivation { # Also put git-http-backend into $PATH, so that we can use smart # HTTP(s) transports for pushing ln -s $out/libexec/git-core/git-http-backend $out/bin/git-http-backend - '' + stdenv.lib.optionalString perlSupport '' + '' + lib.optionalString perlSupport '' # wrap perl commands makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc.perl" $out/bin/git-credential-netrc \ --set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}" @@ -206,7 +206,7 @@ stdenv.mkDerivation { sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \ $out/share/gitweb/gitweb.cgi # Give access to CGI.pm and friends (was removed from perl core in 5.22) - for p in ${stdenv.lib.concatStringsSep " " gitwebPerlLibs}; do + for p in ${lib.concatStringsSep " " gitwebPerlLibs}; do sed -i -e "/use CGI /i use lib \"$p/${perlPackages.perl.libPrefix}\";" \ "$out/share/gitweb/gitweb.cgi" done @@ -230,7 +230,7 @@ stdenv.mkDerivation { notSupported $out/libexec/git-core/git-send-email '') - + stdenv.lib.optionalString withManual ''# Install man pages + + lib.optionalString withManual ''# Install man pages make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES USE_ASCIIDOCTOR=1 PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html \ -C Documentation '' @@ -248,7 +248,7 @@ stdenv.mkDerivation { notSupported "$out/$prog" done '') - + stdenv.lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.isDarwin '' # enable git-credential-osxkeychain by default if darwin mkdir -p $out/etc cat > $out/etc/gitconfig << EOF @@ -275,7 +275,7 @@ stdenv.mkDerivation { installCheckFlagsArray+=( GIT_PROVE_OPTS="--jobs $NIX_BUILD_CORES --failures --state=failed,save" GIT_TEST_INSTALLED=$out/bin - ${stdenv.lib.optionalString (!svnSupport) "NO_SVN_TESTS=y"} + ${lib.optionalString (!svnSupport) "NO_SVN_TESTS=y"} ) function disable_test { @@ -297,7 +297,7 @@ stdenv.mkDerivation { # Our patched gettext never fallbacks disable_test t0201-gettext-fallbacks - ${stdenv.lib.optionalString (!sendEmailSupport) '' + ${lib.optionalString (!sendEmailSupport) '' # Disable sendmail tests disable_test t9001-send-email ''} @@ -310,17 +310,17 @@ stdenv.mkDerivation { # Tested to fail: 2.18.0 disable_test t9902-completion "sourcing the completion script clears cached --options" - ${stdenv.lib.optionalString (!perlSupport) '' + ${lib.optionalString (!perlSupport) '' # request-pull is a Bash script that invokes Perl, so it is not available # when NO_PERL=1, and the test should be skipped, but the test suite does # not check for the Perl prerequisite. disable_test t5150-request-pull ''} - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' # XXX: Some tests added in 2.24.0 fail. # Please try to re-enable on the next release. disable_test t7816-grep-binary-pattern - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString stdenv.hostPlatform.isMusl '' # Test fails (as of 2.17.0, musl 1.1.19) disable_test t3900-i18n-commit # Fails largely due to assumptions about BOM @@ -334,7 +334,7 @@ stdenv.mkDerivation { meta = { homepage = "https://git-scm.com/"; description = "Distributed version control system"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; changelog = "https://raw.githubusercontent.com/git/git/${version}/Documentation/RelNotes/${version}.txt"; longDescription = '' @@ -342,7 +342,7 @@ stdenv.mkDerivation { handle very large projects with speed and efficiency. ''; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ primeos peti wmertens globin ]; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ primeos peti wmertens globin ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix index 34417cfaa8c..a1c63538220 100644 --- a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, stdenv, perl }: +{ fetchgit, lib, stdenv, perl }: stdenv.mkDerivation { name = "git2cl-20080827"; @@ -18,6 +18,6 @@ stdenv.mkDerivation { meta = { homepage = "https://savannah.nongnu.org/projects/git2cl"; description = "Convert git logs to GNU style ChangeLog files"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 20a446965f9..81b2984087b 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -14,8 +14,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ python3 perl ]; buildInputs = [ openssl ] - ++ stdenv.lib.optional stdenv.isLinux xclip - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security AppKit ]; + ++ lib.optional stdenv.isLinux xclip + ++ lib.optionals stdenv.isDarwin [ libiconv Security AppKit ]; meta = with lib; { description = "Blazing fast terminal-ui for git written in rust"; diff --git a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix index b6659b5f539..6f5ce3358a3 100644 --- a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, git, fetchFromGitHub +{ lib, stdenv, buildEnv, git, fetchFromGitHub , gitwebTheme ? false }: let @@ -15,13 +15,13 @@ let sha256 = "17hypq6jvhy6zhh26lp3nyi52npfd5wy5752k6sq0shk4na2acqi"; }; in buildEnv { - name = "gitweb-${stdenv.lib.getVersion git}"; + name = "gitweb-${lib.getVersion git}"; ignoreCollisions = true; - paths = stdenv.lib.optional gitwebTheme gitwebThemeSrc + paths = lib.optional gitwebTheme gitwebThemeSrc ++ [ "${git}/share/gitweb" ]; meta = git.meta // { - maintainers = with stdenv.lib.maintainers; [ gnidorah ]; + maintainers = with lib.maintainers; [ gnidorah ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/pkgs/applications/version-management/git-and-tools/subgit/default.nix index 11189e02c8f..2f275827a2e 100644 --- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/subgit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, makeWrapper, jre }: +{ lib, stdenv, fetchurl, unzip, makeWrapper, jre }: stdenv.mkDerivation rec { name = "subgit-3.3.10"; @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { description = "A tool for a smooth, stress-free SVN to Git migration"; longDescription = "Create writable Git mirror of a local or remote Subversion repository and use both Subversion and Git as long as you like. You may also do a fast one-time import from Subversion to Git."; homepage = "http://subgit.com"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.unfree; + platforms = lib.platforms.all; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index b61ae80bbee..69742b6d760 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ruby, makeWrapper, git }: +{ lib, stdenv, fetchurl, ruby, makeWrapper, git }: let version = "2.4.0"; @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/nirvdrum/svn2git"; description = "Tool for importing Subversion repositories into git"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 1a469970caf..f907cdac036 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { autoreconfFlags = "-I tools -v"; buildInputs = [ ncurses readline git ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.isDarwin [ libiconv ]; # those files are inherently impure, we'll handle the corresponding dependencies. postPatch = '' diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix index faa4d66d7ca..aebd488fe30 100644 --- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { install -m 644 -D contrib/zsh/_transcrypt $out/share/zsh/site-functions/_transcrypt wrapProgram $out/bin/transcrypt \ - --prefix PATH : "${stdenv.lib.makeBinPath [ git openssl coreutils util-linux gnugrep gnused gawk ]}" + --prefix PATH : "${lib.makeBinPath [ git openssl coreutils util-linux gnugrep gnused gawk ]}" cat > $out/bin/transcrypt-depspathprefix << EOF #!${stdenv.shell} - echo "${stdenv.lib.makeBinPath [ git openssl coreutils gawk ]}:" + echo "${lib.makeBinPath [ git openssl coreutils gawk ]}:" EOF chmod +x $out/bin/transcrypt-depspathprefix ''; diff --git a/pkgs/applications/version-management/git-backup/default.nix b/pkgs/applications/version-management/git-backup/default.nix index bb621647125..d73e77d6d94 100644 --- a/pkgs/applications/version-management/git-backup/default.nix +++ b/pkgs/applications/version-management/git-backup/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { homepage = "https://github.com/jsdw/git-backup"; diff --git a/pkgs/applications/version-management/git-crecord/default.nix b/pkgs/applications/version-management/git-crecord/default.nix index 9481f3ebd92..3b906e4dc2e 100644 --- a/pkgs/applications/version-management/git-crecord/default.nix +++ b/pkgs/applications/version-management/git-crecord/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ lib, stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "git-crecord"; @@ -16,6 +16,6 @@ pythonPackages.buildPythonApplication rec { meta = { homepage = "https://github.com/andrewshadura/git-crecord"; description = "Git subcommand to interactively select changes to commit or stage"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index fb0b153bc3a..9c168d71dba 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # Important runtime dependencies postFixup = '' wrapProgram $out/bin/repo --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ git gnupg less ]}" + "${lib.makeBinPath [ git gnupg less ]}" ''; meta = with lib; { diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 528e7c3dd99..20c2e5c9ce8 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -1,10 +1,10 @@ -{ stdenv, buildGoPackage, fetchurl, makeWrapper +{ lib, stdenv, buildGoPackage, fetchurl, makeWrapper , git, bash, gzip, openssh, pam , sqliteSupport ? true , pamSupport ? true }: -with stdenv.lib; +with lib; buildGoPackage rec { pname = "gitea"; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 4fc84767cd4..7618b3f3ff1 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,4 +1,4 @@ -{ stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib +{ lib, stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib , libXfixes, atk, gtk3, libXrender, pango, gnome3, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus @@ -6,7 +6,7 @@ , e2fsprogs, krb5, libdrm, mesa }: -with stdenv.lib; +with lib; let curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; }; diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index c345b8d7a80..ba359bc9779 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.isDarwin [ Security ]; # Needed to get openssl-sys to use pkgconfig. OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index b574c03248f..fed2fd9ea33 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -1,10 +1,10 @@ -{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper +{ lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper , git, bash, gzip, openssh, pam , sqliteSupport ? true , pamSupport ? true }: -with stdenv.lib; +with lib; buildGoModule rec { pname = "gogs"; diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix index 1ff1030150f..82513bab952 100644 --- a/pkgs/applications/version-management/guitone/default.nix +++ b/pkgs/applications/version-management/guitone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchmtn, qt4, qmake4Hook, pkgconfig, graphviz }: +{ lib, stdenv, fetchmtn, qt4, qmake4Hook, pkgconfig, graphviz }: let version = "1.0-mtn-head"; in stdenv.mkDerivation { @@ -28,7 +28,7 @@ stdenv.mkDerivation { description = "Qt4 based GUI for monotone"; homepage = "https://guitone.thomaskeller.biz"; downloadPage = "https://code.monotone.ca/p/guitone/"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index ecad825dc8b..4f94e2926c4 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { format = "other"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "toARTVq3kzJFSf1Y9OsgLY4oDAYzoLdl7ebfs0FgqBs="; }; diff --git a/pkgs/applications/version-management/mercurial/4.9.nix b/pkgs/applications/version-management/mercurial/4.9.nix index f0918ab69a6..29440724274 100644 --- a/pkgs/applications/version-management/mercurial/4.9.nix +++ b/pkgs/applications/version-management/mercurial/4.9.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages, makeWrapper, unzip +{ lib, stdenv, fetchurl, python2Packages, makeWrapper, unzip , guiSupport ? false, tk ? null , ApplicationServices , mercurialSrc ? fetchurl rec { @@ -22,13 +22,13 @@ in python2Packages.buildPythonApplication { inherit python; # pass it so that the same version can be used in hg2git buildInputs = [ makeWrapper docutils unzip ] - ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices ]; + ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; propagatedBuildInputs = [ hg-git dulwich ]; makeFlags = [ "PREFIX=$(out)" ]; - postInstall = (stdenv.lib.optionalString guiSupport + postInstall = (lib.optionalString guiSupport '' mkdir -p $out/etc/mercurial cp contrib/hgk $out/bin @@ -62,10 +62,10 @@ in python2Packages.buildPythonApplication { description = "A fast, lightweight SCM system for very large distributed projects"; homepage = "https://www.mercurial-scm.org"; downloadPage = "https://www.mercurial-scm.org/release/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.eraserhd ]; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.eraserhd ]; updateWalker = true; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index e0400fd46c6..c841482126a 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages, makeWrapper, unzip +{ lib, stdenv, fetchurl, python3Packages, makeWrapper, unzip , guiSupport ? false, tk ? null , ApplicationServices }: @@ -20,11 +20,11 @@ in python3Packages.buildPythonApplication rec { passthru = { inherit python; }; # pass it so that the same version can be used in hg2git buildInputs = [ makeWrapper docutils unzip ] - ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices ]; + ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; makeFlags = [ "PREFIX=$(out)" ]; - postInstall = (stdenv.lib.optionalString guiSupport '' + postInstall = (lib.optionalString guiSupport '' mkdir -p $out/etc/mercurial cp contrib/hgk $out/bin cat >> $out/etc/mercurial/hgrc << EOF @@ -56,9 +56,9 @@ in python3Packages.buildPythonApplication rec { description = "A fast, lightweight SCM system for very large distributed projects"; homepage = "https://www.mercurial-scm.org"; downloadPage = "https://www.mercurial-scm.org/release/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.eelco ]; updateWalker = true; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index 03b98694eaf..f4e21dd4149 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, ocamlPackages, gnome2, pkgconfig, makeWrapper, glib +{ lib, stdenv, fetchurl, ocamlPackages, gnome2, pkgconfig, makeWrapper, glib , libtool, libpng, yacc, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw }: # We need an old version of Graphviz for format compatibility reasons. # This version is vulnerable, but monotone-viz will never feed it bad input. let graphviz_2_0 = import ./graphviz-2.0.nix { - inherit stdenv fetchurl pkgconfig xlibsWrapper libpng libjpeg expat libXaw + inherit lib stdenv fetchurl pkgconfig xlibsWrapper libpng libjpeg expat libXaw yacc libtool fontconfig pango gd libwebp; }; in let inherit (gnome2) libgnomecanvas; in @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { meta = { inherit version; description = ''Monotone ancestry visualiser''; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix index 816bfcde67f..c72256807dd 100644 --- a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix +++ b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xlibsWrapper, libpng, libjpeg, expat, libXaw +{ lib, stdenv, fetchurl, pkgconfig, xlibsWrapper, libpng, libjpeg, expat, libXaw , yacc, libtool, fontconfig, pango, gd, libwebp }: @@ -30,12 +30,12 @@ stdenv.mkDerivation rec { "--with-ltdl-include=${libtool}/include" "--with-ltdl-lib=${libtool.lib}/lib" ] - ++ stdenv.lib.optional (xlibsWrapper == null) "--without-x"; + ++ lib.optional (xlibsWrapper == null) "--without-x"; meta = { description = "A program for visualising graphs"; homepage = "http://www.graphviz.org/"; branch = "2.0"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index e08ea3c8cd8..c8c2d5b048b 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -5,7 +5,7 @@ let version = "1.1"; - perlVersion = stdenv.lib.getVersion perl; + perlVersion = lib.getVersion perl; in assert perlVersion != ""; diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix index 05ef7021f16..da882f1e359 100644 --- a/pkgs/applications/version-management/mr/default.nix +++ b/pkgs/applications/version-management/mr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, perl }: +{ lib, stdenv, fetchgit, perl }: stdenv.mkDerivation { pname = "mr"; @@ -31,8 +31,8 @@ stdenv.mkDerivation { other version control systems can easily be added. ''; homepage = "http://myrepos.branchable.com/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ antono henrytill ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ antono henrytill ]; }; } diff --git a/pkgs/applications/version-management/nitpick/default.nix b/pkgs/applications/version-management/nitpick/default.nix index bcb16ea8678..ba1f3bbb93b 100644 --- a/pkgs/applications/version-management/nitpick/default.nix +++ b/pkgs/applications/version-management/nitpick/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub , buildPythonPackage -, stdenv +, lib, stdenv , isPy27 }: @@ -10,7 +10,7 @@ buildPythonPackage rec { format = "other"; disabled = !isPy27; - + src = fetchFromGitHub { owner = "travisb-ca"; repo = pname; @@ -21,7 +21,7 @@ buildPythonPackage rec { installPhase = '' mkdir -p $out/share/src install -m 755 -t $out/share/src nitpick.py - + mkdir -p $out/bin ln -s $out/share/src/nitpick.py $out/bin/nitpick ''; @@ -34,7 +34,7 @@ buildPythonPackage rec { follow the code via whatever VCS or distribution mechanism. ''; homepage = "http://travisbrown.ca/projects/nitpick/docs/nitpick.html"; - license = with stdenv.lib.licenses; gpl2; + license = with lib.licenses; gpl2; maintainers = []; }; } diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix index 01ea365b76c..476df99d232 100644 --- a/pkgs/applications/version-management/p4v/default.nix +++ b/pkgs/applications/version-management/p4v/default.nix @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { meta = { description = "Perforce Visual Client"; homepage = "https://www.perforce.com"; - license = stdenv.lib.licenses.unfreeRedistributable; + license = lib.licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; - maintainers = with stdenv.lib.maintainers; [ nathyong nioncode ]; + maintainers = with lib.maintainers; [ nathyong nioncode ]; }; } diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index a4b8be65117..a00332a93ce 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -22,13 +22,13 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-Xwk5bX9o41M/1BmkOpAscGQHikhzV+9qAwVz0qI7FRA"; - cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git"; + cargoBuildFlags = lib.optional gitImportSupport "--features=git"; doCheck = false; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl libsodium xxHash zstd ] - ++ (stdenv.lib.optionals gitImportSupport [ libgit2 ]) - ++ (stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ (lib.optionals gitImportSupport [ libgit2 ]) + ++ (lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices Security SystemConfiguration ])); diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index fc6a8adc2ad..33eba79732d 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python }: +{ lib, stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python }: stdenv.mkDerivation rec { pname = "rapidsvn"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Multi-platform GUI front-end for the Subversion revision system"; homepage = "http://rapidsvn.tigris.org/"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.viric ]; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.viric ]; }; } diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index 404d6ae09bc..f8143711318 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, ed }: +{ lib, stdenv, fetchurl, fetchpatch, ed }: stdenv.mkDerivation rec { name = "rcs-5.9.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ ed ]; - patches = stdenv.lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.isDarwin [ # This failure appears unrelated to the subject of the test. This # test seems to rely on a bash bug where `test $x -nt $y` ignores # subsecond values in timetamps. This bug has been fixed in Bash @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-std=c99"; - hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "format"; + hardeningDisable = lib.optional stdenv.cc.isClang "format"; meta = { homepage = "https://www.gnu.org/software/rcs/"; @@ -66,8 +66,8 @@ stdenv.mkDerivation rec { documentation, graphics, papers, and form letters. ''; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ eelco ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ eelco ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index bd8d5db36be..83370f5c6f0 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libzip gnupg ] - ++ (stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreFoundation Security ]); + ++ (lib.optionals stdenv.isDarwin [ libiconv CoreFoundation Security ]); preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index f2bd4bf576b..324c61ab194 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ jre gnome3.adwaita-icon-theme gtk3 ]; - preFixup = with stdenv.lib; '' + preFixup = with lib; '' gappsWrapperArgs+=( \ --prefix PATH : ${makeBinPath [ jre which ]} \ --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - desktopItem = with stdenv.lib; makeDesktopItem rec { + desktopItem = with lib; makeDesktopItem rec { name = "smartgit"; exec = "smartgit"; comment = meta.description; @@ -89,6 +89,6 @@ stdenv.mkDerivation rec { homepage = "https://www.syntevo.com/smartgit/"; license = licenses.unfree; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; + maintainers = with lib.maintainers; [ jraygauthier ]; }; } diff --git a/pkgs/applications/version-management/sourcehut/fetchNodeModules.nix b/pkgs/applications/version-management/sourcehut/fetchNodeModules.nix index 047890a932c..bbc18d0442d 100644 --- a/pkgs/applications/version-management/sourcehut/fetchNodeModules.nix +++ b/pkgs/applications/version-management/sourcehut/fetchNodeModules.nix @@ -1,8 +1,8 @@ -{ stdenv, jq }: { src, nodejs, sha256 }: +{ lib, stdenv, jq }: { src, nodejs, sha256 }: # Only npm >= 5.4.2 is deterministic, see: # https://github.com/npm/npm/issues/17979#issuecomment-332701215 -assert stdenv.lib.versionAtLeast nodejs.version "8.9.0"; +assert lib.versionAtLeast nodejs.version "8.9.0"; stdenv.mkDerivation { name = "node_modules"; diff --git a/pkgs/applications/version-management/srcml/default.nix b/pkgs/applications/version-management/srcml/default.nix index 6deca94fc15..c13a08a711c 100644 --- a/pkgs/applications/version-management/srcml/default.nix +++ b/pkgs/applications/version-management/srcml/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python, antlr, +{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python, antlr, curl }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "0.9.5_beta"; diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index 6ed644d050e..e6c83eb55d8 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -7,7 +7,7 @@ let pname = "sublime-merge"; - packageAttribute = "sublime-merge${stdenv.lib.optionalString dev "-dev"}"; + packageAttribute = "sublime-merge${lib.optionalString dev "-dev"}"; binaries = [ "sublime_merge" "crash_reporter" "git-credential-sublime" "ssh-askpass-sublime" ]; primaryBinary = "sublime_merge"; primaryBinaryAliases = [ "smerge" ]; @@ -17,7 +17,7 @@ let archSha256 = sha256; arch = "x64"; - libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ]; + libPath = lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ]; redirects = [ "/usr/bin/pkexec=${pkexecPath}" "/bin/true=${coreutils}/bin/true" ]; in let binaryPackage = stdenv.mkDerivation { @@ -40,7 +40,7 @@ in let for binary in ${ builtins.concatStringsSep " " binaries }; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${libGL}/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${libPath}:${libGL}/lib:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ $binary done @@ -105,11 +105,11 @@ in stdenv.mkDerivation (rec { passthru.updateScript = writeScript "${pname}-update-script" '' #!${stdenv.shell} set -o errexit - PATH=${stdenv.lib.makeBinPath [ common-updater-scripts curl gnugrep ]} + PATH=${lib.makeBinPath [ common-updater-scripts curl gnugrep ]} latestVersion=$(curl -s ${versionUrl} | grep -Po '(?<=<p class="latest"><i>Version:</i> Build )([0-9]+)') - for platform in ${stdenv.lib.concatStringsSep " " meta.platforms}; do + for platform in ${lib.concatStringsSep " " meta.platforms}; do # The script will not perform an update when the version attribute is up to date from previous platform run # We need to clear it before each run update-source-version ${packageAttribute}.${primaryBinary} 0 0000000000000000000000000000000000000000000000000000000000000000 --file=${versionFile} --version-key=buildVersion --system=$platform diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 66d22e9d718..5540e53c84e 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -31,10 +31,10 @@ let buildInputs = [ zlib apr aprutil sqlite openssl ] ++ extraBuildInputs - ++ stdenv.lib.optional httpSupport serf - ++ stdenv.lib.optional pythonBindings python - ++ stdenv.lib.optional perlBindings perl - ++ stdenv.lib.optional saslSupport sasl; + ++ lib.optional httpSupport serf + ++ lib.optional pythonBindings python + ++ lib.optional perlBindings perl + ++ lib.optional saslSupport sasl; patches = [ ./apr-1.patch ]; @@ -44,15 +44,15 @@ let CPPFLAGS = [ "-P" ]; configureFlags = [ - (stdenv.lib.withFeature bdbSupport "berkeley-db") - (stdenv.lib.withFeatureAs httpServer "apxs" "${apacheHttpd.dev}/bin/apxs") - (stdenv.lib.withFeatureAs (pythonBindings || perlBindings) "swig" swig) - (stdenv.lib.withFeatureAs saslSupport "sasl" sasl) - (stdenv.lib.withFeatureAs httpSupport "serf" serf) + (lib.withFeature bdbSupport "berkeley-db") + (lib.withFeatureAs httpServer "apxs" "${apacheHttpd.dev}/bin/apxs") + (lib.withFeatureAs (pythonBindings || perlBindings) "swig" swig) + (lib.withFeatureAs saslSupport "sasl" sasl) + (lib.withFeatureAs httpSupport "serf" serf) "--disable-keychain" "--with-zlib=${zlib.dev}" "--with-sqlite=${sqlite.dev}" - ] ++ stdenv.lib.optionals javahlBindings [ + ] ++ lib.optionals javahlBindings [ "--enable-javahl" "--with-jdk=${jdk}" ]; @@ -103,7 +103,7 @@ let platforms = platforms.linux ++ platforms.darwin; }; - } // stdenv.lib.optionalAttrs stdenv.isDarwin { + } // lib.optionalAttrs stdenv.isDarwin { CXX = "clang++"; CC = "clang"; CPP = "clang -E"; diff --git a/pkgs/applications/version-management/tkcvs/default.nix b/pkgs/applications/version-management/tkcvs/default.nix index d2a7299bcd9..6a9e910f801 100644 --- a/pkgs/applications/version-management/tkcvs/default.nix +++ b/pkgs/applications/version-management/tkcvs/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, tcl, tk}: +{lib, stdenv, fetchurl, tcl, tk}: stdenv.mkDerivation { @@ -22,7 +22,7 @@ stdenv.mkDerivation meta = { homepage = "https://tkcvs.sourceforge.io"; description = "TCL/TK GUI for cvs and subversion"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index 3a45d126203..b75af94af56 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, gnupg }: +{ lib, stdenv, fetchFromGitHub, git, gnupg }: let version = "2.5.0"; in stdenv.mkDerivation { @@ -35,8 +35,8 @@ stdenv.mkDerivation { * Provides a way to use alternate files on a specific OS or host. * Supplies a method of encrypting confidential data so it can safely be stored in your repository. ''; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ abathur ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ abathur ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 0409954cfb1..7f6dc3df192 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -50,12 +50,12 @@ stdenv.mkDerivation rec { xorg.xcbutil xorg.xcbutilimage xorg.xcbutilkeysyms xorg.xcbutilrenderutil xorg.xcbutilwm libxkbcommon xcbutilxrm ] - ++ stdenv.lib.optional gtk3Support gtk3; + ++ lib.optional gtk3Support gtk3; cmakeFlags = [ #"-DGENERATE_MANPAGES=ON" "-DOVERRIDE_VERSION=${version}" - ] ++ stdenv.lib.optional luaPackages.isLuaJIT "-DLUA_LIBRARY=${lua}/lib/libluajit-5.1.so" + ] ++ lib.optional luaPackages.isLuaJIT "-DLUA_LIBRARY=${lua}/lib/libluajit-5.1.so" ; GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0"; diff --git a/pkgs/applications/window-managers/bspwm/unstable.nix b/pkgs/applications/window-managers/bspwm/unstable.nix index e52e33ec544..93718448340 100644 --- a/pkgs/applications/window-managers/bspwm/unstable.nix +++ b/pkgs/applications/window-managers/bspwm/unstable.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation { meta = { description = "A tiling window manager based on binary space partitioning (git version)"; homepage = "https://github.com/baskerville/bspwm"; - maintainers = [ stdenv.lib.maintainers.meisternu stdenv.lib.maintainers.epitrochoid ]; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.meisternu lib.maintainers.epitrochoid ]; + license = lib.licenses.bsd2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix index e48be5809e9..f7083212e70 100644 --- a/pkgs/applications/window-managers/cage/default.nix +++ b/pkgs/applications/window-managers/cage/default.nix @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { systemd libGL libX11 ]; - mesonFlags = [ "-Dxwayland=${stdenv.lib.boolToString (xwayland != null)}" ]; + mesonFlags = [ "-Dxwayland=${lib.boolToString (xwayland != null)}" ]; - postFixup = stdenv.lib.optionalString (xwayland != null) '' + postFixup = lib.optionalString (xwayland != null) '' wrapProgram $out/bin/cage --prefix PATH : "${xwayland}/bin" ''; diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix index 3d082599789..f0da8fac69c 100644 --- a/pkgs/applications/window-managers/cagebreak/default.nix +++ b/pkgs/applications/window-managers/cagebreak/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "contrib" ]; mesonFlags = [ - "-Dxwayland=${stdenv.lib.boolToString withXwayland}" + "-Dxwayland=${lib.boolToString withXwayland}" "-Dversion_override=${version}" ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cp $src/examples/config $contrib/share/cagebreak/config ''; - postFixup = stdenv.lib.optionalString withXwayland '' + postFixup = lib.optionalString withXwayland '' wrapProgram $out/bin/cagebreak --prefix PATH : "${xwayland}/bin" ''; diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index 455e3249adf..eb349e6f3b1 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, libX11, libXinerama, libXft, writeText, patches ? [], conf ? null}: +{lib, stdenv, fetchurl, libX11, libXinerama, libXft, writeText, patches ? [], conf ? null}: -with stdenv.lib; +with lib; let name = "dwm-6.2"; @@ -27,8 +27,8 @@ stdenv.mkDerivation { meta = { homepage = "https://suckless.org/"; description = "Dynamic window manager for X"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; all; }; } diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 470c8ae2acc..d58b505ad4c 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "041sd9zm1c3v6iihnwjcya2xg5yxb2y4biyxpjlfblz2srxa15dm"; postInstall = lib.optionalString (bins != []) '' - wrapProgram $out/bin/dwm-status --prefix "PATH" : "${stdenv.lib.makeBinPath bins}" + wrapProgram $out/bin/dwm-status --prefix "PATH" : "${lib.makeBinPath bins}" ''; meta = with lib; { diff --git a/pkgs/applications/window-managers/dwm/git.nix b/pkgs/applications/window-managers/dwm/git.nix index 814b6167d17..71e91b6093b 100644 --- a/pkgs/applications/window-managers/dwm/git.nix +++ b/pkgs/applications/window-managers/dwm/git.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { inherit patches; # Allow users to override the entire config file AFTER appying the patches - postPatch = stdenv.lib.optionalString (conf!=null) '' + postPatch = lib.optionalString (conf!=null) '' echo -n '${conf}' > config.def.h ''; diff --git a/pkgs/applications/window-managers/dzen2/default.nix b/pkgs/applications/window-managers/dzen2/default.nix index 367c78ec5ca..2be20bc6db0 100644 --- a/pkgs/applications/window-managers/dzen2/default.nix +++ b/pkgs/applications/window-managers/dzen2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libX11, libXft, libXinerama, libXpm }: +{ lib, stdenv, fetchurl, pkgconfig, libX11, libXft, libXinerama, libXpm }: stdenv.mkDerivation { name = "dzen2-0.9.5"; @@ -30,8 +30,8 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/robm/dzen"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; description = "X notification utility"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix index b1a11d7153c..4cc4601d0d4 100644 --- a/pkgs/applications/window-managers/fluxbox/default.nix +++ b/pkgs/applications/window-managers/fluxbox/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig , freetype, fribidi , libXext, libXft, libXpm, libXrandr, libXrender, xorgproto , libXinerama , imlib2 }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "fluxbox"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { substituteInPlace util/fluxbox-generate_menu.in \ --subst-var-by PREFIX "$out" ''; - + meta = { description = "Full-featured, light-resource X window manager"; longDescription = '' diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix index 6b3f4029755..c691bcf59ed 100644 --- a/pkgs/applications/window-managers/fvwm/default.nix +++ b/pkgs/applications/window-managers/fvwm/default.nix @@ -1,5 +1,5 @@ { gestures ? false -, stdenv, fetchurl, pkgconfig +, lib, stdenv, fetchurl, pkgconfig , cairo, fontconfig, freetype, libXft, libXcursor, libXinerama , libXpm, libXt, librsvg, libpng, fribidi, perl , libstroke ? null @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { cairo fontconfig freetype libXft libXcursor libXinerama libXpm libXt librsvg libpng fribidi perl - ] ++ stdenv.lib.optional gestures libstroke; + ] ++ lib.optional gestures libstroke; meta = { homepage = "http://fvwm.org"; description = "A multiple large virtual desktop window manager"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ edanaher ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ edanaher ]; }; } diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index e547cea3c54..c4bdcb4ca75 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, glib, libX11, libXext, libXinerama, libXrandr +{ lib, stdenv, fetchurl, cmake, pkgconfig, glib, libX11, libXext, libXinerama, libXrandr , withDoc ? stdenv.buildPlatform == stdenv.targetPlatform, asciidoc ? null }: # Doc generation is disabled by default when cross compiling because asciidoc @@ -17,19 +17,19 @@ stdenv.mkDerivation rec { outputs = [ "out" - ] ++ stdenv.lib.optionals withDoc [ + ] ++ lib.optionals withDoc [ "doc" "man" ]; cmakeFlags = [ "-DCMAKE_INSTALL_SYSCONF_PREFIX=${placeholder "out"}/etc" - ] ++ stdenv.lib.optional (!withDoc) "-DWITH_DOCUMENTATION=OFF"; + ] ++ lib.optional (!withDoc) "-DWITH_DOCUMENTATION=OFF"; nativeBuildInputs = [ cmake pkgconfig - ] ++ stdenv.lib.optional withDoc asciidoc; + ] ++ lib.optional withDoc asciidoc; buildInputs = [ libX11 @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = { description = "A manual tiling window manager for X"; homepage = "https://herbstluftwm.org/"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix index 8f9ec3e56a2..89fa7f7ccf1 100644 --- a/pkgs/applications/window-managers/hikari/default.nix +++ b/pkgs/applications/window-managers/hikari/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; # Must replace GNU Make by bmake - buildPhase = with stdenv.lib; concatStringsSep " " ( + buildPhase = with lib; concatStringsSep " " ( [ "bmake" "-j$NIX_BUILD_CORES" "PREFIX=$out" ] ++ optional stdenv.isLinux "WITH_POSIX_C_SOURCE=YES" ++ mapAttrsToList (feat: enabled: diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix index f314f340bee..9c97c72ad5d 100644 --- a/pkgs/applications/window-managers/i3/blocks-gaps.nix +++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix @@ -4,7 +4,7 @@ "load_average" "memory" "volume" "wifi" ] }: -with stdenv.lib; +with lib; let perlscripts = [ "battery" "cpu_usage" "openvpn" "temperature" ]; diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix index bfd76b44437..1574c587743 100644 --- a/pkgs/applications/window-managers/i3/blocks.nix +++ b/pkgs/applications/window-managers/i3/blocks.nix @@ -1,6 +1,6 @@ -{ fetchFromGitHub, fetchpatch, stdenv, autoreconfHook, pkg-config }: +{ fetchFromGitHub, fetchpatch, lib, stdenv, autoreconfHook, pkg-config }: -with stdenv.lib; +with lib; stdenv.mkDerivation { pname = "i3blocks"; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 999deed3c66..d05b187ca78 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/7957 doCheck = false; # stdenv.hostPlatform.system == "x86_64-linux"; - checkPhase = stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") + checkPhase = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' (cd testcases && xvfb-run ./complete-run.pl -p 1 --keep-xserver-output) ! grep -q '^not ok' testcases/latest/complete-run.log diff --git a/pkgs/applications/window-managers/i3/layout-manager.nix b/pkgs/applications/window-managers/i3/layout-manager.nix index a69a1cd5a33..8fd0364bb58 100644 --- a/pkgs/applications/window-managers/i3/layout-manager.nix +++ b/pkgs/applications/window-managers/i3/layout-manager.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, vim, makeWrapper, jq, rofi, xrandr, xdotool, i3, gawk, libnotify }: let - path = stdenv.lib.makeBinPath [ vim jq rofi xrandr xdotool i3 gawk libnotify ]; + path = lib.makeBinPath [ vim jq rofi xrandr xdotool i3 gawk libnotify ]; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index f8d12642999..404e7b41f55 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs = [ # LC_TIME != C results in locale.Error: unsupported locale setting "--set" "LC_TIME" "C" - "--suffix" "LD_LIBRARY_PATH" ":" "${stdenv.lib.makeLibraryPath [ libpulseaudio ]}" + "--suffix" "LD_LIBRARY_PATH" ":" "${lib.makeLibraryPath [ libpulseaudio ]}" ]; postPatch = '' diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index 6005ca3ab3a..00fd501c805 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libconfuse, yajl, alsaLib, libpulseaudio, libnl, pkgconfig, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: +{ fetchurl, lib, stdenv, libconfuse, yajl, alsaLib, libpulseaudio, libnl, pkgconfig, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: stdenv.mkDerivation rec { name = "i3status-2.13"; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { description = "Generates a status line for i3bar, dzen2, xmobar or lemonbar"; homepage = "https://i3wm.org"; maintainers = [ ]; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix index 57c91c2cfb7..8f172ac8700 100644 --- a/pkgs/applications/window-managers/ion-3/default.nix +++ b/pkgs/applications/window-managers/ion-3/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, xlibsWrapper, lua, gettext, groff }: +{ lib, stdenv, fetchurl, xlibsWrapper, lua, gettext, groff }: stdenv.mkDerivation { name = "ion-3-20090110"; meta = { description = "Tiling tabbed window manager designed with keyboard users in mind"; homepage = "http://modeemi.fi/~tuomov/ion"; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.lgpl21; + platforms = with lib.platforms; linux; + license = lib.licenses.lgpl21; }; src = fetchurl { url = "http://tuomov.iki.fi/software/dl/ion-3-20090110.tar.gz"; diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 61ea1b28273..510003e52ea 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, automake, autoconf, libtool, gettext +{ lib, stdenv, fetchFromGitHub, pkgconfig, automake, autoconf, libtool, gettext , which, xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp , libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig }: @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://joewing.net/projects/jwm/"; description = "Joe's Window Manager is a light-weight X11 window manager"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/applications/window-managers/kbdd/default.nix index de1a68a56bf..9496d306bc7 100644 --- a/pkgs/applications/window-managers/kbdd/default.nix +++ b/pkgs/applications/window-managers/kbdd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, dbus-glib, autoreconfHook, xorg }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, dbus-glib, autoreconfHook, xorg }: stdenv.mkDerivation { pname = "kbdd"; @@ -17,8 +17,8 @@ stdenv.mkDerivation { meta = { description = "Simple daemon and library to make per window layout using XKB"; homepage = "https://github.com/qnikst/kbdd"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.wedens ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.wedens ]; }; } diff --git a/pkgs/applications/window-managers/larswm/default.nix b/pkgs/applications/window-managers/larswm/default.nix index b918c28938c..e9d400378e6 100644 --- a/pkgs/applications/window-managers/larswm/default.nix +++ b/pkgs/applications/window-managers/larswm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, imake, gccmakedep, libX11, libXext, libXmu }: +{ lib, stdenv, fetchurl, imake, gccmakedep, libX11, libXext, libXmu }: stdenv.mkDerivation { name = "larswm-7.5.3"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.fnurt.net/larswm"; description = "9wm-like tiling window manager"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.free; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index d0e883f89c8..712e9ab22c7 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, rustPlatform, libX11, libXinerama, makeWrapper }: let - rpath = stdenv.lib.makeLibraryPath [ libXinerama libX11 ]; + rpath = lib.makeLibraryPath [ libXinerama libX11 ]; in rustPlatform.buildRustPackage rec { diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix index a70e5a4dc5c..b318b39709a 100644 --- a/pkgs/applications/window-managers/lemonbar/xft.nix +++ b/pkgs/applications/window-managers/lemonbar/xft.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, libxcb, libXft }: +{ lib, stdenv, fetchFromGitHub, perl, libxcb, libXft }: stdenv.mkDerivation { name = "lemonbar-xft-unstable-2016-02-17"; @@ -18,6 +18,6 @@ stdenv.mkDerivation { description = "A lightweight xcb based bar with XFT-support"; homepage = "https://github.com/krypt-n/bar"; license = "Custom"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix index 3c537d6c931..035fcd44dd3 100644 --- a/pkgs/applications/window-managers/matchbox/default.nix +++ b/pkgs/applications/window-managers/matchbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libmatchbox, libX11, libXext }: +{ lib, stdenv, fetchurl, pkgconfig, libmatchbox, libX11, libXext }: stdenv.mkDerivation rec { pname = "matchbox"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "X window manager for non-desktop embedded systems"; homepage = "https://www.yoctoproject.org/software-item/matchbox/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index 39329e8004c..9b58bb1093d 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, python3 +{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, python3 , libxml2, libXinerama, libXcursor, libXau, libXrandr, libICE, libSM , imlib2, pango, libstartup_notification, makeWrapper }: @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { meta = { description = "X window manager for non-desktop embedded systems"; homepage = "http://openbox.org/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix index 21b18a4917b..52ca2b71073 100644 --- a/pkgs/applications/window-managers/oroborus/default.nix +++ b/pkgs/applications/window-managers/oroborus/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig , freetype, fribidi , libSM, libICE, libXt, libXaw, libXmu , libXext, libXft, libXpm, libXrandr , libXrender, xorgproto, libXinerama }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "oroborus"; diff --git a/pkgs/applications/window-managers/smallwm/default.nix b/pkgs/applications/window-managers/smallwm/default.nix index b6d3821e8d0..9dd2a25e5cf 100644 --- a/pkgs/applications/window-managers/smallwm/default.nix +++ b/pkgs/applications/window-managers/smallwm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , doxygen, graphviz, libX11, libXrandr }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cp -r README.markdown doc/html doc/latex $out/share/doc/${pname}-${version} ''; - meta = with stdenv.lib;{ + meta = with lib;{ description = "A small X window manager, extended from tinywm"; homepage = "https://github.com/adamnew123456/SmallWM"; license = licenses.bsd2; diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 4db5343498c..0f8d933a06d 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation { mkdir -p $out/share/stumpwm/modules cp -r modules/* $out/share/stumpwm/modules/ - for d in ${stdenv.lib.concatStringsSep " " extraModulePaths}; do + for d in ${lib.concatStringsSep " " extraModulePaths}; do cp -r --no-preserve=mode "$d" $out/share/stumpwm/modules/ done @@ -81,7 +81,7 @@ stdenv.mkDerivation { cp $out/share/stumpwm/modules/util/stumpish/stumpish $out/bin/ chmod +x $out/bin/stumpish wrapProgram $out/bin/stumpish \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ rlwrap gnused gnugrep coreutils xprop ]}" + --prefix PATH ":" "${lib.makeBinPath [ rlwrap gnused gnugrep coreutils xprop ]}" # Paths in the compressed image $out/bin/stumpwm are not # recognized by Nix. Add explicit reference here. diff --git a/pkgs/applications/window-managers/sway/contrib.nix b/pkgs/applications/window-managers/sway/contrib.nix index e04a6e1cb78..caf34e543b7 100644 --- a/pkgs/applications/window-managers/sway/contrib.nix +++ b/pkgs/applications/window-managers/sway/contrib.nix @@ -34,7 +34,7 @@ grimshot = stdenv.mkDerivation rec { install -Dm 0755 contrib/grimshot $out/bin/grimshot wrapProgram $out/bin/grimshot --set PATH \ - "${stdenv.lib.makeBinPath [ + "${lib.makeBinPath [ sway-unwrapped wl-clipboard coreutils diff --git a/pkgs/applications/window-managers/sway/lock-fancy.nix b/pkgs/applications/window-managers/sway/lock-fancy.nix index 710dff73452..bee1f925f60 100644 --- a/pkgs/applications/window-managers/sway/lock-fancy.nix +++ b/pkgs/applications/window-managers/sway/lock-fancy.nix @@ -3,7 +3,7 @@ }: let - depsPath = stdenv.lib.makeBinPath [ + depsPath = lib.makeBinPath [ coreutils grim gawk diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix index f0a427e6839..2eeae7f4da5 100644 --- a/pkgs/applications/window-managers/tabbed/default.nix +++ b/pkgs/applications/window-managers/tabbed/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchgit, xorgproto, libX11, libXft, customConfig ? null, patches ? [] }: +{lib, stdenv, fetchgit, xorgproto, libX11, libXft, customConfig ? null, patches ? [] }: -with stdenv.lib; +with lib; stdenv.mkDerivation { name = "tabbed-20180310"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { inherit patches; - postPatch = stdenv.lib.optionalString (customConfig != null) '' + postPatch = lib.optionalString (customConfig != null) '' cp ${builtins.toFile "config.h" customConfig} ./config.h ''; diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix index 681a5baec82..cc457f81589 100644 --- a/pkgs/applications/window-managers/taffybar/default.nix +++ b/pkgs/applications/window-managers/taffybar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, ghcWithPackages, makeWrapper, packages ? (x: []) }: +{ lib, stdenv, ghcWithPackages, makeWrapper, packages ? (x: []) }: let taffybarEnv = ghcWithPackages (self: [ self.taffybar ] ++ packages self); @@ -14,7 +14,7 @@ in stdenv.mkDerivation { ''; meta = { - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.bsd3; + platforms = lib.platforms.unix; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/applications/window-managers/tinywm/default.nix b/pkgs/applications/window-managers/tinywm/default.nix index d6ff4ad51a2..8fa6a84b721 100644 --- a/pkgs/applications/window-managers/tinywm/default.nix +++ b/pkgs/applications/window-managers/tinywm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , libX11 }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { install -m644 annotated.c README -t $out/share/doc/${pname}-${version} ''; - meta = with stdenv.lib;{ + meta = with lib;{ description = "A tiny window manger for X11"; longDescription = '' diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index a1f3b3708a4..3a11444bcf4 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkg-config, wayland +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wayland , libGL, mesa, libxkbcommon, cairo, libxcb , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev , colord, lcms2, pipewire ? null @@ -7,7 +7,7 @@ # beware of null defaults, as the parameters *are* supplied by callPackage by default }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "weston"; version = "9.0.0"; diff --git a/pkgs/applications/window-managers/windowlab/default.nix b/pkgs/applications/window-managers/windowlab/default.nix index 1bbdb7a460f..134dd525ce0 100644 --- a/pkgs/applications/window-managers/windowlab/default.nix +++ b/pkgs/applications/window-managers/windowlab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig , libX11, libXext, libXft }: let version = "1.40"; in @@ -26,7 +26,7 @@ stdenv.mkDerivation { sed "s|/usr/local|$out|g" Makefile.orig >> Makefile ''; - meta = with stdenv.lib; + meta = with lib; { description = "Small and simple stacking window manager"; homepage = "http://nickgravgaard.com/windowlab/"; license = licenses.gpl2; diff --git a/pkgs/applications/window-managers/wio/default.nix b/pkgs/applications/window-managers/wio/default.nix index b001b6a64f9..301b0184e9c 100644 --- a/pkgs/applications/window-managers/wio/default.nix +++ b/pkgs/applications/window-managers/wio/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/wio \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ alacritty cage ]}" + --prefix PATH ":" "${lib.makeBinPath [ alacritty cage ]}" ''; meta = with lib; { diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix index 721e618b1d4..f51dbfbee5a 100644 --- a/pkgs/applications/window-managers/wmii-hg/default.nix +++ b/pkgs/applications/window-managers/wmii-hg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, pkgconfig, libixp_hg, txt2tags, dash, python, which +{ lib, stdenv, fetchurl, unzip, pkgconfig, libixp_hg, txt2tags, dash, python, which , libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }: stdenv.mkDerivation rec { @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://suckless.org/"; # https://wmii.suckless.org/ does not exist anymore description = "A small window manager controlled by a 9P filesystem"; - maintainers = with stdenv.lib.maintainers; [ kovirobi ]; - license = stdenv.lib.licenses.mit; + maintainers = with lib.maintainers; [ kovirobi ]; + license = lib.licenses.mit; inherit version; - platforms = with stdenv.lib.platforms; linux; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index 744ae625790..c75a481e19a 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib dbus-glib xorg.xcbutilwm ] - ++ stdenv.lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome3.gnome-panel ] - ++ stdenv.lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ] - ++ stdenv.lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] + ++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome3.gnome-panel ] + ++ lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ] + ++ lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] ; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/window-managers/yeahwm/default.nix b/pkgs/applications/window-managers/yeahwm/default.nix index a8323ff1d38..3cf997c22c2 100644 --- a/pkgs/applications/window-managers/yeahwm/default.nix +++ b/pkgs/applications/window-managers/yeahwm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , lesstif , libX11, libXext, libXmu, libXinerama }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { install -m644 yeahwm.1.gz ${placeholder "out"}/share/man/man1/ ''; - meta = with stdenv.lib;{ + meta = with lib;{ description = "An X window manager based on evilwm and aewm"; longDescription = '' YeahWM is a h* window manager for X based on evilwm and aewm. diff --git a/pkgs/desktops/cinnamon/cinnamon-common/libcroco.nix b/pkgs/desktops/cinnamon/cinnamon-common/libcroco.nix index 10f5e61a175..c7b912f8281 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/libcroco.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/libcroco.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { version = "0.6.13"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1m110rbj5d2raxcdp4iz0qp172284945awrsbdlq99ksmqsc4zkn"; }; outputs = [ "out" "dev" ]; outputBin = "dev"; - configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; + configureFlags = lib.optional stdenv.isDarwin "--disable-Bsymbolic"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxml2 glib ]; diff --git a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix index 7f2e260e5df..26d9be6d904 100644 --- a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , runCommand , nixos-artwork , glib @@ -36,7 +36,7 @@ let in -with stdenv.lib; +with lib; # TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this runCommand "cinnamon-gsettings-overrides" {} diff --git a/pkgs/desktops/enlightenment/econnman/default.nix b/pkgs/desktops/enlightenment/econnman/default.nix index 1979b4518a7..265c66d0d82 100644 --- a/pkgs/desktops/enlightenment/econnman/default.nix +++ b/pkgs/desktops/enlightenment/econnman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, efl, python3Packages, dbus, makeWrapper }: +{ lib, stdenv, fetchurl, pkgconfig, efl, python3Packages, dbus, makeWrapper }: stdenv.mkDerivation rec { pname = "econnman"; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { description = "A user interface for the connman network connection manager"; homepage = "https://enlightenment.org/"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx romildo ]; + license = lib.licenses.lgpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ matejc tstrobel ftrvxmtrx romildo ]; }; } diff --git a/pkgs/desktops/enlightenment/enlightenment/default.nix b/pkgs/desktops/enlightenment/enlightenment/default.nix index 0c6ae68529d..3b750bd08b7 100644 --- a/pkgs/desktops/enlightenment/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/enlightenment/default.nix @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { xkeyboard_config udisks2 # for removable storage mounting/unmounting ] - ++ stdenv.lib.optional bluetoothSupport bluez5 # for bluetooth configuration and control - ++ stdenv.lib.optional pulseSupport libpulseaudio # for proper audio device control and redirection + ++ lib.optional bluetoothSupport bluez5 # for bluetooth configuration and control + ++ lib.optional pulseSupport libpulseaudio # for proper audio device control and redirection ; patches = [ diff --git a/pkgs/desktops/enlightenment/ephoto/default.nix b/pkgs/desktops/enlightenment/ephoto/default.nix index 36719200c76..952fc41d1ba 100644 --- a/pkgs/desktops/enlightenment/ephoto/default.nix +++ b/pkgs/desktops/enlightenment/ephoto/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, efl, pcre, mesa, makeWrapper }: +{ lib, stdenv, fetchurl, pkgconfig, efl, pcre, mesa, makeWrapper }: stdenv.mkDerivation rec { pname = "ephoto"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { description = "Image viewer and editor written using the Enlightenment Foundation Libraries"; homepage = "https://smhouston.us/projects/ephoto/"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.bsd2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/desktops/enlightenment/rage/default.nix b/pkgs/desktops/enlightenment/rage/default.nix index 3c4de19fa91..c35a75b0932 100644 --- a/pkgs/desktops/enlightenment/rage/default.nix +++ b/pkgs/desktops/enlightenment/rage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, mesa, wrapGAppsHook }: +{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, mesa, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "rage"; @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { meta = { description = "Video + Audio player along the lines of mplayer"; homepage = "https://enlightenment.org/"; - maintainers = with stdenv.lib.maintainers; [ matejc ftrvxmtrx romildo ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.bsd2; + maintainers = with lib.maintainers; [ matejc ftrvxmtrx romildo ]; + platforms = lib.platforms.linux; + license = lib.licenses.bsd2; }; } diff --git a/pkgs/desktops/enlightenment/terminology/default.nix b/pkgs/desktops/enlightenment/terminology/default.nix index 2d0d34ec067..e66415c3e12 100644 --- a/pkgs/desktops/enlightenment/terminology/default.nix +++ b/pkgs/desktops/enlightenment/terminology/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkg-config, efl, pcre, mesa }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, efl, pcre, mesa }: stdenv.mkDerivation rec { pname = "terminology"; @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { meta = { description = "Powerful terminal emulator based on EFL"; homepage = "https://www.enlightenment.org/about-terminology"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx romildo ]; + license = lib.licenses.bsd2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ matejc tstrobel ftrvxmtrx romildo ]; }; } diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix index bdcd9d661c3..01b7149291b 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, python2, pkgconfig, libgnome, GConf, glib, gtk2, gnome_vfs }: -with stdenv.lib; +with lib; let inherit (python2.pkgs) python pygobject2 pygtk dbus-python; diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index 87d2931d274..741e2efe345 100644 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -1,8 +1,8 @@ -{stdenv, fetchpatch, fetchurl, autoreconfHook, pkgconfig, atk, cairo, glib +{lib, stdenv, fetchpatch, fetchurl, autoreconfHook, pkgconfig, atk, cairo, glib , gnome-common, gtk2, pango , libxml2Python, perl, intltool, gettext, gtk-mac-integration-gtk2 }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "gtksourceview"; diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix index 81330218d49..1b8071144a3 100644 --- a/pkgs/desktops/gnome-2/desktop/vte/default.nix +++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, intltool, pkgconfig, glib, gtk2, ncurses +{ lib, stdenv, fetchurl, fetchpatch, intltool, pkgconfig, glib, gtk2, ncurses , pythonSupport ? false, python27Packages}: let @@ -30,13 +30,13 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool glib gtk2 ncurses ] ++ - stdenv.lib.optionals pythonSupport [python pygtk]; + lib.optionals pythonSupport [python pygtk]; configureFlags = [ - (stdenv.lib.enableFeature pythonSupport "python") + (lib.enableFeature pythonSupport "python") ]; - postInstall = stdenv.lib.optionalString pythonSupport '' + postInstall = lib.optionalString pythonSupport '' cd $(toPythonPath $out)/gtk-2.0 for n in *; do ln -s "gtk-2.0/$n" "../$n" @@ -54,8 +54,8 @@ in stdenv.mkDerivation rec { character set conversion, as well as emulating any terminal known to the system's terminfo database. ''; - license = stdenv.lib.licenses.lgpl2; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.lgpl2; + maintainers = with lib.maintainers; [ astsmtl ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index 0e622a38e52..bf4bd9fb68d 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.2.6"; src = fetchurl { - url = "mirror://gnome/sources/GConf/${stdenv.lib.versions.majorMinor version}/GConf-${version}.tar.xz"; + url = "mirror://gnome/sources/GConf/${lib.versions.majorMinor version}/GConf-${version}.tar.xz"; sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ ORBit2 libxml2 python3 ] # polkit requires pam, which requires shadow.h, which is not available on # darwin - ++ stdenv.lib.optional (!stdenv.isDarwin) polkit; + ++ lib.optional (!stdenv.isDarwin) polkit; propagatedBuildInputs = [ glib dbus-glib ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { configureFlags = # fixes the "libgconfbackend-oldxml.so is not portable" error on darwin - stdenv.lib.optional stdenv.isDarwin [ "--enable-static" ]; + lib.optional stdenv.isDarwin [ "--enable-static" ]; postPatch = '' 2to3 --write --nobackup gsettings/gsettings-schema-convert diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix index aa7e3b938c8..befa237dfd5 100644 --- a/pkgs/desktops/gnome-2/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, libxml2, python2 ? null, withLibgladeConvert ? false, gettext }: +{ lib, stdenv, fetchurl, pkgconfig, gtk2, libxml2, python2 ? null, withLibgladeConvert ? false, gettext }: assert withLibgladeConvert -> python2 != null; @@ -14,7 +14,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk2 gettext ] - ++ stdenv.lib.optional withLibgladeConvert python2; + ++ lib.optional withLibgladeConvert python2; NIX_LDFLAGS = "-lgmodule-2.0"; diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index c482a3a45ee..0620d699ac8 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { format = "other"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0fd9vv2abd2if2qj4nlfy7mpd7rc4sx18zhmxd5ijlnfhkpggbp5"; }; diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index d6d181df964..986bd43331f 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/cheese/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0vyim2avlgq3a48rgdfz5g21kqk11mfb53b2l883340v88mp7ll8"; }; diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index 9bf15676115..45c8015ce24 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1whjgfhcxpb5yhhvyqb8pv71vprw6fv02czin4k4z6dxrxsq32qx"; }; diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index aa0e2c3b1f3..fead1c7bcff 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "06ikvjjcgb8nxabkn2rywy76a1c7s6w8dszaxvaxldbxarp1qgbj"; }; diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index c59ff77d29d..38d059cc84d 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gedit/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0kc48a399achcz6vlqq0jk0b8ixbrzyv9xb22s5av76m5hyqalq0"; }; diff --git a/pkgs/desktops/gnome-3/apps/ghex/default.nix b/pkgs/desktops/gnome-3/apps/ghex/default.nix index 44e714382a3..d832d1e809b 100644 --- a/pkgs/desktops/gnome-3/apps/ghex/default.nix +++ b/pkgs/desktops/gnome-3/apps/ghex/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/ghex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/ghex/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1h1pjrr9wynclfykizqd78dbi785wjz6b63p31k87kjvzy8w3nf2"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix index a3456a0ed48..1b9cf9ce4ab 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { version = "3.34.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "153vknqisjn5f105avzm933fsc3v0pjzzbwxlqxf8vjjksh1cmya"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 8020813c4fe..3fa9bc23ea1 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1zjvng0izbws3506998l3dwsxjbm7wnhqipb8nmqzvi096czvajl"; }; @@ -120,7 +120,7 @@ stdenv.mkDerivation rec { ]; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio ]}") + gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ mtools cdrkit libcdio ]}") ''; postPatch = '' diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 6c539c9a970..9f66f9b78ba 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0SG7NLCLbqYB9du6Q6SxYTpuVJP8Cx4uzJDGZnEakS0="; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index 9e4d8d8005f..c435bc49c23 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { version = "3.34.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-characters/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-characters/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0mqaxsa7hcmvid3zbzvxpfkp7s01ghiq6kaibmd3169axrr8ahql"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index 39071542a97..bd90b5914aa 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-clocks/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0f24g76ax59qnms1rjfyf1i0sa84nadgbr0r6m26p90w1w2wnmnr"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix b/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix index f672a7c4f99..17f11d0efdc 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/connections/${stdenv.lib.versions.majorMinor version}/connections-${version}.tar.xz"; + url = "mirror://gnome/sources/connections/${lib.versions.majorMinor version}/connections-${version}.tar.xz"; hash = "sha256-5c7uBFkh9Vsw6bWWUDjNTMDrrFqI5JEgYlsWpfyuTpA="; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 6ab8fa84145..84ca0ab5997 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { version = "3.34.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-documents/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1qph567mapg3s1a26k7b8y57g9bklhj2mh8xm758z9zkms20xafq"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index 0ec65b51c68..93a036228c3 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-getting-started-docs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0ficf4i4njqrx3dn5rdkvpvcys5mwfma4zkgfmfkq964jxpwzqvw"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index ee023b3d434..eae4cbdbda8 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { version = "3.36.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-logs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0w1nfdxbv3f0wnhmdy21ydvr4swfc108hypda561p7l9lrhnnxj4"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index 8ea538eb30b..752fb4d820e 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0pa6h3md688752l7cjggncnxv13c07nj584gbz9asdblljk3r9x1"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 241120db7a9..6cedbcaf4d6 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { format = "other"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0c2051wngf3jrifl5bv5kyqcci459n62vixxkryiryjcaqwbd1am"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix index 60b039c0df6..60a70ac63ea 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "3.8.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 38505f9a83d..3f093b0e8da 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz"; + url = "mirror://gnome/sources/bijiben/${lib.versions.majorMinor version}/bijiben-${version}.tar.xz"; sha256 = "H/bMCsbGKQe/KgmhchXt0vF7dNrKs6XIminDBJFyvis="; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix index 9bccff4a8a7..036aa84c094 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "0drfn3wcc8l4n07qwv6p0rw2dwcd00hwzda282q62l6sasks2b2g"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix index 79fef5bdab1..6662e9f4e7e 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "I5A/c2G+QQhw+6lHIJFnuW9JB2MGQdM8y6qOQvV0tpk="; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix index d1e43e0a13e..867eca4cd9e 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { version = "3.28.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "08ygqbib72jlf9y0a16k54zz51sncpq2wa18wp81v46q8301ymy7"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index 3080db3f100..3d720478f2a 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "3.36.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-weather/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "11z75ky6xp9hx7lm24xng7ydr20bzh4d6p9sbi9c8ccz2m3fdrk8"; }; diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index 6551d653e29..b7206ca0ae6 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1l82nmb5qk4h69rsdhzlcmjjdhwh9jzfs4cnw8hy39sg5v9ady1s"; }; diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 355fd645b30..25db5181cc4 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { version = "3.38.0.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; hash = "sha256-x0XdHebhog8ZorB6Q4uO98yiNaaqc0ENt/E3sCHpsqI="; }; diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix index 7c02715df5e..aaf9aae23e7 100644 --- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "3.22.0"; src = fetchurl { - url = "mirror://gnome/sources/vinagre/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/vinagre/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82"; }; diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index d7d1bad54c1..a71aca79357 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "15xgz9wzk07442x3s3052as95g0223z4pp9qlsgcs323yama30v6"; }; diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix index 68c96209623..15ae93075a4 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "0ac3fbl15l836yvgw724q4whbkws9v4b6l2xy6bnp0b0g0a6i104"; }; diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix index f61490da1e0..5c741614c39 100644 --- a/pkgs/desktops/gnome-3/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/core/caribou/default.nix @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww"; }; diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index 3f128e7378b..8de140e33ca 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -8,7 +8,7 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1d1y33c6fm86xz9xbh3bfz4y2pyas01a58lmirmdx0lh6yd292bd"; }; diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index bc4d67f3a73..0e4e349dbdb 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { version = "3.25.90"; src = fetchurl { - url = "mirror://gnome/sources/empathy/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/empathy/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0sn10fcymc6lyrabk7vx8lpvlaxxkqnmcwj9zdkfa8qf3388k4nc"; }; diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index 20c126a6284..5187f51cbf2 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1xqcfil3b68clafnxg1migp54psqh5x6arnlvdqgmvvpq9hwj7dp"; }; diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 7e47ec24af7..9515d28520c 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0v8iymg72m83ikxxyhapvz5v8zh8hlr1pw7n215cy3p8q6yg41cb"; }; diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 51778f5e8a9..998f4dfd9a2 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/evince/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0j0ry0y9qi1mlm7dcjwrmrw45s1225ri8sv0s9vb8ibm85x8kpr6"; }; @@ -94,8 +94,8 @@ stdenv.mkDerivation rec { poppler t1lib texlive.bin.core # kpathsea for DVI support - ] ++ stdenv.lib.optional supportXPS libgxps - ++ stdenv.lib.optionals supportMultimedia (with gst_all_1; [ + ] ++ lib.optional supportXPS libgxps + ++ lib.optionals supportMultimedia (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]); mesonFlags = [ @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { on the GNOME Desktop with a single simple application. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = teams.gnome.members; }; 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 3415203dccc..a48676cc983 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0mflr8a3f2q55rirvqhizji0zinic75jk8mksflszqzgcdcph85z"; }; diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index cda062378f7..c88c1e0f525 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gdm/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "yliiBdXr/L2rVqEXFriY4Wrl3/Ia7nnQdgRkRGKOxNo="; }; @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { # Upstream checks some common paths to find an `X` binary. We already know it. echo #!/bin/sh > build-aux/find-x-server.sh - echo "echo ${stdenv.lib.getBin xorg.xorgserver}/bin/X" >> build-aux/find-x-server.sh + echo "echo ${lib.getBin xorg.xorgserver}/bin/X" >> build-aux/find-x-server.sh patchShebangs build-aux/find-x-server.sh ''; diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix index ed8e513f8d3..70c206bccf9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1qqygm15rcdgm36vz2iy7b9axndjzvpi29lmygyakjc07a3jlwgp"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index 9a1c7289810..2bba316ee12 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "08k4jak4r72pvn5kjhm21planyc514j6c7jjj5lv9nmvvlxqw1ha"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index 8af32c9208a..dffeb8896f8 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-calculator/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0sri58cp6v07cqpdsf8dhf9dnykz305kvkx0l9dd25g06djcr0wc"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix index 305163179aa..69d8af9a09b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix index ba2fcb39979..53e3ed47ebe 100644 --- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.18.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-common/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-common/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index a6cb63de23c..9c1d4760456 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-contacts/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0hsq0dwxjahcaxnm1m4r1lync9k2fkwzybfmkchrmn95vqcwwvf9"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 18bcc8e2e89..e3628cbe2c4 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "09i011hf23s2i4wim43vjys7y4y43cxl3kyvrnrwqvqgc5n0144d"; }; # See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index a818f23d086..69287c9eae0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-desktop/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1m7iww1zk845szs9s3zc8a1s1wpd6kizndhq7gqy3575c0xgr2w9"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index 51382ad4cae..8615989b963 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "3.26.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-dictionary/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-dictionary/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index db7e60bbafb..700489e4dd3 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1TuF3BMDobXOHkIcH1xqwLMY4HzZqVk50uHwlZpe19k="; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index 2bae66d7d45..092cdbbdce0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "3.34.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-font-viewer/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "12xrsqwmvid7hksiw4zhj4jd1qwxn8w0czskbq4yqfprwn1havxa"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix index 4f20910e20d..98675f05bb5 100644 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; hash = "sha256-qliJJ0+LC23moFErR3Qrgqw0ANrsgt1O/+LuonRko7g="; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index eeb03125a26..e3189c27f70 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "3.36.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-keyring/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "11sgffrrpss5cmv3b717pqlbhgq17l1xd33fsvqgsw8simxbar52"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix index abc791acb09..3cc85053bce 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { version = "3.34.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-online-miners/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-online-miners/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1n2jz9i8a42zwxx5h8j2gdy6q1vyydh4vl00r0al7w8jzdh24p44"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix index 7e428688b92..5d9ff69a6fa 100644 --- a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { version = "0.1.9"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; hash = "sha256-8iZtp4tBRT7NNRKuzwop3rcMvq16RG/I2sAlEIsJ0M8="; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index f6aac0faf4a..4988a2d447b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1h4zsaybjrlkfcrvriyybg4gfr7v9d1ndh2p516k94ad2gfx6mp5"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index ade6ef2bb34..bb4a7fd68ef 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { outputs = ["out" "sessions"]; src = fetchurl { - url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-session/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0rrxjk3vbqy3cdgnl7rw71dvcyrvhwq3m6s53dnkyjxsrnr0xk3v"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index 45250086f1d..9955eee2b3e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0r010wzw3dj87mapzvq15zv93i86wg0x0rpii3x2wapq3bcj30g2"; }; 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 b5d23009045..3f3b619cfe6 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0hzn975v49rv3nsqp8m0mzv8gcm7nyvn54gj3zsml8ahlxwl592p"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index b7dfb90841f..56408d464db 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-shell/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "05fm7kxyvws2lbb156wfa2wf4xmkxr49rrjxg0yaxf68v000yq2k"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index b3a8b2c7d3a..c0cf9bceb67 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-software/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0rjm486vgn6gi9mv1rqdcvr9cilmw6in4r6djqkxbxqll89cp2l7"; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gnome-desktop gspell json-glib libsecret ostree polkit flatpak libxmlb gnome-online-accounts libsysprof-capture - ] ++ stdenv.lib.optionals withFwupd [ + ] ++ lib.optionals withFwupd [ fwupd ]; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { "-Dgudev=false" # FIXME: package malcontent parental controls "-Dmalcontent=false" - ] ++ stdenv.lib.optionals (!withFwupd) [ + ] ++ lib.optionals (!withFwupd) [ "-Dfwupd=false" ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index 7675e1be864..963dbad6290 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1x5gd30g87im7fnqj63njlac69zywfd1r0vgsxkjag2hsns7mgvk"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index e88d6f8fa40..54e2bd698d1 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1lgkvla0fadg76j898p2x2fipqf8kkqbbmmsfkfpz11q9y1d966r"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix index 8207c8322ff..4c9ed85fe48 100644 --- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix @@ -8,7 +8,7 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "06aqg9asq2vqi9wr29bs4v8z2bf4manhbhfghf4nvw01y2zs0jvw"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix index 606dda723bb..26d7593038b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; hash = "sha256-hV/C/Lyz6e9zhe3FRw4Sox5gMqThDP57wVCTgcekjng="; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index d2f2a6242bf..6496df08945 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { version = "3.34.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "04r9ck9v4i0d31grbli1d4slw2d6dcsfkpaybkwbzi7wnj72l30x"; }; diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix index 0b9aacf0ddf..d4baaef819f 100644 --- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, intltool, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, intltool, gobject-introspection, gnome3 }: let pname = "libgnome-keyring"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Framework for managing passwords and other secrets"; homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; - license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; + license = with lib.licenses; [ gpl2Plus lgpl2Plus ]; inherit (glib.meta) platforms maintainers; longDescription = '' diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix index 4e81ae03f85..427893d2aab 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; src = fetchurl { - url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/mutter/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; hash = "sha256-I73ofTO4mBNYgxzsiRW7X/Hq+cHedMkM0WYLG5WINSY="; }; diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 673966e720d..bc86e965547 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -47,7 +47,7 @@ let self = stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; src = fetchurl { - url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/mutter/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "03a612m0c7v6y72bs3ghmpyk49177fzq6gdy1jrz4608vnalx5yr"; }; diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 682740b22bc..25b38a5df9f 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "19ln84d6s05h6cvx3c500bg5pvkz4k6p6ykmr2201rblq9afp76h"; }; diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix index bf821f31f90..234d45f877a 100644 --- a/pkgs/desktops/gnome-3/core/rygel/default.nix +++ b/pkgs/desktops/gnome-3/core/rygel/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0xrbdsgm78h3g4qcvq2p8k70q31x9xdbb35bixz36q6h9s1wqznn"; }; diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index d2d31ada0f8..96a8145ae7f 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0grscz96bwj79ka4qvxh8h75avdx6824k8k38ylmaj6xbl6gi0hy"; }; diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index 2363b921cd7..70cb81a165b 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/sushi/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0vlqqk916dymv4asbyvalp1m096a5hh99nx23i4xavzvgygh4h2h"; }; diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index 03da54a1353..082732eace6 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/totem/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0bs33ijvxbr2prb9yj4dxglsszslsn9k258n311sld84masz4ad8"; }; diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index 91291448883..7aa64d0357a 100644 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/yelp-xsl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0ryzvkcgxp7xi0icmpdl2rinjn904s8imbxdi6wshzxblqymc8dk"; }; diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 3b382a71424..8b27f637280 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/yelp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "102z8khj82vdp12c3y86hhxwm1x89xpkpc5zs63c7gg21cbrwdbl"; }; diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix index 6c6493a42e8..b27c10447f4 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/zenity/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "15fdh8xfdhnwcynyh4byx3mrjxbyprqnwxzi7qn3g5wwaqryg1p7"; }; diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix index 0a7975c03ca..d6109651ce9 100644 --- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "3.34.0"; src = fetchurl { - url = "mirror://gnome/sources/anjuta/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/anjuta/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "13ql7axw6zz387s7pa1m7wmh7qps3x7fk53h9832vq1yxlq33aa2"; }; diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 5f714827e0b..68d7d9adfd5 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/devhelp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "13sa25mmlc49kn520hdfbskma65y7smvwmyhfggj0n9s3fazba2d"; }; diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix index 115d9f289cf..bdbe73d2f88 100644 --- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix +++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-devel-docs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1h6481hbz1c5p69r6h96hbgf560lhp1jibszscgw0s2yikdh6q8n"; }; diff --git a/pkgs/desktops/gnome-3/extensions/clock-override/default.nix b/pkgs/desktops/gnome-3/extensions/clock-override/default.nix index 49df3632755..6d3a752c886 100644 --- a/pkgs/desktops/gnome-3/extensions/clock-override/default.nix +++ b/pkgs/desktops/gnome-3/extensions/clock-override/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, gnome3, gettext, glib }: +{ lib, stdenv, fetchzip, gnome3, gettext, glib }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-clock-override"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Customize the date and time format displayed in clock in the top bar in GNOME Shell"; license = licenses.mit; maintainers = with maintainers; [ rhoriguchi ]; diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix index 7b98e20ed29..54af3281dc4 100644 --- a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix +++ b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ eperuffo ]; homepage = "https://github.com/phocean/TopIcons-plus"; # Unmaintained and no longer working with GNOME Shell 3.34+ - broken = stdenv.lib.versionAtLeast gnome3.gnome-shell.version "3.32"; + broken = lib.versionAtLeast gnome3.gnome-shell.version "3.32"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/unite-shell/default.nix b/pkgs/desktops/gnome-3/extensions/unite-shell/default.nix index add87c10f1a..778743071d6 100644 --- a/pkgs/desktops/gnome-3/extensions/unite-shell/default.nix +++ b/pkgs/desktops/gnome-3/extensions/unite-shell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, gnome3, fetchFromGitHub, xprop, glib, coreutils }: +{ lib, stdenv, gnome3, fetchFromGitHub, xprop, glib, coreutils }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-unite-shell"; version = "44"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Unite is a GNOME Shell extension which makes a few layout tweaks to the top panel and removes window decorations to make it look like Ubuntu Unity Shell"; license = licenses.gpl3Only; maintainers = with maintainers; [ rhoriguchi ]; diff --git a/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix b/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix index e7659b6b314..42f226e9677 100644 --- a/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix +++ b/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ jtojnar ]; homepage = "https://github.com/medenagan/window-corner-preview"; - broken = stdenv.lib.versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34 + broken = lib.versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34 }; } diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/pkgs/desktops/gnome-3/games/atomix/default.nix index 6f8b9ad9bde..32bdbf7cb48 100644 --- a/pkgs/desktops/gnome-3/games/atomix/default.nix +++ b/pkgs/desktops/gnome-3/games/atomix/default.nix @@ -8,7 +8,7 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "0h909a4mccf160hi0aimyicqhq2b0gk1dmqp7qwf87qghfrw6m00"; }; diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix index 291581661f7..5c81524f973 100644 --- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/five-or-more/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/five-or-more/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "19pf8wzbf3ciqf2k4bj9sddvyhckfd62x86pnqr6s8h4vn9jc6ii"; }; diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index edd6a2ecd81..a324bb9cd46 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/four-in-a-row/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "10ji60bdfdzb6wk5dkwjc3yww7hqi3yjcx1k1z7x2521h2dpdli1"; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index f1f7cbcaeb8..db15ce18be8 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-chess/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1bpmi5p5vvjdq2rlm5x9k4gpci8jbrjvdxr1q62h5znzq0vz0w0l"; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix index c6a3a24a50b..e0ed167750d 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "00rwi6z0068pbq01sq2d389ffcqsh3ylq3i8zkrqvblqid1hvnlv"; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix index 51908d3236c..e5d34668b44 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "3.38.3"; src = fetchurl { - url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-mahjongg/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "144ia3zn9rhwa1xbdkvsz6m0dsysl6mxvqw9bnrlh845hmyy9cfj"; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index 93529b0b3f8..b78c9924d63 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "3.36.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0m2680r94nk61imym4x73j03jwfjd8cxm592m5ybiqdfdw6i723i"; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index 410d397bb58..f35ac14891f 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1naknfbciydbym79a0jq039xf0033z8gyln48c0qsbcfr2qn8yj5"; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index 39eb27228be..80a3eceb4f6 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-robots/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1qpzpsyj9i5dsfy7anfb2dcm602bjkcgqj86fxvnxy6llx56ks0z"; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix index 49bafcf9603..4e73882bcdf 100644 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0cpxx63liczmax6ry06r5k0f221xpg2rqh49vkdj2snmqq61swrq"; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index 9c8b06a7dd4..d25dc4fc1b6 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-taquin/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0kw131q0ad0rbsp6qifjc8fjlhvjxyihil8a76kj8ya9mn7kvnwn"; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index 42137e9caa5..3a3dca27d76 100644 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-tetravex/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "06wihvqp2p52zd2dnknsc3rii69qib4a30yp15h558xrg44z3k8z"; }; diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix index 3e5d0e00979..480fb2b1373 100644 --- a/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/pkgs/desktops/gnome-3/games/hitori/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/hitori/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/hitori/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0gjbbh4gym8wwa4jjg7wwifjh2h7bf6m0x23c5jjxvrf3vln9gfq"; }; diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index 15be308e4e9..db3b0d21151 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/iagno/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "097dw1l92l73xah9l56ka5mi3dvx48ffpiv33ni5i5rqw0ng7fc4"; }; diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix index 828a9ac24fb..874e9558bcf 100644 --- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/lightsoff/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0dpnnw8v1yk1p0y08f9c9xkgswqlm8x83dfn96798nif2zbypdnh"; }; diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix index c47b2776563..7a57dc19cc5 100644 --- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "033plabc6q3sk6qjr5nml8z6p07vcw57gxddxjk9b65wgg0rzzhr"; }; diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix index a96ccd5c9b6..db9dfd2dc93 100644 --- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix @@ -8,7 +8,7 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1032psxm59nissi268bh3j964m4a0n0ah4dy1pf0ph27j3zvdik1"; }; diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix index c6d28cd3bc1..a31191dfa2d 100644 --- a/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/pkgs/desktops/gnome-3/games/tali/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/tali/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "196f6hiap61sdqr7kvywk74yl0m2j7fvqml37p6cgfm7gfrhrvi9"; }; diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index db9fb395d7d..bbc2db93e51 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "04p8fjkz4xp5afp0ld1m09pnv0zkcx51l7hf23amfrjkk0kj2bp7"; }; diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index 0ba1d1130bd..4809e30deb3 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0npg4kqpwl992fgjd2cn3fh84aiwpdp9kd8z7rw2xaj2iazsm914"; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix index 601dded4895..1f9b1ba871d 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "04qrzycwm7pz556agl08xw3d0r1mmr4ja9n9jfijjxs9inrhp5yc"; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix index 5495bdb4c3d..2887b86c80a 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-autoar/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0yk56ch46n3wfy633mq31kif9n7v06rlij4vqbsbn6l4z1vw6d0a"; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix index 84666a83308..ba25dcfed4c 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -54,12 +54,12 @@ let "org.gnome.SettingsDaemon.Wacom" "org.gnome.SettingsDaemon.XSettings" ]; - requiredComponents = wmName: "RequiredComponents=${stdenv.lib.concatStringsSep ";" ([ wmName ] ++ requiredComponentsCommon ++ requiredComponentsGsd)};"; + requiredComponents = wmName: "RequiredComponents=${lib.concatStringsSep ";" ([ wmName ] ++ requiredComponentsCommon ++ requiredComponentsGsd)};"; gnome-flashback = stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1r51yqdqichp4jv54kiaqrh0xhykngr4ymlvrkjhzdhivwadsg4m"; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index c69966406e0..c2904a777f2 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-packagekit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-packagekit/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "08rhsisdvx7pnx3rrg5v7c09jbw4grglkdj979gwl4a31j24zjsd"; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix index d4ea880d1af..7e34040bb72 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; hash = "sha256-GosVrvCgKmyqm5IJyNP7Q+e5h6OAB2aRwj8DFOwwLxU="; }; diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix index 0f995927437..a7cb34896d2 100644 --- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "4.10.0"; src = fetchurl { - url = "mirror://gnome/sources/gtkhtml/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gtkhtml/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3"; }; diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix index f5dd04cdb91..29b88e4863a 100644 --- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { version = "1.8.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1pdk9hc30xdlv0ba24f7pvcr2d5370zykrmpws7hgmjgl4wfbpdb"; }; diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix index ef16cf49a15..05a05a017cf 100644 --- a/pkgs/desktops/gnome-3/misc/metacity/default.nix +++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1b0i9sq6qa540f2006cv1p8i6lxg1h6w00apxwzwjpfqn0hk26c1"; }; diff --git a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix b/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix index a942fded087..c7aaddf203a 100644 --- a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix +++ b/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "161050sx3sdxqcpjkjcpf6wl4kx0jydihga7mcvrj9c2f8ly0g07"; }; diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/desktops/gnustep/make/default.nix index 9b803be0251..f571a3c4862 100644 --- a/pkgs/desktops/gnustep/make/default.nix +++ b/pkgs/desktops/gnustep/make/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, clang, which, libobjc }: +{ lib, stdenv, fetchurl, clang, which, libobjc }: let version = "2.8.0"; @@ -32,8 +32,8 @@ stdenv.mkDerivation { meta = { description = "A build manager for GNUstep"; homepage = "http://gnustep.org/"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ ashalkhakov matthewbauer ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl2Plus; + maintainers = with lib.maintainers; [ ashalkhakov matthewbauer ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/desktops/gnustep/make/gsmakeDerivation.nix b/pkgs/desktops/gnustep/make/gsmakeDerivation.nix index 580fbdc5d88..eff7f3eac85 100644 --- a/pkgs/desktops/gnustep/make/gsmakeDerivation.nix +++ b/pkgs/desktops/gnustep/make/gsmakeDerivation.nix @@ -1,4 +1,4 @@ -{ stdenv, make, makeWrapper, which }: +{ lib, stdenv, make, makeWrapper, which }: { buildInputs ? [], ...} @ args: stdenv.mkDerivation (args // { buildInputs = [ makeWrapper make which ] ++ buildInputs; @@ -11,9 +11,9 @@ stdenv.mkDerivation (args // { meta = { homepage = "http://gnustep.org/"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ ashalkhakov matthewbauer ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with lib.maintainers; [ ashalkhakov matthewbauer ]; + platforms = lib.platforms.linux; } // (if builtins.hasAttr "meta" args then args.meta else {}); }) diff --git a/pkgs/desktops/lumina/lumina-calculator/default.nix b/pkgs/desktops/lumina/lumina-calculator/default.nix index 0b5690d9442..05d80997b76 100644 --- a/pkgs/desktops/lumina/lumina-calculator/default.nix +++ b/pkgs/desktops/lumina/lumina-calculator/default.nix @@ -10,7 +10,7 @@ mkDerivation rec { rev = "v${version}"; sha256 = "1238d1m0mjkwkdpgq165a4ql9aql0aji5f41rzdzny6m7ws9nm2y"; }; - + sourceRoot = "source/src-qt5"; nativeBuildInputs = [ qmake qttools ]; @@ -19,7 +19,7 @@ mkDerivation rec { qmakeFlags = [ "CONFIG+=WITH_I18N" - "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" + "LRELEASE=${lib.getDev qttools}/bin/lrelease" ]; meta = with lib; { diff --git a/pkgs/desktops/lumina/lumina-pdf/default.nix b/pkgs/desktops/lumina/lumina-pdf/default.nix index 1e169131604..8d975c749d6 100644 --- a/pkgs/desktops/lumina/lumina-pdf/default.nix +++ b/pkgs/desktops/lumina/lumina-pdf/default.nix @@ -10,7 +10,7 @@ mkDerivation rec { rev = "v${version}"; sha256 = "08caj4nashp79fbvj94rabn0iaa1hymifqmb782x03nb2vkn38r6"; }; - + sourceRoot = "source/src-qt5"; nativeBuildInputs = [ qmake qttools ]; @@ -23,7 +23,7 @@ mkDerivation rec { qmakeFlags = [ "CONFIG+=WITH_I18N" - "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" + "LRELEASE=${lib.getDev qttools}/bin/lrelease" ]; enableParallelBuilding = false; diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix index ec2cbc3b297..4daaf15534c 100644 --- a/pkgs/desktops/lumina/lumina/default.nix +++ b/pkgs/desktops/lumina/lumina/default.nix @@ -70,7 +70,7 @@ mkDerivation rec { # Add full path of bsdtar to lumina-archiver substituteInPlace src-qt5/desktop-utils/lumina-archiver/TarBackend.cpp \ - --replace '"bsdtar"' '"${stdenv.lib.getBin libarchive}/bin/bsdtar"' + --replace '"bsdtar"' '"${lib.getBin libarchive}/bin/bsdtar"' # Fix desktop files for i in $(grep -lir 'OnlyShowIn=Lumina' src-qt5); do @@ -81,7 +81,7 @@ mkDerivation rec { qmakeFlags = [ "LINUX_DISTRO=NixOS" "CONFIG+=WITH_I18N" - "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" + "LRELEASE=${lib.getDev qttools}/bin/lrelease" ]; passthru.providedSessions = [ "Lumina-DE" ]; diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix index 4119f4c4134..8ff71e0a545 100644 --- a/pkgs/desktops/lxde/core/lxappearance/default.nix +++ b/pkgs/desktops/lxde/core/lxappearance/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ./lxappearance-0.6.3-xdg.system.data.dirs.patch ]; - configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3"; + configureFlags = lib.optional withGtk3 "--enable-gtk3"; meta = with lib; { description = "Lightweight program for configuring the theme and fonts of gtk applications"; diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data.nix index 572d86b652e..e52445aa0b0 100644 --- a/pkgs/desktops/lxde/core/lxmenu-data.nix +++ b/pkgs/desktops/lxde/core/lxmenu-data.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool }: +{ lib, stdenv, fetchurl, intltool }: stdenv.mkDerivation rec { pname = "lxmenu-data"; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://lxde.org/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; description = "Freedesktop.org desktop menus for LXDE"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix index 1e0fb356982..a7306f3d2a7 100644 --- a/pkgs/desktops/lxde/core/lxpanel/default.nix +++ b/pkgs/desktops/lxde/core/lxpanel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, m4, intltool, libxmlxx, keybinder +{ lib, stdenv, fetchurl, pkgconfig, gettext, m4, intltool, libxmlxx, keybinder , gtk2, libX11, libfm, libwnck, libXmu, libXpm, cairo, gdk-pixbuf, gdk-pixbuf-xlib , menu-cache, lxmenu-data, wirelesstools, curl , supportAlsa ? false, alsaLib @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ keybinder gtk2 libX11 libfm libwnck libXmu libXpm cairo gdk-pixbuf gdk-pixbuf-xlib.dev menu-cache lxmenu-data m4 wirelesstools curl - ] ++ stdenv.lib.optional supportAlsa alsaLib; + ] ++ lib.optional supportAlsa alsaLib; postPatch = '' substituteInPlace src/Makefile.in \ @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight X11 desktop panel for LXDE"; homepage = "https://lxde.org/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.ryneeverett ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.ryneeverett ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/desktops/lxde/core/lxrandr/default.nix b/pkgs/desktops/lxde/core/lxrandr/default.nix index 6ac021397de..c3ab5e7e40a 100644 --- a/pkgs/desktops/lxde/core/lxrandr/default.nix +++ b/pkgs/desktops/lxde/core/lxrandr/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "04n3vgh3ix12p8jfs4w0dyfq3anbjy33h7g53wbbqqc0f74xyplb"; }; - configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3"; + configureFlags = lib.optional withGtk3 "--enable-gtk3"; nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ libX11 (if withGtk3 then gtk3 else gtk2) xrandr ]; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Standard screen manager of LXDE"; homepage = "https://lxde.org/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = with maintainers; [ rawkode ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix index a1525ec8b73..c61e53715d2 100644 --- a/pkgs/desktops/lxde/core/lxtask/default.nix +++ b/pkgs/desktops/lxde/core/lxtask/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libintl }: +{ lib, stdenv, fetchurl, pkgconfig, intltool, gtk3, libintl }: stdenv.mkDerivation rec { pname = "lxtask"; @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { requires pure GTK. ''; homepage = "https://wiki.lxde.org/en/LXTask"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 50254fbd29c..c8b0e7721a2 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -19,14 +19,14 @@ , enableImages ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "atril"; version = "1.24.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0967gxw7h2qh2kpwl0jgv58hicz6aa92kr12mnykbpikad25s95y"; }; diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix index 85179214b08..8c407f336f5 100644 --- a/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "1.24.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1rcn82q58mv9hn5xamvzay2pw1szfk6zns94362476fcp786lji2"; }; diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index a9cd7abf857..433468f3366 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "13jkynanqj8snys0if8lv6yx1y0jrm778s2152n4x65hsghc6cw5"; }; diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index 9f1ec9f587b..8b4d6765d7b 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "caja"; version = "1.24.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1cnfy481hcwjv3ia3kw0d4h7ga8cng0pqm3z349v4qcmfdapmqc0"; }; @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { meta = { description = "File manager for the MATE desktop"; homepage = "https://mate-desktop.org"; - license = with stdenv.lib.licenses; [ gpl2 lgpl2 ]; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = with lib.licenses; [ gpl2 lgpl2 ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index fce62f9f016..e60bbd2972e 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, gtk3, file, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, gtk3, file, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "engrampa"; version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0akjnz85qkpiqgj1ccn41rzbfid4l3r3nsm4s9s779ilzd7f097y"; }; @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { meta = { description = "Archive Manager for MATE"; homepage = "https://mate-desktop.org"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 2824fba2dfe..98239badd7e 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, gettext, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "eom"; version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0dralsc0dvs0l38cysdhx6kiaiqlb8qi6g9xz2cm6mjqyq3d3f9f"; }; @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { meta = { description = "An image viewing and cataloging program for the MATE desktop"; homepage = "https://mate-desktop.org"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index 4b652d06d29..30a79391cdc 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "17mcxfkvl14p04id3n5kbhpjwjq00c8wmbyciyy2hm7kwdln6zx8"; }; diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index 97a55b5e45e..218d314df5c 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -9,17 +9,17 @@ stdenv.mkDerivation rec { version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1n6rq7k66zvfd6sb7h92xihh021w9hysfa4yd1mzjcbb7c62ybqx"; }; nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ glib ] - ++ stdenv.lib.optional alsaSupport alsaLib - ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; + ++ lib.optional alsaSupport alsaLib + ++ lib.optional pulseaudioSupport libpulseaudio; - configureFlags = stdenv.lib.optional ossSupport "--enable-oss"; + configureFlags = lib.optional ossSupport "--enable-oss"; enableParallelBuilding = true; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index 4ecdfcdf157..c67fd54884f 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "02d7c59pami1fzxg73mp6risa9hvsdpgs68f62wkg09nrppzsk4v"; }; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index fc098428fcb..60efc6db045 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "109b41pjrc1b4slw6sx1lakdhrc46x829vczzk4bz3j15kcszg54"; }; diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index 533070c2698..51389a489e4 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0h70i4x3bk017pgv4zn280682wm58vwdjm7kni91ni8rmblnnvyp"; }; diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index f49529c4a66..b990a53b04a 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.24.2"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1ixb2vlm3dr52ibp4ggrbkf38m3q6i5lxjg4ix82gxbb6h6a3gp5"; }; diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index a9ed85e650b..ddf6948bd48 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0imdimq5d5rjq8mkjcrsd683a2bn9acmhc0lmvyw71y0040inbaw"; }; diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index a491798147f..7a2ac74522f 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "mate-common"; version = "1.24.2"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0srb2ly5pjq1g0cs8m39nbfv33dvsc2j4g2gw081xis3awzh3lki"; }; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { description = "Common files for development of MATE packages"; homepage = "https://mate-desktop.org"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 397f4969b6e..58ce83b902f 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "08bai47fsmbxlw2lhig9n6c8sxr24ixkd1spq3j0635yzcqighb0"; }; diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 1f9db9a9520..6e69a3afedd 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1nd1dn8mm1z6x4r68a25q4vzys1a6fmbzc94ss1z1n1872pczs6i"; }; diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index a429e1e66e3..fd280f3d96e 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, autoreconfHook, gtk3, mate, hicolor-icon-theme }: +{ lib, stdenv, fetchurl, autoreconfHook, gtk3, mate, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "mate-icon-theme-faenza"; version = "1.20.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "000vr9cnbl2qlysf2gyg1lsjirqdzmwrnh6d3hyrsfc0r2vh4wna"; }; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { description = "Faenza icon theme from MATE"; homepage = "https://mate-desktop.org"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index 4a1ea4c41fc..07dadf2dcd8 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, gettext, iconnamingutils, librsvg, gtk3, hicolor-icon-theme }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, iconnamingutils, librsvg, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "mate-icon-theme"; version = "1.24.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0a2lz61ivwwcdznmwlmgjr6ipr9sdl5g2czbagnpxkwz8f3m77na"; }; @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { meta = { description = "Icon themes from MATE"; homepage = "https://mate-desktop.org"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.lgpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix index 981a5a04f02..096d5070ab7 100644 --- a/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.24.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0m7pvbs5hhy5f400wqb8wp0dw3pyjpjnjax9qzc73j97l1k3zawf"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { longDescription = '' A small applet to display information from various applications consistently in the panel. - + The indicator applet exposes Ayatana Indicators in the MATE Panel. Ayatana Indicators are an initiative by Canonical to provide crisp and clean system and application status indication. They take the form of diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index 77e98495b09..6f25d571374 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "118i4w2i2g3hfgbfn3hjzjkfq8vjj6049r7my3vna9js23b7ab92"; }; diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index ae145061e1f..748b7b3c272 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "17zc9fn14jykhn30z8iwlw0qwk32ivj6gxgww3xrqvqk0da5yaas"; }; diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index 7103464f23a..2bb49754aca 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.24.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1bmk9gq5gcqkvfppa7i1hqfph8sajc3xs189s4ha97g0ifwd98a8"; }; diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 6c95f445ace..056ded4dc63 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1ybzr8mni5pgrspf8hqnisd0r0hwdlgk7n5mzsh7xisbkgivpw2b"; }; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 9a09b5e949f..6858031ffd8 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0xblqrhfazd01h0jdmx4hvavkb7f9anbd4rjsk5r6wxhp027l64l"; }; diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix index 556bfa02d3d..4263115c880 100644 --- a/pkgs/desktops/mate/mate-polkit/default.nix +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.24.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1450bqzlnvwy3xa98lj102j2cf7piqbxcd1cy2zp41rdl8ri3gvn"; }; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 995041be6bd..0d3bb40ee3e 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.24.2"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0fni41p3kraxwjnx9l5mdspng0zib1gfdxwlaiyq31mh4g79yjyj"; }; diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index 18f8f571332..216931aff85 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0imb1z2yvz1h95dzq396c569kkxys9mb2dyc6qxxxcnc5w02a2dw"; }; diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index 21b5a58a143..6368aaec327 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1nb4fy3mcymv7pmnc0czpxgp1sqvs533jwnqv1b5cqby415ljb16"; }; diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 64dfd65b20d..b44aea73008 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1zwq8symyp3ijs28pyrknsdi9byf4dpp9wp93ndwdhi0vaip5i51"; }; diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index 467b8c7c9b0..f6aaaf73d0a 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0n1ywr3ir5p536s7azdbw2mh40ylqlpx3a74mjrivbms1rpjxyab"; }; @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { mate.mate-desktop mate.libmatekbd mate.libmatemixer - ] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; + ] ++ lib.optional pulseaudioSupport libpulseaudio; - configureFlags = stdenv.lib.optional pulseaudioSupport "--enable-pulse"; + configureFlags = lib.optional pulseaudioSupport "--enable-pulse"; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index f6e767e94ab..38cea3cda58 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1i2r4lw6xsk972yp15g5hm8p8xx9pp6jmcvvzbdq80xyx3x898qz"; }; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index 1772eacbd04..be8f005ca38 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0qmyhxmarwkxad8k1m9q1iwx70zhfp6zc2mh74nv26nj4gr3h3am"; }; diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index ffa902a2891..25a278ab8ef 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, mate-icon-theme, gtk2, gtk3, +{ lib, stdenv, fetchurl, pkgconfig, gettext, mate-icon-theme, gtk2, gtk3, gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg }: stdenv.mkDerivation rec { @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "3.22.21"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/themes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/themes/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "051g2vq817g84yrqzf7hjcqr4xrghnw1rprjd6jf5mhhzmwcas6n"; }; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { meta = { description = "A set of themes from MATE"; homepage = "https://mate-desktop.org"; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.lgpl21; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index 7a95620f31e..2a91cac5a54 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.24.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0ddxya84iydvy85dbqls0wmz2rph87wri3rsdhv4rkbhh5g4sd7f"; }; diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index 29f169f447d..d91e538059b 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.24.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1h4aabcby96nsg557brzzb0an1qvnawhim2rinzlzg4fhkvdfnr5"; }; diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index 2faa99f9a8b..9b5c857c9df 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.24.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1b16n1628gcsym5mph6lr9x5xm4rgkxsa8xwr2wlx8g2gw2775i1"; }; diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index 669d5400881..78d448f09fe 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -8,7 +8,7 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "01lyi47a04xk0by5bvnfmqgv5sysk2wdlri6a4ssmy1qhgwh9zr3"; }; diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index 94a87f5d5f0..d7da098b3fb 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, gettext, perl, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, perl, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "pluma"; version = "1.24.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1sgc5f480icr2ans6gd3akvcax58mr4jp3zjk3xn7bx1mw9i299f"; }; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { meta = { description = "Powerful text editor for the MATE desktop"; homepage = "https://mate-desktop.org"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix index fef39d11f9d..10971d72e07 100644 --- a/pkgs/desktops/mate/python-caja/default.nix +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.24.0"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1wp61q64cgzr3syd3niclj6rjk87wlib5m86i0myf5ph704r3qgg"; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 538194edd45..787fe691f6d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { # ctags needed in path by outline plugin preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${stdenv.lib.makeBinPath [ ctags ]}" + --prefix PATH : "${lib.makeBinPath [ ctags ]}" ) ''; diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index d3d931e44fc..6bf526cf4fe 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Photo viewer and organizer designed for elementary OS"; homepage = "https://github.com/elementary/photos"; license = licenses.lgpl21Plus; diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix index f435104b320..40ac23ca7f1 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , runCommand , mutter , elementary-default-settings @@ -28,7 +28,7 @@ let in -with stdenv.lib; +with lib; # TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this runCommand "elementary-gsettings-desktop-schemas" {} diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 349b4cd63b5..fac9e62c207 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , fetchpatch @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson/post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A window & compositing manager based on mutter and designed by elementary for use with Pantheon"; homepage = "https://github.com/elementary/gala"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix index 0251e857a18..65995c45659 100644 --- a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ]; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ glib.dev coreutils ]}") + gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ glib.dev coreutils ]}") ''; postFixup = '' diff --git a/pkgs/desktops/surf-display/default.nix b/pkgs/desktops/surf-display/default.nix index 6746229a6bd..3a74982eb4a 100644 --- a/pkgs/desktops/surf-display/default.nix +++ b/pkgs/desktops/surf-display/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { patchShebangs $out/bin/surf-display wrapProgram $out/bin/surf-display \ - --prefix PATH ':' ${stdenv.lib.makeBinPath buildInputs} + --prefix PATH ':' ${lib.makeBinPath buildInputs} ''; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/desktops/xfce/applications/catfish/default.nix b/pkgs/desktops/xfce/applications/catfish/default.nix index 6eff57f46ed..85f823221b7 100644 --- a/pkgs/desktops/xfce/applications/catfish/default.nix +++ b/pkgs/desktops/xfce/applications/catfish/default.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { version = "1.4.13"; src = fetchurl { - url = "https://archive.xfce.org/src/apps/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "https://archive.xfce.org/src/apps/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "0fg89946z6n8njxn4mv29jksw8yavg8vypsljn9031pjwl3fmh2q"; }; diff --git a/pkgs/desktops/xfce/applications/orage/default.nix b/pkgs/desktops/xfce/applications/orage/default.nix index a18002928dc..45500450723 100644 --- a/pkgs/desktops/xfce/applications/orage/default.nix +++ b/pkgs/desktops/xfce/applications/orage/default.nix @@ -4,7 +4,7 @@ assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null; let - inherit (stdenv.lib) optionals; + inherit (lib) optionals; in stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "4.12.1"; src = fetchurl { - url = "https://archive.xfce.org/src/apps/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "https://archive.xfce.org/src/apps/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "0qlhvnl2m33vfxqlbkic2nmfpwyd4mq230jzhs48cg78392amy9w"; }; diff --git a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix index ea4a4e0c7ee..304375f87e3 100644 --- a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix +++ b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "4.4.3"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "1yk6rx3zr9grm4jwpjvqdkl13pisy7qn1wm5cqzmd2kbsn96cy6l"; }; diff --git a/pkgs/desktops/xfce/art/xfwm4-themes.nix b/pkgs/desktops/xfce/art/xfwm4-themes.nix index b93fa776ca4..569a18a796e 100644 --- a/pkgs/desktops/xfce/art/xfwm4-themes.nix +++ b/pkgs/desktops/xfce/art/xfwm4-themes.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { version = "4.10.0"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "0xfmdykav4rf6gdxbd6fhmrfrvbdc1yjihz7r7lba0wp1vqda51j"; }; - + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; diff --git a/pkgs/desktops/xfce/mkXfceDerivation.nix b/pkgs/desktops/xfce/mkXfceDerivation.nix index ddfc5530570..f17b506367c 100644 --- a/pkgs/desktops/xfce/mkXfceDerivation.nix +++ b/pkgs/desktops/xfce/mkXfceDerivation.nix @@ -14,7 +14,7 @@ let inherit (builtins) filter getAttr head isList; - inherit (stdenv.lib) attrNames concatLists recursiveUpdate zipAttrsWithNames; + inherit (lib) attrNames concatLists recursiveUpdate zipAttrsWithNames; filterAttrNames = f: attrs: filter (n: f (getAttr n attrs)) (attrNames attrs); diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix index e8945b3e55b..571305b5f91 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "1.1.0"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "193bj1p54l4zrvgdjj0pvjn161d6dn82jh9invcy09sqwlj0mkiy"; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix index 2b2027bcf4b..e12e499aad8 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk2, xfce }: +{ lib, stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk2, xfce }: let category = "panel-plugins"; in -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "xfce4-embed-plugin"; version = "1.6.0"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "0a72kqsjjh45swimqlpyrahdnplp0383v0i4phr4n6g8c1ixyry7"; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix index edd317918d8..c136fa00301 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "4.5.1"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "1iaszzkagl1mb0cdafrvlfjnjklhhs9y90517par34sjiqbq1dsd"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pkgconfig intltool ]; - + buildInputs = [ libxfce4util libxfce4ui @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { xfconf gtk3 ]; - + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix index 31bb89198f6..bce6eb18473 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "1.1.1"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "05nmfkrmifm76bsywqmbjd1qdvzagv5cbvnwbkb57156j055vl6n"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { xfconf gtk3 ]; - + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix index 4566a140dd3..747d604e917 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "4.0.2"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "1ai3pwgv61nv7i2dyrvncnc63r8kdjbkp40vp51vzak1dx924v15"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { xfce4-panel gtk3 ]; - + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix index b3d1f6e7159..878722975f5 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "1.2.0"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "1bfw3smwivr9mzdyq768biqrl4aq94zqi3xjzq6kqnd8561cqjk2"; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix index dddbf79522e..b5aa6aebb59 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "0.5.2"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "0q3pysdp85b3c7g3b59y3c69g4nw6bvbf518lnri4lxrnsvpizpf"; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix index 70586d1bc34..e5864d82920 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "1.8.1"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "1cjlvvcsigyh40xa26b2vc5zylgss0nlaw72sablzhii2kkw7907"; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix index 61237856d5d..ee1bff6733b 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "1.3.92"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "04jibw23ibi61f19gc9xy400yhcdiya4px6zp8c7fjq65hyn9iix"; }; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { "--with-pathhddtemp=${hddtemp}/bin/hddtemp" "--with-pathnetcat=${netcat-gnu}/bin/netcat" ]; - + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix index c1a5dfecbba..34d7b5deae7 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "1.2.3"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "0x87a8h5l3ashz1ksfaxcpn9a392jzlsbx5n5pga8g90fp2hf905"; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix index 27e9c098974..9e093024d42 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "1.7.1"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "1qr4m3n2l3rvsizsr3h7fyfajszfalqm7rhvjx2yjj8r3f8x4ljb"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; hardeningDisable = [ "format" ]; - + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix index fae85cb6469..eba010009bf 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "0.10.1"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "12bs2rfmmy021087i10vxibdbbvd5vld0vk3h5hymhpz7rgszcmg"; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; - + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 8736edd0e61..ebab134a4ff 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkgconfig , removeReferencesTo @@ -25,7 +25,7 @@ assert enableSystemd -> systemd != null; ### IMPORTANT: before updating cups, make sure the nixos/tests/printing.nix test ### works at least for your platform. -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "cups"; diff --git a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix index 5faf6a2198b..ec02e8c4f0e 100644 --- a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, cups, perl, coreutils, gnused, gnugrep +{ lib, stdenv, fetchurl, makeWrapper, cups, perl, coreutils, gnused, gnugrep , brgenml1lpr, debugLvl ? "0"}: /* @@ -117,8 +117,8 @@ stdenv.mkDerivation rec { meta = { description = "Brother BrGenML1 CUPS wrapper driver"; homepage = "http://www.brother.com"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ jraygauthier ]; }; } diff --git a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix index 985de63637c..6cdff2c4124 100644 --- a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix +++ b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cups, perl, glibc, ghostscript, which, makeWrapper}: +{ lib, stdenv, fetchurl, cups, perl, glibc, ghostscript, which, makeWrapper}: /* [Setup instructions](http://support.brother.com/g/s/id/linux/en/instruction_prn1a.html). @@ -28,7 +28,7 @@ */ let - myPatchElf = file: with stdenv.lib; '' + myPatchElf = file: with lib; '' patchelf --set-interpreter \ ${stdenv.glibc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \ ${file} @@ -86,8 +86,8 @@ stdenv.mkDerivation rec { meta = { description = "Brother BrGenML1 LPR driver"; homepage = "http://www.brother.com"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.unfreeRedistributable; - maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; + platforms = lib.platforms.linux; + license = lib.licenses.unfreeRedistributable; + maintainers = with lib.maintainers; [ jraygauthier ]; }; } diff --git a/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix b/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix index de93a5a7f8b..10ed4368ce2 100644 --- a/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix +++ b/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix @@ -37,7 +37,7 @@ in rec { --replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$dir\"; #" \ --replace "PRINTER =~" "PRINTER = \"${model}\"; #" wrapProgram $dir/lpd/filter_${model} \ - --prefix PATH : ${stdenv.lib.makeBinPath [ + --prefix PATH : ${lib.makeBinPath [ coreutils ghostscript gnugrep gnused which ]} # need to use i686 glibc here, these are 32bit proprietary binaries @@ -48,9 +48,9 @@ in rec { meta = { description = "Brother ${lib.strings.toUpper model} driver"; homepage = "http://www.brother.com/"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ stdenv.lib.maintainers.steveej ]; + maintainers = [ lib.maintainers.steveej ]; }; }; @@ -70,7 +70,7 @@ in rec { --replace "basedir =~" "basedir = \"$basedir\"; #" \ --replace "PRINTER =~" "PRINTER = \"${model}\"; #" wrapProgram $dir/cupswrapper/brother_lpdwrapper_${model} \ - --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnugrep gnused ]} + --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep gnused ]} mkdir -p $out/lib/cups/filter mkdir -p $out/share/cups/model ln $dir/cupswrapper/brother_lpdwrapper_${model} $out/lib/cups/filter @@ -80,9 +80,9 @@ in rec { meta = { description = "Brother ${lib.strings.toUpper model} CUPS wrapper driver"; homepage = "http://www.brother.com/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ stdenv.lib.maintainers.steveej ]; + maintainers = [ lib.maintainers.steveej ]; }; }; } diff --git a/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/pkgs/misc/cups/drivers/cups-bjnp/default.nix index 9dbfdd8b803..40243bb9196 100644 --- a/pkgs/misc/cups/drivers/cups-bjnp/default.nix +++ b/pkgs/misc/cups/drivers/cups-bjnp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cups}: +{lib, stdenv, fetchurl, cups}: stdenv.mkDerivation rec { name = "cups-bjnp-1.2.2"; @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { Canon printer. The design is based on reverse engineering of the protocol. ''; homepage = "http://cups-bjnp.sourceforge.net"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/cups/drivers/hl1110/default.nix b/pkgs/misc/cups/drivers/hl1110/default.nix index 194ef6cc327..916ac32c2e9 100644 --- a/pkgs/misc/cups/drivers/hl1110/default.nix +++ b/pkgs/misc/cups/drivers/hl1110/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}: +{lib, stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}: let version = "3.0.1-1"; @@ -42,10 +42,10 @@ stdenv.mkDerivation { patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/inf/braddprinter wrapProgram $out/opt/brother/Printers/HL1110/lpd/psconvert2 \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + --prefix PATH ":" ${ lib.makeBinPath [ gnused coreutils gawk ] } wrapProgram $out/opt/brother/Printers/HL1110/lpd/filter_HL1110 \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } + --prefix PATH ":" ${ lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } dpkg-deb -x ${cupsdeb} $out @@ -59,15 +59,15 @@ stdenv.mkDerivation { ln -s $out/opt/brother/Printers/HL1110/cupswrapper/brcupsconfig4 $out/lib/cups/filter/brcupsconfig4 wrapProgram $out/opt/brother/Printers/HL1110/cupswrapper/brother_lpdwrapper_HL1110 \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + --prefix PATH ":" ${ lib.makeBinPath [ gnused coreutils gawk ] } ''; meta = { homepage = "http://www.brother.com/"; description = "Brother HL1110 printer driver"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=eu_ot&lang=en&prod=hl1110_us_eu_as&os=128#SelectLanguageType-561_0_1"; }; } diff --git a/pkgs/misc/cups/drivers/hl1210w/default.nix b/pkgs/misc/cups/drivers/hl1210w/default.nix index 88947ed3339..975e07aa6c3 100644 --- a/pkgs/misc/cups/drivers/hl1210w/default.nix +++ b/pkgs/misc/cups/drivers/hl1210w/default.nix @@ -1,4 +1,4 @@ -{stdenv, pkgsi686Linux, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}: +{lib, stdenv, pkgsi686Linux, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}: let version = "3.0.1-1"; @@ -33,9 +33,9 @@ stdenv.mkDerivation { patchelf --set-interpreter ${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1210W/inf/braddprinter wrapProgram $out/opt/brother/Printers/HL1210W/lpd/psconvert2 \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + --prefix PATH ":" ${ lib.makeBinPath [ gnused coreutils gawk ] } wrapProgram $out/opt/brother/Printers/HL1210W/lpd/filter_HL1210W \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } + --prefix PATH ":" ${ lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } # install cups dpkg-deb -x ${cupsdeb} $out @@ -49,14 +49,14 @@ stdenv.mkDerivation { ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brcupsconfig4 $out/lib/cups/filter/brcupsconfig4 wrapProgram $out/opt/brother/Printers/HL1210W/cupswrapper/brother_lpdwrapper_HL1210W \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + --prefix PATH ":" ${ lib.makeBinPath [ gnused coreutils gawk ] } ''; meta = { homepage = "http://www.brother.com/"; description = "Brother HL1210W printer driver"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=nz&lang=en&prod=hl1210w_eu_as&os=128"; }; } diff --git a/pkgs/misc/cups/drivers/hl3140cw/default.nix b/pkgs/misc/cups/drivers/hl3140cw/default.nix index 9dabf053fd6..255fae09c7a 100644 --- a/pkgs/misc/cups/drivers/hl3140cw/default.nix +++ b/pkgs/misc/cups/drivers/hl3140cw/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}: +{lib, stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}: let version = "1.1.4-0"; @@ -44,10 +44,10 @@ stdenv.mkDerivation { patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/usr/bin/brprintconf_hl3140cw wrapProgram $out/opt/brother/Printers/hl3140cw/lpd/psconvertij2 \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + --prefix PATH ":" ${ lib.makeBinPath [ gnused coreutils gawk ] } wrapProgram $out/opt/brother/Printers/hl3140cw/lpd/filterhl3140cw \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } + --prefix PATH ":" ${ lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } dpkg-deb -x ${cupsdeb} $out @@ -65,14 +65,14 @@ stdenv.mkDerivation { ln -s $out/opt/brother/Printers/hl3140cw/lpd/filterhl3140cw $out/lib/cups/filter/brother_lpdwrapper_hl3140cw wrapProgram $out/opt/brother/Printers/hl3140cw/cupswrapper/cupswrapperhl3140cw \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + --prefix PATH ":" ${ lib.makeBinPath [ gnused coreutils gawk ] } ''; meta = { homepage = "http://www.brother.com/"; description = "Brother hl3140cw printer driver"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=eu_ot&lang=en&prod=hl3140cw_us_eu&os=128"; }; } diff --git a/pkgs/misc/cups/drivers/hll2340dw/default.nix b/pkgs/misc/cups/drivers/hll2340dw/default.nix index a621137c8f1..35d81b3da00 100644 --- a/pkgs/misc/cups/drivers/hll2340dw/default.nix +++ b/pkgs/misc/cups/drivers/hll2340dw/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { $out/opt/brother/Printers/HLL2340D/cupswrapper/paperconfigml1 \ ; do wrapProgram $f \ - --prefix PATH : ${stdenv.lib.makeBinPath [ + --prefix PATH : ${lib.makeBinPath [ coreutils ghostscript gnugrep gnused ]} done @@ -54,7 +54,7 @@ stdenv.mkDerivation { ln -s $out/opt/brother/Printers/HLL2340D/cupswrapper/brother-HLL2340D-cups-en.ppd $out/share/cups/model/ wrapProgram $out/opt/brother/Printers/HLL2340D/lpd/filter_HLL2340D \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused gnugrep coreutils which ] } + --prefix PATH ":" ${ lib.makeBinPath [ ghostscript a2ps file gnused gnugrep coreutils which ] } ''; meta = with lib; { diff --git a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix index 1e247d42ca4..04087c765e6 100644 --- a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix +++ b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ; do #substituteInPlace $f \ wrapProgram $f \ - --prefix PATH : ${stdenv.lib.makeBinPath [ + --prefix PATH : ${lib.makeBinPath [ coreutils ghostscript gnugrep gnused ]} done @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ln -s $out/opt/brother/Printers/HLL2390DW/cupswrapper/brother-HLL2390DW-cups-en.ppd $out/share/cups/model/ wrapProgram $out/opt/brother/Printers/HLL2390DW/lpd/lpdfilter \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused gnugrep coreutils which ] } + --prefix PATH ":" ${ lib.makeBinPath [ ghostscript a2ps file gnused gnugrep coreutils which ] } ''; meta = with lib; { diff --git a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix index 23ee927a3bf..2ff073591d0 100644 --- a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mfcj470dwlpr, makeWrapper}: +{ lib, stdenv, fetchurl, mfcj470dwlpr, makeWrapper}: stdenv.mkDerivation rec { pname = "mfcj470dw-cupswrapper"; @@ -48,9 +48,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.brother.com/"; description = "Brother MFC-J470DW CUPS wrapper driver"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj470dw_us_eu_as&os=128"; - maintainers = [ stdenv.lib.maintainers.yochai ]; + maintainers = [ lib.maintainers.yochai ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix index 31b5c1dbd37..b2dbd0ca77a 100644 --- a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cups, dpkg, ghostscript, a2ps, coreutils, gnused, gawk, file, makeWrapper }: +{ lib, stdenv, fetchurl, cups, dpkg, ghostscript, a2ps, coreutils, gnused, gawk, file, makeWrapper }: stdenv.mkDerivation rec { pname = "mfcj470dw-cupswrapper"; @@ -28,18 +28,18 @@ stdenv.mkDerivation rec { ln -s $out/opt/brother/Printers/mfcj470dw/lpd/filtermfcj470dw $out/lib/cups/filter/brother_lpdwrapper_mfcj470dw wrapProgram $out/opt/brother/Printers/mfcj470dw/lpd/psconvertij2 \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + --prefix PATH ":" ${ lib.makeBinPath [ gnused coreutils gawk ] } wrapProgram $out/opt/brother/Printers/mfcj470dw/lpd/filtermfcj470dw \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } + --prefix PATH ":" ${ lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } ''; meta = { homepage = "http://www.brother.com/"; description = "Brother MFC-J470DW LPR driver"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj470dw_us_eu_as&os=128"; - maintainers = [ stdenv.lib.maintainers.yochai ]; + maintainers = [ lib.maintainers.yochai ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix index ea06e8c104d..741abc74f26 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix @@ -73,9 +73,9 @@ stdenv.mkDerivation rec { ln -s $out/opt/brother/Printers/mfcj6510dw/lpd/filtermfcj6510dw $out/lib/cups/filter/brother_lpdwrapper_mfcj6510dw wrapProgram $out/opt/brother/Printers/mfcj6510dw/lpd/psconvertij2 \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ coreutils gnused gawk ] } + --prefix PATH ":" ${ lib.makeBinPath [ coreutils gnused gawk ] } wrapProgram $out/opt/brother/Printers/mfcj6510dw/lpd/filtermfcj6510dw \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ coreutils gnused file ghostscript a2ps ] } + --prefix PATH ":" ${ lib.makeBinPath [ coreutils gnused file ghostscript a2ps ] } ''; meta = with lib; { diff --git a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix index 27cb40a9e4f..6eebfe64d5a 100644 --- a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix @@ -1,4 +1,4 @@ -{ coreutils, dpkg, fetchurl, gnugrep, gnused, makeWrapper, mfcl2700dnlpr, perl, stdenv }: +{ coreutils, dpkg, fetchurl, gnugrep, gnused, makeWrapper, mfcl2700dnlpr, perl, lib, stdenv }: stdenv.mkDerivation rec { name = "mfcl2700dncupswrapper-${meta.version}"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { --replace "PRINTER =~" "PRINTER = \"MFCL2700DN\"; #" wrapProgram $dir/cupswrapper/brother_lpdwrapper_MFCL2700DN \ - --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnugrep gnused ]} + --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep gnused ]} mkdir -p $out/lib/cups/filter mkdir -p $out/share/cups/model @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2700DN CUPS wrapper driver"; homepage = "http://www.brother.com/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.tv ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.tv ]; + platforms = lib.platforms.linux; version = "3.2.0-1"; }; } diff --git a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix index 24d3e5cab7f..0d11579e954 100644 --- a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix @@ -1,4 +1,4 @@ -{ coreutils, dpkg, fetchurl, ghostscript, gnugrep, gnused, makeWrapper, perl, stdenv, which }: +{ lib, stdenv, coreutils, dpkg, fetchurl, ghostscript, gnugrep, gnused, makeWrapper, perl, which }: stdenv.mkDerivation rec { pname = "mfcl2700dnlpr"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { --replace "PRINTER =~" "PRINTER = \"MFCL2700DN\"; #" wrapProgram $dir/lpd/filter_MFCL2700DN \ - --prefix PATH : ${stdenv.lib.makeBinPath [ + --prefix PATH : ${lib.makeBinPath [ coreutils ghostscript gnugrep gnused which ]} @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2700DN LPR driver"; homepage = "http://www.brother.com/"; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.tv ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.tv ]; platforms = [ "i686-linux" ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix index 8a2ce7edf26..5d4980da9d1 100644 --- a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2720dwlpr }: +{ lib, stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2720dwlpr }: stdenv.mkDerivation rec { pname = "mfcl2720dwcupswrapper"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --replace /usr/bin/perl ${perl}/bin/perl wrapProgram $dir/cupswrapper/brother_lpdwrapper_MFCL2720DW \ - --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnugrep gnused ]} + --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep gnused ]} mkdir -p $out/lib/cups/filter mkdir -p $out/share/cups/model @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2720DW CUPS wrapper driver"; homepage = "http://www.brother.com/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ stdenv.lib.maintainers.xeji ]; + maintainers = [ lib.maintainers.xeji ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix index 0dc9eed2ac0..2b6c458e745 100644 --- a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }: +{ pkgs, lib, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }: stdenv.mkDerivation rec { pname = "mfcl2720dwlpr"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { --replace "PRINTER =~" "PRINTER = \"MFCL2720DW\"; #" wrapProgram $dir/lpd/filter_MFCL2720DW \ - --prefix PATH : ${stdenv.lib.makeBinPath [ + --prefix PATH : ${lib.makeBinPath [ coreutils ghostscript gnugrep gnused which ]} @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2720DW lpr driver"; homepage = "http://www.brother.com/"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ stdenv.lib.maintainers.xeji ]; + maintainers = [ lib.maintainers.xeji ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix index f2143df321c..a119c31517c 100644 --- a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2740dwlpr }: +{ lib, stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2740dwlpr }: stdenv.mkDerivation rec { pname = "mfcl2740dwcupswrapper"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --replace /usr/bin/perl ${perl}/bin/perl wrapProgram $dir/cupswrapper/brother_lpdwrapper_MFCL2740DW \ - --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnugrep gnused ]} + --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep gnused ]} mkdir -p $out/lib/cups/filter mkdir -p $out/share/cups/model @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2740DW CUPS wrapper driver"; homepage = "http://www.brother.com/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ stdenv.lib.maintainers.enzime ]; + maintainers = [ lib.maintainers.enzime ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix index 74571611b44..38722a734a6 100644 --- a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix @@ -1,4 +1,4 @@ -{ pkgsi686Linux, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }: +{ pkgsi686Linux, lib, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }: stdenv.mkDerivation rec { pname = "mfcl2740dwlpr"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { --replace "PRINTER =~" "PRINTER = \"MFCL2740DW\"; #" wrapProgram $dir/lpd/filter_MFCL2740DW \ - --prefix PATH : ${stdenv.lib.makeBinPath [ + --prefix PATH : ${lib.makeBinPath [ coreutils ghostscript gnugrep gnused which ]} @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2740DW lpr driver"; homepage = "http://www.brother.com/"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ stdenv.lib.maintainers.enzime ]; + maintainers = [ lib.maintainers.enzime ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix index d82c0ad9a86..ebb2e439298 100644 --- a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix @@ -1,5 +1,5 @@ { coreutils, dpkg, fetchurl, gnugrep, gnused, makeWrapper, -mfcl8690cdwlpr, perl, stdenv}: +mfcl8690cdwlpr, perl, lib, stdenv}: stdenv.mkDerivation rec { pname = "mfcl8690cdwcupswrapper"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --replace "PRINTER =~" "PRINTER = \"mfcl8690cdw\"; #" wrapProgram $dir/cupswrapper/brother_lpdwrapper_mfcl8690cdw \ - --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnugrep gnused ]} + --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep gnused ]} mkdir -p $out/lib/cups/filter mkdir -p $out/share/cups/model @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L8690CDW CUPS wrapper driver"; homepage = "http://www.brother.com/"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.fuzzy-id ]; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.fuzzy-id ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix index 9e3c529e898..2b5dc44cead 100644 --- a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix @@ -1,5 +1,5 @@ { coreutils, dpkg, fetchurl, file, ghostscript, gnugrep, gnused, -makeWrapper, perl, pkgs, stdenv, which }: +makeWrapper, perl, pkgs, lib, stdenv, which }: stdenv.mkDerivation rec { pname = "mfcl8690cdwlpr"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --replace "PRINTER =~" "PRINTER = \"mfcl8690cdw\"; #" wrapProgram $filter \ - --prefix PATH : ${stdenv.lib.makeBinPath [ + --prefix PATH : ${lib.makeBinPath [ coreutils file ghostscript gnugrep gnused which ]} @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L8690CDW LPR printer driver"; homepage = "http://www.brother.com/"; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.fuzzy-id ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.fuzzy-id ]; platforms = [ "i686-linux" ]; }; } diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix index f346b6e3c40..2ea0e253853 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix @@ -87,10 +87,10 @@ in stdenv.mkDerivation rec { preFixup = '' for bin in "$out/bin/"*; do patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$bin" - patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$bin" + patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$bin" done - patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$out/lib/libscmssc.so" + patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$out/lib/libscmssc.so" patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb-compat-0_1.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1" ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ diff --git a/pkgs/misc/cups/drivers/samsung/1.00.37.nix b/pkgs/misc/cups/drivers/samsung/1.00.37.nix index af022454e42..9fb26f62d76 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.37.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.37.nix @@ -70,10 +70,10 @@ in stdenv.mkDerivation rec { preFixup = '' for bin in "$out/bin/"*; do patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$bin" - patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$bin" + patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$bin" done - patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$out/lib/libscmssc.so" + patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$out/lib/libscmssc.so" patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb-compat-0_1.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1" ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix index 9982e7b4282..92f5fdc409c 100644 --- a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix +++ b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix @@ -16,7 +16,7 @@ # Do not bump lightly! Visit <http://www.bchemnet.com/suldr/supported.html> # to see what will break when upgrading. Consider a new versioned attribute. let - cups' = stdenv.lib.getLib cups; + cups' = lib.getLib cups; in stdenv.mkDerivation rec { pname = "samsung-UnifiedLinuxDriver"; version = "4.00.39"; diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix index 68f2abde705..2591cf73566 100644 --- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -18,7 +18,7 @@ let installationPath = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" else "i386"; appendPath = if stdenv.hostPlatform.system == "x86_64-linux" then "64" else ""; - libPath = stdenv.lib.makeLibraryPath [ cups libusb-compat-0_1 ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}"; + libPath = lib.makeLibraryPath [ cups libusb-compat-0_1 ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}"; in stdenv.mkDerivation rec { pname = "samsung-UnifiedLinuxDriver"; version = "4.01.17"; diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 217f0c7f0da..7477c5aa78b 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, cups, poppler, poppler_utils, fontconfig +{ lib, stdenv, fetchurl, pkgconfig, cups, poppler, poppler_utils, fontconfig , libjpeg, libpng, perl, ijs, qpdf, dbus, avahi , makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which, ghostscript , mupdf }: let - binPath = stdenv.lib.makeBinPath [ coreutils gnused bc gawk gnugrep which ]; + binPath = lib.makeBinPath [ coreutils gnused bc gawk gnugrep which ]; in stdenv.mkDerivation rec { pname = "cups-filters"; @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { meta = { homepage = "http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters"; description = "Backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/documentation-highlighter/default.nix b/pkgs/misc/documentation-highlighter/default.nix index 16b47d01f24..022cc4aa834 100644 --- a/pkgs/misc/documentation-highlighter/default.nix +++ b/pkgs/misc/documentation-highlighter/default.nix @@ -1,11 +1,11 @@ -{ stdenv, runCommand }: +{ lib, stdenv, runCommand }: runCommand "documentation-highlighter" { meta = { description = "Highlight.js sources for the Nix Ecosystem's documentation"; homepage = "https://highlightjs.org"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.grahamc ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.grahamc ]; }; } '' cp -r ${./.} $out diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index 9054c4c48f8..407eef06773 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , makeWrapper @@ -19,8 +19,8 @@ }: let common_meta = { homepage = "http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"; - license = with stdenv.lib.licenses; epson; - platforms = with stdenv.lib.platforms; linux; + license = with lib.licenses; epson; + platforms = with lib.platforms; linux; }; in ############################ @@ -261,7 +261,7 @@ let plugins = { in let fwdir = symlinkJoin { name = "esci-firmware-dir"; - paths = stdenv.lib.mapAttrsToList (name: value: value + /share/esci) plugins; + paths = lib.mapAttrsToList (name: value: value + /share/esci) plugins; }; in let iscan-data = stdenv.mkDerivation rec { @@ -337,7 +337,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/iscan-registry --prefix PATH : ${getopt}/bin registry=$out/bin/iscan-registry; '' + - stdenv.lib.concatStrings (stdenv.lib.mapAttrsToList + lib.concatStrings (lib.mapAttrsToList (name: value: '' plugin=${value}; ${value.passthru.registrationCommand} @@ -349,7 +349,7 @@ stdenv.mkDerivation rec { Includes gui-less iscan (aka. Image Scan! for Linux). Supported hardware: at least : '' + - stdenv.lib.concatStringsSep ", " (stdenv.lib.mapAttrsToList (name: value: value.passthru.hw) plugins); - maintainers = with stdenv.lib.maintainers; [ symphorien dominikh ]; + lib.concatStringsSep ", " (lib.mapAttrsToList (name: value: value.passthru.hw) plugins); + maintainers = with lib.maintainers; [ symphorien dominikh ]; }; } diff --git a/pkgs/misc/drivers/epson-alc1100/default.nix b/pkgs/misc/drivers/epson-alc1100/default.nix index fc467e8a4d2..2a0fd92867e 100644 --- a/pkgs/misc/drivers/epson-alc1100/default.nix +++ b/pkgs/misc/drivers/epson-alc1100/default.nix @@ -33,12 +33,12 @@ in postFixup = '' patchelf --set-interpreter ${pkgsi686Linux.glibc}/lib/ld-linux.so.2 \ - --set-rpath "${stdenv.lib.makeLibraryPath [ + --set-rpath "${lib.makeLibraryPath [ pkgsi686Linux.glibc "$out" ]}" $out/bin/alc1100 - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ + patchelf --set-rpath "${lib.makeLibraryPath [ pkgsi686Linux.glibc ]}" $out/lib/libstdc++.so.5.0.7 diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index 3ca64e0e8f8..eae437b0a4d 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchurl, pkgconfig, perl, cups, dbus, enscript }: +{ lib, stdenv, fetchpatch, fetchurl, pkgconfig, perl, cups, dbus, enscript }: stdenv.mkDerivation rec { name = "foomatic-filters-4.0.17"; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { meta = { description = "Foomatic printing filters"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/misc/drivers/gutenprint/bin.nix index 4adb96e1299..58b77cb9107 100644 --- a/pkgs/misc/drivers/gutenprint/bin.nix +++ b/pkgs/misc/drivers/gutenprint/bin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rpm, cpio, zlib }: +{ lib, stdenv, fetchurl, rpm, cpio, zlib }: /* usage: (sorry, its still impure but works!) @@ -36,7 +36,7 @@ stdenv.mkDerivation { phases = "buildPhase"; - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc zlib ]; + libPath = lib.makeLibraryPath [ stdenv.cc.cc zlib ]; buildPhase = '' ar -x $src data.tar.gz diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix index c48c5bff4bf..128a5e39df7 100644 --- a/pkgs/misc/drivers/hplip/3.16.11.nix +++ b/pkgs/misc/drivers/hplip/3.16.11.nix @@ -69,7 +69,7 @@ python2Packages.buildPythonApplication { pygobject2 reportlab usbutils - ] ++ stdenv.lib.optionals qtSupport [ + ] ++ lib.optionals qtSupport [ pyqt4 ]; @@ -111,7 +111,7 @@ python2Packages.buildPythonApplication { enableParallelBuilding = true; - postInstall = stdenv.lib.optionalString withPlugin '' + postInstall = lib.optionalString withPlugin '' sh ${plugin} --noexec --keep cd plugin_tmp diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/pkgs/misc/drivers/hplip/3.18.5.nix index c7e1f47e2e5..9622382e121 100644 --- a/pkgs/misc/drivers/hplip/3.18.5.nix +++ b/pkgs/misc/drivers/hplip/3.18.5.nix @@ -76,7 +76,7 @@ python2Packages.buildPythonApplication { reportlab usbutils sip - ] ++ stdenv.lib.optionals withQt5 [ + ] ++ lib.optionals withQt5 [ pyqt5 ]; @@ -108,9 +108,9 @@ python2Packages.buildPythonApplication { --with-systraydir=$out/xdg/autostart --with-mimedir=$out/etc/cups --enable-policykit - ${stdenv.lib.optionalString withStaticPPDInstall "--enable-cups-ppd-install"} + ${lib.optionalString withStaticPPDInstall "--enable-cups-ppd-install"} --disable-qt4 - ${stdenv.lib.optionalString withQt5 "--enable-qt5"} + ${lib.optionalString withQt5 "--enable-qt5"} " export makeFlags=" @@ -136,7 +136,7 @@ python2Packages.buildPythonApplication { # Running `hp-diagnose_plugin -g` can be used to diagnose # issues with plugins. # - postInstall = stdenv.lib.optionalString withPlugin '' + postInstall = lib.optionalString withPlugin '' sh ${plugin} --noexec --keep cd plugin_tmp diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index b20797808af..ed0d5183347 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -71,7 +71,7 @@ python3Packages.buildPythonApplication { nativeBuildInputs = [ pkgconfig removeReferencesTo - ] ++ stdenv.lib.optional withQt5 qt5.wrapQtAppsHook; + ] ++ lib.optional withQt5 qt5.wrapQtAppsHook; pythonPath = with python3Packages; [ dbus @@ -81,7 +81,7 @@ python3Packages.buildPythonApplication { usbutils sip dbus-python - ] ++ stdenv.lib.optionals withQt5 [ + ] ++ lib.optionals withQt5 [ pyqt5 enum-compat ]; @@ -127,9 +127,9 @@ python3Packages.buildPythonApplication { --with-systraydir=$out/xdg/autostart --with-mimedir=$out/etc/cups --enable-policykit - ${stdenv.lib.optionalString withStaticPPDInstall "--enable-cups-ppd-install"} + ${lib.optionalString withStaticPPDInstall "--enable-cups-ppd-install"} --disable-qt4 - ${stdenv.lib.optionalString withQt5 "--enable-qt5"} + ${lib.optionalString withQt5 "--enable-qt5"} " export makeFlags=" @@ -155,7 +155,7 @@ python3Packages.buildPythonApplication { # Running `hp-diagnose_plugin -g` can be used to diagnose # issues with plugins. # - postInstall = stdenv.lib.optionalString withPlugin '' + postInstall = lib.optionalString withPlugin '' sh ${plugin} --noexec --keep cd plugin_tmp @@ -229,7 +229,7 @@ python3Packages.buildPythonApplication { --replace {,${util-linux}/bin/}logger \ --replace {/usr,$out}/bin remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/*.so) - '' + stdenv.lib.optionalString withQt5 '' + '' + lib.optionalString withQt5 '' for f in $out/bin/hp-*;do wrapQtApp $f done diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix index b94a0978284..d52f9dd7cde 100644 --- a/pkgs/misc/drivers/sundtek/default.nix +++ b/pkgs/misc/drivers/sundtek/default.nix @@ -1,6 +1,6 @@ -{ fetchurl, stdenv }: +{ fetchurl, lib, stdenv }: -with stdenv.lib; +with lib; let version = "2016-01-26"; diff --git a/pkgs/misc/drivers/xwiimote/default.nix b/pkgs/misc/drivers/xwiimote/default.nix index 3b7b42990af..a9e3d42ef9f 100644 --- a/pkgs/misc/drivers/xwiimote/default.nix +++ b/pkgs/misc/drivers/xwiimote/default.nix @@ -1,4 +1,4 @@ -{ stdenv, udev, ncurses, pkgconfig, fetchurl, bluez }: +{ lib, stdenv, udev, ncurses, pkgconfig, fetchurl, bluez }: stdenv.mkDerivation rec { name = "xwiimote-2"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://dvdhrm.github.io/xwiimote"; description = "Userspace utilities to control connected Nintendo Wii Remotes"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; + platforms = lib.platforms.linux; + license = lib.licenses.mit; }; postInstallPhase = '' diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/misc/emulators/atari++/default.nix index 4758d173e92..2019820510e 100644 --- a/pkgs/misc/emulators/atari++/default.nix +++ b/pkgs/misc/emulators/atari++/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libSM libX11 SDL libICE alsaLib gcc-unwrapped libXext ]; postFixup = '' - patchelf --set-rpath ${stdenv.lib.makeLibraryPath buildInputs} "$out/bin/atari++" + patchelf --set-rpath ${lib.makeLibraryPath buildInputs} "$out/bin/atari++" ''; meta = with lib; { @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ maintainers.AndersonTorres ]; license = licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix index 6c846e2f0ab..163b81922c2 100644 --- a/pkgs/misc/emulators/atari800/default.nix +++ b/pkgs/misc/emulators/atari800/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ lib, stdenv, fetchFromGitHub, autoreconfHook , unzip, zlib, SDL, readline, libGLU, libGL, libX11 }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "atari800"; version = "4.2.0"; @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ maintainers.AndersonTorres ]; license = licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/blastem/default.nix b/pkgs/misc/emulators/blastem/default.nix index f4cef93141d..c56a63b063b 100644 --- a/pkgs/misc/emulators/blastem/default.nix +++ b/pkgs/misc/emulators/blastem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, SDL2, glew, xcftools, python, pillow, makeWrapper }: +{ lib, stdenv, fetchurl, fetchFromGitHub, pkgconfig, SDL2, glew, xcftools, python, pillow, makeWrapper }: let vasm = @@ -41,9 +41,9 @@ stdenv.mkDerivation { meta = { homepage = "https://www.retrodev.com/blastem/"; description = "The fast and accurate Genesis emulator"; - maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + maintainers = with lib.maintainers; [ puffnfresh ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; # Makefile:140: *** aarch64 is not a supported architecture. Stop. badPlatforms = [ "aarch64-linux" ]; }; diff --git a/pkgs/misc/emulators/bsod/default.nix b/pkgs/misc/emulators/bsod/default.nix index 56b85227cda..872ee8571f3 100644 --- a/pkgs/misc/emulators/bsod/default.nix +++ b/pkgs/misc/emulators/bsod/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses}: +{lib, stdenv, fetchurl, ncurses}: stdenv.mkDerivation { name = "bsod-0.1"; @@ -23,9 +23,9 @@ stdenv.mkDerivation { blue screen of death on the console. Errors and drivers causing the error are selected randomly from a large set of examples."; homepage = "http://www.vanheusden.com/bsod/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.antono ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.antono ]; }; } diff --git a/pkgs/misc/emulators/ccemux/default.nix b/pkgs/misc/emulators/ccemux/default.nix index 96cb9afaf2f..11f24d59e5c 100644 --- a/pkgs/misc/emulators/ccemux/default.nix +++ b/pkgs/misc/emulators/ccemux/default.nix @@ -6,7 +6,7 @@ let version = "1.1.1"; rev = "af12e2e4da586275ba931eae8f40a2201251bf59"; - baseUrl = "https://emux.cc/versions/${stdenv.lib.substring 0 8 rev}/CCEmuX"; + baseUrl = "https://emux.cc/versions/${lib.substring 0 8 rev}/CCEmuX"; jar = if useCCTweaked then fetchurl { diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix index 51e6a6ac5c8..702a46f49aa 100644 --- a/pkgs/misc/emulators/cdemu/base.nix +++ b/pkgs/misc/emulators/cdemu/base.nix @@ -32,6 +32,6 @@ in stdenv.mkDerivation ({ homepage = "http://cdemu.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ bendlas ]; + maintainers = with lib.maintainers; [ bendlas ]; }; } // drvParams) diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index 17d2f8f5e97..182469310c4 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = "http://cdemu.sourceforge.net/about/vhba/"; platforms = platforms.linux; license = licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ bendlas ]; + maintainers = with lib.maintainers; [ bendlas ]; }; } diff --git a/pkgs/misc/emulators/darcnes/default.nix b/pkgs/misc/emulators/darcnes/default.nix index 3ea98c571e8..7919e0a9009 100644 --- a/pkgs/misc/emulators/darcnes/default.nix +++ b/pkgs/misc/emulators/darcnes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXt, libXext, libXaw }: +{ lib, stdenv, fetchurl, libX11, libXt, libXext, libXaw }: stdenv.mkDerivation rec { pname = "darcnes"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = "https://web.archive.org/web/20130502171725/http://www.dridus.com/~nyef/darcnes/"; description = "Sega Master System, Game Gear, SG-1000, NES, ColecoVision and Apple II emulator"; # Prohibited commercial use, credit required. - license = stdenv.lib.licenses.free; + license = lib.licenses.free; platforms = [ "i686-linux" ]; }; } diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix index 27c1a2cb9c3..075ad6833b1 100644 --- a/pkgs/misc/emulators/desmume/default.nix +++ b/pkgs/misc/emulators/desmume/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl, fetchpatch , pkgconfig, libtool, intltool , libXmu , lua @@ -8,7 +8,7 @@ , gtk2, gtkglext, libglade , libGLU, libpcap, SDL, zziplib }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "desmume"; diff --git a/pkgs/misc/emulators/dlx/default.nix b/pkgs/misc/emulators/dlx/default.nix index 215f2ee46f9..3360d45ccc8 100644 --- a/pkgs/misc/emulators/dlx/default.nix +++ b/pkgs/misc/emulators/dlx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation { name = "dlx-2012.07.08"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.davidviner.com/dlx.php"; description = "DLX Simulator"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index 10c542c5a6e..439553ccc4d 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, curl, boost, eigen +{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake, curl, boost, eigen , freeimage, freetype, libGLU, libGL, SDL2, alsaLib, libarchive , fetchpatch }: @@ -30,8 +30,8 @@ stdenv.mkDerivation { meta = { description = "A flexible emulator front-end supporting keyboardless navigation and custom system themes"; homepage = "https://emulationstation.org"; - maintainers = [ stdenv.lib.maintainers.edwtjo ]; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.edwtjo ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix index 493cf4c2628..7cdd88d0b94 100644 --- a/pkgs/misc/emulators/epsxe/default.nix +++ b/pkgs/misc/emulators/epsxe/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, alsaLib, curl, gdk-pixbuf, glib, gtk3, libGLU, libGL, +{ lib, stdenv, fetchurl, alsaLib, curl, gdk-pixbuf, glib, gtk3, libGLU, libGL, libX11, openssl_1_0_2, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook, autoPatchelfHook }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "epsxe"; diff --git a/pkgs/misc/emulators/fakenes/default.nix b/pkgs/misc/emulators/fakenes/default.nix index d7c8a185a09..2011d8ce037 100644 --- a/pkgs/misc/emulators/fakenes/default.nix +++ b/pkgs/misc/emulators/fakenes/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, allegro, openal, libGLU, libGL, zlib, hawknl, freeglut, libX11, +{lib, stdenv, fetchurl, allegro, openal, libGLU, libGL, zlib, hawknl, freeglut, libX11, libXxf86vm, libXcursor, libXpm }: stdenv.mkDerivation { @@ -24,9 +24,9 @@ stdenv.mkDerivation { meta = { homepage = "http://fakenes.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; description = "Portable Open Source NES Emulator"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; broken = true; }; } diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/misc/emulators/fceux/default.nix index 0d4b4cd3576..124203e82e9 100644 --- a/pkgs/misc/emulators/fceux/default.nix +++ b/pkgs/misc/emulators/fceux/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, scons, zlib, SDL, lua5_1, pkgconfig}: +{lib, stdenv, fetchFromGitHub, scons, zlib, SDL, lua5_1, pkgconfig}: stdenv.mkDerivation { pname = "fceux-unstable"; @@ -32,9 +32,9 @@ stdenv.mkDerivation { meta = { description = "A Nintendo Entertainment System (NES) Emulator"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.scubed2 ]; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.scubed2 ]; homepage = "http://www.fceux.com/"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/firebird-emu/default.nix b/pkgs/misc/emulators/firebird-emu/default.nix index 888cfea0204..236eff8610c 100644 --- a/pkgs/misc/emulators/firebird-emu/default.nix +++ b/pkgs/misc/emulators/firebird-emu/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }: +{ mkDerivation, lib, stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }: mkDerivation rec { pname = "firebird-emu"; @@ -30,9 +30,9 @@ mkDerivation rec { meta = { homepage = "https://github.com/nspire-emus/firebird"; description = "Third-party multi-platform emulator of the ARM-based TI-Nspire™ calculators"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ pneumaticat ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ pneumaticat ]; # Only tested on Linux, but likely possible to build on, e.g. macOS - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index 214c1e6e75b..eb9b2f1e5cc 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig , gettext, gtk2, SDL2, zlib, glib, openal, libGLU, libGL, lua, freetype, libmpeg2, zip }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "fs-uae"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; homepage = "https://fs-uae.net"; - maintainers = with stdenv.lib; [ maintainers.AndersonTorres ]; + maintainers = with lib; [ maintainers.AndersonTorres ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix index 267944a8bfc..be80b9bc351 100644 --- a/pkgs/misc/emulators/hatari/default.nix +++ b/pkgs/misc/emulators/hatari/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, SDL, cmake }: +{ lib, stdenv, fetchurl, zlib, SDL, cmake }: stdenv.mkDerivation rec { pname = "hatari"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://hatari.tuxfamily.org/"; description = "Atari ST/STE/TT/Falcon emulator"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index 88872dd3972..5d25320068e 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -11,7 +11,7 @@ , libicns, Carbon, Cocoa, OpenGL, OpenAL}: let - inherit (stdenv.lib) optionals; + inherit (lib) optionals; in stdenv.mkDerivation rec { diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix index ddf0a129ab8..e09ddd57c74 100644 --- a/pkgs/misc/emulators/mame/default.nix +++ b/pkgs/misc/emulators/mame/default.nix @@ -61,7 +61,7 @@ in mkDerivation { ''; installPhase = '' - make -f dist.mak PTR64=${stdenv.lib.optionalString stdenv.is64bit "1"} + make -f dist.mak PTR64=${lib.optionalString stdenv.is64bit "1"} mkdir -p ${dest} mv build/release/*/Release/mame/* ${dest} diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix index 60b0bfe1223..8e12eea31a9 100644 --- a/pkgs/misc/emulators/mednaffe/default.nix +++ b/pkgs/misc/emulators/mednaffe/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, makeWrapper, autoreconfHook, pkgconfig, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, makeWrapper, autoreconfHook, pkgconfig, wrapGAppsHook , gtk2 ? null, gtk3 ? null, mednafen }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "mednaffe"; diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index 5050df007f6..059b3791d11 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, SDL2, alsaLib, gtk3 +{ lib, stdenv, fetchFromGitHub, pkgconfig, SDL2, alsaLib, gtk3 , makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg_utils , epoxy, gdk-pixbuf, gnome3, wrapGAppsHook }: @@ -64,9 +64,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://0ldsk00l.ca/nestopia/"; description = "NES emulator with a focus on accuracy"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ MP2E ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ MP2E ]; }; } diff --git a/pkgs/misc/emulators/oberon-risc-emu/default.nix b/pkgs/misc/emulators/oberon-risc-emu/default.nix index 14c213fcc0a..749e3549bf8 100644 --- a/pkgs/misc/emulators/oberon-risc-emu/default.nix +++ b/pkgs/misc/emulators/oberon-risc-emu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, SDL2 }: +{ lib, stdenv, fetchFromGitHub, SDL2 }: stdenv.mkDerivation { pname = "oberon-risc-emu"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { mv risc $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/pdewacht/oberon-risc-emu/"; description = "Emulator for the Oberon RISC machine"; license = licenses.isc; diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/misc/emulators/openmsx/default.nix index dc533c4f17c..0de3d61c7ee 100644 --- a/pkgs/misc/emulators/openmsx/default.nix +++ b/pkgs/misc/emulators/openmsx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkgconfig , python , alsaLib, glew, libGL, libpng , libogg, libtheora, libvorbis @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # for providing support to Nixpkgs :) TCL_CONFIG="${tcl}/lib/"; - meta = with stdenv.lib;{ + meta = with lib;{ description = "The MSX emulator that aims for perfection"; longDescription = '' OpenMSX is an emulator for the MSX home computer system. Its goal is diff --git a/pkgs/misc/emulators/resim/default.nix b/pkgs/misc/emulators/resim/default.nix index ba7ac621257..6e759bd7552 100644 --- a/pkgs/misc/emulators/resim/default.nix +++ b/pkgs/misc/emulators/resim/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, cmake, qt4 }: +{ fetchFromGitHub, lib, stdenv, cmake, qt4 }: stdenv.mkDerivation { name = "resim"; @@ -16,5 +16,5 @@ stdenv.mkDerivation { cp -v vc4emul/vc4emul $out/bin/vc4emul ''; - meta.license = stdenv.lib.licenses.mit; + meta.license = lib.licenses.mit; } diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 65771577896..06e4a71055b 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -6,10 +6,10 @@ let - d2u = stdenv.lib.replaceChars ["-"] ["_"]; + d2u = lib.replaceChars ["-"] ["_"]; mkLibRetroCore = { core, src, description, license, broken ? false, ... }@a: - stdenv.lib.makeOverridable stdenv.mkDerivation ((rec { + lib.makeOverridable stdenv.mkDerivation ((rec { name = "libretro-${a.core}-${version}"; version = "2020-03-06"; @@ -62,7 +62,7 @@ let fetchSubmodules = true; }; -in with stdenv.lib.licenses; +in with lib.licenses; { @@ -313,8 +313,8 @@ in with stdenv.lib.licenses; license = gpl2; extraBuildInputs = [ libpcap libGLU libGL xorg.libX11 ]; preBuild = "cd desmume/src/frontend/libretro"; - makeFlags = stdenv.lib.optional stdenv.hostPlatform.isAarch32 "platform=armv-unix" - ++ stdenv.lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0"; + makeFlags = lib.optional stdenv.hostPlatform.isAarch32 "platform=armv-unix" + ++ lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0"; }; desmume2015 = mkLibRetroCore rec { @@ -327,8 +327,8 @@ in with stdenv.lib.licenses; description = "libretro wrapper for desmume NDS emulator from 2015"; license = gpl2; extraBuildInputs = [ libpcap libGLU libGL xorg.libX11 ]; - makeFlags = stdenv.lib.optional stdenv.hostPlatform.isAarch32 "platform=armv-unix" - ++ stdenv.lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0"; + makeFlags = lib.optional stdenv.hostPlatform.isAarch32 "platform=armv-unix" + ++ lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0"; preBuild = "cd desmume"; }; @@ -435,7 +435,7 @@ in with stdenv.lib.licenses; license = gpl2; extraBuildInputs = [ libGL libGLU ]; makefile = "Makefile"; - makeFlags = stdenv.lib.optional stdenv.hostPlatform.isAarch64 [ "platform=arm64" ]; + makeFlags = lib.optional stdenv.hostPlatform.isAarch64 [ "platform=arm64" ]; meta.platforms = [ "aarch64-linux" "x86_64-linux" ]; }; @@ -505,7 +505,7 @@ in with stdenv.lib.licenses; sha256 = "1jhgfys8hiipvbwq3gc48d7v6wq645d10rbr4w5m6px0fk6csshk"; }; description = "Port of Game and Watch to libretro"; - license = stdenv.lib.licenses.zlib; + license = lib.licenses.zlib; makefile = "Makefile"; }; @@ -567,7 +567,7 @@ in with stdenv.lib.licenses; description = "Port of MAME ~2000 to libretro"; license = gpl2Plus; makefile = "Makefile"; - makeFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "IS_X86=0"; + makeFlags = lib.optional (!stdenv.hostPlatform.isx86) "IS_X86=0"; }; mame2003 = mkLibRetroCore rec { @@ -604,7 +604,7 @@ in with stdenv.lib.licenses; description = "Port of MAME ~2010 to libretro"; license = gpl2Plus; makefile = "Makefile"; - makeFlags = stdenv.lib.optionals stdenv.hostPlatform.isAarch64 [ "PTR64=1" "ARM_ENABLED=1" "X86_SH2DRC=0" "FORCE_DRC_C_BACKEND=1" ]; + makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "PTR64=1" "ARM_ENABLED=1" "X86_SH2DRC=0" "FORCE_DRC_C_BACKEND=1" ]; }; mame2015 = mkLibRetroCore rec { @@ -778,7 +778,7 @@ in with stdenv.lib.licenses; license = gpl2; extraBuildInputs = [ libGLU libGL libpng ]; makefile = "Makefile"; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isAarch64 '' + postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' sed -i -e '1 i\CPUFLAGS += -DARM_FIX -DNO_ASM -DARM_ASM -DDONT_WANT_ARM_OPTIMIZATIONS -DARM64' Makefile \ && sed -i -e 's,CPUFLAGS :=,,g' Makefile ''; @@ -810,7 +810,7 @@ in with stdenv.lib.licenses; SDL_CONFIG = "${SDL.dev}/bin/sdl-config"; dontAddPrefix = true; configurePlatforms = []; - makeFlags = stdenv.lib.optional stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ]; + makeFlags = lib.optional stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ]; }; play = mkLibRetroCore { @@ -1091,7 +1091,7 @@ in with stdenv.lib.licenses; license = gpl2; makefile = "Makefile"; # Disable SSE for non-x86. DYNAREC doesn't build on either Aarch64 or x86_64. - makeFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "HAVE_SSE=0"; + makeFlags = lib.optional (!stdenv.hostPlatform.isx86) "HAVE_SSE=0"; preBuild = "cd yabause/src/libretro"; }; diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index bfc2c338769..9a01bdb78b5 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which, pkgconfig, makeWrapper +{ lib, stdenv, fetchFromGitHub, which, pkgconfig, makeWrapper , ffmpeg_3, libGLU, libGL, freetype, libxml2, python3 , libobjc, AppKit, Foundation , alsaLib ? null @@ -19,7 +19,7 @@ , libxkbcommon }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "retroarch-bare"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = stdenv.lib.optionals stdenv.isLinux [ "--enable-kms" "--enable-egl" ]; + configureFlags = lib.optionals stdenv.isLinux [ "--enable-kms" "--enable-egl" ]; postInstall = optionalString withVulkan '' wrapProgram $out/bin/retroarch --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib diff --git a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix index d751c4f7fc4..79dd025cf94 100644 --- a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix +++ b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { buildCommand = '' mkdir -p $out/bin - ${stdenv.lib.concatMapStrings (exec: "ln -s ${scriptSh exec} $out/bin/kodi-${exec.name};") execs} + ${lib.concatMapStrings (exec: "ln -s ${scriptSh exec} $out/bin/kodi-${exec.name};") execs} ''; meta = { @@ -35,6 +35,6 @@ stdenv.mkDerivation { advanced (emulation) launcher for Kodi since device input is otherwise caught by both Kodi and the retroarch process. ''; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/misc/emulators/ryujinx/default.nix b/pkgs/misc/emulators/ryujinx/default.nix index b7259a3deb3..79d71301163 100644 --- a/pkgs/misc/emulators/ryujinx/default.nix +++ b/pkgs/misc/emulators/ryujinx/default.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { makeWrapper $out/lib/ryujinx/Ryujinx $out/bin/Ryujinx \ --set DOTNET_ROOT "${dotnetCorePackages.netcore_3_1}" \ - --suffix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath runtimeDeps}" \ + --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" \ ''${gappsWrapperArgs[@]} for i in 16 32 48 64 96 128 256 512 1024; do diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index ece734ef4bc..458922bdc1d 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, SDL2 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, SDL2 }: stdenv.mkDerivation rec { pname = "stella"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib;{ + meta = with lib;{ description = "An open-source Atari 2600 VCS emulator"; longDescription = '' Stella is a multi-platform Atari 2600 VCS emulator released under diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix index 7b52430aa01..0cce4a926c3 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/misc/emulators/uae/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, gtk2, alsaLib, SDL}: +{lib, stdenv, fetchurl, pkgconfig, gtk2, alsaLib, SDL}: stdenv.mkDerivation rec { name = "uae-0.8.29"; @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { meta = { description = "Ultimate/Unix/Unusable Amiga Emulator"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "http://web.archive.org/web/20130901222855/http://www.amigaemulator.org/"; - maintainers = [ stdenv.lib.maintainers.sander ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.sander ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix index 2aae72b3e20..378a238d049 100644 --- a/pkgs/misc/emulators/vbam/default.nix +++ b/pkgs/misc/emulators/vbam/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , cairo , cmake , fetchFromGitHub @@ -46,12 +46,12 @@ stdenv.mkDerivation rec { "-DENABLE_SDL='true'" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A merge of the original Visual Boy Advance forks"; license = licenses.gpl2; maintainers = with maintainers; [ lassulus ]; homepage = "https://vba-m.com/"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index c80d820059f..c7524427504 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU, libGL, libXaw +{ lib, stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU, libGL, libXaw , pkgconfig, gtk2, SDL, autoreconfHook, makeDesktopItem }: @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { meta = { description = "Commodore 64, 128 and other emulators"; homepage = "http://www.viceteam.org"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.sander ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.sander ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 6d164fd27bf..6d7c2543d80 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -148,8 +148,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { meta = { inherit version platforms; homepage = "https://www.winehq.org/"; - license = with stdenv.lib.licenses; [ lgpl21Plus ]; + license = with lib.licenses; [ lgpl21Plus ]; description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; - maintainers = with stdenv.lib.maintainers; [ avnik raskin bendlas ]; + maintainers = with lib.maintainers; [ avnik raskin bendlas ]; }; }) diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix index a628f5ded58..24da1d86bbf 100644 --- a/pkgs/misc/emulators/wine/staging.nix +++ b/pkgs/misc/emulators/wine/staging.nix @@ -1,13 +1,13 @@ -{ stdenv, callPackage, wineUnstable }: +{ lib, stdenv, callPackage, wineUnstable }: with callPackage ./util.nix {}; let patch = (callPackage ./sources.nix {}).staging; build-inputs = pkgNames: extra: (mkBuildInputs wineUnstable.pkgArches pkgNames) ++ extra; -in assert stdenv.lib.getVersion wineUnstable == patch.version; +in assert lib.getVersion wineUnstable == patch.version; -(stdenv.lib.overrideDerivation wineUnstable (self: { +(lib.overrideDerivation wineUnstable (self: { buildInputs = build-inputs [ "perl" "util-linux" "autoconf" "gitMinimal" ] self.buildInputs; name = "${self.name}-staging"; @@ -18,7 +18,7 @@ in assert stdenv.lib.getVersion wineUnstable == patch.version; chmod +w patches cd patches patchShebangs gitapply.sh - ./patchinstall.sh DESTDIR="$PWD/.." --all ${stdenv.lib.concatMapStringsSep " " (ps: "-W ${ps}") patch.disabledPatchsets} + ./patchinstall.sh DESTDIR="$PWD/.." --all ${lib.concatMapStringsSep " " (ps: "-W ${ps}") patch.disabledPatchsets} cd .. ''; })) // { diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index cfb35a9f996..cfde64fc33a 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, wine, perl, which, coreutils, zenity, curl +{ lib, stdenv, callPackage, wine, perl, which, coreutils, zenity, curl , cabextract, unzip, p7zip, gnused, gnugrep, bash } : stdenv.mkDerivation rec { @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { buildInputs = [ perl which ]; # coreutils is for sha1sum - pathAdd = stdenv.lib.concatMapStringsSep ":" (x: x + "/bin") - (stdenv.lib.filter (x: x != null) + pathAdd = lib.concatMapStringsSep ":" (x: x + "/bin") + (lib.filter (x: x != null) [ wine perl which coreutils zenity curl cabextract unzip p7zip gnused gnugrep bash ]); makeFlags = [ "PREFIX=$(out)" ]; @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = { description = "A script to install DLLs needed to work around problems in Wine"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; homepage = "https://github.com/Winetricks/winetricks"; - platforms = with stdenv.lib.platforms; linux; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix index 4e90a524aa7..8621d213b79 100644 --- a/pkgs/misc/emulators/wxmupen64plus/default.nix +++ b/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU, libGL +{ lib, stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU, libGL , wafHook }: stdenv.mkDerivation { @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "GUI for the Mupen64Plus 2.0 emulator"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "https://bitbucket.org/auria/wxmupen64plus/wiki/Home"; }; } diff --git a/pkgs/misc/emulators/xcpc/default.nix b/pkgs/misc/emulators/xcpc/default.nix index 75c30280e21..f5bab913de1 100644 --- a/pkgs/misc/emulators/xcpc/default.nix +++ b/pkgs/misc/emulators/xcpc/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, glib, libXaw, libX11, libXext +{ lib, stdenv, fetchurl, pkgconfig, glib, libXaw, libX11, libXext , libDSKSupport ? true, libdsk , motifSupport ? false, lesstif }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "20070122"; pname = "xcpc"; diff --git a/pkgs/misc/emulators/yuzu/default.nix b/pkgs/misc/emulators/yuzu/default.nix index ae151f96ed3..2248696d667 100644 --- a/pkgs/misc/emulators/yuzu/default.nix +++ b/pkgs/misc/emulators/yuzu/default.nix @@ -20,15 +20,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; buildInputs = [ qtbase qtwebengine qttools boost173 catch2 fmt lz4 nlohmann_json rapidjson zlib zstd SDL2 udev libusb1 libpulseaudio alsaLib sndio ecasound libjack2 libzip ffmpeg ] - ++ stdenv.lib.optionals useVulkan [ vulkan-loader vulkan-headers ]; + ++ lib.optionals useVulkan [ vulkan-loader vulkan-headers ]; cmakeFlags = [ "-DENABLE_QT_TRANSLATION=ON" "-DYUZU_USE_QT_WEB_ENGINE=ON" "-DUSE_DISCORD_PRESENCE=ON" ] - ++ stdenv.lib.optionals (!useVulkan) [ "-DENABLE_VULKAN=No" ]; + ++ lib.optionals (!useVulkan) [ "-DENABLE_VULKAN=No" ]; # Trick the configure system. This prevents a check for submodule directories. preConfigure = "rm .gitmodules"; # Fix vulkan detection - postFixup = stdenv.lib.optionals useVulkan '' + postFixup = lib.optionals useVulkan '' wrapProgram $out/bin/yuzu --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib wrapProgram $out/bin/yuzu-cmd --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib ''; diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix index 142a49b8d18..4a6b1fbda27 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/misc/emulators/zsnes/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, nasm, SDL, zlib, libpng, ncurses, libGLU, libGL +{ lib, stdenv, fetchFromGitHub, nasm, SDL, zlib, libpng, ncurses, libGLU, libGL , makeDesktopItem }: let @@ -55,8 +55,8 @@ in stdenv.mkDerivation { meta = { description = "A Super Nintendo Entertainment System Emulator"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.sander ]; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.sander ]; homepage = "http://www.zsnes.com"; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 6f113bcd99c..760ec2bc053 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { cp -r Resource "$out/share/ghostscript/${version}" ln -s "${fonts}" "$out/share/ghostscript/fonts" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' for file in $out/lib/*.dylib* ; do install_name_tool -id "$file" $file done @@ -132,9 +132,9 @@ stdenv.mkDerivation rec { of output drivers for various file formats and printers. ''; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.viric ]; }; } diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix index 5a4eb1e7f33..16f46d8796a 100644 --- a/pkgs/misc/gnash/default.nix +++ b/pkgs/misc/gnash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchpatch, autoreconfHook +{ lib, stdenv, fetchgit, fetchpatch, autoreconfHook , pkgconfig, libtool, boost, SDL , glib, pango, gettext, curl, xorg , libpng, libjpeg, giflib, speex, atk @@ -24,7 +24,7 @@ , enablePlugins ? false, xulrunner ? null, npapi_sdk ? null }: -with stdenv.lib; +with lib; let available = x: x != null; @@ -109,7 +109,7 @@ stdenv.mkDerivation { }) ]; - configureFlags = with stdenv.lib; [ + configureFlags = with lib; [ "--with-boost-incl=${boost.dev}/include" "--with-boost-lib=${boost.out}/lib" "--enable-renderer=${concatStringsSep "," renderers}" diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 556bb6a7408..fd50aa6de54 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, python3Packages, makeWrapper +{ lib, stdenv, fetchFromGitHub, pkgconfig, python3Packages, makeWrapper , bash, libsamplerate, libsndfile, readline, eigen, celt , wafHook # Darwin Dependencies @@ -12,10 +12,10 @@ , prefix ? "" }: -with stdenv.lib; +with lib; let inherit (python3Packages) python dbus-python; - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; + shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; libOnly = prefix == "lib"; diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 2a5bf806d0f..26d7cf18dd5 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -5,7 +5,7 @@ }: let - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; + shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; optAlsaLib = shouldUsePkg alsaLib; optDb = shouldUsePkg db; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; configureFlags = [ - (stdenv.lib.enableFeature (optLibffado != null) "firewire") + (lib.enableFeature (optLibffado != null) "firewire") ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/misc/libcardiacarrest/default.nix b/pkgs/misc/libcardiacarrest/default.nix index 0c3370814bc..6b2fa372b5d 100644 --- a/pkgs/misc/libcardiacarrest/default.nix +++ b/pkgs/misc/libcardiacarrest/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, pkgconfig, glib, libpulseaudio }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, libpulseaudio }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libcardiacarrest"; diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix index 1036f474b14..c4de45421f2 100644 --- a/pkgs/misc/lilypond/with-fonts.nix +++ b/pkgs/misc/lilypond/with-fonts.nix @@ -1,8 +1,8 @@ -{ stdenv, lndir, symlinkJoin, makeWrapper +{ lib, stdenv, lndir, symlinkJoin, makeWrapper , lilypond, openlilylib-fonts }: -stdenv.lib.appendToName "with-fonts" (symlinkJoin { +lib.appendToName "with-fonts" (symlinkJoin { inherit (lilypond) meta name version ; paths = [ lilypond ] ++ openlilylib-fonts.all; diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index 7196202dba4..1be14ecec9b 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -46,7 +46,7 @@ in { journal entries from Linuxes with systemd. ''; buildInputs = [ systemd.dev ]; - postFixup = let libPath = stdenv.lib.makeLibraryPath [ (lib.getLib systemd) ]; in '' + postFixup = let libPath = lib.makeLibraryPath [ (lib.getLib systemd) ]; in '' patchelf --set-rpath ${libPath} "$out/bin/journalbeat" ''; }; diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index 9e524e6a5e6..d7416731e63 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -45,7 +45,7 @@ in { journal entries from Linuxes with systemd. ''; buildInputs = [ systemd.dev ]; - postFixup = let libPath = stdenv.lib.makeLibraryPath [ (lib.getLib systemd) ]; in '' + postFixup = let libPath = lib.makeLibraryPath [ (lib.getLib systemd) ]; in '' patchelf --set-rpath ${libPath} "$out/bin/journalbeat" ''; }; diff --git a/pkgs/misc/long-shebang/default.nix b/pkgs/misc/long-shebang/default.nix index 753e1f490bb..6ad7c8496ed 100644 --- a/pkgs/misc/long-shebang/default.nix +++ b/pkgs/misc/long-shebang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: let +{ lib, stdenv, fetchurl }: let version = "1.2.0"; in stdenv.mkDerivation { pname = "long-shebang"; @@ -14,8 +14,8 @@ in stdenv.mkDerivation { homepage = "https://github.com/shlevy/long-shebang"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/misc/riscv-pk/default.nix b/pkgs/misc/riscv-pk/default.nix index 6ef50a33a5b..4dd2626b568 100644 --- a/pkgs/misc/riscv-pk/default.nix +++ b/pkgs/misc/riscv-pk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, payload ? null }: let +{ lib, stdenv, fetchFromGitHub, autoreconfHook, payload ? null }: let rev = "e5846a2bc707eaa58dc8ab6a8d20a090c6ee8570"; sha256 = "1clynpp70fnbgsjgxx7xi0vrdrj1v0h8zpv0x26i324kp2gwylf4"; revCount = "438"; @@ -21,7 +21,7 @@ in stdenv.mkDerivation { configureScript = "../configure"; - configureFlags = stdenv.lib.optional (payload != null) + configureFlags = lib.optional (payload != null) "--with-payload=${payload}"; hardeningDisable = [ "all" ]; @@ -35,8 +35,8 @@ in stdenv.mkDerivation { meta = { description = "RISC-V Proxy Kernel and Bootloader"; homepage = "https://github.com/riscv/riscv-pk"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.riscv; - maintainers = [ stdenv.lib.maintainers.shlevy ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.riscv; + maintainers = [ lib.maintainers.shlevy ]; }; } diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix index a62aeda9f50..8d40df14616 100644 --- a/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = let PATH = - stdenv.lib.makeBinPath + lib.makeBinPath [imagemagick i3lock-color xdpyinfo xrandr bc feh procps xrdb]; in '' mkdir -p $out/bin diff --git a/pkgs/misc/screensavers/multilockscreen/default.nix b/pkgs/misc/screensavers/multilockscreen/default.nix index 4d4e7609d93..56f5c82fe30 100644 --- a/pkgs/misc/screensavers/multilockscreen/default.nix +++ b/pkgs/misc/screensavers/multilockscreen/default.nix @@ -7,7 +7,7 @@ let i3lock = writeShellScriptBin "i3lock" '' ${i3lock-color}/bin/i3lock-color "$@" ''; - binPath = stdenv.lib.makeBinPath [ + binPath = lib.makeBinPath [ imagemagick i3lock xdpyinfo xrandr xset bc feh procps xrdb diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix index a4e40fd77ef..11d85e59776 100644 --- a/pkgs/misc/screensavers/pipes/default.nix +++ b/pkgs/misc/screensavers/pipes/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { make PREFIX=$out/ install wrapProgram $out/bin/pipes.sh \ - --set PATH "${stdenv.lib.makeBinPath [ coreutils ncurses ]}" + --set PATH "${lib.makeBinPath [ coreutils ncurses ]}" ''; meta = with lib; { diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 467f762de86..70ff0b18821 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, xlibsWrapper, libXext, libGLU, libGL, imagemagick, libtiff, bzip2}: +{lib, stdenv, fetchurl, pkgconfig, xlibsWrapper, libXext, libGLU, libGL, imagemagick, libtiff, bzip2}: stdenv.mkDerivation rec { version = "0.9.1"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { This package currently contains all of the screensavers from the original collection, plus a few others. ''; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index 7df635c10c7..800a81d2ffc 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, writeText +{ lib, stdenv, fetchurl, writeText , xorgproto, libX11, libXext, libXrandr # default header can be obtained from # https://git.suckless.org/slock/tree/config.def.h , conf ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "slock-1.4"; diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 71108c9c689..820af768548 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bc, perl, perlPackages, pam, libXext, libXScrnSaver, libX11 +{ lib, stdenv, fetchurl, pkgconfig, bc, perl, perlPackages, pam, libXext, libXScrnSaver, libX11 , libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, libGLU, libGL, gtk2 , libxml2, libglade, intltool, xorg, makeWrapper, gle, gdk-pixbuf, gdk-pixbuf-xlib , forceInstallAllHacks ? false @@ -37,14 +37,14 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/xscreensaver-text \ - --prefix PATH : ${stdenv.lib.makeBinPath [xorg.appres]} + --prefix PATH : ${lib.makeBinPath [xorg.appres]} wrapProgram $out/bin/xscreensaver-getimage-file \ --set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${with perlPackages; makePerlPath [ EncodeLocale HTTPDate HTTPMessage IOSocketSSL LWP LWPProtocolHttps MozillaCA NetHTTP NetSSLeay TryTiny URI ]}" '' - + stdenv.lib.optionalString forceInstallAllHacks '' + + lib.optionalString forceInstallAllHacks '' make -C hacks/glx dnalogo cat hacks/Makefile.in | grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1 | xargs make -C hacks cat hacks/glx/Makefile.in | grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1 | xargs make -C hacks/glx @@ -55,8 +55,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.jwz.org/xscreensaver/"; description = "A set of screensavers"; - maintainers = with stdenv.lib.maintainers; [ raskin ]; - platforms = stdenv.lib.platforms.unix; # Once had cygwin problems + maintainers = with lib.maintainers; [ raskin ]; + platforms = lib.platforms.unix; # Once had cygwin problems inherit version; downloadPage = "https://www.jwz.org/xscreensaver/download.html"; updateWalker = true; diff --git a/pkgs/misc/screensavers/xssproxy/default.nix b/pkgs/misc/screensavers/xssproxy/default.nix index cff03f3bed0..cfe1efc02c8 100644 --- a/pkgs/misc/screensavers/xssproxy/default.nix +++ b/pkgs/misc/screensavers/xssproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glib, pkgconfig, xorg, dbus }: +{ lib, stdenv, fetchFromGitHub, glib, pkgconfig, xorg, dbus }: let rev = "1.0.0"; in @@ -23,8 +23,8 @@ stdenv.mkDerivation { meta = { description = "Forward freedesktop.org Idle Inhibition Service calls to Xss"; homepage = "https://github.com/timakro/xssproxy"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ benley ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ benley ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix index ca4623e3068..a99020ad305 100644 --- a/pkgs/misc/screensavers/xtrlock-pam/default.nix +++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, python, pkgconfig, xlibsWrapper, pam }: +{ lib, stdenv, fetchgit, python, pkgconfig, xlibsWrapper, pam }: stdenv.mkDerivation { name = "xtrlock-pam-3.4-post-20150909"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { homepage = "https://github.com/aanatoly/xtrlock-pam"; description = "PAM based X11 screen locker"; license = "unknown"; - maintainers = with stdenv.lib.maintainers; [ tstrobel ]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with lib.maintainers; [ tstrobel ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix index 179148ac3fc..c86198a6985 100644 --- a/pkgs/misc/sndio/default.nix +++ b/pkgs/misc/sndio/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { pname = "sndio"; version = "1.7.0"; enableParallelBuilding = true; - nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = stdenv.lib.optional stdenv.hostPlatform.isLinux alsaLib; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + buildInputs = lib.optional stdenv.hostPlatform.isLinux alsaLib; src = fetchurl { url = "http://www.sndio.org/sndio-${version}.tar.gz"; diff --git a/pkgs/misc/stabber/default.nix b/pkgs/misc/stabber/default.nix index 2c63bf40d36..2db68968801 100644 --- a/pkgs/misc/stabber/default.nix +++ b/pkgs/misc/stabber/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, expat +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, expat , libmicrohttpd }: -with stdenv.lib; +with lib; stdenv.mkDerivation { pname = "stabber-unstable"; diff --git a/pkgs/misc/talkfilters/default.nix b/pkgs/misc/talkfilters/default.nix index a622eca7795..0f265f7e259 100644 --- a/pkgs/misc/talkfilters/default.nix +++ b/pkgs/misc/talkfilters/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let pname = "talkfilters"; @@ -18,9 +18,9 @@ stdenv.mkDerivation { meta = { description = "Converts English text into text that mimics a stereotyped or humorous dialect"; homepage = "http://www.hyperrealm.com/talkfilters/talkfilters.html"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ ikervagyok ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ ikervagyok ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 93e58516610..80009769afb 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -88,9 +88,9 @@ in rec { computer or server restarts, if the machine is on, tmux will be there how you left it off the last time it was used. ''; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ronanmacf ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ronanmacf ]; }; }; @@ -379,9 +379,9 @@ in rec { * restoring vim and neovim sessions * restoring pane contents ''; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ronanmacf ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ronanmacf ]; }; }; @@ -491,9 +491,9 @@ in rec { * User menu. * Popup window support. ''; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ kyleondy ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ kyleondy ]; }; }; diff --git a/pkgs/misc/vim-plugins/build-vim-plugin.nix b/pkgs/misc/vim-plugins/build-vim-plugin.nix index 4ca99b09af5..6960b790539 100644 --- a/pkgs/misc/vim-plugins/build-vim-plugin.nix +++ b/pkgs/misc/vim-plugins/build-vim-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , rtpPath ? "share/vim-plugins" , vim }: @@ -18,7 +18,7 @@ rec { buildPhase ? "", preInstall ? "", postInstall ? "", - path ? stdenv.lib.getName name, + path ? lib.getName name, addonInfo ? null, ... }: diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index c914ac62b83..78544df4cc4 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -73,11 +73,11 @@ self: super: { src = LanguageClient-neovim-src; cargoSha256 = "0mf94j85awdcqa6cyb89bipny9xg13ldkznjf002fq747f55my2a"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; # FIXME: Use impure version of CoreFoundation because of missing symbols. # Undefined symbols for architecture x86_64: "_CFURLResourceIsReachable" - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS="-F${CoreFoundation}/Library/Frameworks -framework CoreFoundation $NIX_LDFLAGS" ''; }; @@ -180,8 +180,8 @@ self: super: { meta = { description = "Address-completion for khard via deoplete"; homepage = "https://github.com/nicoe/deoplete-khard"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ jorsn ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jorsn ]; }; }); @@ -234,7 +234,7 @@ self: super: { meta = with lib; { description = "Discord rich presence for Vim"; homepage = "https://github.com/hugolgst/vimsence"; - maintainers = with stdenv.lib.maintainers; [ hugolgst ]; + maintainers = with lib.maintainers; [ hugolgst ]; }; }); @@ -245,7 +245,7 @@ self: super: { meson = buildVimPluginFrom2Nix { inherit (meson) pname version src; preInstall = "cd data/syntax-highlighting/vim"; - meta.maintainers = with stdenv.lib.maintainers; [ vcunat ]; + meta.maintainers = with lib.maintainers; [ vcunat ]; }; ncm2 = super.ncm2.overrideAttrs(old: { @@ -325,7 +325,7 @@ self: super: { description = "Vim-Improved eMACS: Emacs emulation plugin for Vim"; homepage = "http://algorithm.com.au/code/vimacs"; license = licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ millerjason ]; + maintainers = with lib.maintainers; [ millerjason ]; }; }); @@ -334,7 +334,7 @@ self: super: { }); vim-addon-manager = super.vim-addon-manager.overrideAttrs(old: { - buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa; + buildInputs = lib.optional stdenv.isDarwin Cocoa; }); vim-addon-actions = super.vim-addon-actions.overrideAttrs(old: { @@ -581,7 +581,7 @@ self: super: { buildInputs = [ python3.pkgs.jedi ]; meta = { description = "code-completion for python using python-jedi"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }); @@ -602,7 +602,7 @@ self: super: { propagatedBuildInputs = [ gnome3.zenity ]; meta = { description = "Simple color selector/picker plugin"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }; }); @@ -632,7 +632,7 @@ self: super: { ln -s ${hexokinase}/bin/hexokinase $target/hexokinase/hexokinase ''; - meta.platforms = stdenv.lib.platforms.all; + meta.platforms = lib.platforms.all; }); vim-clap = super.vim-clap.overrideAttrs(old: { @@ -647,7 +647,7 @@ self: super: { buildInputs = [ openssl - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ CoreServices curl libgit2 @@ -660,7 +660,7 @@ self: super: { ln -s ${maple-bin}/bin/maple $target/bin/maple ''; - meta.platforms = stdenv.lib.platforms.all; + meta.platforms = lib.platforms.all; }); completion-tabnine = super.completion-tabnine.overrideAttrs(old: { diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index ee77599a3ba..fd66c48ecb2 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -1,4 +1,4 @@ -{ stdenv, vim, vimPlugins, vim_configurable, neovim, buildEnv, writeText, writeScriptBin +{ lib, stdenv, vim, vimPlugins, vim_configurable, neovim, buildEnv, writeText, writeScriptBin , nix-prefetch-hg, nix-prefetch-git , fetchFromGitHub, runtimeShell }: @@ -150,7 +150,7 @@ vim_with_plugins can be installed like any other application within Nix. let - inherit (stdenv) lib; + inherit lib; # make sure a plugin is a derivation and its dependencies are derivations. If # plugin already is a derivation, this is a no-op. If it is a string, it is @@ -373,7 +373,7 @@ rec { gvimExecutableName, }: let - rcOption = o: file: stdenv.lib.optionalString (file != null) "-${o} ${file}"; + rcOption = o: file: lib.optionalString (file != null) "-${o} ${file}"; vimWrapperScript = writeScriptBin vimExecutableName '' #!${runtimeShell} exec ${vimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@" @@ -450,7 +450,7 @@ rec { vim_with_vim2nix = vim_configurable.customize { name = "vim"; vimrcConfig.vam.pluginDictionaries = [ "vim-addon-vim2nix" ]; }; - inherit (import ./build-vim-plugin.nix { inherit stdenv rtpPath vim; }) buildVimPlugin buildVimPluginFrom2Nix; + inherit (import ./build-vim-plugin.nix { inherit lib stdenv rtpPath vim; }) buildVimPlugin buildVimPluginFrom2Nix; # used to figure out which python dependencies etc. neovim needs requiredPlugins = { diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index e2f01531c50..73bb7a28874 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -10,7 +10,7 @@ let # So an extension's attribute name should be of the form: # "${mktplcRef.publisher}.${mktplcRef.name}". # - baseExtensions = self: stdenv.lib.mapAttrs (_n: stdenv.lib.recurseIntoAttrs) + baseExtensions = self: lib.mapAttrs (_n: lib.recurseIntoAttrs) { a5huynh.vscode-ron = buildVscodeMarketplaceExtension { mktplcRef = { @@ -20,7 +20,7 @@ let sha256 = "0d3p50mhqp550fmj662d3xklj14gvzvhszm2hlqvx4h28v222z97"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -32,7 +32,7 @@ let sha256 = "1mz0h5zd295i73hbji9ivla8hx02i4yhqcv6l4r23w3f07ql3i8h"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -59,7 +59,7 @@ let buildInputs = [ nodePackages.pyright ]; meta = { - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; }; @@ -135,7 +135,7 @@ let version = "0.0.4"; sha256 = "0sa04srhqmngmw71slnrapi2xay0arj42j4gkan8i11n7bfi1xpf"; }; - meta = { license = stdenv.lib.licenses.mit; }; + meta = { license = lib.licenses.mit; }; }; dhall.vscode-dhall-lsp-server = buildVscodeMarketplaceExtension { @@ -145,7 +145,7 @@ let version = "0.0.4"; sha256 = "1zin7s827bpf9yvzpxpr5n6mv0b5rhh3civsqzmj52mdq365d2js"; }; - meta = { license = stdenv.lib.licenses.mit; }; + meta = { license = lib.licenses.mit; }; }; donjayamanne.githistory = buildVscodeMarketplaceExtension { @@ -207,7 +207,7 @@ let sha256 = "058jgmllqb0j6gg5anghdp35nkykii28igfcwqgh4bp10pyvspg0"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -219,7 +219,7 @@ let sha256 = "0cqg9mxkyf41brjq2c764w42lzyn6ffphw6ciw7xnqk1h1x8wwbs"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -264,7 +264,7 @@ let sha256 = "sha256-b2Wa3TULQQnBm1/xnDCB9SZjE+Wxz5wBttjDEtf8qlE="; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -329,7 +329,7 @@ let sha256 = "0lxp8xz17ciy93nj4lzxqvz71vw1zdyamrnh2n792yair8890rr6"; }; meta = { - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }; }; @@ -341,7 +341,7 @@ let sha256 = "1ks6z8wsxmlfhiwa51f7d6digvw11dlxc7mja3hankgxcf5dyj31"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -353,7 +353,7 @@ let sha256 = "0w5mijs4ll5qjkpyw7qpn1k40pq8spm0b3q72x150ydbcini5hxw"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -365,7 +365,7 @@ let sha256 = "0n59whmcrx8946xix6skvc50f2vsc85ckvn8cs06w9mqmymm1q0s"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -377,7 +377,7 @@ let sha256 = "12a4phl1pddsajy3n0ld6rp607iy0pif6pqrs6ljbg2x97fyra28"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -397,7 +397,7 @@ let sha256 = "1syzf43ws343z911fnhrlbzbx70gdn930q67yqkf6g0mj8lf2za2"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -409,7 +409,7 @@ let sha256 = "046kdk73a5xbrwq16ff0l64271c6q6ygjvxaph58z29gyiszfkig"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -440,7 +440,7 @@ let sha256 = "1m9mis59j9xnf1zvh67p5rhayaa9qxjiw9iw847nyl9vsy73w8ya"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -452,7 +452,7 @@ let sha256 = "1r4kg4slgxncdppr4fn7i5vfhvzcg26ljia2r97n6wvwn8534vs9"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -464,7 +464,7 @@ let sha256 = "0nrj32a7a86vwc9gfh748xs3mmfwbc304dp7nks61f0lx8b4wzxw"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -476,7 +476,7 @@ let sha256 = "0v599yssvk358gxfxnyzzkyk0y5krsbp8n4rkp9wb2ncxqsqladr"; }; meta = { - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; }; @@ -488,7 +488,7 @@ let sha256 = "1xk7ayv590hsm3scqpyh6962kvgdlinnpkx0vapr7vs4y08dx72f"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -512,7 +512,7 @@ let sha256 = "16x2y58hkankazpwm93j8lqdn3mala7iayck548kki9zx4qrhhck"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -524,7 +524,7 @@ let sha256 = "0l4wibsjnlbzbrl1wcj18vnm1q4ygvxmh347jvzziv8f1l790qjl"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -540,7 +540,7 @@ let sha256 = "1albwz3lc9i20if77inm1ipwws8apigvx24rbag3d1h3p4vwda49"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -554,7 +554,7 @@ let sha256 = "1smzsgcrkhghbnpy51gp28kh74l7y4s2m8pfxabb4ffb751254j0"; }; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; diff --git a/pkgs/misc/vscode-extensions/remote-ssh/default.nix b/pkgs/misc/vscode-extensions/remote-ssh/default.nix index 575b9ed490c..82924f369ae 100644 --- a/pkgs/misc/vscode-extensions/remote-ssh/default.nix +++ b/pkgs/misc/vscode-extensions/remote-ssh/default.nix @@ -21,7 +21,7 @@ let ln -s ''$localNodePath ''$f fi fi - ${stdenv.lib.optionalString useLocalExtensions '' + ${lib.optionalString useLocalExtensions '' # Use local extensions if [ -d ~/.vscode/extensions ]; then if ! test -L "~/.vscode-server/extensions"; then diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index bd326390bbd..46e1d7643d5 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { description = "Apache HTTPD, the world's most popular web server"; homepage = "http://httpd.apache.org/"; license = licenses.asl20; - platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with maintainers; [ lovek323 peti ]; }; } diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 7767d864de3..d6207e79554 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "A Web server and javax.servlet container"; homepage = "https://www.eclipse.org/jetty/"; platforms = lib.platforms.all; - license = [ lib.licenses.asl20 stdenv.lib.licenses.epl10 ]; + license = [ lib.licenses.asl20 lib.licenses.epl10 ]; }; } diff --git a/pkgs/servers/pies/default.nix b/pkgs/servers/pies/default.nix index b513d591493..46cc9562fb1 100644 --- a/pkgs/servers/pies/default.nix +++ b/pkgs/servers/pies/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/pies/"; - platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; + platforms = lib.platforms.gnu ++ lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index 60798b22580..94a32a6e78b 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -14,7 +14,7 @@ let mkWith = mkFlag "with-" "without-"; mkOther = mkFlag "" "" true; - shouldUsePkg = pkg: if pkg != null && lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; + shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; optPam = shouldUsePkg pam; optLibidn = shouldUsePkg libidn; diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index 0cdab1d7792..75f4956651e 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/xnee/"; maintainers = with lib.maintainers; [ ]; - platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/tools/filesystems/bonnie/default.nix b/pkgs/tools/filesystems/bonnie/default.nix index f2ef9a0f52a..e34e5289ad6 100644 --- a/pkgs/tools/filesystems/bonnie/default.nix +++ b/pkgs/tools/filesystems/bonnie/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { homepage = "http://www.coker.com.au/bonnie++/"; description = "Hard drive and file system benchmark suite"; license = lib.licenses.gpl2; - platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index a4688ffd4ac..9efe64f4723 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Utilities for creating and checking FAT and VFAT file systems"; homepage = "https://github.com/dosfstools/dosfstools"; - platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; license = lib.licenses.gpl3; }; } diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 3f15a33ffc7..34bb1b8cc3a 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; patches = - (lib.optional (stdenv.lib.versionOlder version "2.68") + (lib.optional (lib.versionOlder version "2.68") (fetchpatch { url = "https://github.com/vectorgraphics/asymptote/commit/3361214340d58235f4dbb8f24017d0cd5d94da72.patch"; sha256 = "sha256:1z2b41x8v7683myd45lq6niixpdjy0b185x0xl61130vrijhq5nm"; diff --git a/pkgs/tools/misc/ding-libs/default.nix b/pkgs/tools/misc/ding-libs/default.nix index 653f150fecf..8bb2c287268 100644 --- a/pkgs/tools/misc/ding-libs/default.nix +++ b/pkgs/tools/misc/ding-libs/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = "https://fedorahosted.org/sssd/"; platforms = with lib.platforms; linux; maintainers = with lib.maintainers; [ e-user ]; - license = [ lib.licenses.gpl3 stdenv.lib.licenses.lgpl3 ]; + license = [ lib.licenses.gpl3 lib.licenses.lgpl3 ]; }; } diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index f54a61566e9..57504f8a3ab 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems"; homepage = "https://goaccess.io"; license = lib.licenses.mit; - platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ ederoyd46 ]; }; } diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index ab1abec7b69..d6be71c63b2 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more"; homepage = "http://urjtag.org/"; license = with lib.licenses; [ gpl2Plus lgpl21Plus ]; - platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice maintainers = with lib.maintainers; [ lowfatcomputing ]; }; } diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix index 455824ec1cc..1f0831fb890 100644 --- a/pkgs/tools/networking/connect/default.nix +++ b/pkgs/tools/networking/connect/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://bitbucket.org/gotoh/connect/wiki/Home"; license = lib.licenses.gpl2Plus; - platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.gnu ++ lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index c82e0ab9985..d994d9d8cec 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -19,7 +19,7 @@ python2Packages.buildPythonApplication rec { meta = { description = "A program for retrieving mail"; - maintainers = [ lib.maintainers.raskin stdenv.lib.maintainers.domenkozar ]; + maintainers = [ lib.maintainers.raskin lib.maintainers.domenkozar ]; platforms = lib.platforms.linux; homepage = "http://pyropus.ca/software/getmail/"; diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix index 704c0b024c5..212f7bfc287 100644 --- a/pkgs/tools/networking/nss-mdns/default.nix +++ b/pkgs/tools/networking/nss-mdns/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; # Supports both the GNU and FreeBSD NSS. - platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd; + platforms = lib.platforms.gnu ++ lib.platforms.linux ++ lib.platforms.freebsd; maintainers = [ ]; }; diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index fdef5df3b62..c41ef54530f 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -36,6 +36,6 @@ in stdenv.mkDerivation rec { homepage = "http://www.infradead.org/openconnect/"; license = licenses.lgpl21; maintainers = with maintainers; [ pradeepchhetri tricktron ]; - platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix index 63813619abc..878d47f8adf 100644 --- a/pkgs/tools/security/modsecurity/default.nix +++ b/pkgs/tools/security/modsecurity/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; homepage = "https://www.modsecurity.org/"; maintainers = with maintainers; [offline]; - platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index 4c92d2e3e18..7d038a1aeab 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -35,7 +35,7 @@ python3Packages.buildPythonApplication { license = lib.licenses.gpl2; - platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; + platforms = lib.platforms.gnu ++ lib.platforms.linux; maintainers = with lib.maintainers; [ kierdavis ]; }; } diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 610dfe0a646..9529ccad399 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ raskin ]; - platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice updateWalker = true; inherit version; diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix index 84dba9962ab..e5b3f59db8c 100644 --- a/pkgs/tools/text/namazu/default.nix +++ b/pkgs/tools/text/namazu/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; homepage = "http://namazu.org/"; - platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice maintainers = [ ]; broken = true; # File-MMagic is not compatible with our Perl version }; diff --git a/pkgs/tools/typesetting/kindlegen/default.nix b/pkgs/tools/typesetting/kindlegen/default.nix index a9d062dfbe4..6afa246f818 100644 --- a/pkgs/tools/typesetting/kindlegen/default.nix +++ b/pkgs/tools/typesetting/kindlegen/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation { sourceRoot = "."; - nativeBuildInputs = lib.optional (stdenv.lib.hasSuffix ".zip" url) unzip; + nativeBuildInputs = lib.optional (lib.hasSuffix ".zip" url) unzip; installPhase = '' mkdir -p $out/bin $out/share/kindlegen/doc diff --git a/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/pkgs/tools/virtualization/xe-guest-utilities/default.nix index 256d6175ba8..ab3c9b1e71c 100644 --- a/pkgs/tools/virtualization/xe-guest-utilities/default.nix +++ b/pkgs/tools/virtualization/xe-guest-utilities/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (rec { homepage = "http://citrix.com/English/ps2/products/product.asp?contentID=683148&ntref=hp_nav_US"; maintainers = with lib.maintainers; [ benwbooth ]; platforms = lib.platforms.linux; - license = [ lib.licenses.gpl2 stdenv.lib.licenses.lgpl21 ]; + license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ]; }; src = fetchurl { url = "https://sources.archlinux.org/other/community/xe-guest-utilities/xe-guest-utilities_${version}-1120.tar.gz"; |