diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix index 83054b46a94..b1d8eb4332e 100644 --- a/pkgs/development/misc/avr/libc/default.nix +++ b/pkgs/development/misc/avr/libc/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchurl, automake, autoconf }: -let - version = "2.0.0"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "avr-libc"; - inherit version; + version = "2.0.0"; src = fetchurl { url = "https://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2"; diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix index 486ca04d36a..1ecf9be5d8d 100644 --- a/pkgs/development/misc/stm32/betaflight/default.nix +++ b/pkgs/development/misc/stm32/betaflight/default.nix @@ -9,14 +9,10 @@ "OMNINXT" # 3.4.0-rc4: has not specified a valid STM group, must be one of F1, F3, F405, F411 or F7x5. Have you prepared a valid target.mk? ]}: -let - - version = "3.4.0-rc4"; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "betaflight"; - inherit version; + version = "3.4.0-rc4"; src = fetchFromGitHub { owner = "betaflight"; diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix index c7e59a5d27e..c1f762e47d8 100644 --- a/pkgs/development/misc/stm32/inav/default.nix +++ b/pkgs/development/misc/stm32/inav/default.nix @@ -2,14 +2,10 @@ , gcc-arm-embedded, binutils-arm-embedded, ruby }: -let - - version = "2.0.0-rc2"; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "inav"; - inherit version; + version = "2.0.0-rc2"; src = fetchFromGitHub { owner = "iNavFlight"; diff --git a/pkgs/development/mobile/abootimg/default.nix b/pkgs/development/mobile/abootimg/default.nix index bec022f08c7..3c7a2840e49 100644 --- a/pkgs/development/mobile/abootimg/default.nix +++ b/pkgs/development/mobile/abootimg/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchFromGitHub, coreutils, cpio, findutils, gzip, makeWrapper, util-linux }: -let - version = "0.6"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "abootimg"; - inherit version; + version = "0.6"; src = fetchFromGitHub { owner = "ggrandou"; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index a8e7c10ce44..5c239cfc63e 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -86,6 +86,5 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ raskin makefu mic92 ]; platforms = with lib.platforms; linux; - inherit version; }; } diff --git a/pkgs/shells/es/default.nix b/pkgs/shells/es/default.nix index 5efb860c1d5..52131a214a5 100644 --- a/pkgs/shells/es/default.nix +++ b/pkgs/shells/es/default.nix @@ -1,12 +1,9 @@ { lib, stdenv, fetchurl, readline, bison }: -let - version = "0.9.1"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "es"; - inherit version; + version = "0.9.1"; src = fetchurl { url = "https://github.com/wryun/es-shell/releases/download/v${version}/es-${version}.tar.gz"; diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 71f526525e4..d9927638577 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,23 +1,19 @@ { lib, stdenv, fetchurl, ncurses, pcre, buildPackages }: -let - version = "5.8"; - - documentation = fetchurl { - url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz"; - sha256 = "1i6wdzq6rfjx5yjrpzan1jf50hk2pfzy5qib9mb7cnnbjfar6klv"; - }; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "zsh"; - inherit version; + version = "5.8"; src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz"; sha256 = "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w"; }; + documentation = fetchurl { + url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz"; + sha256 = "1i6wdzq6rfjx5yjrpzan1jf50hk2pfzy5qib9mb7cnnbjfar6klv"; + }; + buildInputs = [ ncurses pcre ]; configureFlags = [ diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index c48bf209d0f..f60bb966003 100644 --- a/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -1,12 +1,8 @@ { lib, stdenv, fetchFromGitHub }: -let - version = "0.4.4"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "nix-zsh-completions"; - inherit version; + version = "0.4.4"; src = fetchFromGitHub { owner = "spwhitt"; diff --git a/pkgs/tools/X11/autocutsel/default.nix b/pkgs/tools/X11/autocutsel/default.nix index 4e6f40707a7..036ba8bc4e9 100644 --- a/pkgs/tools/X11/autocutsel/default.nix +++ b/pkgs/tools/X11/autocutsel/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; homepage = "https://www.nongnu.org/autocutsel/"; description = "Tracks changes in the server's cutbuffer and CLIPBOARD selection"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 706194cc0dd..48d28562c20 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -33,8 +33,6 @@ }: let - version = "3.2.1"; - nvidia_x11s = [ nvidia_x11 ] ++ lib.optional nvidia_x11.useGLVND libglvnd ++ lib.optionals (nvidia_x11_i686 != null) @@ -57,7 +55,7 @@ let in stdenv.mkDerivation rec { pname = "bumblebee"; - inherit version; + version = "3.2.1"; src = fetchurl { url = "https://bumblebee-project.org/${pname}-${version}.tar.gz"; diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix index 432193950cd..deefddf23ce 100644 --- a/pkgs/tools/X11/nitrogen/default.nix +++ b/pkgs/tools/X11/nitrogen/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, glib, gtkmm2 }: -let version = "1.6.1"; -in stdenv.mkDerivation rec { pname = "nitrogen"; - inherit version; + version = "1.6.1"; src = fetchurl { url = "http://projects.l3ib.org/nitrogen/files/${pname}-${version}.tar.gz"; diff --git a/pkgs/tools/X11/skippy-xd/default.nix b/pkgs/tools/X11/skippy-xd/default.nix index adf3b3d9250..0519f2c4204 100644 --- a/pkgs/tools/X11/skippy-xd/default.nix +++ b/pkgs/tools/X11/skippy-xd/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { sed -e "s@/etc/xdg@$out&@" -i Makefile ''; meta = { - inherit version; description = "Expose-style compositing-based standalone window switcher"; license = lib.licenses.gpl2Plus ; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/tools/X11/wayv/default.nix b/pkgs/tools/X11/wayv/default.nix index 4ee2c8acc25..e489ad0237b 100644 --- a/pkgs/tools/X11/wayv/default.nix +++ b/pkgs/tools/X11/wayv/default.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "A gesture control for X11"; license = lib.licenses.gpl2Plus ; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/tools/X11/xannotate/default.nix b/pkgs/tools/X11/xannotate/default.nix index 9c88a038e3e..9eafb5e6b49 100644 --- a/pkgs/tools/X11/xannotate/default.nix +++ b/pkgs/tools/X11/xannotate/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 ]; meta = { - inherit version; description = "A tool to scribble over X windows"; license = lib.licenses.gpl2Plus ; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/tools/X11/xautomation/default.nix b/pkgs/tools/X11/xautomation/default.nix index 0521b6f8b3b..a1fb8817632 100644 --- a/pkgs/tools/X11/xautomation/default.nix +++ b/pkgs/tools/X11/xautomation/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, libpng, libX11, libXext, libXi, libXtst }: -let version = "1.09"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "xautomation"; - inherit version; + version = "1.09"; src = fetchurl { url = "https://www.hoopajoo.net/static/projects/xautomation-${version}.tar.gz"; sha256 = "03azv5wpg65h40ip2kk1kdh58vix4vy1r9bihgsq59jx2rhjr3zf"; diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix index ba45442a449..17e0ca66e3f 100644 --- a/pkgs/tools/X11/xbindkeys/default.nix +++ b/pkgs/tools/X11/xbindkeys/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, libX11, guile }: -let version = "1.8.7"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "xbindkeys"; - inherit version; + version = "1.8.7"; src = fetchurl { url = "https://www.nongnu.org/xbindkeys/xbindkeys-${version}.tar.gz"; sha256 = "1wl2vc5alisiwyk8m07y1ryq8w3ll9ym83j27g4apm4ixjl8d6x2"; diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix index 311f1e42901..af17f3ade7d 100644 --- a/pkgs/tools/X11/xwinmosaic/default.nix +++ b/pkgs/tools/X11/xwinmosaic/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 libXdamage ]; meta = { - inherit version; description = "X window switcher drawing a colourful grid"; license = lib.licenses.bsd2 ; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/tools/X11/xwinwrap/default.nix b/pkgs/tools/X11/xwinwrap/default.nix index 00ee7413189..3921df9fffa 100644 --- a/pkgs/tools/X11/xwinwrap/default.nix +++ b/pkgs/tools/X11/xwinwrap/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchbzr, xlibsWrapper }: -let - version = "4"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "xwinwrap"; - inherit version; + version = "4"; src = fetchbzr { url = "https://code.launchpad.net/~shantanu-goel/xwinwrap/devel"; diff --git a/pkgs/tools/X11/xzoom/default.nix b/pkgs/tools/X11/xzoom/default.nix index ba62704bdd3..979e2725098 100644 --- a/pkgs/tools/X11/xzoom/default.nix +++ b/pkgs/tools/X11/xzoom/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install.man" ]; meta = { - inherit version; description = "An X11 screen zoom tool"; license = lib.licenses.free ; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/tools/admin/boulder/default.nix b/pkgs/tools/admin/boulder/default.nix index a21a3ebdde1..706ac84afb3 100644 --- a/pkgs/tools/admin/boulder/default.nix +++ b/pkgs/tools/admin/boulder/default.nix @@ -4,13 +4,10 @@ , lib }: -let - version = "release-2019-10-13"; - -in buildGoPackage { +buildGoPackage rec{ pname = "boulder"; - inherit version; + version = "release-2019-10-13"; goPackagePath = "github.com/letsencrypt/boulder"; diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix index a202ee9376b..59e8bf8843a 100644 --- a/pkgs/tools/cd-dvd/lsdvd/default.nix +++ b/pkgs/tools/cd-dvd/lsdvd/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchurl, libdvdread, pkg-config }: -let - version = "0.17"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "lsdvd"; - inherit version; + version = "0.17"; src = fetchurl { url = "mirror://sourceforge/lsdvd/lsdvd-${version}.tar.gz"; sha256 = "1274d54jgca1prx106iyir7200aflr70bnb1kawndlmcckcmnb3x"; diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 9dc2ad4d5f5..8ebccd8047a 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -1,12 +1,10 @@ { stdenv, fetchzip, jam, unzip, libX11, libXxf86vm, libXrandr, libXinerama , libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText , libXdmcp, libXau, lib, openssl }: -let - version = "2.1.2"; - in + stdenv.mkDerivation rec { pname = "argyllcms"; - inherit version; + version = "2.1.2"; src = fetchzip { # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix index b554ac9b3c0..07f7b63ad7d 100644 --- a/pkgs/tools/graphics/briss/default.nix +++ b/pkgs/tools/graphics/briss/default.nix @@ -2,17 +2,12 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: -let - - version = "0.9"; - sha256 = "45dd668a9ceb9cd59529a9fefe422a002ee1554a61be07e6fc8b3baf33d733d9"; - -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "briss"; - inherit version; + version = "0.9"; src = fetchurl { url = "mirror://sourceforge/briss/briss-${version}.tar.gz"; - inherit sha256; + sha256 = "45dd668a9ceb9cd59529a9fefe422a002ee1554a61be07e6fc8b3baf33d733d9"; }; nativeBuildInputs = [makeWrapper]; diff --git a/pkgs/tools/graphics/convchain/default.nix b/pkgs/tools/graphics/convchain/default.nix index 714cdd656df..20f29b2a0ad 100644 --- a/pkgs/tools/graphics/convchain/default.nix +++ b/pkgs/tools/graphics/convchain/default.nix @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { ''; buildInputs = [mono]; meta = { - inherit version; description = "Bitmap generation from a single example with convolutions and MCMC"; license = lib.licenses.mit; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index 6cd8777f525..6749a193c00 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -11,12 +11,9 @@ , zlib }: -let - version = "0.20"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "mscgen"; - inherit version; + version = "0.20"; src = fetchurl { url = "http://www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz"; diff --git a/pkgs/tools/graphics/pgf/default.nix b/pkgs/tools/graphics/pgf/default.nix index 14cd83c3fcf..8976700006b 100644 --- a/pkgs/tools/graphics/pgf/default.nix +++ b/pkgs/tools/graphics/pgf/default.nix @@ -1,13 +1,9 @@ { lib, stdenv, fetchurl, autoconf, automake, libtool, dos2unix, libpgf, freeimage, doxygen }: with lib; - -let - version = "6.14.12"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "pgf"; - inherit version; + version = "6.14.12"; src = fetchurl { url = "mirror://sourceforge/libpgf/pgf-console-src-${version}.tar.gz"; diff --git a/pkgs/tools/graphics/syntex/default.nix b/pkgs/tools/graphics/syntex/default.nix index a076e97d056..b149333f2ea 100644 --- a/pkgs/tools/graphics/syntex/default.nix +++ b/pkgs/tools/graphics/syntex/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { ''; buildInputs = [mono]; meta = { - inherit version; description = "Texture synthesis from examples"; license = lib.licenses.mit; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/tools/graphics/twilight/default.nix b/pkgs/tools/graphics/twilight/default.nix index 7c43063fb81..58d4d0df913 100644 --- a/pkgs/tools/graphics/twilight/default.nix +++ b/pkgs/tools/graphics/twilight/default.nix @@ -1,11 +1,9 @@ { lib, stdenv, fetchFromGitHub , libGL, libGLU, freeglut, libX11 }: -let - version = "2018-04-19"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "twilight"; - inherit version; + version = "unstable-2018-04-19"; src = fetchFromGitHub { owner = "tweakoz"; diff --git a/pkgs/tools/graphics/wavefunctioncollapse/default.nix b/pkgs/tools/graphics/wavefunctioncollapse/default.nix index f761e2bbde6..2c7ce427245 100644 --- a/pkgs/tools/graphics/wavefunctioncollapse/default.nix +++ b/pkgs/tools/graphics/wavefunctioncollapse/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { ''; buildInputs = [mono]; meta = { - inherit version; description = "A generator of bitmaps that are locally similar to the input bitmap"; license = lib.licenses.mit; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/tools/graphics/zxing/default.nix b/pkgs/tools/graphics/zxing/default.nix index f4eeb50fc03..18721390a51 100644 --- a/pkgs/tools/graphics/zxing/default.nix +++ b/pkgs/tools/graphics/zxing/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { cd "$out/lib/java"; for i in *.jar; do mv "$i" "''${i#*-}"; done ''; meta = { - inherit version; description = "1D and 2D code reading library"; license = lib.licenses.asl20; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 1d4a3a2b6ec..79320401454 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -4,63 +4,59 @@ , systemd , xrandr }: -let - python = python3Packages.python; +stdenv.mkDerivation rec { + pname = "autorandr"; version = "1.11"; -in - stdenv.mkDerivation { - pname = "autorandr"; - inherit version; - buildInputs = [ python ]; + buildInputs = [ python3Packages.python ]; - # no wrapper, as autorandr --batch does os.environ.clear() - buildPhase = '' - substituteInPlace autorandr.py \ - --replace 'os.popen("xrandr' 'os.popen("${xrandr}/bin/xrandr' \ - --replace '["xrandr"]' '["${xrandr}/bin/xrandr"]' - ''; + # no wrapper, as autorandr --batch does os.environ.clear() + buildPhase = '' + substituteInPlace autorandr.py \ + --replace 'os.popen("xrandr' 'os.popen("${xrandr}/bin/xrandr' \ + --replace '["xrandr"]' '["${xrandr}/bin/xrandr"]' + ''; - outputs = [ "out" "man" ]; + outputs = [ "out" "man" ]; - installPhase = '' - runHook preInstall - make install TARGETS='autorandr' PREFIX=$out + installPhase = '' + runHook preInstall + make install TARGETS='autorandr' PREFIX=$out - make install TARGETS='bash_completion' DESTDIR=$out/share/bash-completion/completions + make install TARGETS='bash_completion' DESTDIR=$out/share/bash-completion/completions - make install TARGETS='autostart_config' PREFIX=$out DESTDIR=$out + make install TARGETS='autostart_config' PREFIX=$out DESTDIR=$out - make install TARGETS='manpage' PREFIX=$man + make install TARGETS='manpage' PREFIX=$man - ${if systemd != null then '' - make install TARGETS='systemd udev' PREFIX=$out DESTDIR=$out \ - SYSTEMD_UNIT_DIR=/lib/systemd/system \ - UDEV_RULES_DIR=/etc/udev/rules.d - substituteInPlace $out/etc/udev/rules.d/40-monitor-hotplug.rules \ - --replace /bin/systemctl "/run/current-system/systemd/bin/systemctl" - '' else '' - make install TARGETS='pmutils' DESTDIR=$out \ - PM_SLEEPHOOKS_DIR=/lib/pm-utils/sleep.d - make install TARGETS='udev' PREFIX=$out DESTDIR=$out \ - UDEV_RULES_DIR=/etc/udev/rules.d - ''} + ${if systemd != null then '' + make install TARGETS='systemd udev' PREFIX=$out DESTDIR=$out \ + SYSTEMD_UNIT_DIR=/lib/systemd/system \ + UDEV_RULES_DIR=/etc/udev/rules.d + substituteInPlace $out/etc/udev/rules.d/40-monitor-hotplug.rules \ + --replace /bin/systemctl "/run/current-system/systemd/bin/systemctl" + '' else '' + make install TARGETS='pmutils' DESTDIR=$out \ + PM_SLEEPHOOKS_DIR=/lib/pm-utils/sleep.d + make install TARGETS='udev' PREFIX=$out DESTDIR=$out \ + UDEV_RULES_DIR=/etc/udev/rules.d + ''} - runHook postInstall - ''; + runHook postInstall + ''; - src = fetchFromGitHub { - owner = "phillipberndt"; - repo = "autorandr"; - rev = version; - sha256 = "0rmnqk2bi6bbd2if1rll37mlzlqxzmnazfffdhcpzskxwyaj4yn5"; - }; + src = fetchFromGitHub { + owner = "phillipberndt"; + repo = "autorandr"; + rev = version; + sha256 = "0rmnqk2bi6bbd2if1rll37mlzlqxzmnazfffdhcpzskxwyaj4yn5"; + }; - meta = with lib; { - homepage = "https://github.com/phillipberndt/autorandr/"; - description = "Automatically select a display configuration based on connected devices"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ coroa globin ]; - platforms = platforms.unix; - }; - } + meta = with lib; { + homepage = "https://github.com/phillipberndt/autorandr/"; + description = "Automatically select a display configuration based on connected devices"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ coroa globin ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/bcunit/default.nix b/pkgs/tools/misc/bcunit/default.nix index 099ae294bec..61fc84fef7e 100644 --- a/pkgs/tools/misc/bcunit/default.nix +++ b/pkgs/tools/misc/bcunit/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { }; meta = with lib; { - inherit version; description = "A fork of CUnit test framework"; homepage = "https://gitlab.linphone.org/BC/public/bcunit"; license = licenses.lgpl2Plus; diff --git a/pkgs/tools/misc/clac/default.nix b/pkgs/tools/misc/clac/default.nix index 4f26b2036a7..acf9b6b867d 100644 --- a/pkgs/tools/misc/clac/default.nix +++ b/pkgs/tools/misc/clac/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit version; description = "Interactive stack-based calculator"; homepage = "https://github.com/soveran/clac"; license = licenses.bsd2; diff --git a/pkgs/tools/misc/clasp/default.nix b/pkgs/tools/misc/clasp/default.nix index 4fc0d2c2f8c..401a2006c6f 100644 --- a/pkgs/tools/misc/clasp/default.nix +++ b/pkgs/tools/misc/clasp/default.nix @@ -1,12 +1,8 @@ { lib, stdenv, fetchurl }: -let - version = "3.1.4"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "clasp"; - inherit version; + version = "3.1.4"; src = fetchurl { url = "mirror://sourceforge/project/potassco/clasp/${version}/clasp-${version}-source.tar.gz"; diff --git a/pkgs/tools/misc/cp437/default.nix b/pkgs/tools/misc/cp437/default.nix index ac9282ae434..c08214ff548 100644 --- a/pkgs/tools/misc/cp437/default.nix +++ b/pkgs/tools/misc/cp437/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchFromGitHub }: -let version = "0.6"; -in -stdenv.mkDerivation { + +stdenv.mkDerivation rec { pname = "cp437"; - inherit version; + version = "0.6"; src = fetchFromGitHub { owner = "keaston"; diff --git a/pkgs/tools/misc/dijo/default.nix b/pkgs/tools/misc/dijo/default.nix index 9a6bd799921..606bba0dff9 100644 --- a/pkgs/tools/misc/dijo/default.nix +++ b/pkgs/tools/misc/dijo/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, ncurses, CoreServices }: -let version = "0.2.7"; in -rustPlatform.buildRustPackage { + +rustPlatform.buildRustPackage rec { pname = "dijo"; - inherit version; + version = "0.2.7"; buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin CoreServices; src = fetchFromGitHub { owner = "NerdyPepper"; diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/tools/misc/diskscan/default.nix index 1e7bbd6bfce..265218dfcfd 100644 --- a/pkgs/tools/misc/diskscan/default.nix +++ b/pkgs/tools/misc/diskscan/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { description = "Scan HDD/SSD for failed and near failed sectors"; platforms = with platforms; linux; maintainers = with maintainers; [ peterhoeg ]; - inherit version; license = licenses.gpl3; }; } diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix index 99a21e28b07..f39fc1b5524 100644 --- a/pkgs/tools/misc/edid-decode/default.nix +++ b/pkgs/tools/misc/edid-decode/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchgit }: -let - version = "2018-12-06"; -in stdenv.mkDerivation { + +stdenv.mkDerivation rec { pname = "edid-decode-unstable"; - inherit version; + version = "unstable-2018-12-06"; src = fetchgit { url = "git://linuxtv.org/edid-decode.git"; diff --git a/pkgs/tools/misc/edid-generator/default.nix b/pkgs/tools/misc/edid-generator/default.nix index 89ac21db5f5..d3abb37b9f4 100644 --- a/pkgs/tools/misc/edid-generator/default.nix +++ b/pkgs/tools/misc/edid-generator/default.nix @@ -6,11 +6,10 @@ , zsh , modelines ? [] # Modeline "1280x800" 83.50 1280 1352 1480 1680 800 803 809 831 -hsync +vsync }: -let - version = "unstable-2018-03-15"; -in stdenv.mkDerivation { + +stdenv.mkDerivation rec { pname = "edid-generator"; - inherit version; + version = "unstable-2018-03-15"; src = fetchFromGitHub { owner = "akatrevorjay"; diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix index 100e7023232..dac33eaedb3 100644 --- a/pkgs/tools/misc/fsql/default.nix +++ b/pkgs/tools/misc/fsql/default.nix @@ -19,7 +19,6 @@ buildGoPackage rec { license = licenses.mit; maintainers = with maintainers; [ pSub ]; platforms = platforms.unix; - inherit version; }; } diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix index f08bad03916..87902de0cb0 100644 --- a/pkgs/tools/misc/gringo/default.nix +++ b/pkgs/tools/misc/gringo/default.nix @@ -3,13 +3,9 @@ libcxx }: -let - version = "4.5.4"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gringo"; - inherit version; + version = "4.5.4"; src = fetchurl { url = "mirror://sourceforge/project/potassco/gringo/${version}/gringo-${version}-source.tar.gz"; diff --git a/pkgs/tools/misc/hdaps-gl/default.nix b/pkgs/tools/misc/hdaps-gl/default.nix index 41de7ef5d28..8ea863f4641 100644 --- a/pkgs/tools/misc/hdaps-gl/default.nix +++ b/pkgs/tools/misc/hdaps-gl/default.nix @@ -1,24 +1,23 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, freeglut, libGL, libGLU }: -let version = "0.0.7"; in -stdenv.mkDerivation { - pname = "hdaps-gl"; - inherit version; - src = fetchFromGitHub { - owner = "linux-thinkpad"; - repo = "hdaps-gl"; - rev = version; - sha256 = "0jywsrcr1wzkjig5cvz014c3r026sbwscbkv7zh1014lkjm0kyyh"; - }; +stdenv.mkDerivation rec { + pname = "hdaps-gl"; + version = "0.0.7"; + src = fetchFromGitHub { + owner = "linux-thinkpad"; + repo = "hdaps-gl"; + rev = version; + sha256 = "0jywsrcr1wzkjig5cvz014c3r026sbwscbkv7zh1014lkjm0kyyh"; + }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ freeglut libGL libGLU ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ freeglut libGL libGLU ]; - meta = with lib; { - description = "GL-based laptop model that rotates in real-time via hdaps"; - homepage = "https://github.com/linux-thinkpad/hdaps-gl"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.symphorien ]; - }; + meta = with lib; { + description = "GL-based laptop model that rotates in real-time via hdaps"; + homepage = "https://github.com/linux-thinkpad/hdaps-gl"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.symphorien ]; + }; } diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index ea4b2a9cbbc..ce3a5acd4c9 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -7,12 +7,11 @@ }: let - version = "0.48.1"; perl' = perl.withPackages (p: with p; [ ConvertASN1 perlldap AuthenSASL ]); in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "lbdb"; - inherit version; + version = "0.48.1"; src = fetchurl { url = "https://www.spinnaker.de/lbdb/download/lbdb_${version}.tar.gz"; sha256 = "1gr5l2fr9qbdccga8bhsrpvz6jxigvfkdxrln9wyf2xpps5cdjxh"; diff --git a/pkgs/tools/misc/unclutter-xfixes/default.nix b/pkgs/tools/misc/unclutter-xfixes/default.nix index 464183cf579..d59b759503f 100644 --- a/pkgs/tools/misc/unclutter-xfixes/default.nix +++ b/pkgs/tools/misc/unclutter-xfixes/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { description = "Rewrite of unclutter using the X11 Xfixes extension"; platforms = platforms.unix; license = lib.licenses.mit; - inherit version; maintainers = [ maintainers.globin ]; }; } diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index 00e3ec1fbdc..cb575adf75e 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -59,7 +59,6 @@ mkDerivation rec { ''; meta = with lib; { - inherit version; description = "Cross-platform application for configuring any YubiKey over all USB interfaces"; homepage = "https://developers.yubico.com/yubikey-manager-qt/"; license = licenses.bsd2; diff --git a/pkgs/tools/package-management/nix-top/default.nix b/pkgs/tools/package-management/nix-top/default.nix index da64ec138a6..eedd4f97db6 100644 --- a/pkgs/tools/package-management/nix-top/default.nix +++ b/pkgs/tools/package-management/nix-top/default.nix @@ -48,6 +48,5 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ samueldr ]; platforms = platforms.linux ++ platforms.darwin; - inherit version; }; } diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix index 16ecc7f11de..5b4729e2abd 100644 --- a/pkgs/tools/package-management/nixops/default.nix +++ b/pkgs/tools/package-management/nixops/default.nix @@ -2,12 +2,9 @@ , fetchurl, fetchpatch }: -let - version = "1.7"; - -in python2Packages.buildPythonApplication { +python2Packages.buildPythonApplication rec { pname = "nixops"; - inherit version; + version = "1.7"; src = fetchurl { url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix index ba18c58becb..ce996bf7c6f 100644 --- a/pkgs/tools/system/dd_rescue/default.nix +++ b/pkgs/tools/system/dd_rescue/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; homepage = "http://www.garloff.de/kurt/linux/ddrescue/"; license = licenses.gpl2Plus; - inherit version; updateWalker = true; }; } diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 8dbe4b5e003..77828ae823d 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -39,6 +39,5 @@ stdenv.mkDerivation rec { platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice updateWalker = true; - inherit version; }; } diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index 4efc8024cc4..a11890dabd6 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -27,6 +27,5 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.bsd3; downloadPage = "https://sourceforge.net/projects/ipmiutil/files/ipmiutil/"; - inherit version; }; } diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix index be4eaf5f079..912afb7021c 100644 --- a/pkgs/tools/system/sleuthkit/default.nix +++ b/pkgs/tools/system/sleuthkit/default.nix @@ -29,6 +29,5 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; license = lib.licenses.ipl10; - inherit version; }; } diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 8d0539d118f..0142156a737 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -4,8 +4,6 @@ , IOKit, ApplicationServices }: let - version = "7.2"; - dbrev = "5171"; drivedbBranch = "RELEASE_7_2_DRIVEDB"; driverdb = fetchurl { @@ -16,7 +14,7 @@ let in stdenv.mkDerivation rec { pname = "smartmontools"; - inherit version; + version = "7.2"; src = fetchurl { url = "mirror://sourceforge/smartmontools/${pname}-${version}.tar.gz"; diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index dea7fd2e2b6..ab76de74762 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -1,8 +1,6 @@ { lib, stdenv, fetchurl }: let - version = "1.8.0"; - # These settings are found in the Makefile, but there seems to be no # way to select one ore the other setting other than editing the file # manually, so we have to duplicate the know how here. @@ -23,9 +21,9 @@ let '' else ""; # use linux flags by default in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "tree"; - inherit version; + version = "1.8.0"; src = fetchurl { url = "http://mama.indstate.edu/users/ice/tree/src/tree-${version}.tgz"; diff --git a/pkgs/tools/system/wsmancli/default.nix b/pkgs/tools/system/wsmancli/default.nix index bb7a206ced8..ac6a561bb0a 100644 --- a/pkgs/tools/system/wsmancli/default.nix +++ b/pkgs/tools/system/wsmancli/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/Openwsman/wsmancli/releases"; inherit (openwsman.meta) homepage license maintainers platforms; - inherit version; }; } diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index 47256f9f7ee..33f8481bc1a 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -67,6 +67,5 @@ stdenv.mkDerivation rec { homepage = "https://jwilk.net/software/pdf2djvu"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; - inherit version; }; } diff --git a/pkgs/tools/typesetting/pdf2odt/default.nix b/pkgs/tools/typesetting/pdf2odt/default.nix index 8365163c2fc..6b64ee46609 100644 --- a/pkgs/tools/typesetting/pdf2odt/default.nix +++ b/pkgs/tools/typesetting/pdf2odt/default.nix @@ -44,6 +44,5 @@ in stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ peterhoeg ]; - inherit version; }; }