From 6c6201a99bb52e96d7c10365dbcf67f6cafdfe2c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 30 Jul 2015 18:00:14 +0200 Subject: [PATCH] Remove unnecessary rec{s from "my" packages --- pkgs/applications/editors/neovim/default.nix | 6 +++--- pkgs/development/compilers/squeak/default.nix | 2 +- pkgs/development/interpreters/picoc/default.nix | 2 +- pkgs/development/libraries/accounts-qt/default.nix | 2 +- pkgs/development/libraries/libcli/default.nix | 2 +- pkgs/development/tools/misc/bin_replace_string/default.nix | 2 +- pkgs/development/tools/parsing/flexc++/default.nix | 2 +- pkgs/os-specific/linux/freefall/default.nix | 2 +- pkgs/os-specific/linux/jfbview/default.nix | 2 +- pkgs/os-specific/linux/phc-intel/default.nix | 2 +- pkgs/tools/filesystems/duff/default.nix | 2 +- pkgs/tools/filesystems/encfs/default.nix | 2 +- pkgs/tools/networking/hans/default.nix | 4 ++-- pkgs/tools/security/eid-mw/default.nix | 2 +- pkgs/tools/security/eid-viewer/default.nix | 3 ++- pkgs/tools/text/aha/default.nix | 2 +- 16 files changed, 20 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 28d455e06b26..c55d4b0e76a7 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -17,7 +17,7 @@ let version = "2015-06-09"; # Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness: - neovimLibvterm = let version = "2015-02-23"; in stdenv.mkDerivation rec { + neovimLibvterm = let version = "2015-02-23"; in stdenv.mkDerivation { name = "neovim-libvterm-${version}"; src = fetchFromGitHub { @@ -54,7 +54,7 @@ let ignoreCollisions = true; }; - neovim = stdenv.mkDerivation rec { + neovim = stdenv.mkDerivation { name = "neovim-${version}"; src = fetchFromGitHub { @@ -135,7 +135,7 @@ let }; }; -in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivation rec { +in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivation { name = "neovim-${version}-configured"; nativeBuildInputs = [ makeWrapper ]; buildCommand = '' diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index 6e68defb6248..7f3ed5c6ec3a 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -2,7 +2,7 @@ , libpthreadstubs, pango, pkgconfig, libpulseaudio, which }: let version = "4.10.2.2614"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "squeak-${version}"; src = fetchurl { diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix index c9ec01703bf0..290abca5474a 100644 --- a/pkgs/development/interpreters/picoc/default.nix +++ b/pkgs/development/interpreters/picoc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, readline }: let version = "2015-05-04"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "picoc-${version}"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index 824a29494921..26a04362090c 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qt5 }: let version = "1.13"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "accounts-qt-${version}"; src = fetchFromGitLab { diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix index bbeb75d0b8dd..a6d564d92946 100644 --- a/pkgs/development/libraries/libcli/default.nix +++ b/pkgs/development/libraries/libcli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: let version = "1.9.7"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libcli-${version}"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/bin_replace_string/default.nix b/pkgs/development/tools/misc/bin_replace_string/default.nix index 7d33d8ee3c3d..9e4b77c196e7 100644 --- a/pkgs/development/tools/misc/bin_replace_string/default.nix +++ b/pkgs/development/tools/misc/bin_replace_string/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libelf, txt2man }: let version = "0.2"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "bin_replace_string-${version}"; src = fetchurl { diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix index d723cc0382b3..0b9c4fcbc644 100644 --- a/pkgs/development/tools/parsing/flexc++/default.nix +++ b/pkgs/development/tools/parsing/flexc++/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bobcat, icmake, yodl }: let version = "2.02.00"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "flexc++-${version}"; src = fetchurl { diff --git a/pkgs/os-specific/linux/freefall/default.nix b/pkgs/os-specific/linux/freefall/default.nix index 4c1497367e32..34d0f3881e42 100644 --- a/pkgs/os-specific/linux/freefall/default.nix +++ b/pkgs/os-specific/linux/freefall/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: let version = "3.19"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "freefall-${version}"; src = fetchurl { diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix index 34bf136ece78..c89f6e814105 100644 --- a/pkgs/os-specific/linux/jfbview/default.nix +++ b/pkgs/os-specific/linux/jfbview/default.nix @@ -5,7 +5,7 @@ let version = "0.5.1"; binaries = [ "jfbpdf" "jfbview" "jpdfcat" "jpdfgrep" ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "jfbview-${version}"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index 4b6569673861..4c47047ff74f 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -7,7 +7,7 @@ assert stdenv.lib.versionAtLeast kernel.version "4.0"; assert !kernel.features ? grsecurity; let version = "0.4.0-rev17"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "linux-phc-intel-${version}-${kernel.version}"; src = fetchurl { diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix index edb69aaef5cf..310153341669 100644 --- a/pkgs/tools/filesystems/duff/default.nix +++ b/pkgs/tools/filesystems/duff/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, gettext }: let version = "0.5.2"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "duff-${version}"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index d85440c5475e..b21054e478df 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -2,7 +2,7 @@ , pkgconfig, rlog }: let version = "1.8.1"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "encfs-${version}"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix index c4f7c8da9d41..31a47d2e4414 100644 --- a/pkgs/tools/networking/hans/default.nix +++ b/pkgs/tools/networking/hans/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, nettools }: let version = "0.4.4"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "hans-${version}"; src = fetchFromGitHub { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ nettools ]; postPatch = '' - substituteInPlace src/tun.cpp --replace "/sbin/" "/${nettools}/bin/" + substituteInPlace src/tun.cpp --replace "/sbin/" "${nettools}/bin/" ''; enableParallelBuilding = true; diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index e14bc6b9cc4b..c039c41314db 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -2,7 +2,7 @@ , pkgconfig }: let version = "4.1.4"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "eid-mw-${version}"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/eid-viewer/default.nix b/pkgs/tools/security/eid-viewer/default.nix index f2dfd58a7fb1..6df5116ad188 100644 --- a/pkgs/tools/security/eid-viewer/default.nix +++ b/pkgs/tools/security/eid-viewer/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchurl, jre, makeWrapper, pcsclite }: -stdenv.mkDerivation rec { +let # TODO: find out what the version components actually mean, if anything: package = "eid-viewer-4.0.7-195"; build = "tcm406-258907"; +in stdenv.mkDerivation rec { name = "${package}-${build}"; src = fetchurl { diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix index 4ae8048623c9..d1c21e62a66a 100644 --- a/pkgs/tools/text/aha/default.nix +++ b/pkgs/tools/text/aha/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: let version = "0.4.8"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "aha-${version}"; src = fetchFromGitHub {