Merge pull request #163131 from Stunkymonkey/treewide-pname-version-16

This commit is contained in:
Sandro 2022-03-08 14:22:02 +01:00 committed by GitHub
commit 753aa36fea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 54 additions and 44 deletions

View file

@ -1,7 +1,8 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation {
name = "Fluid-3";
pname = "Fluid";
version = "3";
src = fetchurl {
url = "https://ftp.osuosl.org/pub/musescore/soundfont/fluid-soundfont.tar.gz";

View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation {
name = "ydp-grand";
pname = "ydp-grand";
version = "unstable-2016-08-04";
src = fetchurl {

View file

@ -1,12 +1,16 @@
{ lib, stdenv, fetchgit }:
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation {
name = "gnome-breeze-20160526";
src = fetchgit {
url = "https://github.com/dirruk1/gnome-breeze";
sha256 = "0hkk0gqlnrs1m4rb5r84f5y96qfamrbiwm09z89yc32124x1a1lm";
pname = "gnome-breeze";
version = "unstable-2016-05-26";
src = fetchFromGitHub {
owner = "dirruk1";
repo = "gnome-breeze";
rev = "49a5cd67a270e13a4c04a4b904f126ef728e9221";
sha256 = "sha256-lQYVOhFBDOYT+glUHleuymGTfHEE5bIyqUFnS/EDc0I=";
};
installPhase = ''
mkdir -p $out/share/themes
cp -r Breeze* $out/share/themes
@ -14,12 +18,12 @@ stdenv.mkDerivation {
preferLocalBuild = true;
meta = {
meta = with lib; {
description = "A GTK theme built to match KDE's breeze theme";
homepage = "https://github.com/dirruk1/gnome-breeze";
license = lib.licenses.lgpl2;
maintainers = with lib.maintainers; [ bennofs ];
platforms = lib.platforms.all;
license = licenses.lgpl2;
maintainers = with maintainers; [ bennofs ];
platforms = platforms.all;
hydraPlatforms = [];
};
}

View file

@ -18,10 +18,10 @@ let
};
in stdenv.mkDerivation rec {
version = "2.3.2";
name = "cde-${version}";
pname = "cde";
src = fetchurl {
url = "mirror://sourceforge/cdesktopenv/${name}.tar.gz";
url = "mirror://sourceforge/cdesktopenv/cde-${version}.tar.gz";
sha256 = "029rljhi5r483x8rzdpl8625z0wx8r7k2m0364nbw66h5pig9lbx";
};

View file

@ -19,7 +19,8 @@ let
testingName = lib.optionalString (testName != null) "${testName}-";
in
stdenv.mkDerivation rec {
name = "${testingName}${switchboard.name}-with-plugs";
pname = "${testingName}${switchboard.pname}-with-plugs";
inherit (switchboard) version;
src = null;

View file

@ -17,7 +17,8 @@ let
else indicators ++ (lib.optionals useDefaultIndicators wingpanelIndicators);
in
stdenv.mkDerivation rec {
name = "${wingpanel.name}-with-indicators";
pname = "${wingpanel.pname}-with-indicators";
inherit (wingpanel) version;
src = null;

View file

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

View file

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

View file

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

View file

@ -7,7 +7,7 @@
let
jre = stdenv.mkDerivation {
name = "${jdk.name}-minimal-jre";
pname = "${jdk.pname}-minimal-jre";
version = jdk.version;
buildInputs = [ jdk ];

View file

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

View file

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

View file

@ -7,7 +7,8 @@ let
in
stdenv.mkDerivation {
name = "dotty-${dotty-bare.version}";
pname = "dotty";
inherit (dotty-bare) version;
dontUnpack = true;

View file

@ -182,7 +182,8 @@ let
in
stdenv.mkDerivation {
name = "swift-${versions.swift}";
pname = "swift";
version = versions.swift;
nativeBuildInputs = [
autoconf

View file

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

View file

@ -1,18 +1,8 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper }:
let
version = "0.10";
name = "chibi-scheme-${version}";
in
stdenv.mkDerivation {
inherit name;
meta = {
homepage = "https://github.com/ashinn/chibi-scheme";
description = "Small Footprint Scheme for use as a C Extension Language";
platforms = lib.platforms.all;
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.DerGuteMoritz ];
};
stdenv.mkDerivation rec {
version = "0.10";
pname = "chibi-scheme";
src = fetchFromGitHub {
owner = "ashinn";
@ -36,4 +26,12 @@ stdenv.mkDerivation {
--replace "/usr/bin/env chibi-scheme" "$out/bin/chibi-scheme"
done
'';
meta = {
homepage = "https://github.com/ashinn/chibi-scheme";
description = "Small Footprint Scheme for use as a C Extension Language";
platforms = lib.platforms.all;
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.DerGuteMoritz ];
};
}

View file

@ -25,7 +25,7 @@ in
assert versionAtLeast (getVersion erlang) minimumOTPVersion;
stdenv.mkDerivation ({
name = "${baseName}-${version}";
pname = "${baseName}";
inherit src version debugInfo;

View file

@ -2,9 +2,10 @@
}:
racket.overrideAttrs (oldAttrs: rec {
name = "racket-minimal-${oldAttrs.version}";
pname = "racket-minimal";
version = oldAttrs.version;
src = oldAttrs.src.override {
inherit name;
name = "${pname}-${version}";
sha256 = "sha256-FZlUWvjtioe4S8gPetj7vdneVX6jEFguJo4j2wJsKAw=";
};

View file

@ -2,15 +2,15 @@
{ version, artifactId, groupId, sha512, type ? "jar", suffix ? "" }:
let
name = "${artifactId}-${version}";
m2Path = "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}/${version}";
m2File = "${name}${suffix}.${type}";
m2File = "${artifactId}-${version}${suffix}.${type}";
src = fetchurl {
inherit sha512;
url = "mirror://maven/${m2Path}/${m2File}";
};
in stdenv.mkDerivation {
inherit name m2Path m2File src;
inherit version m2Path m2File src;
pname = artifactId;
dontUnpack = true;

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "4.14.2";
name = "cgal-" + version;
pname = "cgal";
src = fetchFromGitHub {
owner = "CGAL";