Remove unnecessary rec{s from "my" packages

This commit is contained in:
Tobias Geerinckx-Rice 2015-07-30 18:00:14 +02:00
parent a010a30889
commit 6c6201a99b
16 changed files with 20 additions and 19 deletions

View file

@ -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 = ''

View file

@ -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 {

View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, readline }:
let version = "2015-05-04"; in
stdenv.mkDerivation rec {
stdenv.mkDerivation {
name = "picoc-${version}";
src = fetchFromGitHub {

View file

@ -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 {

View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
let version = "1.9.7"; in
stdenv.mkDerivation rec {
stdenv.mkDerivation {
name = "libcli-${version}";
src = fetchFromGitHub {

View file

@ -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 {

View file

@ -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 {

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
let version = "3.19"; in
stdenv.mkDerivation rec {
stdenv.mkDerivation {
name = "freefall-${version}";
src = fetchurl {

View file

@ -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 {

View file

@ -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 {

View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, gettext }:
let version = "0.5.2"; in
stdenv.mkDerivation rec {
stdenv.mkDerivation {
name = "duff-${version}";
src = fetchFromGitHub {

View file

@ -2,7 +2,7 @@
, pkgconfig, rlog }:
let version = "1.8.1"; in
stdenv.mkDerivation rec {
stdenv.mkDerivation {
name = "encfs-${version}";
src = fetchFromGitHub {

View file

@ -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;

View file

@ -2,7 +2,7 @@
, pkgconfig }:
let version = "4.1.4"; in
stdenv.mkDerivation rec {
stdenv.mkDerivation {
name = "eid-mw-${version}";
src = fetchFromGitHub {

View file

@ -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 {

View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
let version = "0.4.8"; in
stdenv.mkDerivation rec {
stdenv.mkDerivation {
name = "aha-${version}";
src = fetchFromGitHub {