forked from auxolotl/core
Compare commits
No commits in common. "isabelroses/update-enmass" and "main" have entirely different histories.
isabelrose
...
main
|
|
@ -1,69 +1,55 @@
|
||||||
{
|
{ lib
|
||||||
lib,
|
, stdenv
|
||||||
stdenv,
|
, fetchurl
|
||||||
fetchurl,
|
, fetchpatch
|
||||||
fetchpatch,
|
, autoreconfHook
|
||||||
autoreconfHook,
|
, bash
|
||||||
bash,
|
, buildPackages
|
||||||
buildPackages,
|
, libtool
|
||||||
linuxHeaders,
|
, linuxHeaders
|
||||||
python3,
|
, python3
|
||||||
swig,
|
, swig
|
||||||
pkgsCross,
|
|
||||||
|
|
||||||
# Enabling python support while cross compiling would be possible, but the
|
# Enabling python support while cross compiling would be possible, but the
|
||||||
# configure script tries executing python to gather info instead of relying on
|
# configure script tries executing python to gather info instead of relying on
|
||||||
# python3-config exclusively
|
# python3-config exclusively
|
||||||
enablePython ? stdenv.hostPlatform == stdenv.buildPlatform,
|
, enablePython ? stdenv.hostPlatform == stdenv.buildPlatform,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "audit";
|
pname = "audit";
|
||||||
version = "4.0";
|
version = "3.1.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://people.redhat.com/sgrubb/audit/audit-${finalAttrs.version}.tar.gz";
|
url = "https://people.redhat.com/sgrubb/audit/audit-${finalAttrs.version}.tar.gz";
|
||||||
hash = "sha256-v0ItQSard6kqTDrDneVHPyeNw941ck0lGKSMe+FdVNg=";
|
hash = "sha256-wLF5LR8KiMbxgocQUJy7mHBZ/GhxLJdmnKkOrhA9KH0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
(fetchpatch {
|
|
||||||
name = "musl.patch";
|
|
||||||
url = "https://github.com/linux-audit/audit-userspace/commit/64cb48e1e5137b8a389c7528e611617a98389bc7.patch";
|
|
||||||
hash = "sha256-DN2F5w+2Llm80FZntH9dvdyT00pVBSgRu8DDFILyrlU=";
|
|
||||||
})
|
|
||||||
(fetchpatch {
|
|
||||||
name = "musl.patch";
|
|
||||||
url = "https://github.com/linux-audit/audit-userspace/commit/4192eb960388458c85d76e5e385cfeef48f02c79.patch";
|
|
||||||
hash = "sha256-G6CJ9nBJSsTyJ0qq14PVo+YdInAvLLQtXcR25Q8V5/4=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace bindings/swig/src/auditswig.i \
|
substituteInPlace bindings/swig/src/auditswig.i \
|
||||||
--replace-fail "/usr/include/linux/audit.h" \
|
--replace "/usr/include/linux/audit.h" \
|
||||||
"${linuxHeaders}/include/linux/audit.h"
|
"${linuxHeaders}/include/linux/audit.h"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
outputs = [
|
outputs = [ "bin" "dev" "out" "man" ];
|
||||||
"bin"
|
|
||||||
"dev"
|
|
||||||
"out"
|
|
||||||
"man"
|
|
||||||
];
|
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
||||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
depsBuildBuild = [
|
||||||
|
buildPackages.stdenv.cc
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs =
|
nativeBuildInputs = [
|
||||||
[ autoreconfHook ]
|
autoreconfHook
|
||||||
++ lib.optionals enablePython [
|
]
|
||||||
python3
|
++ lib.optionals enablePython [
|
||||||
swig
|
python3
|
||||||
];
|
swig
|
||||||
|
];
|
||||||
|
|
||||||
buildInputs = [ bash ];
|
buildInputs = [
|
||||||
|
bash
|
||||||
|
];
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
# z/OS plugin is not useful on Linux, and pulls in an extra openldap
|
# z/OS plugin is not useful on Linux, and pulls in an extra openldap
|
||||||
|
|
@ -76,10 +62,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
passthru.tests = {
|
|
||||||
musl = pkgsCross.musl64.audit;
|
|
||||||
};
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "https://people.redhat.com/sgrubb/audit/";
|
homepage = "https://people.redhat.com/sgrubb/audit/";
|
||||||
description = "Audit Library";
|
description = "Audit Library";
|
||||||
|
|
|
||||||
|
|
@ -1,76 +1,80 @@
|
||||||
{
|
{ lib
|
||||||
lib,
|
, fetchFromGitHub
|
||||||
fetchFromGitHub,
|
, version
|
||||||
version,
|
, suffix ? ""
|
||||||
suffix ? "",
|
, hash ? null
|
||||||
hash ? null,
|
, src ? fetchFromGitHub {
|
||||||
src ? fetchFromGitHub {
|
|
||||||
owner = "lix-project";
|
owner = "lix-project";
|
||||||
repo = "lix";
|
repo = "lix";
|
||||||
rev = version;
|
rev = version;
|
||||||
inherit hash;
|
inherit hash;
|
||||||
},
|
}
|
||||||
docCargoHash ? null,
|
, docCargoHash ? null
|
||||||
docCargoLock ? null,
|
, patches ? [ ]
|
||||||
patches ? [ ],
|
, maintainers ? lib.teams.lix.members
|
||||||
maintainers ? lib.teams.lix.members,
|
,
|
||||||
}@args:
|
}@args:
|
||||||
assert (hash == null) -> (src != null);
|
assert (hash == null) -> (src != null);
|
||||||
assert lib.assertMsg (docCargoHash != null || docCargoLock != null)
|
{ stdenv
|
||||||
"Either `lix-doc`'s cargoHash using `docCargoHash` or `lix-doc`'s `cargoLock.lockFile` using `docCargoLock` must be set!";
|
, meson
|
||||||
let
|
, bash
|
||||||
isLegacyParser = lib.versionOlder version "2.91";
|
, bison
|
||||||
in
|
, boehmgc
|
||||||
{
|
, boost
|
||||||
stdenv,
|
, brotli
|
||||||
meson,
|
, busybox-sandbox-shell
|
||||||
bison,
|
, bzip2
|
||||||
boehmgc,
|
, callPackage
|
||||||
boost,
|
, coreutils
|
||||||
brotli,
|
, curl
|
||||||
busybox-sandbox-shell,
|
, cmake
|
||||||
bzip2,
|
, docbook_xsl_ns
|
||||||
callPackage,
|
, docbook5
|
||||||
curl,
|
, doxygen
|
||||||
cmake,
|
, editline
|
||||||
doxygen,
|
, flex
|
||||||
editline,
|
, git
|
||||||
flex,
|
, gnutar
|
||||||
git,
|
, gtest
|
||||||
gtest,
|
, gzip
|
||||||
jq,
|
, jq
|
||||||
lib,
|
, lib
|
||||||
libarchive,
|
, libarchive
|
||||||
libcpuid,
|
, libcpuid
|
||||||
libsodium,
|
, libgit2
|
||||||
lowdown,
|
, libsodium
|
||||||
lsof,
|
, libxml2
|
||||||
mercurial,
|
, libxslt
|
||||||
mdbook,
|
, lowdown
|
||||||
mdbook-linkcheck,
|
, lsof
|
||||||
nlohmann_json,
|
, man
|
||||||
ninja,
|
, mercurial
|
||||||
openssl,
|
, mdbook
|
||||||
toml11,
|
, mdbook-linkcheck
|
||||||
pegtl,
|
, nlohmann_json
|
||||||
python3,
|
, ninja
|
||||||
pkg-config,
|
, openssl
|
||||||
rapidcheck,
|
, toml11
|
||||||
Security,
|
, python3
|
||||||
sqlite,
|
, perl
|
||||||
util-linuxMinimal,
|
, pkg-config
|
||||||
xz,
|
, rapidcheck
|
||||||
# , nixosTests
|
, Security
|
||||||
enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform,
|
, sqlite
|
||||||
enableStatic ? stdenv.hostPlatform.isStatic,
|
, util-linuxMinimal
|
||||||
withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin),
|
, xz
|
||||||
aws-sdk-cpp,
|
# , nixosTests
|
||||||
# RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50
|
, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform
|
||||||
withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp,
|
, enableStatic ? stdenv.hostPlatform.isStatic
|
||||||
libseccomp,
|
, withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin)
|
||||||
confDir,
|
, aws-sdk-cpp
|
||||||
stateDir,
|
, # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50
|
||||||
storeDir,
|
withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp
|
||||||
|
, libseccomp
|
||||||
|
, confDir
|
||||||
|
, stateDir
|
||||||
|
, storeDir
|
||||||
|
,
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
lix-doc = callPackage ./doc {
|
lix-doc = callPackage ./doc {
|
||||||
|
|
@ -101,12 +105,14 @@ let
|
||||||
nativeBuildInputs =
|
nativeBuildInputs =
|
||||||
[
|
[
|
||||||
pkg-config
|
pkg-config
|
||||||
|
bison
|
||||||
flex
|
flex
|
||||||
jq
|
jq
|
||||||
meson
|
meson
|
||||||
ninja
|
ninja
|
||||||
cmake
|
cmake
|
||||||
python3
|
python3
|
||||||
|
doxygen
|
||||||
|
|
||||||
# Tests
|
# Tests
|
||||||
git
|
git
|
||||||
|
|
@ -114,12 +120,10 @@ let
|
||||||
jq
|
jq
|
||||||
lsof
|
lsof
|
||||||
]
|
]
|
||||||
++ lib.optionals isLegacyParser [ bison ]
|
++ lib.optionals (enableDocumentation) [
|
||||||
++ lib.optionals enableDocumentation [
|
|
||||||
(lib.getBin lowdown)
|
(lib.getBin lowdown)
|
||||||
mdbook
|
mdbook
|
||||||
mdbook-linkcheck
|
mdbook-linkcheck
|
||||||
doxygen
|
|
||||||
]
|
]
|
||||||
++ lib.optionals stdenv.isLinux [ util-linuxMinimal ];
|
++ lib.optionals stdenv.isLinux [ util-linuxMinimal ];
|
||||||
|
|
||||||
|
|
@ -141,9 +145,8 @@ let
|
||||||
toml11
|
toml11
|
||||||
lix-doc
|
lix-doc
|
||||||
]
|
]
|
||||||
++ lib.optionals (!isLegacyParser) [ pegtl ]
|
|
||||||
++ lib.optionals stdenv.isDarwin [ Security ]
|
++ lib.optionals stdenv.isDarwin [ Security ]
|
||||||
++ lib.optionals stdenv.isx86_64 [ libcpuid ]
|
++ lib.optionals (stdenv.isx86_64) [ libcpuid ]
|
||||||
++ lib.optionals withLibseccomp [ libseccomp ]
|
++ lib.optionals withLibseccomp [ libseccomp ]
|
||||||
++ lib.optionals withAWS [ aws-sdk-cpp ];
|
++ lib.optionals withAWS [ aws-sdk-cpp ];
|
||||||
|
|
||||||
|
|
@ -153,7 +156,7 @@ let
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs --build tests doc/manual
|
patchShebangs --build tests
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preConfigure =
|
preConfigure =
|
||||||
|
|
@ -179,7 +182,6 @@ let
|
||||||
|
|
||||||
mesonFlags =
|
mesonFlags =
|
||||||
[
|
[
|
||||||
(lib.mesonBool "b_lto" true)
|
|
||||||
(lib.mesonEnable "gc" true)
|
(lib.mesonEnable "gc" true)
|
||||||
(lib.mesonBool "enable-tests" true)
|
(lib.mesonBool "enable-tests" true)
|
||||||
(lib.mesonBool "enable-docs" enableDocumentation)
|
(lib.mesonBool "enable-docs" enableDocumentation)
|
||||||
|
|
@ -201,15 +203,10 @@ let
|
||||||
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
|
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
|
||||||
};
|
};
|
||||||
|
|
||||||
ninjaFlags = [ "-v" ];
|
|
||||||
|
|
||||||
postInstall =
|
postInstall =
|
||||||
lib.optionalString enableDocumentation ''
|
''
|
||||||
mkdir -p $doc/nix-support
|
mkdir -p $doc/nix-support
|
||||||
echo "doc manual $doc/share/doc/nix/manual" >> $doc/nix-support/hydra-build-products
|
echo "doc manual $doc/share/doc/nix/manual" >> $doc/nix-support/hydra-build-products
|
||||||
|
|
||||||
mkdir -p $devdoc/nix-support
|
|
||||||
echo "devdoc internal-api $devdoc/share/doc/nix/internal-api" >> $devdoc/nix-support/hydra-build-products
|
|
||||||
''
|
''
|
||||||
+ lib.optionalString stdenv.hostPlatform.isStatic ''
|
+ lib.optionalString stdenv.hostPlatform.isStatic ''
|
||||||
mkdir -p $out/nix-support
|
mkdir -p $out/nix-support
|
||||||
|
|
@ -225,26 +222,14 @@ let
|
||||||
'';
|
'';
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
mesonCheckFlags = [
|
mesonCheckFlags = [ "--suite=check" ];
|
||||||
"--suite=check"
|
|
||||||
"--print-errorlogs"
|
|
||||||
];
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
gtest
|
gtest
|
||||||
rapidcheck
|
rapidcheck
|
||||||
];
|
];
|
||||||
|
|
||||||
# This needs to run after _multioutDocs moves the docs to $doc
|
|
||||||
postFixup = ''
|
|
||||||
mkdir -p $devdoc/share/doc/nix
|
|
||||||
mv $doc/share/doc/nix/internal-api $devdoc/share/doc/nix
|
|
||||||
'';
|
|
||||||
|
|
||||||
doInstallCheck = true;
|
doInstallCheck = true;
|
||||||
mesonInstallCheckFlags = [
|
mesonInstallCheckFlags = [ "--suite=installcheck" ];
|
||||||
"--suite=installcheck"
|
|
||||||
"--print-errorlogs"
|
|
||||||
];
|
|
||||||
|
|
||||||
preInstallCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
preInstallCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||||
# socket path becomes too long otherwise
|
# socket path becomes too long otherwise
|
||||||
|
|
@ -277,7 +262,7 @@ let
|
||||||
# point 'nix edit' and ofborg at the file that defines the attribute,
|
# point 'nix edit' and ofborg at the file that defines the attribute,
|
||||||
# not this common file.
|
# not this common file.
|
||||||
pos = builtins.unsafeGetAttrPos "version" args;
|
pos = builtins.unsafeGetAttrPos "version" args;
|
||||||
meta = {
|
meta = with lib; {
|
||||||
description = "Powerful package manager that makes package management reliable and reproducible";
|
description = "Powerful package manager that makes package management reliable and reproducible";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
Lix (a fork of Nix) is a powerful package manager for Linux and other Unix systems that
|
Lix (a fork of Nix) is a powerful package manager for Linux and other Unix systems that
|
||||||
|
|
@ -287,10 +272,10 @@ let
|
||||||
environments.
|
environments.
|
||||||
'';
|
'';
|
||||||
homepage = "https://lix.systems";
|
homepage = "https://lix.systems";
|
||||||
license = lib.licenses.lgpl21Plus;
|
license = licenses.lgpl21Plus;
|
||||||
inherit maintainers;
|
inherit maintainers;
|
||||||
platforms = lib.platforms.unix;
|
platforms = platforms.unix;
|
||||||
outputsToInstall = [ "out" ] ++ lib.optional enableDocumentation "man";
|
outputsToInstall = [ "out" ] ++ optional enableDocumentation "man";
|
||||||
mainProgram = "nix";
|
mainProgram = "nix";
|
||||||
broken = enableStatic;
|
broken = enableStatic;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,14 @@
|
||||||
{
|
{ lib
|
||||||
lib,
|
, aws-sdk-cpp
|
||||||
aws-sdk-cpp,
|
, boehmgc
|
||||||
boehmgc,
|
, callPackage
|
||||||
callPackage,
|
, fetchFromGitHub
|
||||||
fetchFromGitHub,
|
, Security
|
||||||
Security,
|
, storeDir ? "/nix/store"
|
||||||
storeDir ? "/nix/store",
|
, stateDir ? "/nix/var"
|
||||||
stateDir ? "/nix/var",
|
, confDir ? "/etc"
|
||||||
confDir ? "/etc",
|
, path
|
||||||
path,
|
,
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
boehmgc-nix_2_3 = boehmgc.override { enableLargeConfig = true; };
|
boehmgc-nix_2_3 = boehmgc.override { enableLargeConfig = true; };
|
||||||
|
|
@ -20,9 +20,6 @@ let
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
|
|
||||||
# Since Lix 2.91 does not use boost coroutines, it does not need boehmgc patches either.
|
|
||||||
needsBoehmgcPatches = version: lib.versionOlder version "2.91";
|
|
||||||
|
|
||||||
aws-sdk-cpp-nix =
|
aws-sdk-cpp-nix =
|
||||||
(aws-sdk-cpp.override {
|
(aws-sdk-cpp.override {
|
||||||
apis = [
|
apis = [
|
||||||
|
|
@ -45,23 +42,19 @@ let
|
||||||
stateDir
|
stateDir
|
||||||
confDir
|
confDir
|
||||||
;
|
;
|
||||||
boehmgc = if needsBoehmgcPatches args.version then boehmgc-nix else boehmgc-nix_2_3;
|
boehmgc = boehmgc-nix;
|
||||||
aws-sdk-cpp = aws-sdk-cpp-nix;
|
aws-sdk-cpp = aws-sdk-cpp-nix;
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
lib.makeExtensible (self: {
|
lib.makeExtensible (self: ({
|
||||||
lix_2_90 = common {
|
lix_2_90 = (
|
||||||
version = "2.90.0";
|
common {
|
||||||
hash = "sha256-f8k+BezKdJfmE+k7zgBJiohtS3VkkriycdXYsKOm3sc=";
|
version = "2.90-beta.1";
|
||||||
docCargoHash = "sha256-vSf9MyD2XzofZlbzsmh6NP69G+LiX72GX4Um9UJp3dc=";
|
hash = "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=";
|
||||||
};
|
docCargoHash = "sha256-oH248kR4Of0MhcY2DYxNX0A+/XJ3L+UuIpBKn3sJt54=";
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
lix_2_91 = common {
|
latest = self.lix_2_90;
|
||||||
version = "2.91.0";
|
stable = self.lix_2_90;
|
||||||
hash = "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=";
|
}))
|
||||||
docCargoHash = "sha256-KOn1fXF7k7c/0e5ZCNZwt3YZmjL1oi5A2mhwxQWKaUo=";
|
|
||||||
};
|
|
||||||
|
|
||||||
latest = self.lix_2_91;
|
|
||||||
stable = self.lix_2_91;
|
|
||||||
})
|
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
_: _: pkgs: _:
|
{ ... }:
|
||||||
|
res: pkgs: super:
|
||||||
|
|
||||||
with pkgs; {
|
with pkgs;
|
||||||
lixVersions = recurseIntoAttrs (
|
{
|
||||||
callPackage ./. {
|
lixVersions = recurseIntoAttrs (callPackage ./. {
|
||||||
storeDir = config.nix.storeDir or "/nix/store";
|
storeDir = config.nix.storeDir or "/nix/store";
|
||||||
stateDir = config.nix.stateDir or "/nix/var";
|
stateDir = config.nix.stateDir or "/nix/var";
|
||||||
inherit (darwin.apple_sdk.frameworks) Security;
|
inherit (darwin.apple_sdk.frameworks) Security;
|
||||||
}
|
});
|
||||||
);
|
|
||||||
|
|
||||||
lix = lixVersions.stable;
|
lix = lixVersions.stable;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,38 +0,0 @@
|
||||||
{
|
|
||||||
cmake,
|
|
||||||
fetchFromGitHub,
|
|
||||||
lib,
|
|
||||||
ninja,
|
|
||||||
stdenv,
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
version = "3.2.7";
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
pname = "pegtl";
|
|
||||||
inherit version;
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "taocpp";
|
|
||||||
repo = "PEGTL";
|
|
||||||
rev = version;
|
|
||||||
hash = "sha256-IV5YNGE4EWVrmg2Sia/rcU8jCuiBynQGJM6n3DCWTQU=";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
cmake
|
|
||||||
ninja
|
|
||||||
];
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = "https://github.com/taocpp/pegtl";
|
|
||||||
description = "Parsing Expression Grammar Template Library";
|
|
||||||
longDescription = ''
|
|
||||||
Zero-dependency C++ header-only parser combinator library
|
|
||||||
for creating parsers according to a Parsing Expression Grammar (PEG).
|
|
||||||
'';
|
|
||||||
license = lib.licenses.boost;
|
|
||||||
maintainers = [ ];
|
|
||||||
platforms = lib.platforms.all;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,92 +1,52 @@
|
||||||
{ ... }:
|
{ ... }:
|
||||||
res: pkgs: super:
|
res: pkgs: super:
|
||||||
|
|
||||||
with pkgs; {
|
with pkgs;
|
||||||
|
{
|
||||||
pythonInterpreters = callPackage ./. { };
|
pythonInterpreters = callPackage ./. { };
|
||||||
inherit (pythonInterpreters)
|
inherit (pythonInterpreters) python27 python39 python310 python311 python312 python313 python3Minimal pypy27 pypy310 pypy39 rustpython;
|
||||||
python27
|
|
||||||
python39
|
|
||||||
python310
|
|
||||||
python311
|
|
||||||
python312
|
|
||||||
python313
|
|
||||||
python3Minimal
|
|
||||||
pypy27
|
|
||||||
pypy310
|
|
||||||
pypy39
|
|
||||||
rustpython
|
|
||||||
;
|
|
||||||
|
|
||||||
# List of extensions with overrides to apply to all Python package sets.
|
# List of extensions with overrides to apply to all Python package sets.
|
||||||
pythonPackagesExtensions = [ ];
|
pythonPackagesExtensions = [ ];
|
||||||
# Python package sets.
|
# Python package sets.
|
||||||
python27Packages = python27.pkgs // {
|
python27Packages = python27.pkgs // { __attrsFailEvaluation = true; };
|
||||||
__attrsFailEvaluation = true;
|
python39Packages = python39.pkgs // { __attrsFailEvaluation = true; };
|
||||||
};
|
python310Packages = python310.pkgs // { __attrsFailEvaluation = true; };
|
||||||
python39Packages = python39.pkgs // {
|
python311Packages = recurseIntoAttrs python311.pkgs // { pythonPackages = python311.pkgs // { __attrsFailEvaluation = true; }; };
|
||||||
__attrsFailEvaluation = true;
|
python312Packages = recurseIntoAttrs python312.pkgs // { pythonPackages = python312.pkgs // { __attrsFailEvaluation = true; }; };
|
||||||
};
|
python313Packages = python313.pkgs // { __attrsFailEvaluation = true; };
|
||||||
python310Packages = python310.pkgs // {
|
pypyPackages = pypy.pkgs // { __attrsFailEvaluation = true; };
|
||||||
__attrsFailEvaluation = true;
|
pypy2Packages = pypy2.pkgs // { __attrsFailEvaluation = true; };
|
||||||
};
|
pypy27Packages = pypy27.pkgs // { __attrsFailEvaluation = true; };
|
||||||
python311Packages = recurseIntoAttrs python311.pkgs // {
|
pypy3Packages = pypy3.pkgs // { __attrsFailEvaluation = true; };
|
||||||
pythonPackages = python311.pkgs // {
|
pypy39Packages = pypy39.pkgs // { __attrsFailEvaluation = true; };
|
||||||
__attrsFailEvaluation = true;
|
pypy310Packages = pypy310.pkgs // { __attrsFailEvaluation = true; };
|
||||||
};
|
|
||||||
};
|
|
||||||
python312Packages = recurseIntoAttrs python312.pkgs // {
|
|
||||||
pythonPackages = python312.pkgs // {
|
|
||||||
__attrsFailEvaluation = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
python313Packages = python313.pkgs // {
|
|
||||||
__attrsFailEvaluation = true;
|
|
||||||
};
|
|
||||||
pypyPackages = pypy.pkgs // {
|
|
||||||
__attrsFailEvaluation = true;
|
|
||||||
};
|
|
||||||
pypy2Packages = pypy2.pkgs // {
|
|
||||||
__attrsFailEvaluation = true;
|
|
||||||
};
|
|
||||||
pypy27Packages = pypy27.pkgs // {
|
|
||||||
__attrsFailEvaluation = true;
|
|
||||||
};
|
|
||||||
pypy3Packages = pypy3.pkgs // {
|
|
||||||
__attrsFailEvaluation = true;
|
|
||||||
};
|
|
||||||
pypy39Packages = pypy39.pkgs // {
|
|
||||||
__attrsFailEvaluation = true;
|
|
||||||
};
|
|
||||||
pypy310Packages = pypy310.pkgs // {
|
|
||||||
__attrsFailEvaluation = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Python interpreters. All standard library modules are included except for tkinter, which is
|
# Python interpreters. All standard library modules are included except for tkinter, which is
|
||||||
# available as `pythonPackages.tkinter` and can be used as any other Python package.
|
# available as `pythonPackages.tkinter` and can be used as any other Python package.
|
||||||
# When switching these sets, please update docs at ../../doc/languages-frameworks/python.md
|
# When switching these sets, please update docs at ../../doc/languages-frameworks/python.md
|
||||||
python2 = python27;
|
python2 = python27;
|
||||||
python3 = python312;
|
python3 = python311;
|
||||||
|
|
||||||
# pythonPackages further below, but assigned here because they need to be in sync
|
# pythonPackages further below, but assigned here because they need to be in sync
|
||||||
python2Packages = dontRecurseIntoAttrs python27Packages;
|
python2Packages = dontRecurseIntoAttrs python27Packages;
|
||||||
python3Packages = dontRecurseIntoAttrs python311Packages;
|
python3Packages = dontRecurseIntoAttrs python311Packages;
|
||||||
|
|
||||||
|
|
||||||
# Should eventually be moved inside Python interpreters.
|
# Should eventually be moved inside Python interpreters.
|
||||||
python-setup-hook = buildPackages.callPackage ./setup-hook.nix { };
|
python-setup-hook = buildPackages.callPackage ./setup-hook.nix { };
|
||||||
|
|
||||||
update-python-libraries = callPackage ./update-python-libraries { };
|
update-python-libraries = callPackage ./update-python-libraries { };
|
||||||
|
|
||||||
docutils =
|
docutils = with python3Packages; toPythonApplication (
|
||||||
with python3Packages;
|
docutils.overridePythonAttrs (attrs: rec {
|
||||||
toPythonApplication (
|
version = "0.20.1";
|
||||||
docutils.overridePythonAttrs (attrs: rec {
|
src = attrs.src.override {
|
||||||
version = "0.20.1";
|
inherit version;
|
||||||
src = attrs.src.override {
|
hash = "sha256-8IpOJ2w6FYOobc4+NKuj/gTQK7ot1R7RYQYkToqSPjs=";
|
||||||
inherit version;
|
};
|
||||||
hash = "sha256-8IpOJ2w6FYOobc4+NKuj/gTQK7ot1R7RYQYkToqSPjs=";
|
})
|
||||||
};
|
);
|
||||||
})
|
|
||||||
);
|
|
||||||
|
|
||||||
actdiag = with python3.pkgs; toPythonApplication actdiag;
|
actdiag = with python3.pkgs; toPythonApplication actdiag;
|
||||||
blockdiag = with python3Packages; toPythonApplication blockdiag;
|
blockdiag = with python3Packages; toPythonApplication blockdiag;
|
||||||
|
|
|
||||||
60
pkgs/by-name/ru/rust/1_77.nix
Normal file
60
pkgs/by-name/ru/rust/1_77.nix
Normal file
|
|
@ -0,0 +1,60 @@
|
||||||
|
# New rust versions should first go to staging.
|
||||||
|
# Things to check after updating:
|
||||||
|
# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin:
|
||||||
|
# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github
|
||||||
|
# This testing can be also done by other volunteers as part of the pull
|
||||||
|
# request review, in case platforms cannot be covered.
|
||||||
|
# 2. The LLVM version used for building should match with rust upstream.
|
||||||
|
# Check the version number in the src/llvm-project git submodule in:
|
||||||
|
# https://github.com/rust-lang/rust/blob/<version-tag>/.gitmodules
|
||||||
|
# 3. Firefox and Thunderbird should still build on x86_64-linux.
|
||||||
|
|
||||||
|
{ stdenv, lib
|
||||||
|
, newScope, callPackage
|
||||||
|
, CoreFoundation, Security, SystemConfiguration
|
||||||
|
, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost, pkgsTargetTarget
|
||||||
|
, makeRustPlatform
|
||||||
|
, wrapRustcWith
|
||||||
|
, llvmPackages_17, llvm_17
|
||||||
|
, path
|
||||||
|
} @ args:
|
||||||
|
|
||||||
|
import ./default.nix {
|
||||||
|
rustcVersion = "1.77.1";
|
||||||
|
rustcSha256 = "7hBuTFafUtujtbKCsQWCD4a9j2s9CcBrjc6C+xuzpKE=";
|
||||||
|
|
||||||
|
llvmSharedForBuild = pkgsBuildBuild.llvmPackages_17.libllvm.override { enableSharedLibraries = true; };
|
||||||
|
llvmSharedForHost = pkgsBuildHost.llvmPackages_17.libllvm.override { enableSharedLibraries = true; };
|
||||||
|
llvmSharedForTarget = pkgsBuildTarget.llvmPackages_17.libllvm.override { enableSharedLibraries = true; };
|
||||||
|
|
||||||
|
# For use at runtime
|
||||||
|
llvmShared = llvm_17.override { enableSharedLibraries = true; };
|
||||||
|
|
||||||
|
# Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox
|
||||||
|
llvmPackages = llvmPackages_17;
|
||||||
|
|
||||||
|
# Note: the version MUST be one version prior to the version we're
|
||||||
|
# building
|
||||||
|
bootstrapVersion = "1.76.0";
|
||||||
|
|
||||||
|
# fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
|
||||||
|
bootstrapHashes = {
|
||||||
|
i686-unknown-linux-gnu = "4c3eefc9341b8809235e6c4fbcbc19ab52a5cbe771292c400df068c12984fa3e";
|
||||||
|
x86_64-unknown-linux-gnu = "9d589d2036b503cc45ecc94992d616fb3deec074deb36cacc2f5c212408f7399";
|
||||||
|
x86_64-unknown-linux-musl = "aa8568f4d262468aaf4f622bd421c5435b24454d8fbcdae48da1162962205384";
|
||||||
|
arm-unknown-linux-gnueabihf = "7d1da067362fc64bcad198d90a61e024d5712aed76e17b28e1cd7e8ba263cc6f";
|
||||||
|
armv7-unknown-linux-gnueabihf = "c03346d56d4a860cd3a8d2d2a7ea75c510b68204e3ad97b3770076595261c913";
|
||||||
|
aarch64-unknown-linux-gnu = "2e8313421e8fb673efdf356cdfdd4bc16516f2610d4f6faa01327983104c05a0";
|
||||||
|
aarch64-unknown-linux-musl = "a1d1c8ccb8ea00cfa2b79d80411b8eb22b2bef5214f86536825361e98d7c617a";
|
||||||
|
x86_64-apple-darwin = "7bdbe085695df8e46389115e99eda7beed37a9494f6b961b45554c658e53b8e7";
|
||||||
|
aarch64-apple-darwin = "17496f15c3cb6ff73d5c36f5b54cc110f1ac31fa09521a7991c0d7ddd890dceb";
|
||||||
|
powerpc64le-unknown-linux-gnu = "44b3494675284d26b04747a824dc974e32fd8fd46fc0aa06a7c8ebe851332d2c";
|
||||||
|
riscv64gc-unknown-linux-gnu = "4a9db321874fc441235b71eb8aa295fc50251305e461540b25b4eef89fb56255";
|
||||||
|
};
|
||||||
|
|
||||||
|
selectRustPackage = pkgs: pkgs.rust_1_77;
|
||||||
|
|
||||||
|
rustcPatches = [ ];
|
||||||
|
}
|
||||||
|
|
||||||
|
(builtins.removeAttrs args [ "llvmPackages_17" "llvm_17"])
|
||||||
|
|
@ -1,138 +0,0 @@
|
||||||
# New rust versions should first go to staging.
|
|
||||||
# Things to check after updating:
|
|
||||||
# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin:
|
|
||||||
# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github
|
|
||||||
# This testing can be also done by other volunteers as part of the pull
|
|
||||||
# request review, in case platforms cannot be covered.
|
|
||||||
# 2. The LLVM version used for building should match with rust upstream.
|
|
||||||
# Check the version number in the src/llvm-project git submodule in:
|
|
||||||
# https://github.com/rust-lang/rust/blob/<version-tag>/.gitmodules
|
|
||||||
# 3. Firefox and Thunderbird should still build on x86_64-linux.
|
|
||||||
|
|
||||||
{
|
|
||||||
stdenv,
|
|
||||||
lib,
|
|
||||||
newScope,
|
|
||||||
callPackage,
|
|
||||||
CoreFoundation,
|
|
||||||
Security,
|
|
||||||
SystemConfiguration,
|
|
||||||
pkgsBuildTarget,
|
|
||||||
pkgsBuildBuild,
|
|
||||||
pkgsBuildHost,
|
|
||||||
pkgsTargetTarget,
|
|
||||||
makeRustPlatform,
|
|
||||||
wrapRustcWith,
|
|
||||||
llvmPackages_18,
|
|
||||||
llvm_18,
|
|
||||||
wrapCCWith,
|
|
||||||
overrideCC,
|
|
||||||
path,
|
|
||||||
}@args:
|
|
||||||
let
|
|
||||||
llvmSharedFor =
|
|
||||||
pkgSet:
|
|
||||||
pkgSet.llvmPackages_18.libllvm.override (
|
|
||||||
{
|
|
||||||
enableSharedLibraries = true;
|
|
||||||
}
|
|
||||||
// lib.optionalAttrs (stdenv.targetPlatform.useLLVM or false) {
|
|
||||||
# Force LLVM to compile using clang + LLVM libs when targeting pkgsLLVM
|
|
||||||
stdenv = pkgSet.stdenv.override {
|
|
||||||
allowedRequisites = null;
|
|
||||||
cc = pkgSet.llvmPackages_18.clangUseLLVM;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
);
|
|
||||||
in
|
|
||||||
import ./default.nix
|
|
||||||
{
|
|
||||||
rustcVersion = "1.80.1";
|
|
||||||
rustcSha256 = "sha256-LAuPZDlC3LgQy8xQ8pJWSxtuRNtdX0UJEVOZbfldLcQ=";
|
|
||||||
|
|
||||||
llvmSharedForBuild = llvmSharedFor pkgsBuildBuild;
|
|
||||||
llvmSharedForHost = llvmSharedFor pkgsBuildHost;
|
|
||||||
llvmSharedForTarget = llvmSharedFor pkgsBuildTarget;
|
|
||||||
|
|
||||||
# For use at runtime
|
|
||||||
llvmShared = llvmSharedFor { inherit llvmPackages_18 stdenv; };
|
|
||||||
|
|
||||||
# Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox
|
|
||||||
llvmPackages =
|
|
||||||
if (stdenv.targetPlatform.useLLVM or false) then
|
|
||||||
callPackage (
|
|
||||||
{
|
|
||||||
pkgs,
|
|
||||||
bootBintoolsNoLibc ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintoolsNoLibc,
|
|
||||||
bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools,
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
llvmPackages = llvmPackages_18;
|
|
||||||
|
|
||||||
setStdenv =
|
|
||||||
pkg:
|
|
||||||
pkg.override {
|
|
||||||
stdenv = stdenv.override {
|
|
||||||
allowedRequisites = null;
|
|
||||||
cc = llvmPackages.clangUseLLVM;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
in
|
|
||||||
rec {
|
|
||||||
inherit (llvmPackages) bintools;
|
|
||||||
|
|
||||||
libunwind = setStdenv llvmPackages.libunwind;
|
|
||||||
llvm = setStdenv llvmPackages.llvm;
|
|
||||||
|
|
||||||
libcxx = llvmPackages.libcxx.override {
|
|
||||||
stdenv = stdenv.override {
|
|
||||||
allowedRequisites = null;
|
|
||||||
cc = llvmPackages.clangNoLibcxx;
|
|
||||||
hostPlatform = stdenv.hostPlatform // {
|
|
||||||
useLLVM = !stdenv.isDarwin;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
inherit libunwind;
|
|
||||||
};
|
|
||||||
|
|
||||||
clangUseLLVM = llvmPackages.clangUseLLVM.override { inherit libcxx; };
|
|
||||||
|
|
||||||
stdenv = overrideCC args.stdenv clangUseLLVM;
|
|
||||||
}
|
|
||||||
) { }
|
|
||||||
else
|
|
||||||
llvmPackages_18;
|
|
||||||
|
|
||||||
# Note: the version MUST be one version prior to the version we're
|
|
||||||
# building
|
|
||||||
bootstrapVersion = "1.79.0";
|
|
||||||
|
|
||||||
# fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
|
|
||||||
bootstrapHashes = {
|
|
||||||
i686-unknown-linux-gnu = "0a1e371809446cd77dba7abce2afb4efac8d8b2e63483cfe19f1c98bf9ab7855";
|
|
||||||
x86_64-unknown-linux-gnu = "628efa8ef0658a7c4199883ee132281f19931448d3cfee4ecfd768898fe74c18";
|
|
||||||
x86_64-unknown-linux-musl = "2e4b0e40d027e2b31a40163986b4c04dfd0bce41c706a99f2e82ba473a4383de";
|
|
||||||
arm-unknown-linux-gnueabihf = "ce8d8d296277a06e0d2f63a21a0586717e09be3df28c0d1a04bc2c6f85eecc15";
|
|
||||||
armv7-unknown-linux-gnueabihf = "31968f88b22058e384dfb3cdf3efe7f60c03481d790300fcffc420d5ba3851f2";
|
|
||||||
aarch64-unknown-linux-gnu = "f7d3b31581331b54af97cf3162e65b8c26c8aa14d42f71c1ce9adc1078ef54e5";
|
|
||||||
aarch64-unknown-linux-musl = "f8100c806754cd21600ded26546467a1a242db9b9ab8a6a666656e3cc4edfa52";
|
|
||||||
x86_64-apple-darwin = "62f018aad30bafa0ef8bff0ed60d5d45e6cadc799769aad9d945509203e9f921";
|
|
||||||
aarch64-apple-darwin = "e70a9362975b94df7dbc6e2ed5ceab4254dd32f72ba497ff4a70440ace3f729f";
|
|
||||||
powerpc64le-unknown-linux-gnu = "9865eeebb5bb20006367d3148d9116576499ec958d847e22b645f008a1bc4170";
|
|
||||||
riscv64gc-unknown-linux-gnu = "c8d38e600ef4dea8b375df2d08153393816ffd3dcab18e4d081ddc19e28b5a40";
|
|
||||||
x86_64-unknown-freebsd = "3c8005f488b8dda0fc6d47928868200852106cac2b568934ae9a2e5c89d3a50d";
|
|
||||||
};
|
|
||||||
|
|
||||||
selectRustPackage = pkgs: pkgs.rust_1_80;
|
|
||||||
|
|
||||||
rustcPatches = [ ];
|
|
||||||
}
|
|
||||||
|
|
||||||
(
|
|
||||||
builtins.removeAttrs args [
|
|
||||||
"llvmPackages_18"
|
|
||||||
"llvm_18"
|
|
||||||
"wrapCCWith"
|
|
||||||
"overrideCC"
|
|
||||||
]
|
|
||||||
)
|
|
||||||
|
|
@ -1,26 +1,23 @@
|
||||||
{
|
{ lib, stdenv, makeWrapper, wrapRustc, bash, curl, darwin, zlib
|
||||||
lib,
|
, autoPatchelfHook, gcc
|
||||||
stdenv,
|
, version
|
||||||
makeWrapper,
|
, src
|
||||||
wrapRustc,
|
, platform
|
||||||
bash,
|
, versionType
|
||||||
darwin,
|
|
||||||
zlib,
|
|
||||||
autoPatchelfHook,
|
|
||||||
gcc,
|
|
||||||
version,
|
|
||||||
src,
|
|
||||||
platform,
|
|
||||||
versionType,
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (lib) optionalString;
|
inherit (lib) optionalString;
|
||||||
inherit (darwin.apple_sdk.frameworks) Security;
|
inherit (darwin.apple_sdk.frameworks) Security;
|
||||||
|
|
||||||
bootstrapping = versionType == "bootstrap";
|
bootstrapping = versionType == "bootstrap";
|
||||||
|
|
||||||
installComponents = "rustc,rust-std-${platform}" + (optionalString bootstrapping ",cargo");
|
installComponents
|
||||||
|
= "rustc,rust-std-${platform}"
|
||||||
|
+ (optionalString bootstrapping ",cargo")
|
||||||
|
;
|
||||||
in
|
in
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
rustc-unwrapped = stdenv.mkDerivation {
|
rustc-unwrapped = stdenv.mkDerivation {
|
||||||
pname = "rustc-${versionType}";
|
pname = "rustc-${versionType}";
|
||||||
|
|
@ -28,22 +25,17 @@ rec {
|
||||||
inherit version;
|
inherit version;
|
||||||
inherit src;
|
inherit src;
|
||||||
|
|
||||||
meta = {
|
meta = with lib; {
|
||||||
homepage = "https://www.rust-lang.org/";
|
homepage = "https://www.rust-lang.org/";
|
||||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||||
description = "Safe, concurrent, practical language";
|
description = "A safe, concurrent, practical language";
|
||||||
maintainers = [ ];
|
maintainers = with maintainers; [ qknight ];
|
||||||
license = [
|
license = [ licenses.mit licenses.asl20 ];
|
||||||
lib.licenses.mit
|
|
||||||
lib.licenses.asl20
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook;
|
nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook;
|
||||||
buildInputs =
|
buildInputs = [ bash ]
|
||||||
[ bash ]
|
++ lib.optionals (!stdenv.isDarwin) [ gcc.cc.lib zlib ]
|
||||||
++ lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) gcc.cc.lib
|
|
||||||
++ lib.optional (!stdenv.isDarwin) zlib
|
|
||||||
++ lib.optional stdenv.isDarwin Security;
|
++ lib.optional stdenv.isDarwin Security;
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
@ -81,18 +73,15 @@ rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://doc.rust-lang.org/cargo/";
|
homepage = "https://doc.rust-lang.org/cargo/";
|
||||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||||
description = "Rust package manager";
|
description = "The Rust package manager";
|
||||||
maintainers = with maintainers; [ qknight ];
|
maintainers = with maintainers; [ qknight ];
|
||||||
license = [
|
license = [ licenses.mit licenses.asl20 ];
|
||||||
licenses.mit
|
|
||||||
licenses.asl20
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ] ++ lib.optional (!stdenv.isDarwin) autoPatchelfHook;
|
nativeBuildInputs = [ makeWrapper ]
|
||||||
buildInputs =
|
++ lib.optional (!stdenv.isDarwin) autoPatchelfHook;
|
||||||
[ bash ]
|
buildInputs = [ bash ]
|
||||||
++ lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) gcc.cc.lib
|
++ lib.optional (!stdenv.isDarwin) gcc.cc.lib
|
||||||
++ lib.optional stdenv.isDarwin Security;
|
++ lib.optional stdenv.isDarwin Security;
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,5 @@
|
||||||
{
|
{ lib, buildPackages, fetchFromGitHub, fetchpatch, makeRustPlatform, installShellFiles, stdenv }:
|
||||||
lib,
|
|
||||||
buildPackages,
|
|
||||||
fetchFromGitHub,
|
|
||||||
fetchpatch,
|
|
||||||
makeRustPlatform,
|
|
||||||
installShellFiles,
|
|
||||||
stdenv,
|
|
||||||
}:
|
|
||||||
let
|
let
|
||||||
args = rec {
|
args = rec {
|
||||||
pname = "cargo-auditable";
|
pname = "cargo-auditable";
|
||||||
|
|
@ -29,39 +22,44 @@ let
|
||||||
|
|
||||||
cargoHash = "sha256-4o3ctun/8VcBRuj+j0Yaawdkyn6Z6LPp+FTyhPxQWU8=";
|
cargoHash = "sha256-4o3ctun/8VcBRuj+j0Yaawdkyn6Z6LPp+FTyhPxQWU8=";
|
||||||
|
|
||||||
meta = {
|
# Cargo.lock is outdated
|
||||||
description = "Tool to make production Rust binaries auditable";
|
preConfigure = ''
|
||||||
|
cargo update --offline
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A tool to make production Rust binaries auditable";
|
||||||
mainProgram = "cargo-auditable";
|
mainProgram = "cargo-auditable";
|
||||||
homepage = "https://github.com/rust-secure-code/cargo-auditable";
|
homepage = "https://github.com/rust-secure-code/cargo-auditable";
|
||||||
changelog = "https://github.com/rust-secure-code/cargo-auditable/blob/v${version}/cargo-auditable/CHANGELOG.md";
|
changelog = "https://github.com/rust-secure-code/cargo-auditable/blob/v${version}/cargo-auditable/CHANGELOG.md";
|
||||||
license = with lib.licenses; [
|
license = with licenses; [ mit /* or */ asl20 ];
|
||||||
mit # or
|
maintainers = with maintainers; [ figsoda ];
|
||||||
asl20
|
|
||||||
];
|
|
||||||
maintainers = with lib.maintainers; [ figsoda ];
|
|
||||||
broken = stdenv.hostPlatform != stdenv.buildPlatform;
|
broken = stdenv.hostPlatform != stdenv.buildPlatform;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
rustPlatform = makeRustPlatform {
|
rustPlatform = makeRustPlatform {
|
||||||
inherit (buildPackages) rustc;
|
inherit (buildPackages) rustc;
|
||||||
cargo = buildPackages.cargo.override { auditable = false; };
|
cargo = buildPackages.cargo.override {
|
||||||
|
auditable = false;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
bootstrap = rustPlatform.buildRustPackage (args // { auditable = false; });
|
bootstrap = rustPlatform.buildRustPackage (args // {
|
||||||
|
auditable = false;
|
||||||
|
});
|
||||||
in
|
in
|
||||||
|
|
||||||
rustPlatform.buildRustPackage.override { cargo-auditable = bootstrap; } (
|
rustPlatform.buildRustPackage.override { cargo-auditable = bootstrap; } (args // {
|
||||||
args
|
nativeBuildInputs = [
|
||||||
// {
|
installShellFiles
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
installManPage cargo-auditable/cargo-auditable.1
|
installManPage cargo-auditable/cargo-auditable.1
|
||||||
'';
|
'';
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
inherit bootstrap;
|
inherit bootstrap;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
)
|
|
||||||
|
|
|
||||||
|
|
@ -1,114 +1,85 @@
|
||||||
{
|
{ lib, stdenv, pkgsBuildHost, pkgsHostHost
|
||||||
lib,
|
, file, curl, pkg-config, python3, openssl, cmake, zlib
|
||||||
stdenv,
|
, installShellFiles, makeWrapper, rustPlatform, rustc
|
||||||
pkgsHostHost,
|
, CoreFoundation, Security
|
||||||
file,
|
, auditable ? !cargo-auditable.meta.broken
|
||||||
curl,
|
, cargo-auditable
|
||||||
pkg-config,
|
, pkgsBuildBuild
|
||||||
python3,
|
|
||||||
openssl,
|
|
||||||
cmake,
|
|
||||||
zlib,
|
|
||||||
installShellFiles,
|
|
||||||
makeWrapper,
|
|
||||||
rustPlatform,
|
|
||||||
rustc,
|
|
||||||
CoreFoundation,
|
|
||||||
Security,
|
|
||||||
auditable ? !cargo-auditable.meta.broken,
|
|
||||||
cargo-auditable,
|
|
||||||
pkgsBuildBuild,
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage.override { cargo-auditable = cargo-auditable.bootstrap; } (
|
rustPlatform.buildRustPackage.override {
|
||||||
{
|
cargo-auditable = cargo-auditable.bootstrap;
|
||||||
pname = "cargo";
|
} ({
|
||||||
inherit (rustc.unwrapped) version src;
|
pname = "cargo";
|
||||||
|
inherit (rustc.unwrapped) version src;
|
||||||
|
|
||||||
# the rust source tarball already has all the dependencies vendored, no need to fetch them again
|
# the rust source tarball already has all the dependencies vendored, no need to fetch them again
|
||||||
cargoVendorDir = "vendor";
|
cargoVendorDir = "vendor";
|
||||||
buildAndTestSubdir = "src/tools/cargo";
|
buildAndTestSubdir = "src/tools/cargo";
|
||||||
|
|
||||||
inherit auditable;
|
inherit auditable;
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
rustc = rustc;
|
rustc = rustc;
|
||||||
inherit (rustc.unwrapped) tests;
|
inherit (rustc.unwrapped) tests;
|
||||||
};
|
};
|
||||||
|
|
||||||
# changes hash of vendor directory otherwise
|
# changes hash of vendor directory otherwise
|
||||||
dontUpdateAutotoolsGnuConfigScripts = true;
|
dontUpdateAutotoolsGnuConfigScripts = true;
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config cmake installShellFiles makeWrapper
|
||||||
cmake
|
(lib.getDev pkgsHostHost.curl)
|
||||||
installShellFiles
|
zlib
|
||||||
makeWrapper
|
];
|
||||||
(lib.getDev pkgsHostHost.curl)
|
buildInputs = [ file curl python3 openssl zlib ]
|
||||||
zlib
|
++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ];
|
||||||
];
|
|
||||||
buildInputs =
|
|
||||||
[
|
|
||||||
file
|
|
||||||
curl
|
|
||||||
python3
|
|
||||||
openssl
|
|
||||||
zlib
|
|
||||||
]
|
|
||||||
++ lib.optionals stdenv.isDarwin [
|
|
||||||
CoreFoundation
|
|
||||||
Security
|
|
||||||
];
|
|
||||||
|
|
||||||
# cargo uses git-rs which is made for a version of libgit2 from recent master that
|
# cargo uses git-rs which is made for a version of libgit2 from recent master that
|
||||||
# is not compatible with the current version in nixpkgs.
|
# is not compatible with the current version in nixpkgs.
|
||||||
#LIBGIT2_SYS_USE_PKG_CONFIG = 1;
|
#LIBGIT2_SYS_USE_PKG_CONFIG = 1;
|
||||||
|
|
||||||
# fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel
|
# fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel
|
||||||
RUSTC_BOOTSTRAP = 1;
|
RUSTC_BOOTSTRAP = 1;
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
wrapProgram "$out/bin/cargo" --suffix PATH : "${rustc}/bin"
|
wrapProgram "$out/bin/cargo" --suffix PATH : "${rustc}/bin"
|
||||||
|
|
||||||
installManPage src/tools/cargo/src/etc/man/*
|
installManPage src/tools/cargo/src/etc/man/*
|
||||||
|
|
||||||
installShellCompletion --bash --name cargo \
|
installShellCompletion --bash --name cargo \
|
||||||
src/tools/cargo/src/etc/cargo.bashcomp.sh
|
src/tools/cargo/src/etc/cargo.bashcomp.sh
|
||||||
|
|
||||||
installShellCompletion --zsh src/tools/cargo/src/etc/_cargo
|
installShellCompletion --zsh src/tools/cargo/src/etc/_cargo
|
||||||
'';
|
'';
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
# Disable cross compilation tests
|
# Disable cross compilation tests
|
||||||
export CFG_DISABLE_CROSS_TESTS=1
|
export CFG_DISABLE_CROSS_TESTS=1
|
||||||
cargo test
|
cargo test
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Disable check phase as there are failures (4 tests fail)
|
# Disable check phase as there are failures (4 tests fail)
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
doInstallCheck = !stdenv.hostPlatform.isStatic && stdenv.hostPlatform.isElf;
|
doInstallCheck = !stdenv.hostPlatform.isStatic && stdenv.hostPlatform.isElf;
|
||||||
installCheckPhase = ''
|
installCheckPhase = ''
|
||||||
runHook preInstallCheck
|
runHook preInstallCheck
|
||||||
readelf -a $out/bin/.cargo-wrapped | grep -F 'Shared library: [libcurl.so'
|
readelf -a $out/bin/.cargo-wrapped | grep -F 'Shared library: [libcurl.so'
|
||||||
runHook postInstallCheck
|
runHook postInstallCheck
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = with lib; {
|
||||||
homepage = "https://crates.io";
|
homepage = "https://crates.io";
|
||||||
description = "Downloads your Rust project's dependencies and builds your project";
|
description = "Downloads your Rust project's dependencies and builds your project";
|
||||||
mainProgram = "cargo";
|
mainProgram = "cargo";
|
||||||
maintainers = [ ];
|
maintainers = teams.rust.members;
|
||||||
license = [
|
license = [ licenses.mit licenses.asl20 ];
|
||||||
lib.licenses.mit
|
platforms = platforms.unix;
|
||||||
lib.licenses.asl20
|
# https://github.com/alexcrichton/nghttp2-rs/issues/2
|
||||||
];
|
broken = stdenv.hostPlatform.isx86 && stdenv.buildPlatform != stdenv.hostPlatform;
|
||||||
platforms = lib.platforms.unix;
|
};
|
||||||
# https://github.com/alexcrichton/nghttp2-rs/issues/2
|
}
|
||||||
broken = stdenv.hostPlatform.isx86 && stdenv.buildPlatform != stdenv.hostPlatform;
|
// lib.optionalAttrs (stdenv.buildPlatform.rust.rustcTarget != stdenv.hostPlatform.rust.rustcTarget) {
|
||||||
};
|
HOST_PKG_CONFIG_PATH="${pkgsBuildBuild.pkg-config}/bin/pkg-config";
|
||||||
}
|
})
|
||||||
// lib.optionalAttrs (
|
|
||||||
stdenv.buildPlatform.rust.rustcTarget != stdenv.hostPlatform.rust.rustcTarget
|
|
||||||
) { HOST_PKG_CONFIG_PATH = "${pkgsBuildBuild.pkg-config}/bin/pkg-config"; }
|
|
||||||
)
|
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,5 @@
|
||||||
{
|
{ stdenv, lib, rustPlatform, rustc, Security, patchelf }:
|
||||||
stdenv,
|
|
||||||
lib,
|
|
||||||
rustPlatform,
|
|
||||||
rustc,
|
|
||||||
Security,
|
|
||||||
}:
|
|
||||||
rustPlatform.buildRustPackage {
|
rustPlatform.buildRustPackage {
|
||||||
pname = "clippy";
|
pname = "clippy";
|
||||||
inherit (rustc) version src;
|
inherit (rustc) version src;
|
||||||
|
|
@ -18,7 +13,8 @@ rustPlatform.buildRustPackage {
|
||||||
# changes hash of vendor directory otherwise
|
# changes hash of vendor directory otherwise
|
||||||
dontUpdateAutotoolsGnuConfigScripts = true;
|
dontUpdateAutotoolsGnuConfigScripts = true;
|
||||||
|
|
||||||
buildInputs = [ rustc.llvm ] ++ lib.optionals stdenv.isDarwin [ Security ];
|
buildInputs = [ rustc.llvm ]
|
||||||
|
++ lib.optionals stdenv.isDarwin [ Security ];
|
||||||
|
|
||||||
# fixes: error: the option `Z` is only accepted on the nightly compiler
|
# fixes: error: the option `Z` is only accepted on the nightly compiler
|
||||||
RUSTC_BOOTSTRAP = 1;
|
RUSTC_BOOTSTRAP = 1;
|
||||||
|
|
@ -39,15 +35,12 @@ rustPlatform.buildRustPackage {
|
||||||
install_name_tool -add_rpath "${rustc.unwrapped}/lib" "$out/bin/cargo-clippy"
|
install_name_tool -add_rpath "${rustc.unwrapped}/lib" "$out/bin/cargo-clippy"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = with lib; {
|
||||||
homepage = "https://rust-lang.github.io/rust-clippy/";
|
homepage = "https://rust-lang.github.io/rust-clippy/";
|
||||||
description = "Bunch of lints to catch common mistakes and improve your Rust code";
|
description = "A bunch of lints to catch common mistakes and improve your Rust code";
|
||||||
mainProgram = "cargo-clippy";
|
mainProgram = "cargo-clippy";
|
||||||
maintainers = with lib.maintainers; [ basvandijk ] ++ teams.rust.members;
|
maintainers = with maintainers; [ basvandijk ] ++ teams.rust.members;
|
||||||
license = with lib.licenses; [
|
license = with licenses; [ mit asl20 ];
|
||||||
mit
|
platforms = platforms.unix;
|
||||||
asl20
|
|
||||||
];
|
|
||||||
platforms = lib.platforms.unix;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,61 +1,41 @@
|
||||||
{
|
{ rustcVersion
|
||||||
rustcVersion,
|
, rustcSha256
|
||||||
rustcSha256,
|
, enableRustcDev ? true
|
||||||
enableRustcDev ? true,
|
, bootstrapVersion
|
||||||
bootstrapVersion,
|
, bootstrapHashes
|
||||||
bootstrapHashes,
|
, selectRustPackage
|
||||||
selectRustPackage,
|
, rustcPatches ? []
|
||||||
rustcPatches ? [ ],
|
, llvmShared
|
||||||
llvmShared,
|
, llvmSharedForBuild
|
||||||
llvmSharedForBuild,
|
, llvmSharedForHost
|
||||||
llvmSharedForHost,
|
, llvmSharedForTarget
|
||||||
llvmSharedForTarget,
|
, llvmPackages # Exposed through rustc for LTO in Firefox
|
||||||
llvmPackages, # Exposed through rustc for LTO in Firefox
|
|
||||||
}:
|
}:
|
||||||
{
|
{ stdenv, lib
|
||||||
stdenv,
|
, newScope, callPackage
|
||||||
lib,
|
, CoreFoundation, Security, SystemConfiguration
|
||||||
newScope,
|
, pkgsBuildBuild
|
||||||
callPackage,
|
, pkgsBuildHost
|
||||||
CoreFoundation,
|
, pkgsBuildTarget
|
||||||
Security,
|
, pkgsTargetTarget
|
||||||
SystemConfiguration,
|
, makeRustPlatform
|
||||||
pkgsBuildBuild,
|
, wrapRustcWith
|
||||||
pkgsBuildHost,
|
, path
|
||||||
pkgsBuildTarget,
|
|
||||||
pkgsTargetTarget,
|
|
||||||
makeRustPlatform,
|
|
||||||
wrapRustcWith,
|
|
||||||
path,
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
# Use `import` to make sure no packages sneak in here.
|
# Use `import` to make sure no packages sneak in here.
|
||||||
lib' = import (path + /pkgs/build-support/rust/lib) {
|
lib' = import (path + /pkgs/build-support/rust/lib) {
|
||||||
inherit
|
inherit lib stdenv pkgsBuildHost pkgsBuildTarget pkgsTargetTarget;
|
||||||
lib
|
|
||||||
stdenv
|
|
||||||
pkgsBuildHost
|
|
||||||
pkgsBuildTarget
|
|
||||||
pkgsTargetTarget
|
|
||||||
;
|
|
||||||
};
|
};
|
||||||
# Allow faster cross compiler generation by reusing Build artifacts
|
# Allow faster cross compiler generation by reusing Build artifacts
|
||||||
fastCross =
|
fastCross = (stdenv.buildPlatform == stdenv.hostPlatform) && (stdenv.hostPlatform != stdenv.targetPlatform);
|
||||||
(stdenv.buildPlatform == stdenv.hostPlatform) && (stdenv.hostPlatform != stdenv.targetPlatform);
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
lib = lib';
|
lib = lib';
|
||||||
|
|
||||||
# Backwards compat before `lib` was factored out.
|
# Backwards compat before `lib` was factored out.
|
||||||
inherit (lib')
|
inherit (lib') toTargetArch toTargetOs toRustTarget toRustTargetSpec IsNoStdTarget toRustTargetForUseInEnvVars envVars;
|
||||||
toTargetArch
|
|
||||||
toTargetOs
|
|
||||||
toRustTarget
|
|
||||||
toRustTargetSpec
|
|
||||||
IsNoStdTarget
|
|
||||||
toRustTargetForUseInEnvVars
|
|
||||||
envVars
|
|
||||||
;
|
|
||||||
|
|
||||||
# This just contains tools for now. But it would conceivably contain
|
# This just contains tools for now. But it would conceivably contain
|
||||||
# libraries too, say if we picked some default/recommended versions to build
|
# libraries too, say if we picked some default/recommended versions to build
|
||||||
|
|
@ -73,78 +53,55 @@ in
|
||||||
version = bootstrapVersion;
|
version = bootstrapVersion;
|
||||||
hashes = bootstrapHashes;
|
hashes = bootstrapHashes;
|
||||||
};
|
};
|
||||||
stable = lib.makeScope newScope (
|
stable = lib.makeScope newScope (self: let
|
||||||
self:
|
# Like `buildRustPackages`, but may also contain prebuilt binaries to
|
||||||
let
|
# break cycle. Just like `bootstrapTools` for nixpkgs as a whole,
|
||||||
# Like `buildRustPackages`, but may also contain prebuilt binaries to
|
# nothing in the final package set should refer to this.
|
||||||
# break cycle. Just like `bootstrapTools` for nixpkgs as a whole,
|
bootstrapRustPackages = if fastCross
|
||||||
# nothing in the final package set should refer to this.
|
then pkgsBuildBuild.rustPackages
|
||||||
bootstrapRustPackages =
|
else
|
||||||
if fastCross then
|
self.buildRustPackages.overrideScope (_: _:
|
||||||
pkgsBuildBuild.rustPackages
|
lib.optionalAttrs (stdenv.buildPlatform == stdenv.hostPlatform)
|
||||||
else
|
(selectRustPackage pkgsBuildHost).packages.prebuilt);
|
||||||
self.buildRustPackages.overrideScope (
|
bootRustPlatform = makeRustPlatform bootstrapRustPackages;
|
||||||
_: _:
|
in {
|
||||||
lib.optionalAttrs (stdenv.buildPlatform == stdenv.hostPlatform)
|
# Packages suitable for build-time, e.g. `build.rs`-type stuff.
|
||||||
(selectRustPackage pkgsBuildHost).packages.prebuilt
|
buildRustPackages = (selectRustPackage pkgsBuildHost).packages.stable // { __attrsFailEvaluation = true; };
|
||||||
);
|
# Analogous to stdenv
|
||||||
bootRustPlatform = makeRustPlatform bootstrapRustPackages;
|
rustPlatform = makeRustPlatform self.buildRustPackages;
|
||||||
in
|
rustc-unwrapped = self.callPackage ./rustc.nix ({
|
||||||
{
|
version = rustcVersion;
|
||||||
# Packages suitable for build-time, e.g. `build.rs`-type stuff.
|
sha256 = rustcSha256;
|
||||||
buildRustPackages = (selectRustPackage pkgsBuildHost).packages.stable // {
|
inherit enableRustcDev;
|
||||||
# Prevent `pkgs/top-level/release-attrpaths-superset.nix` from recursing more than one level here.
|
inherit llvmShared llvmSharedForBuild llvmSharedForHost llvmSharedForTarget llvmPackages fastCross;
|
||||||
buildRustPackages = self.buildRustPackages // {
|
|
||||||
__attrsFailEvaluation = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
# Analogous to stdenv
|
|
||||||
rustPlatform = makeRustPlatform self.buildRustPackages;
|
|
||||||
rustc-unwrapped = self.callPackage ./rustc.nix {
|
|
||||||
version = rustcVersion;
|
|
||||||
sha256 = rustcSha256;
|
|
||||||
inherit enableRustcDev;
|
|
||||||
inherit
|
|
||||||
llvmShared
|
|
||||||
llvmSharedForBuild
|
|
||||||
llvmSharedForHost
|
|
||||||
llvmSharedForTarget
|
|
||||||
llvmPackages
|
|
||||||
fastCross
|
|
||||||
;
|
|
||||||
|
|
||||||
patches = rustcPatches;
|
patches = rustcPatches;
|
||||||
|
|
||||||
# Use boot package set to break cycle
|
# Use boot package set to break cycle
|
||||||
inherit (bootstrapRustPackages) cargo rustc rustfmt;
|
inherit (bootstrapRustPackages) cargo rustc rustfmt;
|
||||||
};
|
});
|
||||||
rustc = wrapRustcWith {
|
rustc = wrapRustcWith {
|
||||||
inherit (self) rustc-unwrapped;
|
inherit (self) rustc-unwrapped;
|
||||||
sysroot = if fastCross then self.rustc-unwrapped else null;
|
sysroot = if fastCross then self.rustc-unwrapped else null;
|
||||||
};
|
};
|
||||||
rustfmt = self.callPackage ./rustfmt.nix {
|
rustfmt = self.callPackage ./rustfmt.nix {
|
||||||
inherit Security;
|
inherit Security;
|
||||||
inherit (self.buildRustPackages) rustc;
|
inherit (self.buildRustPackages) rustc;
|
||||||
};
|
};
|
||||||
cargo =
|
cargo = if (!fastCross) then self.callPackage ./cargo.nix {
|
||||||
if (!fastCross) then
|
# Use boot package set to break cycle
|
||||||
self.callPackage ./cargo.nix {
|
rustPlatform = bootRustPlatform;
|
||||||
# Use boot package set to break cycle
|
inherit CoreFoundation Security;
|
||||||
rustPlatform = bootRustPlatform;
|
} else self.callPackage ./cargo_cross.nix {};
|
||||||
inherit CoreFoundation Security;
|
cargo-auditable = self.callPackage ./cargo-auditable.nix { };
|
||||||
}
|
cargo-auditable-cargo-wrapper = self.callPackage ./cargo-auditable-cargo-wrapper.nix { };
|
||||||
else
|
clippy = self.callPackage ./clippy.nix {
|
||||||
self.callPackage ./cargo_cross.nix { };
|
# We want to use self, not buildRustPackages, so that
|
||||||
cargo-auditable = self.callPackage ./cargo-auditable.nix { };
|
# buildPackages.clippy uses the cross compiler and supports
|
||||||
cargo-auditable-cargo-wrapper = self.callPackage ./cargo-auditable-cargo-wrapper.nix { };
|
# linting for the target platform.
|
||||||
clippy = self.callPackage ./clippy.nix {
|
rustPlatform = makeRustPlatform self;
|
||||||
# We want to use self, not buildRustPackages, so that
|
inherit Security;
|
||||||
# buildPackages.clippy uses the cross compiler and supports
|
};
|
||||||
# linting for the target platform.
|
});
|
||||||
rustPlatform = makeRustPlatform self;
|
|
||||||
inherit Security;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
);
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,19 +1,10 @@
|
||||||
{
|
{ lib, buildPackages, callPackage, callPackages, cargo-auditable, stdenv, runCommand, path }@prev:
|
||||||
lib,
|
|
||||||
buildPackages,
|
{ rustc
|
||||||
callPackage,
|
, cargo
|
||||||
callPackages,
|
, cargo-auditable ? prev.cargo-auditable
|
||||||
cargo-auditable,
|
, stdenv ? prev.stdenv
|
||||||
stdenv,
|
, ...
|
||||||
runCommand,
|
|
||||||
path,
|
|
||||||
}@prev:
|
|
||||||
{
|
|
||||||
rustc,
|
|
||||||
cargo,
|
|
||||||
cargo-auditable ? prev.cargo-auditable,
|
|
||||||
stdenv ? prev.stdenv,
|
|
||||||
...
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
|
|
@ -22,45 +13,28 @@ rec {
|
||||||
cargo = lib.warn "rustPlatform.rust.cargo is deprecated. Use cargo instead." cargo;
|
cargo = lib.warn "rustPlatform.rust.cargo is deprecated. Use cargo instead." cargo;
|
||||||
};
|
};
|
||||||
|
|
||||||
fetchCargoTarball =
|
fetchCargoTarball = buildPackages.callPackage (path + "/pkgs/build-support/rust/fetch-cargo-tarball") {
|
||||||
buildPackages.callPackage (path + "/pkgs/build-support/rust/fetch-cargo-tarball")
|
git = buildPackages.gitMinimal;
|
||||||
{
|
inherit cargo;
|
||||||
git = buildPackages.gitMinimal;
|
|
||||||
inherit cargo;
|
|
||||||
};
|
|
||||||
|
|
||||||
buildRustPackage = callPackage (path + "/pkgs/build-support/rust/build-rust-package") {
|
|
||||||
inherit
|
|
||||||
stdenv
|
|
||||||
cargoBuildHook
|
|
||||||
cargoCheckHook
|
|
||||||
cargoInstallHook
|
|
||||||
cargoNextestHook
|
|
||||||
cargoSetupHook
|
|
||||||
fetchCargoTarball
|
|
||||||
importCargoLock
|
|
||||||
rustc
|
|
||||||
cargo
|
|
||||||
cargo-auditable
|
|
||||||
;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
importCargoLock = buildPackages.callPackage (
|
buildRustPackage = callPackage (path + "/pkgs/build-support/rust/build-rust-package") {
|
||||||
path + "/pkgs/build-support/rust/import-cargo-lock.nix"
|
inherit stdenv cargoBuildHook cargoCheckHook cargoInstallHook cargoNextestHook cargoSetupHook
|
||||||
) { inherit cargo; };
|
fetchCargoTarball importCargoLock rustc cargo cargo-auditable;
|
||||||
|
};
|
||||||
|
|
||||||
rustcSrc = callPackage ./rust-src.nix { inherit runCommand rustc; };
|
importCargoLock = buildPackages.callPackage (path + "/pkgs/build-support/rust/import-cargo-lock.nix") { inherit cargo; };
|
||||||
|
|
||||||
rustLibSrc = callPackage ./rust-lib-src.nix { inherit runCommand rustc; };
|
rustcSrc = callPackage ./rust-src.nix {
|
||||||
|
inherit runCommand rustc;
|
||||||
|
};
|
||||||
|
|
||||||
|
rustLibSrc = callPackage ./rust-lib-src.nix {
|
||||||
|
inherit runCommand rustc;
|
||||||
|
};
|
||||||
|
|
||||||
# Hooks
|
# Hooks
|
||||||
inherit (callPackages (path + "/pkgs/build-support/rust/hooks") { inherit stdenv cargo rustc; })
|
inherit (callPackages (path + "/pkgs/build-support/rust/hooks") {
|
||||||
cargoBuildHook
|
inherit stdenv cargo rustc;
|
||||||
cargoCheckHook
|
}) cargoBuildHook cargoCheckHook cargoInstallHook cargoNextestHook cargoSetupHook maturinBuildHook bindgenHook;
|
||||||
cargoInstallHook
|
|
||||||
cargoNextestHook
|
|
||||||
cargoSetupHook
|
|
||||||
maturinBuildHook
|
|
||||||
bindgenHook
|
|
||||||
;
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,24 +1,18 @@
|
||||||
{ ... }:
|
{ ... }:
|
||||||
res: pkgs: super:
|
res: pkgs: super:
|
||||||
|
|
||||||
with pkgs; {
|
with pkgs;
|
||||||
rust_1_80 = callPackage ./1_80.nix {
|
{
|
||||||
|
rust_1_77 = callPackage ./1_77.nix {
|
||||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
|
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
|
||||||
llvm_18 = llvmPackages_18.libllvm;
|
llvm_17 = llvmPackages_17.libllvm;
|
||||||
};
|
};
|
||||||
rust = rust_1_80;
|
rust = rust_1_77;
|
||||||
|
|
||||||
rustPackages_1_80 = rust_1_80.packages.stable;
|
rustPackages_1_77 = rust_1_77.packages.stable;
|
||||||
rustPackages = rustPackages_1_80;
|
rustPackages = rustPackages_1_77;
|
||||||
|
|
||||||
inherit (rustPackages)
|
inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform;
|
||||||
cargo
|
|
||||||
cargo-auditable
|
|
||||||
cargo-auditable-cargo-wrapper
|
|
||||||
clippy
|
|
||||||
rustc
|
|
||||||
rustPlatform
|
|
||||||
;
|
|
||||||
|
|
||||||
makeRustPlatform = callPackage ./make-rust-platform.nix { };
|
makeRustPlatform = callPackage ./make-rust-platform.nix { };
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,53 +1,30 @@
|
||||||
{
|
{ lib, stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, targetPackages
|
||||||
lib,
|
, llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget, llvmPackages
|
||||||
stdenv,
|
, fetchurl, file, python3
|
||||||
removeReferencesTo,
|
, darwin, cargo, cmake, rustc, rustfmt
|
||||||
pkgsBuildBuild,
|
, pkg-config, openssl, xz
|
||||||
pkgsBuildHost,
|
, libiconv
|
||||||
pkgsBuildTarget,
|
, which, libffi
|
||||||
targetPackages,
|
, withBundledLLVM ? false
|
||||||
llvmShared,
|
, enableRustcDev ? true
|
||||||
llvmSharedForBuild,
|
, version
|
||||||
llvmSharedForHost,
|
, sha256
|
||||||
llvmSharedForTarget,
|
, patches ? []
|
||||||
llvmPackages,
|
# , fd
|
||||||
runCommandLocal,
|
# , ripgrep
|
||||||
fetchurl,
|
# , wezterm
|
||||||
file,
|
# , firefox
|
||||||
python3,
|
# , thunderbird
|
||||||
darwin,
|
# This only builds std for target and reuses the rustc from build.
|
||||||
cargo,
|
, fastCross
|
||||||
cmake,
|
, lndir
|
||||||
rustc,
|
, makeWrapper
|
||||||
rustfmt,
|
|
||||||
pkg-config,
|
|
||||||
openssl,
|
|
||||||
xz,
|
|
||||||
zlib,
|
|
||||||
libiconv,
|
|
||||||
which,
|
|
||||||
libffi,
|
|
||||||
withBundledLLVM ? false,
|
|
||||||
enableRustcDev ? true,
|
|
||||||
version,
|
|
||||||
sha256,
|
|
||||||
patches ? [ ],
|
|
||||||
# This only builds std for target and reuses the rustc from build.
|
|
||||||
fastCross,
|
|
||||||
lndir,
|
|
||||||
makeWrapper,
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (lib)
|
inherit (lib) optionals optional optionalString concatStringsSep;
|
||||||
optionals
|
|
||||||
optional
|
|
||||||
optionalString
|
|
||||||
concatStringsSep
|
|
||||||
;
|
|
||||||
inherit (darwin.apple_sdk.frameworks) Security;
|
inherit (darwin.apple_sdk.frameworks) Security;
|
||||||
useLLVM = stdenv.targetPlatform.useLLVM or false;
|
in stdenv.mkDerivation (finalAttrs: {
|
||||||
in
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
|
||||||
pname = "${targetPackages.stdenv.cc.targetPrefix}rustc";
|
pname = "${targetPackages.stdenv.cc.targetPrefix}rustc";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
|
|
@ -58,12 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
passthru.isReleaseTarball = true;
|
passthru.isReleaseTarball = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
hardeningDisable = optionals stdenv.cc.isClang [
|
|
||||||
# remove once https://github.com/NixOS/nixpkgs/issues/318674 is
|
|
||||||
# addressed properly
|
|
||||||
"zerocallusedregs"
|
|
||||||
];
|
|
||||||
|
|
||||||
__darwinAllowLocalNetworking = true;
|
__darwinAllowLocalNetworking = true;
|
||||||
|
|
||||||
# rustc complains about modified source files otherwise
|
# rustc complains about modified source files otherwise
|
||||||
|
|
@ -82,152 +53,110 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
# but it does support checking these idiosyncratic PKG_CONFIG_${TRIPLE}
|
# but it does support checking these idiosyncratic PKG_CONFIG_${TRIPLE}
|
||||||
# environment variables.
|
# environment variables.
|
||||||
# [1]: https://github.com/rust-lang/pkg-config-rs/issues/53
|
# [1]: https://github.com/rust-lang/pkg-config-rs/issues/53
|
||||||
"PKG_CONFIG_${
|
"PKG_CONFIG_${builtins.replaceStrings ["-"] ["_"] stdenv.buildPlatform.rust.rustcTarget}" =
|
||||||
builtins.replaceStrings [ "-" ] [ "_" ] stdenv.buildPlatform.rust.rustcTarget
|
"${pkgsBuildHost.stdenv.cc.targetPrefix}pkg-config";
|
||||||
}" = "${pkgsBuildHost.stdenv.cc.targetPrefix}pkg-config";
|
|
||||||
|
|
||||||
NIX_LDFLAGS = toString (
|
NIX_LDFLAGS = toString (
|
||||||
# when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch'
|
# when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch'
|
||||||
# This doesn't apply to cross-building for FreeBSD because the host
|
optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state"
|
||||||
# uses libstdc++, but the target (used for building std) uses libc++
|
|
||||||
optional (
|
|
||||||
stdenv.isLinux && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD && !useLLVM
|
|
||||||
) "--push-state --as-needed -lstdc++ --pop-state"
|
|
||||||
++
|
|
||||||
optional (stdenv.isLinux && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD && useLLVM)
|
|
||||||
"--push-state --as-needed -L${llvmPackages.libcxx}/lib -lc++ -lc++abi -lLLVM-${lib.versions.major llvmPackages.llvm.version} --pop-state"
|
|
||||||
++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++ -lc++abi"
|
++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++ -lc++abi"
|
||||||
++ optional stdenv.isFreeBSD "-rpath ${llvmPackages.libunwind}/lib"
|
++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib");
|
||||||
++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost.lib}/lib"
|
|
||||||
);
|
|
||||||
|
|
||||||
# Increase codegen units to introduce parallelism within the compiler.
|
# Increase codegen units to introduce parallelism within the compiler.
|
||||||
RUSTFLAGS = "-Ccodegen-units=10";
|
RUSTFLAGS = "-Ccodegen-units=10";
|
||||||
|
|
||||||
RUSTDOCFLAGS = "-A rustdoc::broken-intra-doc-links";
|
RUSTDOCFLAGS = "-A rustdoc::broken-intra-doc-links";
|
||||||
|
|
||||||
# We need rust to build rust. If we don't provide it, configure will try to download it.
|
# We need rust to build rust. If we don't provide it, configure will try to download it.
|
||||||
# Reference: https://github.com/rust-lang/rust/blob/master/src/bootstrap/configure.py
|
# Reference: https://github.com/rust-lang/rust/blob/master/src/bootstrap/configure.py
|
||||||
configureFlags =
|
configureFlags = let
|
||||||
let
|
prefixForStdenv = stdenv: "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}";
|
||||||
prefixForStdenv = stdenv: "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}";
|
ccPrefixForStdenv = stdenv: "${prefixForStdenv stdenv}${if (stdenv.cc.isClang or false) then "clang" else "cc"}";
|
||||||
ccPrefixForStdenv =
|
cxxPrefixForStdenv = stdenv: "${prefixForStdenv stdenv}${if (stdenv.cc.isClang or false) then "clang++" else "c++"}";
|
||||||
stdenv: "${prefixForStdenv stdenv}${if (stdenv.cc.isClang or false) then "clang" else "cc"}";
|
setBuild = "--set=target.${stdenv.buildPlatform.rust.rustcTarget}";
|
||||||
cxxPrefixForStdenv =
|
setHost = "--set=target.${stdenv.hostPlatform.rust.rustcTarget}";
|
||||||
stdenv: "${prefixForStdenv stdenv}${if (stdenv.cc.isClang or false) then "clang++" else "c++"}";
|
setTarget = "--set=target.${stdenv.targetPlatform.rust.rustcTarget}";
|
||||||
setBuild = "--set=target.${stdenv.buildPlatform.rust.rustcTarget}";
|
ccForBuild = ccPrefixForStdenv pkgsBuildBuild.targetPackages.stdenv;
|
||||||
setHost = "--set=target.${stdenv.hostPlatform.rust.rustcTarget}";
|
cxxForBuild = cxxPrefixForStdenv pkgsBuildBuild.targetPackages.stdenv;
|
||||||
setTarget = "--set=target.${stdenv.targetPlatform.rust.rustcTarget}";
|
ccForHost = ccPrefixForStdenv pkgsBuildHost.targetPackages.stdenv;
|
||||||
ccForBuild = ccPrefixForStdenv pkgsBuildBuild.targetPackages.stdenv;
|
cxxForHost = cxxPrefixForStdenv pkgsBuildHost.targetPackages.stdenv;
|
||||||
cxxForBuild = cxxPrefixForStdenv pkgsBuildBuild.targetPackages.stdenv;
|
ccForTarget = ccPrefixForStdenv pkgsBuildTarget.targetPackages.stdenv;
|
||||||
ccForHost = ccPrefixForStdenv pkgsBuildHost.targetPackages.stdenv;
|
cxxForTarget = cxxPrefixForStdenv pkgsBuildTarget.targetPackages.stdenv;
|
||||||
cxxForHost = cxxPrefixForStdenv pkgsBuildHost.targetPackages.stdenv;
|
in [
|
||||||
ccForTarget = ccPrefixForStdenv pkgsBuildTarget.targetPackages.stdenv;
|
"--sysconfdir=${placeholder "out"}/etc"
|
||||||
cxxForTarget = cxxPrefixForStdenv pkgsBuildTarget.targetPackages.stdenv;
|
"--release-channel=stable"
|
||||||
in
|
"--set=build.rustc=${rustc}/bin/rustc"
|
||||||
[
|
"--set=build.cargo=${cargo}/bin/cargo"
|
||||||
"--sysconfdir=${placeholder "out"}/etc"
|
] ++ lib.optionals (!(finalAttrs.src.passthru.isReleaseTarball or false)) [
|
||||||
"--release-channel=stable"
|
# release tarballs vendor the rustfmt source; when
|
||||||
"--set=build.rustc=${rustc}/bin/rustc"
|
# git-bisect'ing from upstream's git repo we must prevent
|
||||||
"--set=build.cargo=${cargo}/bin/cargo"
|
# attempts to download the missing source tarball
|
||||||
]
|
"--set=build.rustfmt=${rustfmt}/bin/rustfmt"
|
||||||
++ lib.optionals (!(finalAttrs.src.passthru.isReleaseTarball or false)) [
|
] ++ [
|
||||||
# release tarballs vendor the rustfmt source; when
|
"--tools=rustc,rustdoc,rust-analyzer-proc-macro-srv"
|
||||||
# git-bisect'ing from upstream's git repo we must prevent
|
"--enable-rpath"
|
||||||
# attempts to download the missing source tarball
|
"--enable-vendor"
|
||||||
"--set=build.rustfmt=${rustfmt}/bin/rustfmt"
|
"--build=${stdenv.buildPlatform.rust.rustcTargetSpec}"
|
||||||
]
|
"--host=${stdenv.hostPlatform.rust.rustcTargetSpec}"
|
||||||
++ [
|
# std is built for all platforms in --target.
|
||||||
"--tools=rustc,rustdoc,rust-analyzer-proc-macro-srv"
|
"--target=${concatStringsSep "," ([
|
||||||
"--enable-rpath"
|
stdenv.targetPlatform.rust.rustcTargetSpec
|
||||||
"--enable-vendor"
|
|
||||||
"--build=${stdenv.buildPlatform.rust.rustcTargetSpec}"
|
|
||||||
"--host=${stdenv.hostPlatform.rust.rustcTargetSpec}"
|
|
||||||
# std is built for all platforms in --target.
|
|
||||||
"--target=${
|
|
||||||
concatStringsSep "," (
|
|
||||||
[
|
|
||||||
stdenv.targetPlatform.rust.rustcTargetSpec
|
|
||||||
|
|
||||||
# Other targets that don't need any extra dependencies to build.
|
# Other targets that don't need any extra dependencies to build.
|
||||||
]
|
] ++ optionals (!fastCross) [
|
||||||
++ optionals (!fastCross) [
|
"wasm32-unknown-unknown"
|
||||||
"wasm32-unknown-unknown"
|
|
||||||
|
|
||||||
# (build!=target): When cross-building a compiler we need to add
|
# (build!=target): When cross-building a compiler we need to add
|
||||||
# the build platform as well so rustc can compile build.rs
|
# the build platform as well so rustc can compile build.rs
|
||||||
# scripts.
|
# scripts.
|
||||||
]
|
] ++ optionals (stdenv.buildPlatform != stdenv.targetPlatform && !fastCross) [
|
||||||
++ optionals (stdenv.buildPlatform != stdenv.targetPlatform && !fastCross) [
|
stdenv.buildPlatform.rust.rustcTargetSpec
|
||||||
stdenv.buildPlatform.rust.rustcTargetSpec
|
|
||||||
|
|
||||||
# (host!=target): When building a cross-targeting compiler we
|
# (host!=target): When building a cross-targeting compiler we
|
||||||
# need to add the host platform as well so rustc can compile
|
# need to add the host platform as well so rustc can compile
|
||||||
# build.rs scripts.
|
# build.rs scripts.
|
||||||
]
|
] ++ optionals (stdenv.hostPlatform != stdenv.targetPlatform && !fastCross) [
|
||||||
++ optionals (stdenv.hostPlatform != stdenv.targetPlatform && !fastCross) [
|
stdenv.hostPlatform.rust.rustcTargetSpec
|
||||||
stdenv.hostPlatform.rust.rustcTargetSpec
|
])}"
|
||||||
]
|
|
||||||
)
|
|
||||||
}"
|
|
||||||
|
|
||||||
"${setBuild}.cc=${ccForBuild}"
|
"${setBuild}.cc=${ccForBuild}"
|
||||||
"${setHost}.cc=${ccForHost}"
|
"${setHost}.cc=${ccForHost}"
|
||||||
"${setTarget}.cc=${ccForTarget}"
|
"${setTarget}.cc=${ccForTarget}"
|
||||||
|
|
||||||
"${setBuild}.linker=${ccForBuild}"
|
"${setBuild}.linker=${ccForBuild}"
|
||||||
"${setHost}.linker=${ccForHost}"
|
"${setHost}.linker=${ccForHost}"
|
||||||
"${setTarget}.linker=${ccForTarget}"
|
"${setTarget}.linker=${ccForTarget}"
|
||||||
|
|
||||||
"${setBuild}.cxx=${cxxForBuild}"
|
"${setBuild}.cxx=${cxxForBuild}"
|
||||||
"${setHost}.cxx=${cxxForHost}"
|
"${setHost}.cxx=${cxxForHost}"
|
||||||
"${setTarget}.cxx=${cxxForTarget}"
|
"${setTarget}.cxx=${cxxForTarget}"
|
||||||
|
|
||||||
"${setBuild}.crt-static=${lib.boolToString stdenv.buildPlatform.isStatic}"
|
"${setBuild}.crt-static=${lib.boolToString stdenv.buildPlatform.isStatic}"
|
||||||
"${setHost}.crt-static=${lib.boolToString stdenv.hostPlatform.isStatic}"
|
"${setHost}.crt-static=${lib.boolToString stdenv.hostPlatform.isStatic}"
|
||||||
"${setTarget}.crt-static=${lib.boolToString stdenv.targetPlatform.isStatic}"
|
"${setTarget}.crt-static=${lib.boolToString stdenv.targetPlatform.isStatic}"
|
||||||
]
|
] ++ optionals (!withBundledLLVM) [
|
||||||
++ optionals (!withBundledLLVM) [
|
"--enable-llvm-link-shared"
|
||||||
"--enable-llvm-link-shared"
|
"${setBuild}.llvm-config=${llvmSharedForBuild.dev}/bin/llvm-config"
|
||||||
"${setBuild}.llvm-config=${llvmSharedForBuild.dev}/bin/llvm-config"
|
"${setHost}.llvm-config=${llvmSharedForHost.dev}/bin/llvm-config"
|
||||||
"${setHost}.llvm-config=${llvmSharedForHost.dev}/bin/llvm-config"
|
"${setTarget}.llvm-config=${llvmSharedForTarget.dev}/bin/llvm-config"
|
||||||
"${setTarget}.llvm-config=${llvmSharedForTarget.dev}/bin/llvm-config"
|
] ++ optionals (stdenv.isLinux && !stdenv.targetPlatform.isRedox) [
|
||||||
]
|
"--enable-profiler" # build libprofiler_builtins
|
||||||
++ optionals fastCross [
|
] ++ optionals stdenv.buildPlatform.isMusl [
|
||||||
# Since fastCross only builds std, it doesn't make sense (and
|
"${setBuild}.musl-root=${pkgsBuildBuild.targetPackages.stdenv.cc.libc}"
|
||||||
# doesn't work) to build a linker.
|
] ++ optionals stdenv.hostPlatform.isMusl [
|
||||||
"--disable-llvm-bitcode-linker"
|
"${setHost}.musl-root=${pkgsBuildHost.targetPackages.stdenv.cc.libc}"
|
||||||
]
|
] ++ optionals stdenv.targetPlatform.isMusl [
|
||||||
++
|
"${setTarget}.musl-root=${pkgsBuildTarget.targetPackages.stdenv.cc.libc}"
|
||||||
optionals
|
] ++ optionals stdenv.targetPlatform.rust.isNoStdTarget [
|
||||||
(stdenv.isLinux && !stdenv.targetPlatform.isRedox && !(stdenv.targetPlatform.useLLVM or false))
|
"--disable-docs"
|
||||||
[
|
] ++ optionals (stdenv.isDarwin && stdenv.isx86_64) [
|
||||||
"--enable-profiler" # build libprofiler_builtins
|
# https://github.com/rust-lang/rust/issues/92173
|
||||||
]
|
"--set rust.jemalloc"
|
||||||
++ optionals stdenv.buildPlatform.isMusl [
|
];
|
||||||
"${setBuild}.musl-root=${pkgsBuildBuild.targetPackages.stdenv.cc.libc}"
|
|
||||||
]
|
|
||||||
++ optionals stdenv.hostPlatform.isMusl [
|
|
||||||
"${setHost}.musl-root=${pkgsBuildHost.targetPackages.stdenv.cc.libc}"
|
|
||||||
]
|
|
||||||
++ optionals stdenv.targetPlatform.isMusl [
|
|
||||||
"${setTarget}.musl-root=${pkgsBuildTarget.targetPackages.stdenv.cc.libc}"
|
|
||||||
]
|
|
||||||
++ optionals stdenv.targetPlatform.rust.isNoStdTarget [ "--disable-docs" ]
|
|
||||||
++ optionals (stdenv.isDarwin && stdenv.isx86_64) [
|
|
||||||
# https://github.com/rust-lang/rust/issues/92173
|
|
||||||
"--set rust.jemalloc"
|
|
||||||
]
|
|
||||||
++ optionals useLLVM [
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/311930
|
|
||||||
"--llvm-libunwind=${if withBundledLLVM then "in-tree" else "system"}"
|
|
||||||
"--enable-use-libcxx"
|
|
||||||
];
|
|
||||||
|
|
||||||
# if we already have a rust compiler for build just compile the target std
|
# if we already have a rust compiler for build just compile the target std
|
||||||
# library and reuse compiler
|
# library and reuse compiler
|
||||||
buildPhase =
|
buildPhase = if fastCross then "
|
||||||
if fastCross then
|
|
||||||
"
|
|
||||||
runHook preBuild
|
runHook preBuild
|
||||||
|
|
||||||
mkdir -p build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-{std,rustc}/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/
|
mkdir -p build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-{std,rustc}/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/
|
||||||
|
|
@ -239,144 +168,88 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
python ./x.py --keep-stage=0 --stage=1 build library
|
python ./x.py --keep-stage=0 --stage=1 build library
|
||||||
|
|
||||||
runHook postBuild
|
runHook postBuild
|
||||||
"
|
" else null;
|
||||||
else
|
|
||||||
null;
|
|
||||||
|
|
||||||
installPhase =
|
installPhase = if fastCross then ''
|
||||||
if fastCross then
|
runHook preInstall
|
||||||
''
|
|
||||||
runHook preInstall
|
|
||||||
|
|
||||||
python ./x.py --keep-stage=0 --stage=1 install library/std
|
python ./x.py --keep-stage=0 --stage=1 install library/std
|
||||||
mkdir -v $out/bin $doc $man
|
mkdir -v $out/bin $doc $man
|
||||||
ln -s ${rustc.unwrapped}/bin/{rustc,rustdoc} $out/bin
|
ln -s ${rustc.unwrapped}/bin/{rustc,rustdoc} $out/bin
|
||||||
rm -rf -v $out/lib/rustlib/{manifest-rust-std-,}${stdenv.hostPlatform.rust.rustcTargetSpec}
|
ln -s ${rustc.unwrapped}/lib/rustlib/{manifest-rust-std-,}${stdenv.hostPlatform.rust.rustcTargetSpec} $out/lib/rustlib/
|
||||||
ln -s ${rustc.unwrapped}/lib/rustlib/{manifest-rust-std-,}${stdenv.hostPlatform.rust.rustcTargetSpec} $out/lib/rustlib/
|
echo rust-std-${stdenv.hostPlatform.rust.rustcTargetSpec} >> $out/lib/rustlib/components
|
||||||
echo rust-std-${stdenv.hostPlatform.rust.rustcTargetSpec} >> $out/lib/rustlib/components
|
lndir ${rustc.doc} $doc
|
||||||
lndir ${rustc.doc} $doc
|
lndir ${rustc.man} $man
|
||||||
lndir ${rustc.man} $man
|
|
||||||
|
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
''
|
'' else null;
|
||||||
else
|
|
||||||
null;
|
|
||||||
|
|
||||||
# the rust build system complains that nix alters the checksums
|
# the rust build system complains that nix alters the checksums
|
||||||
dontFixLibtool = true;
|
dontFixLibtool = true;
|
||||||
|
|
||||||
inherit patches;
|
inherit patches;
|
||||||
|
|
||||||
postPatch =
|
postPatch = ''
|
||||||
''
|
patchShebangs src/etc
|
||||||
patchShebangs src/etc
|
|
||||||
|
|
||||||
# rust-lld is the name rustup uses for its bundled lld, so that it
|
${optionalString (!withBundledLLVM) "rm -rf src/llvm"}
|
||||||
# doesn't conflict with any system lld. This is not an
|
|
||||||
# appropriate default for Nixpkgs, where there is no rust-lld.
|
|
||||||
substituteInPlace compiler/rustc_target/src/spec/*/*.rs \
|
|
||||||
--replace-quiet '"rust-lld"' '"lld"'
|
|
||||||
|
|
||||||
${optionalString (!withBundledLLVM) "rm -rf src/llvm"}
|
# Useful debugging parameter
|
||||||
|
# export VERBOSE=1
|
||||||
# Useful debugging parameter
|
'' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
|
||||||
# export VERBOSE=1
|
# See https://github.com/jemalloc/jemalloc/issues/1997
|
||||||
''
|
# Using a value of 48 should work on both emulated and native x86_64-darwin.
|
||||||
+ lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
|
export JEMALLOC_SYS_WITH_LG_VADDR=48
|
||||||
# See https://github.com/jemalloc/jemalloc/issues/1997
|
'' + lib.optionalString (!(finalAttrs.src.passthru.isReleaseTarball or false)) ''
|
||||||
# Using a value of 48 should work on both emulated and native x86_64-darwin.
|
mkdir .cargo
|
||||||
export JEMALLOC_SYS_WITH_LG_VADDR=48
|
cat > .cargo/config <<\EOF
|
||||||
''
|
[source.crates-io]
|
||||||
+ lib.optionalString (!(finalAttrs.src.passthru.isReleaseTarball or false)) ''
|
replace-with = "vendored-sources"
|
||||||
mkdir .cargo
|
[source.vendored-sources]
|
||||||
cat > .cargo/config <<\EOF
|
directory = "vendor"
|
||||||
[source.crates-io]
|
EOF
|
||||||
replace-with = "vendored-sources"
|
'';
|
||||||
[source.vendored-sources]
|
|
||||||
directory = "vendor"
|
|
||||||
EOF
|
|
||||||
''
|
|
||||||
+ lib.optionalString stdenv.isFreeBSD ''
|
|
||||||
# lzma-sys bundles an old version of xz that doesn't build
|
|
||||||
# on modern FreeBSD, use the system one instead
|
|
||||||
substituteInPlace src/bootstrap/src/core/build_steps/tool.rs \
|
|
||||||
--replace 'cargo.env("LZMA_API_STATIC", "1");' ' '
|
|
||||||
'';
|
|
||||||
|
|
||||||
# rustc unfortunately needs cmake to compile llvm-rt but doesn't
|
# rustc unfortunately needs cmake to compile llvm-rt but doesn't
|
||||||
# use it for the normal build. This disables cmake in Nix.
|
# use it for the normal build. This disables cmake in Nix.
|
||||||
dontUseCmakeConfigure = true;
|
dontUseCmakeConfigure = true;
|
||||||
|
|
||||||
depsBuildBuild = [
|
depsBuildBuild = [ pkgsBuildHost.stdenv.cc pkg-config ];
|
||||||
pkgsBuildHost.stdenv.cc
|
|
||||||
pkg-config
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs =
|
nativeBuildInputs = [
|
||||||
[
|
file python3 rustc cmake
|
||||||
file
|
which libffi removeReferencesTo pkg-config xz
|
||||||
python3
|
]
|
||||||
rustc
|
++ optionals fastCross [ lndir makeWrapper ];
|
||||||
cmake
|
|
||||||
which
|
|
||||||
libffi
|
|
||||||
removeReferencesTo
|
|
||||||
pkg-config
|
|
||||||
xz
|
|
||||||
]
|
|
||||||
++ optionals fastCross [
|
|
||||||
lndir
|
|
||||||
makeWrapper
|
|
||||||
];
|
|
||||||
|
|
||||||
buildInputs =
|
buildInputs = [ openssl ]
|
||||||
[ openssl ]
|
++ optionals stdenv.isDarwin [ libiconv Security ]
|
||||||
++ optionals stdenv.isDarwin [
|
++ optional (!withBundledLLVM) llvmShared;
|
||||||
libiconv
|
|
||||||
Security
|
|
||||||
zlib
|
|
||||||
]
|
|
||||||
++ optional (!withBundledLLVM) llvmShared.lib
|
|
||||||
++ optional (useLLVM && !withBundledLLVM) [
|
|
||||||
llvmPackages.libunwind
|
|
||||||
# Hack which is used upstream https://github.com/gentoo/gentoo/blob/master/dev-lang/rust/rust-1.78.0.ebuild#L284
|
|
||||||
(runCommandLocal "libunwind-libgcc" { } ''
|
|
||||||
mkdir -p $out/lib
|
|
||||||
ln -s ${llvmPackages.libunwind}/lib/libunwind.so $out/lib/libgcc_s.so
|
|
||||||
ln -s ${llvmPackages.libunwind}/lib/libunwind.so $out/lib/libgcc_s.so.1
|
|
||||||
'')
|
|
||||||
];
|
|
||||||
|
|
||||||
outputs = [
|
outputs = [ "out" "man" "doc" ];
|
||||||
"out"
|
|
||||||
"man"
|
|
||||||
"doc"
|
|
||||||
];
|
|
||||||
setOutputFlags = false;
|
setOutputFlags = false;
|
||||||
|
|
||||||
postInstall =
|
postInstall = lib.optionalString (enableRustcDev && !fastCross) ''
|
||||||
lib.optionalString (enableRustcDev && !fastCross) ''
|
# install rustc-dev components. Necessary to build rls, clippy...
|
||||||
# install rustc-dev components. Necessary to build rls, clippy...
|
python x.py dist rustc-dev
|
||||||
python x.py dist rustc-dev
|
tar xf build/dist/rustc-dev*tar.gz
|
||||||
tar xf build/dist/rustc-dev*tar.gz
|
cp -r rustc-dev*/rustc-dev*/lib/* $out/lib/
|
||||||
cp -r rustc-dev*/rustc-dev*/lib/* $out/lib/
|
rm $out/lib/rustlib/install.log
|
||||||
rm $out/lib/rustlib/install.log
|
for m in $out/lib/rustlib/manifest-rust*
|
||||||
for m in $out/lib/rustlib/manifest-rust*
|
do
|
||||||
do
|
sort --output=$m < $m
|
||||||
sort --output=$m < $m
|
done
|
||||||
done
|
|
||||||
|
|
||||||
''
|
'' + ''
|
||||||
+ ''
|
# remove references to llvm-config in lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
|
||||||
# remove references to llvm-config in lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
|
# and thus a transitive dependency on ncurses
|
||||||
# and thus a transitive dependency on ncurses
|
find $out/lib -name "*.so" -type f -exec remove-references-to -t ${llvmShared} '{}' '+'
|
||||||
find $out/lib -name "*.so" -type f -exec remove-references-to -t ${llvmShared} '{}' '+'
|
|
||||||
|
|
||||||
# remove uninstall script that doesn't really make sense for Nix.
|
# remove uninstall script that doesn't really make sense for Nix.
|
||||||
rm $out/lib/rustlib/uninstall.sh
|
rm $out/lib/rustlib/uninstall.sh
|
||||||
'';
|
'';
|
||||||
|
|
||||||
configurePlatforms = [ ];
|
configurePlatforms = [];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
|
@ -387,44 +260,29 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
passthru = {
|
passthru = {
|
||||||
llvm = llvmShared;
|
llvm = llvmShared;
|
||||||
inherit llvmPackages;
|
inherit llvmPackages;
|
||||||
|
# tests = {
|
||||||
|
# inherit fd ripgrep wezterm;
|
||||||
|
# } // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit firefox thunderbird; };
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = {
|
meta = with lib; {
|
||||||
homepage = "https://www.rust-lang.org/";
|
homepage = "https://www.rust-lang.org/";
|
||||||
description = "Safe, concurrent, practical language";
|
description = "A safe, concurrent, practical language";
|
||||||
maintainers = [ ];
|
maintainers = with maintainers; [ havvy ] ++ teams.rust.members;
|
||||||
license = [
|
license = [ licenses.mit licenses.asl20 ];
|
||||||
lib.licenses.mit
|
|
||||||
lib.licenses.asl20
|
|
||||||
];
|
|
||||||
platforms = [
|
platforms = [
|
||||||
# Platforms with host tools from
|
# Platforms with host tools from
|
||||||
# https://doc.rust-lang.org/nightly/rustc/platform-support.html
|
# https://doc.rust-lang.org/nightly/rustc/platform-support.html
|
||||||
"x86_64-darwin"
|
"x86_64-darwin" "i686-darwin" "aarch64-darwin"
|
||||||
"i686-darwin"
|
"i686-freebsd" "x86_64-freebsd"
|
||||||
"aarch64-darwin"
|
|
||||||
"i686-freebsd"
|
|
||||||
"x86_64-freebsd"
|
|
||||||
"x86_64-solaris"
|
"x86_64-solaris"
|
||||||
"aarch64-linux"
|
"aarch64-linux" "armv6l-linux" "armv7l-linux" "i686-linux"
|
||||||
"armv6l-linux"
|
"loongarch64-linux" "powerpc64-linux" "powerpc64le-linux"
|
||||||
"armv7l-linux"
|
"riscv64-linux" "s390x-linux" "x86_64-linux"
|
||||||
"i686-linux"
|
"aarch64-netbsd" "armv7l-netbsd" "i686-netbsd" "powerpc-netbsd"
|
||||||
"loongarch64-linux"
|
|
||||||
"powerpc64-linux"
|
|
||||||
"powerpc64le-linux"
|
|
||||||
"riscv64-linux"
|
|
||||||
"s390x-linux"
|
|
||||||
"x86_64-linux"
|
|
||||||
"aarch64-netbsd"
|
|
||||||
"armv7l-netbsd"
|
|
||||||
"i686-netbsd"
|
|
||||||
"powerpc-netbsd"
|
|
||||||
"x86_64-netbsd"
|
"x86_64-netbsd"
|
||||||
"i686-openbsd"
|
"i686-openbsd" "x86_64-openbsd"
|
||||||
"x86_64-openbsd"
|
"i686-windows" "x86_64-windows"
|
||||||
"i686-windows"
|
|
||||||
"x86_64-windows"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,6 @@
|
||||||
{
|
{ lib, stdenv, rustPlatform, rustc, Security, asNightly ? false }:
|
||||||
lib,
|
|
||||||
stdenv,
|
rustPlatform.buildRustPackage rec {
|
||||||
rustPlatform,
|
|
||||||
rustc,
|
|
||||||
Security,
|
|
||||||
asNightly ? false,
|
|
||||||
}:
|
|
||||||
rustPlatform.buildRustPackage {
|
|
||||||
pname = "rustfmt" + lib.optionalString asNightly "-nightly";
|
pname = "rustfmt" + lib.optionalString asNightly "-nightly";
|
||||||
inherit (rustc) version src;
|
inherit (rustc) version src;
|
||||||
|
|
||||||
|
|
@ -17,7 +11,9 @@ rustPlatform.buildRustPackage {
|
||||||
# changes hash of vendor directory otherwise
|
# changes hash of vendor directory otherwise
|
||||||
dontUpdateAutotoolsGnuConfigScripts = true;
|
dontUpdateAutotoolsGnuConfigScripts = true;
|
||||||
|
|
||||||
buildInputs = [ rustc.llvm ] ++ lib.optional stdenv.isDarwin Security;
|
buildInputs = [
|
||||||
|
rustc.llvm
|
||||||
|
] ++ lib.optional stdenv.isDarwin Security;
|
||||||
|
|
||||||
# rustfmt uses the rustc_driver and std private libraries, and Rust's build process forces them to have
|
# rustfmt uses the rustc_driver and std private libraries, and Rust's build process forces them to have
|
||||||
# an install name of `@rpath/...` [0] [1] instead of the standard on macOS, which is an absolute path
|
# an install name of `@rpath/...` [0] [1] instead of the standard on macOS, which is an absolute path
|
||||||
|
|
@ -38,17 +34,11 @@ rustPlatform.buildRustPackage {
|
||||||
CFG_RELEASE = rustc.version;
|
CFG_RELEASE = rustc.version;
|
||||||
CFG_RELEASE_CHANNEL = if asNightly then "nightly" else "stable";
|
CFG_RELEASE_CHANNEL = if asNightly then "nightly" else "stable";
|
||||||
|
|
||||||
meta = {
|
meta = with lib; {
|
||||||
description = "Tool for formatting Rust code according to style guidelines";
|
description = "A tool for formatting Rust code according to style guidelines";
|
||||||
homepage = "https://github.com/rust-lang-nursery/rustfmt";
|
homepage = "https://github.com/rust-lang-nursery/rustfmt";
|
||||||
license = with lib.licenses; [
|
license = with licenses; [ mit asl20 ];
|
||||||
mit
|
|
||||||
asl20
|
|
||||||
];
|
|
||||||
mainProgram = "rustfmt";
|
mainProgram = "rustfmt";
|
||||||
maintainers = with lib.maintainers; [
|
maintainers = with maintainers; [ globin basvandijk ];
|
||||||
globin
|
|
||||||
basvandijk
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue