diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-08 18:01:16 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-08 18:01:16 +0000 |
commit | d47f26379adf02bb973cbae487c2dcf40d3613bd (patch) | |
tree | fca453db0514ec48d01cb3dcdb0b9d9103de78c8 /pkgs/development/compilers | |
parent | 4a35c770221bf9dea0da66b9e92702c5da144581 (diff) | |
parent | 55face65be766a52d8277404b3b2023778e7f408 (diff) | |
download | nixpkgs-d47f26379adf02bb973cbae487c2dcf40d3613bd.tar nixpkgs-d47f26379adf02bb973cbae487c2dcf40d3613bd.tar.gz nixpkgs-d47f26379adf02bb973cbae487c2dcf40d3613bd.tar.bz2 nixpkgs-d47f26379adf02bb973cbae487c2dcf40d3613bd.tar.lz nixpkgs-d47f26379adf02bb973cbae487c2dcf40d3613bd.tar.xz nixpkgs-d47f26379adf02bb973cbae487c2dcf40d3613bd.tar.zst nixpkgs-d47f26379adf02bb973cbae487c2dcf40d3613bd.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/bs-platform/ocaml.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ios-cross-compile/9.2.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/mit-scheme/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/openjdk/jre.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/osl/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/rust/clippy.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/scala/dotty.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/swift/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/urn/default.nix | 3 |
9 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/development/compilers/bs-platform/ocaml.nix b/pkgs/development/compilers/bs-platform/ocaml.nix index d650d767a8d..05fb8b6b17e 100644 --- a/pkgs/development/compilers/bs-platform/ocaml.nix +++ b/pkgs/development/compilers/bs-platform/ocaml.nix @@ -1,7 +1,7 @@ { lib, stdenv, src, version }: stdenv.mkDerivation rec { inherit src version; - name = "ocaml-${version}+bs"; + pname = "ocaml-bs"; configurePhase = '' ./configure -prefix $out ''; diff --git a/pkgs/development/compilers/ios-cross-compile/9.2.nix b/pkgs/development/compilers/ios-cross-compile/9.2.nix index 688ca15177a..ea1af60993f 100644 --- a/pkgs/development/compilers/ios-cross-compile/9.2.nix +++ b/pkgs/development/compilers/ios-cross-compile/9.2.nix @@ -4,7 +4,7 @@ automake, autoconf, libtool, clangStdenv } : clangStdenv.mkDerivation rec { - name = "ios-cross-compile-${version}"; + pname = "ios-cross-compile"; version = "9.2"; sdk = "iPhoneOS9.2.sdk"; cctools_port = fetchFromGitHub { diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index c67f8d2f72f..75b3d1128e4 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -12,7 +12,8 @@ let "-x86-64"; in stdenv.mkDerivation { - name = if enableX11 then "mit-scheme-x11-${version}" else "mit-scheme-${version}"; + pname = "mit-scheme" + lib.optionalString enableX11 "-x11"; + inherit version; # MIT/GNU Scheme is not bootstrappable, so it's recommended to compile from # the platform-specific tarballs, which contain pre-built binaries. It diff --git a/pkgs/development/compilers/openjdk/jre.nix b/pkgs/development/compilers/openjdk/jre.nix index 78dec7885d9..02f6da928cd 100644 --- a/pkgs/development/compilers/openjdk/jre.nix +++ b/pkgs/development/compilers/openjdk/jre.nix @@ -7,7 +7,7 @@ let jre = stdenv.mkDerivation { - name = "${jdk.name}-minimal-jre"; + pname = "${jdk.pname}-minimal-jre"; version = jdk.version; buildInputs = [ jdk ]; diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index 736a9d3c34c..53b05c16d9a 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -7,7 +7,7 @@ let boost_static = boost165.override { enableStatic = true; }; in clangStdenv.mkDerivation rec { # In theory this could use GCC + Clang rather than just Clang, # but https://github.com/NixOS/nixpkgs/issues/29877 stops this - name = "openshadinglanguage-${version}"; + pname = "openshadinglanguage"; version = "1.10.9"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index a3597e9febf..23b8e7effe1 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -1,6 +1,6 @@ { stdenv, lib, rustPlatform, rustc, Security, patchelf }: rustPlatform.buildRustPackage { - name = "clippy-${rustc.version}"; + pname = "clippy"; inherit (rustc) version src; # the rust source tarball already has all the dependencies vendored, no need to fetch them again diff --git a/pkgs/development/compilers/scala/dotty.nix b/pkgs/development/compilers/scala/dotty.nix index c99ed24c214..1cd187f2e54 100644 --- a/pkgs/development/compilers/scala/dotty.nix +++ b/pkgs/development/compilers/scala/dotty.nix @@ -7,7 +7,8 @@ let in stdenv.mkDerivation { - name = "dotty-${dotty-bare.version}"; + pname = "dotty"; + inherit (dotty-bare) version; dontUnpack = true; diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index e3a9aa2b486..f47d4cd818f 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -182,7 +182,8 @@ let in stdenv.mkDerivation { - name = "swift-${versions.swift}"; + pname = "swift"; + version = versions.swift; nativeBuildInputs = [ autoconf diff --git a/pkgs/development/compilers/urn/default.nix b/pkgs/development/compilers/urn/default.nix index 7381e7c89fe..66f1bda6d5f 100644 --- a/pkgs/development/compilers/urn/default.nix +++ b/pkgs/development/compilers/urn/default.nix @@ -21,7 +21,8 @@ let in stdenv.mkDerivation { - name = "urn-${optionalString (extraLibraries != []) "with-libraries-"}${version}"; + pname = "urn${optionalString (extraLibraries != []) "-with-libraries"}"; + inherit version; src = fetchFromGitLab { owner = "urn"; |