···54545555 depsExtraArgs ? { },
56565757- # Toggles whether a custom sysroot is created when the target is a .json file.
5858- __internal_dontAddSysroot ? false,
5959-6057 # Needed to `pushd`/`popd` into a subdir of a tarball if this subdir
6158 # contains a Cargo.toml, but isn't part of a workspace (which is e.g. the
6259 # case for `rustfmt`/etc from the `rust-sources).
···125122126123 target = stdenv.hostPlatform.rust.rustcTargetSpec;
127124 targetIsJSON = lib.hasSuffix ".json" target;
128128- useSysroot = targetIsJSON && !__internal_dontAddSysroot;
129129-130130- sysroot = callPackage ./sysroot { } {
131131- inherit target;
132132- shortTarget = stdenv.hostPlatform.rust.cargoShortTarget;
133133- RUSTFLAGS = args.RUSTFLAGS or "";
134134- originalCargoToml = src + /Cargo.toml; # profile info is later extracted
135135- };
136136-137125in
138126139139-# Tests don't currently work for `no_std`, and all custom sysroots are currently built without `std`.
140140-# See https://os.phil-opp.com/testing/ for more information.
141141-assert useSysroot -> !(args.doCheck or true);
142142-143127stdenv.mkDerivation (
144128 (removeAttrs args [
145129 "depsExtraArgs"
···147131 "cargoDeps"
148132 "cargoLock"
149133 ])
150150- // lib.optionalAttrs useSysroot {
151151- RUSTFLAGS = "--sysroot ${sysroot} " + (args.RUSTFLAGS or "");
152152- }
153134 // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && buildType == "debug") {
154154- RUSTFLAGS =
155155- "-C split-debuginfo=packed "
156156- + lib.optionalString useSysroot "--sysroot ${sysroot} "
157157- + (args.RUSTFLAGS or "");
135135+ RUSTFLAGS = "-C split-debuginfo=packed " + (args.RUSTFLAGS or "");
158136 }
159137 // {
160138 cargoDeps = cargoDeps';
···33 stdenvNoCC,
44 fetchFromGitHub,
55 nixosTests,
66+ nix-update-script,
67}:
7889stdenvNoCC.mkDerivation (finalAttrs: {
910 pname = "privatebin";
1010- version = "1.7.5";
1111+ version = "1.7.6";
1212+1113 src = fetchFromGitHub {
1214 owner = "PrivateBin";
1315 repo = "PrivateBin";
1416 tag = finalAttrs.version;
1515- hash = "sha256-LdTteUED/pq4Z4IOBttLPm3K9gx1xVqP24QQ48uvuyI=";
1717+ hash = "sha256-tKzuPpll1GOMlaIDfs5udXrHcTko6jmWJq4dPuPYy6Y=";
1618 };
17191820 installPhase = ''
···2224 runHook postInstall
2325 '';
24262525- passthru.tests = nixosTests.privatebin;
2727+ passthru = {
2828+ tests = nixosTests.privatebin;
2929+ updateScript = nix-update-script { };
3030+ };
26312732 meta = {
2833 changelog = "https://github.com/PrivateBin/PrivateBin/releases/tag/${finalAttrs.version}";
2929- description = "Minimalist, open source online pastebin where the server has zero knowledge of pasted data.";
3434+ description = "Minimalist, open source online pastebin where the server has zero knowledge of pasted data";
3035 homepage = "https://privatebin.info";
3131- license = lib.licenses.gpl2;
3232- maintainers = [ lib.maintainers.savyajha ];
3636+ license = with lib.licenses; [
3737+ # privatebin
3838+ zlib
3939+ # dependencies, see https://github.com/PrivateBin/PrivateBin/blob/master/LICENSE.md
4040+ gpl2Only
4141+ bsd3
4242+ mit
4343+ asl20
4444+ cc-by-40
4545+ ];
4646+ maintainers = with lib.maintainers; [
4747+ savyajha
4848+ defelo
4949+ ];
3350 };
3451})
+7
pkgs/by-name/pr/prrte/package.nix
···35353636 postPatch = ''
3737 patchShebangs ./autogen.pl ./config
3838+3939+ # This is needed for multi-node jobs.
4040+ # mpirun/srun/prterun does not have "prted" in its path unless
4141+ # it is actively pulled in. Hard-coding the nix store path
4242+ # as a default universally solves this issue.
4343+ substituteInPlace src/runtime/prte_mca_params.c --replace-fail \
4444+ "prte_launch_agent = \"prted\"" "prte_launch_agent = \"$out/bin/prted\""
3845 '';
39464047 preConfigure = ''