public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: remove redundant rec

Browse Source
This commit is contained in:
volth
2019-08-28 11:07:32 +00:00
parent 5061fe0c2c
commit 08f68313a4
1875 changed files with 2591 additions and 2596 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
+1 -1
View File
@@ -6,7 +6,7 @@ sourcePerArch:
}:
let cpuName = stdenv.hostPlatform.parsed.cpu.name;
result = stdenv.mkDerivation rec {
result = stdenv.mkDerivation {
name = if sourcePerArch.packageType == "jdk"
then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}"
else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}";
pkgs/development/compilers/carp/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, makeWrapper, clang, haskellPackages }:
haskellPackages.mkDerivation rec {
haskellPackages.mkDerivation {
pname = "carp";
version = "unstable-2018-09-15";
pkgs/development/compilers/clean/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
name = "clean-3.0";
src =
pkgs/development/compilers/cmdstan/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, python, runtimeShell }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
name = "cmdstan-2.17.1";
src = fetchurl {
pkgs/development/compilers/fasm/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ stdenv, lib, fasm-bin, isx86_64 }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
inherit (fasm-bin) version src meta;
pname = "fasm";
pkgs/development/compilers/gambit/bootstrap.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, autoconf, ... }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "gambit-bootstrap";
version = "4.9.3";
pkgs/development/compilers/gcl/2.6.13-pre.nix
+1 -1
View File
@@ -7,7 +7,7 @@ assert stdenv.cc.isGNU ;
assert stdenv.cc ? libc ;
assert stdenv.cc.libc != null ;
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "gcl";
version = "2.6.13pre50";
pkgs/development/compilers/ghc/8.6.4.nix
+1 -1
View File
@@ -104,7 +104,7 @@ stdenv.mkDerivation (rec {
name = "D5123.diff";
sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n";
})
(fetchpatch rec { # https://github.com/haskell/haddock/issues/900
(fetchpatch { # https://github.com/haskell/haddock/issues/900
url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff";
name = "loadpluginsinmodules.diff";
sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1";
pkgs/development/compilers/ghc/8.6.5.nix
+1 -1
View File
@@ -104,7 +104,7 @@ stdenv.mkDerivation (rec {
name = "D5123.diff";
sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n";
})
(fetchpatch rec { # https://github.com/haskell/haddock/issues/900
(fetchpatch { # https://github.com/haskell/haddock/issues/900
url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff";
name = "loadpluginsinmodules.diff";
sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1";
pkgs/development/compilers/ghc/head.nix
+1 -1
View File
@@ -98,7 +98,7 @@ stdenv.mkDerivation (rec {
outputs = [ "out" "doc" ];
patches = [
(fetchpatch rec { # https://github.com/haskell/haddock/issues/900
(fetchpatch { # https://github.com/haskell/haddock/issues/900
url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff";
name = "loadpluginsinmodules.diff";
sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1";
pkgs/development/compilers/ghcjs/base.nix
+1 -1
View File
@@ -61,7 +61,7 @@
let
inherit (bootPkgs) ghc;
in mkDerivation (rec {
in mkDerivation ({
pname = "ghcjs";
inherit version;
src = ghcjsSrc;
pkgs/development/compilers/haxe/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
let
generic = { version, sha256, prePatch }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "haxe";
inherit version;
pkgs/development/compilers/jwasm/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
, cmake }:
with stdenv.lib;
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "jwasm";
version = "git-2017-11-22";
pkgs/development/compilers/kotlin/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
let
version = "1.3.41";
in stdenv.mkDerivation rec {
in stdenv.mkDerivation {
inherit version;
pname = "kotlin";
pkgs/development/compilers/llvm/3.5/libc++/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
let version = "3.5.2"; in
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "libc++";
inherit version;
pkgs/development/compilers/llvm/3.5/llvm.nix
+1 -1
View File
@@ -17,7 +17,7 @@
, enableSharedLibraries ? !stdenv.isDarwin
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "llvm";
inherit version;
pkgs/development/compilers/llvm/3.8/libc++/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "libc++";
inherit version;
pkgs/development/compilers/llvm/3.8/llvm.nix
+1 -1
View File
@@ -16,7 +16,7 @@
, enableSharedLibraries ? true
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "llvm";
inherit version;
pkgs/development/compilers/llvm/3.9/libc++/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "libc++";
inherit version;
pkgs/development/compilers/llvm/4/libc++/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "libc++";
inherit version;
pkgs/development/compilers/llvm/4/llvm.nix
+1 -1
View File
@@ -23,7 +23,7 @@ let
imap (i: _: concatStringsSep "." (take i parts)) parts;
in
stdenv.mkDerivation (rec {
stdenv.mkDerivation ({
name = "llvm-${version}";
src = fetch "llvm" "0l9bf7kdwhlj0kq1hawpyxhna1062z3h7qcz2y8nfl9dz2qksy6s";
pkgs/development/compilers/llvm/5/compiler-rt.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
with stdenv.lib;
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "compiler-rt";
inherit version;
src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy";
pkgs/development/compilers/llvm/5/libc++/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "libc++";
inherit version;
pkgs/development/compilers/llvm/5/llvm.nix
+1 -1
View File
@@ -21,7 +21,7 @@ let
imap (i: _: concatStringsSep "." (take i parts)) parts;
in
stdenv.mkDerivation (rec {
stdenv.mkDerivation ({
name = "llvm-${version}";
src = fetch "llvm" "0g1bbj2n6xv4p1n6hh17vj3vpvg56wacipc81dgwga9mg2lys8nm";
pkgs/development/compilers/llvm/6/compiler-rt.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
with stdenv.lib;
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "compiler-rt";
inherit version;
src = fetch "compiler-rt" "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl";
pkgs/development/compilers/llvm/6/libc++/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "libc++";
inherit version;
pkgs/development/compilers/llvm/6/llvm.nix
+1 -1
View File
@@ -25,7 +25,7 @@ let
imap (i: _: concatStringsSep "." (take i parts)) parts;
in
stdenv.mkDerivation (rec {
stdenv.mkDerivation ({
name = "llvm-${version}";
src = fetch "llvm" "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn";
pkgs/development/compilers/llvm/7/compiler-rt.nix
+1 -1
View File
@@ -1,5 +1,5 @@
{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "compiler-rt";
inherit version;
src = fetch "compiler-rt" "1n48p8gjarihkws0i2bay5w9bdwyxyxxbpwyng7ba58jb30dlyq5";
pkgs/development/compilers/llvm/7/default.nix
+1 -1
View File
@@ -111,7 +111,7 @@ let
'' + mkExtraBuildCommands cc;
};
lldClangNoCompilerRt = wrapCCWith rec {
lldClangNoCompilerRt = wrapCCWith {
cc = tools.clang-unwrapped;
bintools = wrapBintoolsWith {
inherit (tools) bintools;
pkgs/development/compilers/llvm/7/libc++/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "libc++";
inherit version;
pkgs/development/compilers/llvm/7/llvm.nix
+1 -1
View File
@@ -29,7 +29,7 @@ let
let parts = splitString "." release_version; in
imap (i: _: concatStringsSep "." (take i parts)) parts;
in stdenv.mkDerivation (rec {
in stdenv.mkDerivation ({
name = "llvm-${version}";
src = fetch "llvm" "0r1p5didv4rkgxyvbkyz671xddg6i3dxvbpsi1xxipkla0l9pk0v";
pkgs/development/compilers/llvm/8/compiler-rt.nix
+1 -1
View File
@@ -1,5 +1,5 @@
{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "compiler-rt";
inherit version;
src = fetch "compiler-rt" "0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi";
pkgs/development/compilers/llvm/8/default.nix
+1 -1
View File
@@ -145,7 +145,7 @@ let
'' + mkExtraBuildCommands cc;
};
lldClangNoCompilerRt = wrapCCWith rec {
lldClangNoCompilerRt = wrapCCWith {
cc = tools.clang-unwrapped;
libcxx = null;
bintools = wrapBintoolsWith {
pkgs/development/compilers/llvm/8/libc++/default.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version
, enableShared ? true }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "libc++";
inherit version;
pkgs/development/compilers/llvm/8/llvm.nix
+1 -1
View File
@@ -27,7 +27,7 @@ let
shortVersion = with stdenv.lib;
concatStringsSep "." (take 1 (splitString "." release_version));
in stdenv.mkDerivation (rec {
in stdenv.mkDerivation ({
name = "llvm-${version}";
src = fetch "llvm" "1rvm5gqp5v8hfn17kqws3zhk94w4kxndal12bqa0y57p09nply24";
pkgs/development/compilers/manticore/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
let
rev= "47273c463fc3c5d0a0ae655cf75a4700bdb020b4";
in stdenv.mkDerivation rec {
in stdenv.mkDerivation {
pname = "manticore";
version = "2018.09.29";
pkgs/development/compilers/mono/4.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ callPackage, Foundation, libobjc }:
callPackage ./generic.nix (rec {
callPackage ./generic.nix ({
inherit Foundation libobjc;
version = "4.8.1.0";
sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq";
pkgs/development/compilers/mono/5.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ callPackage, Foundation, libobjc }:
callPackage ./generic.nix (rec {
callPackage ./generic.nix ({
inherit Foundation libobjc;
version = "5.20.1.27";
sha256 = "15rpwxw642ad1na93k5nj7d2lb24f21kncr924gxr00178a9x0jy";
pkgs/development/compilers/mono/6.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ callPackage, Foundation, libobjc }:
callPackage ./generic.nix (rec {
callPackage ./generic.nix ({
inherit Foundation libobjc;
version = "6.0.0.313";
srcArchiveSuffix = "tar.xz";
pkgs/development/compilers/mono/llvm.nix
+1 -1
View File
@@ -13,7 +13,7 @@
, zlib
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "llvm";
version = "3.6-mono-2017-02-15";
pkgs/development/compilers/ocaml/4.01.0.nix
+1 -1
View File
@@ -1,4 +1,4 @@
import ./generic.nix rec {
import ./generic.nix {
major_version = "4";
minor_version = "01";
patch_version = "0";
pkgs/development/compilers/ocaml/4.02.nix
+1 -1
View File
@@ -1,4 +1,4 @@
import ./generic.nix rec {
import ./generic.nix {
major_version = "4";
minor_version = "02";
patch_version = "3";
pkgs/development/compilers/ocaml/4.03.nix
+1 -1
View File
@@ -1,4 +1,4 @@
import ./generic.nix rec {
import ./generic.nix {
major_version = "4";
minor_version = "03";
patch_version = "0";
pkgs/development/compilers/ocaml/generic.nix
+1 -1
View File
@@ -30,7 +30,7 @@ let
x11inc = x11env + "/include";
in
stdenv.mkDerivation (args // rec {
stdenv.mkDerivation (args // {
inherit name;
inherit version;
pkgs/development/compilers/ocaml/metaocaml-3.09.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, xlibsWrapper, ncurses }:
stdenv.mkDerivation (rec {
stdenv.mkDerivation ({
pname = "metaocaml";
version = "3.09-alpha-30";
pkgs/development/compilers/openspin/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "openspin";
version = "unstable-2018-10-02";
pkgs/development/compilers/pforth/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
version = "28";
pname = "pforth";
src = fetchFromGitHub {
pkgs/development/compilers/rust/binary.nix
+2 -2
View File
@@ -18,7 +18,7 @@ let
in
rec {
rustc = stdenv.mkDerivation rec {
rustc = stdenv.mkDerivation {
name = "rustc-${versionType}-${version}";
inherit version;
@@ -64,7 +64,7 @@ rec {
setupHooks = ./setup-hook.sh;
};
cargo = stdenv.mkDerivation rec {
cargo = stdenv.mkDerivation {
name = "cargo-${versionType}-${version}";
inherit version;
pkgs/development/compilers/rust/cargo.nix
+1 -1
View File
@@ -3,7 +3,7 @@
, CoreFoundation, Security
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage {
name = "cargo-${rustc.version}";
inherit (rustc) version src;
pkgs/development/compilers/rust/clippy.nix
+1 -1
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, rustPlatform, rustc, Security, patchelf }:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage {
name = "clippy-${rustc.version}";
inherit (rustc) version src;
pkgs/development/compilers/rust/rls/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
, openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv
, CoreFoundation, Security }:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage {
pname = "rls";
inherit (rustPlatform.rust.rustc) src version;
pkgs/development/compilers/sbcl/bootstrap.nix
+7 -7
View File
@@ -2,38 +2,38 @@
let
options = rec {
x86_64-darwin = rec {
x86_64-darwin = {
version = "1.2.11";
system = "x86-64-darwin";
sha256 = "0lh4gpvi8hl6g6b9321g5pwh8sk3218i7h4lx7p3vd9z0cf3lz85";
};
x86_64-linux = rec {
x86_64-linux = {
version = "1.3.16";
system = "x86-64-linux";
sha256 = "0sq2dylwwyqfwkbdvcgqwz3vay9v895zpb0fyzsiwy31d1x9pr2s";
};
i686-linux = rec {
i686-linux = {
version = "1.2.7";
system = "x86-linux";
sha256 = "07f3bz4br280qvn85i088vpzj9wcz8wmwrf665ypqx181pz2ai3j";
};
aarch64-linux = rec {
aarch64-linux = {
version = "1.3.16";
system = "arm64-linux";
sha256 = "0q1brz9c49xgdljzfx8rpxxnlwhadxkcy5kg0mcd9wnxygind1cl";
};
armv7l-linux = rec {
armv7l-linux = {
version = "1.2.14";
system = "armhf-linux";
sha256 = "0sp5445rbvms6qvzhld0kwwvydw51vq5iaf4kdqsf2d9jvaz3yx5";
};
armv6l-linux = armv7l-linux;
x86_64-freebsd = rec {
x86_64-freebsd = {
version = "1.2.7";
system = "x86-64-freebsd";
sha256 = "14k42xiqd2rrim4pd5k5pjcrpkac09qnpynha8j1v4jngrvmw7y6";
};
x86_64-solaris = rec {
x86_64-solaris = {
version = "1.2.7";
system = "x86-64-solaris";
sha256 = "05c12fmac4ha72k1ckl6i780rckd7jh4g5s5hiic7fjxnf1kx8d0";
pkgs/development/compilers/seexpr/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
bison, flex, libGLU, pythonPackages
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "seexpr";
version = "2.11";
src = fetchFromGitHub {
pkgs/development/compilers/serpent/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, ... }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "serpent";
# I can't find any version numbers, so we're just using the date
pkgs/development/compilers/swift/default.nix
+1 -1
View File
@@ -131,7 +131,7 @@ let
extra_cmake_options="${stdenv.lib.concatStringsSep "," cmakeFlags}"'';
in
stdenv.mkDerivation rec {
stdenv.mkDerivation {
name = "swift-${version_friendly}";
nativeBuildInputs = [
pkgs/development/compilers/urn/default.nix
+1 -1
View File
@@ -20,7 +20,7 @@ let
inherit (stdenv.lib) optionalString concatMapStringsSep;
in
stdenv.mkDerivation rec {
stdenv.mkDerivation {
name = "urn-${optionalString (extraLibraries != []) "with-libraries-"}${version}";
src = fetchFromGitLab {
pkgs/development/compilers/wcc/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, capstone, libbfd, libelf, libiberty, readline }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "wcc-unstable";
version = "2018-04-05";
pkgs/development/compilers/zulu/8.nix
+1 -1
View File
@@ -23,7 +23,7 @@ let
xorg.libXt xorg.libXrender stdenv.cc.cc
]));
in stdenv.mkDerivation rec {
in stdenv.mkDerivation {
inherit version openjdk platform hash extension;
pname = "zulu";
pkgs/development/compilers/zulu/default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ let
xorg.libXt xorg.libXrender stdenv.cc.cc
]));
in stdenv.mkDerivation rec {
in stdenv.mkDerivation {
inherit version openjdk platform hash extension;
pname = "zulu";