diff options
28 files changed, 218 insertions, 127 deletions
diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/misc/drivers/gutenprint/bin.nix index 891421d3312c..e1fcb838957c 100644 --- a/pkgs/misc/drivers/gutenprint/bin.nix +++ b/pkgs/misc/drivers/gutenprint/bin.nix @@ -25,7 +25,8 @@ TODO tidy this all up. Find source instead of binary. Fix paths ... Find out how */ stdenv.mkDerivation { - name = "cups-gutenprint-binary-5.0.1"; + pname = "cups-gutenprint-binary"; + version = "5.0.1"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://www.openprinting.org/download/printdriver/debian/dists/lsb3.1/main/binary-amd64/gutenprint_5.0.1-1lsb3.1_amd64.deb"; diff --git a/pkgs/os-specific/darwin/DarwinTools/default.nix b/pkgs/os-specific/darwin/DarwinTools/default.nix index 588769c7bfc6..f648435eed27 100644 --- a/pkgs/os-specific/darwin/DarwinTools/default.nix +++ b/pkgs/os-specific/darwin/DarwinTools/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "DarwinTools-1"; + pname = "DarwinTools"; + version = "1"; src = fetchurl { - url = "https://opensource.apple.com/tarballs/DarwinTools/${name}.tar.gz"; + url = "https://opensource.apple.com/tarballs/DarwinTools/DarwinTools-${version}.tar.gz"; sha256 = "0hh4jl590jv3v830p77r3jcrnpndy7p2b8ajai3ldpnx2913jfhp"; }; diff --git a/pkgs/os-specific/darwin/insert_dylib/default.nix b/pkgs/os-specific/darwin/insert_dylib/default.nix index 07e8886e3e63..7ab9692f0d42 100644 --- a/pkgs/os-specific/darwin/insert_dylib/default.nix +++ b/pkgs/os-specific/darwin/insert_dylib/default.nix @@ -1,18 +1,22 @@ { lib, stdenv, fetchFromGitHub, xcbuildHook }: -stdenv.mkDerivation - { name = "insert_dylib-2016.08.28"; - src = fetchFromGitHub - { owner = "Tyilo"; - repo = "insert_dylib"; - rev = "c8beef66a08688c2feeee2c9b6eaf1061c2e67a9"; - sha256 = "0az38y06pvvy9jf2wnzdwp9mp98lj6nr0ldv0cs1df5p9x2qvbya"; - }; - nativeBuildInputs = [ xcbuildHook ]; - installPhase = - '' - mkdir -p $out/bin - install -m755 Products/Release/insert_dylib $out/bin - ''; - meta.platforms = lib.platforms.darwin; - } +stdenv.mkDerivation { + pname = "insert_dylib"; + version = "unstable-2016-08-28"; + + src = fetchFromGitHub { + owner = "Tyilo"; + repo = "insert_dylib"; + rev = "c8beef66a08688c2feeee2c9b6eaf1061c2e67a9"; + sha256 = "0az38y06pvvy9jf2wnzdwp9mp98lj6nr0ldv0cs1df5p9x2qvbya"; + }; + + nativeBuildInputs = [ xcbuildHook ]; + + installPhase = '' + mkdir -p $out/bin + install -m755 Products/Release/insert_dylib $out/bin + ''; + + meta.platforms = lib.platforms.darwin; +} diff --git a/pkgs/os-specific/darwin/maloader/default.nix b/pkgs/os-specific/darwin/maloader/default.nix index 9142484e043c..bcd9fe6488d2 100644 --- a/pkgs/os-specific/darwin/maloader/default.nix +++ b/pkgs/os-specific/darwin/maloader/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, opencflite, clang, libcxx }: stdenv.mkDerivation { - name = "maloader-0git"; + pname = "maloader"; + version = "unstable-2014-02-25"; src = fetchgit { url = "git://github.com/shinh/maloader.git"; diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index 72e886b91f55..4fdbb06c5217 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -1,19 +1,18 @@ -{stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkg-config, ncurses, libx86}: +{ stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkg-config, ncurses, libx86 }: let s = # Generated upstream information - { - baseName="fbterm"; - version="1.7.0"; - name="fbterm-1.7.0"; - hash="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm/fbterm-1.7.0.tar.gz"; - sha256="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; - }; - buildInputs = [gpm freetype fontconfig ncurses] + { + version = "1.7.0"; + pname = "fbterm"; + hash = "0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm/fbterm-1.7.0.tar.gz"; + sha256 = "0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; + }; + buildInputs = [ gpm freetype fontconfig ncurses ] ++ lib.optional (stdenv.isi686 || stdenv.isx86_64) libx86; in stdenv.mkDerivation { - inherit (s) name version; + inherit (s) pname version; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index ca5b82b87858..769bb1e43b44 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -4,25 +4,25 @@ with lib; let bits = - if stdenv.is64bit then "64" - else "32"; + if stdenv.is64bit then "64" + else "32"; libpath = makeLibraryPath [ stdenv.cc.cc stdenv.glibc alsa-lib ]; in stdenv.mkDerivation rec { - name = "mwprocapture-1.3.0.${version}-${kernel.version}"; - version = "4236"; + pname = "mwprocapture"; + subVersion = "4236"; + version = "1.3.0.${subVersion}-${kernel.version}"; src = fetchurl { - url = "https://www.magewell.com/files/drivers/ProCaptureForLinux_${version}.tar.gz"; + url = "https://www.magewell.com/files/drivers/ProCaptureForLinux_${subVersion}.tar.gz"; sha256 = "1mfgj84km276sq5i8dny1vqp2ycqpvgplrmpbqwnk230d0w3qs74"; }; nativeBuildInputs = kernel.moduleBuildDependencies; - preConfigure = - '' + preConfigure = '' cd ./src export INSTALL_MOD_PATH="$out" ''; diff --git a/pkgs/os-specific/linux/seturgent/default.nix b/pkgs/os-specific/linux/seturgent/default.nix index 2e9e445eddc5..da494f08ca2e 100644 --- a/pkgs/os-specific/linux/seturgent/default.nix +++ b/pkgs/os-specific/linux/seturgent/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, libX11, xorgproto, unzip }: stdenv.mkDerivation { - name = "seturgent-2012-08-17"; + pname = "seturgent"; + version = "unstable-2012-08-17"; src = fetchurl { url = "https://github.com/hiltjo/seturgent/archive/ada70dcb15865391e5cdcab27a0739a304a17e03.zip"; @@ -10,7 +11,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ unzip ]; buildInputs = [ - libX11 xorgproto + libX11 + xorgproto ]; installPhase = '' @@ -19,10 +21,10 @@ stdenv.mkDerivation { ''; meta = { - platforms = lib.platforms.linux; - description = "Set an application's urgency hint (or not)"; - maintainers = [ lib.maintainers.yarr ]; - homepage = "https://github.com/hiltjo/seturgent"; - license = lib.licenses.mit; + platforms = lib.platforms.linux; + description = "Set an application's urgency hint (or not)"; + maintainers = [ lib.maintainers.yarr ]; + homepage = "https://github.com/hiltjo/seturgent"; + license = lib.licenses.mit; }; } diff --git a/pkgs/os-specific/linux/udisks-glue/default.nix b/pkgs/os-specific/linux/udisks-glue/default.nix index 453df94f8fb5..e51a2b1990c3 100644 --- a/pkgs/os-specific/linux/udisks-glue/default.nix +++ b/pkgs/os-specific/linux/udisks-glue/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, automake, autoconf, udisks1, dbus-glib, glib, libconfuse }: -stdenv.mkDerivation { - name = "udisks-glue-1.3.5"; +stdenv.mkDerivation rec { + pname = "udisks-glue"; + version = "1.3.5"; src = fetchurl { - url = "https://github.com/fernandotcl/udisks-glue/archive/release-1.3.5.tar.gz"; + url = "https://github.com/fernandotcl/udisks-glue/archive/release-${version}.tar.gz"; sha256 = "317d25bf249278dc8f6a5dcf18f760512427c772b9afe3cfe34e6e1baa258176"; }; @@ -17,9 +18,9 @@ stdenv.mkDerivation { homepage = "https://github.com/fernandotcl/udisks-glue"; description = "A tool to associate udisks events to user-defined actions"; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [pSub]; + maintainers = with lib.maintainers; [ pSub ]; license = lib.licenses.bsd2; broken = true; - hydraPlatforms = []; + hydraPlatforms = [ ]; }; } diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index f20dc6b60765..87da3a29d6c0 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -1,12 +1,31 @@ -{ lib, stdenv, fetchurl, pkg-config, sg3_utils, udev, glib, dbus, dbus-glib -, polkit, parted, lvm2, libatasmart, intltool, libuuid, mdadm -, libxslt, docbook_xsl, util-linux, libgudev }: +{ lib +, stdenv +, fetchurl +, pkg-config +, sg3_utils +, udev +, glib +, dbus +, dbus-glib +, polkit +, parted +, lvm2 +, libatasmart +, intltool +, libuuid +, mdadm +, libxslt +, docbook_xsl +, util-linux +, libgudev +}: stdenv.mkDerivation rec { - name = "udisks-1.0.5"; + pname = "udisks"; + version = "1.0.5"; src = fetchurl { - url = "https://hal.freedesktop.org/releases/${name}.tar.gz"; + url = "https://hal.freedesktop.org/releases/udisks-${version}.tar.gz"; sha256 = "0wbg3jrv8limdgvcygf4dqin3y6d30y9pcmmk711vq571vmq5v7j"; }; @@ -27,8 +46,21 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ sg3_utils udev glib dbus dbus-glib polkit parted libgudev - lvm2 libatasmart intltool libuuid libxslt docbook_xsl + [ + sg3_utils + udev + glib + dbus + dbus-glib + polkit + parted + libgudev + lvm2 + libatasmart + intltool + libuuid + libxslt + docbook_xsl ]; nativeBuildInputs = [ pkg-config ]; @@ -41,6 +73,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = with licenses; [ gpl2 lgpl2Plus ]; broken = true; - hydraPlatforms = []; + hydraPlatforms = [ ]; }; } diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index f3a953576ec9..dfd3f3ff19c3 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -4,7 +4,8 @@ # both mingw32 and mingw64. stdenv.mkDerivation { - name = "jom-1.0.11"; + pname = "jom"; + version = "1.0.11"; src = fetchgit { url = "git://gitorious.org/qt-labs/jom.git"; diff --git a/pkgs/os-specific/windows/mingwrt/default.nix b/pkgs/os-specific/windows/mingwrt/default.nix index 4fb92569a47a..5bf6951cd434 100644 --- a/pkgs/os-specific/windows/mingwrt/default.nix +++ b/pkgs/os-specific/windows/mingwrt/default.nix @@ -1,10 +1,11 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "mingwrt-5.0.2"; + pname = "mingwrt"; + version = "5.0.2"; src = fetchurl { - url = "mirror://sourceforge/mingw/MinGW/Base/mingwrt/${name}/${name}-mingw32-src.tar.xz"; + url = "mirror://sourceforge/mingw/MinGW/Base/mingwrt/mingwrt-${version}/mingwrt-${version}-mingw32-src.tar.xz"; sha256 = "1vj6f578wcffdmy7zzf7xz1lw57kxjy08j0k1n28f0j4ylrk68vp"; }; diff --git a/pkgs/os-specific/windows/w32api/default.nix b/pkgs/os-specific/windows/w32api/default.nix index ebc95ecaa7a9..99faeeb7a8bf 100644 --- a/pkgs/os-specific/windows/w32api/default.nix +++ b/pkgs/os-specific/windows/w32api/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, lib }: stdenv.mkDerivation rec { - name = "w32api-3.17-2"; + pname = "w32api"; + version = "3.17-2"; src = fetchurl { - url = "mirror://sourceforge/mingw/MinGW/Base/w32api/w32api-3.17/${name}-mingw32-src.tar.lzma"; + url = "mirror://sourceforge/mingw/MinGW/Base/w32api/w32api-${lib.versions.majorMinor version}/w32api-${version}-mingw32-src.tar.lzma"; sha256 = "09rhnl6zikmdyb960im55jck0rdy5z9nlg3akx68ixn7khf3j8wb"; }; diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix index c4fb79933432..bf1e73f67b9a 100644 --- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix +++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true }: -stdenv.mkDerivation { - name = "wxMSW-2.8.11"; +stdenv.mkDerivation rec { + pname = "wxMSW"; + version = "2.8.11"; src = fetchurl { - url = "mirror://sourceforge/wxwindows/wxWidgets-2.8.11.tar.gz"; + url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.gz"; sha256 = "0icxd21g18d42n1ygshkpw0jnflm03iqki6r623pb5hhd7fm2ksj"; }; @@ -27,7 +28,7 @@ stdenv.mkDerivation { (cd $out/include && ln -s wx-*/* .) "; - passthru = {inherit compat24 compat26 unicode;}; + passthru = { inherit compat24 compat26 unicode; }; meta = { platforms = lib.platforms.windows; diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix index d2f779ddd724..43e0a8233fd0 100644 --- a/pkgs/tools/X11/primus/lib.nix +++ b/pkgs/tools/X11/primus/lib.nix @@ -1,5 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch -, libX11, libGL, mesa +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, libX11 +, libGL +, mesa , nvidia_x11 ? null , libglvnd }: @@ -10,8 +15,10 @@ let else if nvidia_x11.useGLVND then libglvnd else nvidia_x11; -in stdenv.mkDerivation { - name = "primus-lib-2015-04-28"; +in +stdenv.mkDerivation { + pname = "primus-lib"; + version = "unstable-2015-04-28"; src = fetchFromGitHub { owner = "amonakov"; @@ -30,11 +37,12 @@ in stdenv.mkDerivation { buildInputs = [ libX11 libGL ]; - makeFlags = [ "LIBDIR=$(out)/lib" - "PRIMUS_libGLa=${aPackage}/lib/libGL.so" - "PRIMUS_libGLd=${libGL}/lib/libGL.so" - "PRIMUS_LOAD_GLOBAL=${mesa}/lib/libglapi.so" - ]; + makeFlags = [ + "LIBDIR=$(out)/lib" + "PRIMUS_libGLa=${aPackage}/lib/libGL.so" + "PRIMUS_libGLd=${libGL}/lib/libGL.so" + "PRIMUS_LOAD_GLOBAL=${mesa}/lib/libglapi.so" + ]; installPhase = '' ln -s $out/lib/libGL.so.1 $out/lib/libGL.so diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix index 6e372b75a7d7..7b2e65d474f7 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix @@ -1,14 +1,24 @@ -{ lib, stdenv, fetchurl, fetchpatch, lvm2, libgcrypt, libuuid, pkg-config, popt -, enablePython ? true, python ? null +{ lib +, stdenv +, fetchurl +, fetchpatch +, lvm2 +, libgcrypt +, libuuid +, pkg-config +, popt +, enablePython ? true +, python ? null }: assert enablePython -> python != null; stdenv.mkDerivation rec { - name = "cryptsetup-1.6.3"; + pname = "cryptsetup"; + version = "1.6.3"; src = fetchurl { - url = "http://cryptsetup.googlecode.com/files/${name}.tar.bz2"; + url = "http://cryptsetup.googlecode.com/files/cryptsetup-${version}.tar.bz2"; sha256 = "1n1qk5chyjspbiianrdb55fhb4wl0vfyqz2br05vfb24v4qlgbx2"; }; @@ -22,11 +32,11 @@ stdenv.mkDerivation rec { ]; configureFlags = [ "--enable-cryptsetup-reencrypt" ] - ++ lib.optional enablePython "--enable-python"; + ++ lib.optional enablePython "--enable-python"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ lvm2 libgcrypt libuuid popt ] - ++ lib.optional enablePython python; + ++ lib.optional enablePython python; meta = with lib; { homepage = "http://code.google.com/p/cryptsetup/"; diff --git a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix index c5d8eebc47ca..899af827508a 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, lvm2 }: stdenv.mkDerivation rec { - name = "dmraid-1.0.0.rc15"; + pname = "dmraid"; + version = "1.0.0.rc15"; src = fetchurl { - url = "https://people.redhat.com/~heinzm/sw/dmraid/src/old/${name}.tar.bz2"; + url = "https://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-${version}.tar.bz2"; sha256 = "01bcaq0sc329ghgj7f182xws7jgjpdc41bvris8fsiprnxc7511h"; }; diff --git a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix index 976a3ce2567a..e6d304c2cd37 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix @@ -3,10 +3,11 @@ { lib, stdenv, fetchurl, fetchpatch, lvm2, libaio, gzip, readline, systemd }: stdenv.mkDerivation rec { - name = "multipath-tools-0.4.9"; + pname = "multipath-tools"; + version = "0.4.9"; src = fetchurl { - url = "http://christophe.varoqui.free.fr/multipath-tools/${name}.tar.bz2"; + url = "http://christophe.varoqui.free.fr/multipath-tools/multipath-tools-${version}.tar.bz2"; sha256 = "04n7kazp1zrlqfza32phmqla0xkcq4zwn176qff5ida4a60whi4d"; }; diff --git a/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/pkgs/tools/filesystems/nixpart/0.4/parted.nix index 2891f990afb0..e3dd662c18a9 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/parted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/parted.nix @@ -1,13 +1,22 @@ -{ lib,stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline -, util-linux, check +{ lib +, stdenv +, fetchurl +, fetchpatch +, lvm2 +, libuuid +, gettext +, readline +, util-linux +, check , enableStatic ? stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { - name = "parted-3.1"; + pname = "parted"; + version = "3.1"; src = fetchurl { - url = "mirror://gnu/parted/${name}.tar.xz"; + url = "mirror://gnu/parted/parted-${version}.tar.xz"; sha256 = "05fa4m1bky9d13hqv91jlnngzlyn7y4rnnyq6d86w0dg3vww372y"; }; @@ -26,9 +35,9 @@ stdenv.mkDerivation rec { ++ lib.optional (lvm2 != null) lvm2; configureFlags = - (if (readline != null) - then [ "--with-readline" ] - else [ "--without-readline" ]) + (if (readline != null) + then [ "--with-readline" ] + else [ "--without-readline" ]) ++ lib.optional (lvm2 == null) "--disable-device-mapper" ++ lib.optional enableStatic "--enable-static"; diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix index 3d34dcbac175..ccbec8209e9a 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix @@ -1,17 +1,18 @@ { lib, stdenv, fetchurl, makeWrapper, pkg-config, cmake, fcitx, gtk3, isocodes, gnome }: stdenv.mkDerivation rec { - name = "fcitx-configtool-0.4.10"; + pname = "fcitx-configtool"; + version = "0.4.10"; meta = with lib; { description = "GTK-based config tool for Fcitx"; - license = licenses.gpl2; - platforms = platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; maintainers = with maintainers; [ cdepillabout ]; }; src = fetchurl { - url = "https://download.fcitx-im.org/fcitx-configtool/${name}.tar.xz"; + url = "https://download.fcitx-im.org/fcitx-configtool/fcitx-configtool-${version}.tar.xz"; sha256 = "1yyi9jhkwn49lx9a47k1zbvwgazv4y4z72gnqgzdpgdzfrlrgi5w"; }; diff --git a/pkgs/tools/networking/easyrsa/2.x.nix b/pkgs/tools/networking/easyrsa/2.x.nix index 52cf2082d63f..42188cfbfff1 100644 --- a/pkgs/tools/networking/easyrsa/2.x.nix +++ b/pkgs/tools/networking/easyrsa/2.x.nix @@ -1,11 +1,18 @@ -{ lib, stdenv, fetchurl, autoreconfHook, makeWrapper -, gnugrep, openssl }: +{ lib +, stdenv +, fetchurl +, autoreconfHook +, makeWrapper +, gnugrep +, openssl +}: -stdenv.mkDerivation { - name = "easyrsa-2.2.0"; +stdenv.mkDerivation rec { + pname = "easyrsa"; + version = "2.2.0"; src = fetchurl { - url = "https://github.com/OpenVPN/easy-rsa/archive/v2.2.0.tar.gz"; + url = "https://github.com/OpenVPN/easy-rsa/archive/v${version}.tar.gz"; sha256 = "1xq4by5frb6ikn53ss3y8v7ss639dccxfq8jfrbk07ynkmk668qk"; }; diff --git a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix index 2120679fef3e..514491c2be21 100644 --- a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix +++ b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix @@ -1,7 +1,8 @@ -{ lib, stdenv, fetchgit, makeWrapper, coreutils, gawk, util-linux }: +{ lib, stdenv, fetchgit, makeWrapper, coreutils, gawk, util-linux }: stdenv.mkDerivation { - name = "openvpn-learnaddress-19b03c3"; + pname = "openvpn-learnaddress"; + version = "unstable-2013-10-21"; src = fetchgit { url = "https://gist.github.com/4058733.git"; diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix index d71ab72901bc..e8533a214af1 100644 --- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix +++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix @@ -3,8 +3,10 @@ let binPath = lib.makeBinPath [ coreutils openresolv systemd ]; -in stdenv.mkDerivation { - name = "update-resolv-conf-2017-06-21"; +in +stdenv.mkDerivation { + pname = "update-resolv-conf"; + version = "unstable-2017-06-21"; src = fetchFromGitHub { owner = "masterkorp"; diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix index 66b05384c6be..8fc5dce7ba04 100644 --- a/pkgs/tools/security/gnupg/1.nix +++ b/pkgs/tools/security/gnupg/1.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, readline, bzip2 }: stdenv.mkDerivation rec { - name = "gnupg-1.4.23"; + pname = "gnupg"; + version = "1.4.23"; src = fetchurl { - url = "mirror://gnupg/gnupg/${name}.tar.bz2"; + url = "mirror://gnupg/gnupg/gnupg-${version}.tar.bz2"; sha256 = "1fkq4sqldvf6a25mm2qz95swv1qjg464736091w51djiwqbjyin9"; }; diff --git a/pkgs/tools/text/gnused/422.nix b/pkgs/tools/text/gnused/422.nix index 6b16f01f2fa1..15e57e319019 100644 --- a/pkgs/tools/text/gnused/422.nix +++ b/pkgs/tools/text/gnused/422.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "gnused-4.2.2"; +stdenv.mkDerivation rec { + pname = "gnused"; + version = "4.2.2"; src = fetchurl { - url = "mirror://gnu/sed/sed-4.2.2.tar.bz2"; + url = "mirror://gnu/sed/sed-${version}.tar.bz2"; sha256 = "f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7"; }; diff --git a/pkgs/tools/typesetting/pdftk/legacy.nix b/pkgs/tools/typesetting/pdftk/legacy.nix index 3c4d042097ff..189978870376 100644 --- a/pkgs/tools/typesetting/pdftk/legacy.nix +++ b/pkgs/tools/typesetting/pdftk/legacy.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, gcj, unzip }: -stdenv.mkDerivation { - name = "pdftk-2.02"; +stdenv.mkDerivation rec { + pname = "pdftk"; + version = "2.02"; src = fetchurl { - url = "https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-2.02-src.zip"; + url = "https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-${version}-src.zip"; sha256 = "1hdq6zm2dx2f9h7bjrp6a1hfa1ywgkwydp14i2sszjiszljnm3qi"; }; @@ -36,7 +37,7 @@ stdenv.mkDerivation { description = "Simple tool for doing everyday things with PDF documents"; homepage = "https://www.pdflabs.com/tools/pdftk-server/"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [raskin]; + maintainers = with lib.maintainers; [ raskin ]; platforms = with lib.platforms; linux; broken = true; # Broken on Hydra since 2020-08-24 }; diff --git a/pkgs/tools/typesetting/tex/pgf/1.x.nix b/pkgs/tools/typesetting/tex/pgf/1.x.nix index efaf0e0fe1b3..618f936d8bf8 100644 --- a/pkgs/tools/typesetting/tex/pgf/1.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/1.x.nix @@ -1,10 +1,11 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "pgf-1.18"; +stdenv.mkDerivation rec { + pname = "pgf"; + version = "1.18"; src = fetchurl { - url = "mirror://sourceforge/pgf/pgf-1.18.tar.gz"; + url = "mirror://sourceforge/pgf/pgf-${version}.tar.gz"; sha256 = "0s6b8rx9yfxcjjg18vx1mphnwbd28fl5lnq0dasjz40pp3ypwdjv"; }; diff --git a/pkgs/tools/typesetting/tex/pgf/2.x.nix b/pkgs/tools/typesetting/tex/pgf/2.x.nix index 9661ec3324be..b8a3f2f63660 100644 --- a/pkgs/tools/typesetting/tex/pgf/2.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/2.x.nix @@ -1,10 +1,11 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "pgf-2.00"; +stdenv.mkDerivation rec { + pname = "pgf"; + version = "2.00"; src = fetchurl { - url = "mirror://sourceforge/pgf/pgf-2.00.tar.gz"; + url = "mirror://sourceforge/pgf/pgf-${version}.tar.gz"; sha256 = "0j57niag4jb2k0iyrvjsannxljc3vkx0iag7zd35ilhiy4dh6264"; }; diff --git a/pkgs/tools/typesetting/tex/pgf/3.x.nix b/pkgs/tools/typesetting/tex/pgf/3.x.nix index b33f05d34a78..9af41ff1f43f 100644 -- |