Commit Graph

6233 Commits

Author SHA1 Message Date
Artturin
28ff7991a1 replaceDependency: use runCommandLocal
> Currently when distributed builds enabled each derivation is uploaded to the remote server to have their hashes rewritten.

fixes issue 13056
2023-03-01 14:36:49 +02:00
github-actions[bot]
399e2c78d4
Merge master into staging-next 2023-02-26 06:01:09 +00:00
figsoda
6fcd1dcb0b rustPlatform.importCargoLock: passthru lockFile
This is to make it possible to implement support for updating
`Cargo.lock`s in nix-update by exposing the path to the `Cargo.lock`
file
2023-02-26 00:46:36 -05:00
Winter
115e3413e1 rustPlatform.importCargoLock: add support for v1 lock files
v1 lock files (generated by default by Cargo versions 1.40 and below)
use a single table, `metadata`, to store the checksums of packages.

The primary motivation for doing this now is that we're considering
vendoring all Cargo lock files in Nixpkgs, some packages still use it
(e.g. cargo-asm), and adding support for it doesn't increase the
complexity of the function. No matter the outcome of the vendoring
discussion, this is a nice thing to have because Cargo still supports v1
lock files.
2023-02-26 00:45:40 -05:00
github-actions[bot]
2384cd723b
Merge master into staging-next 2023-02-24 12:01:20 +00:00
Maximilian Bosch
de100f17c3
Merge pull request #217663 from lheckemann/mkshell-preferlocalbuild
mkShell: set preferLocalBuild by default
2023-02-24 07:49:14 +01:00
Alyssa Ross
52c286ee5b
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/libraries/pmdk/default.nix
2023-02-23 13:51:34 +00:00
Artturin
f9fdf2d402 treewide: move NIX_CFLAGS_COMPILE to the env attrset
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper

this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
2023-02-22 21:23:04 +02:00
Linus Heckemann
c4b83df38a mkShell: set preferLocalBuild by default
Before this change, `nix develop` would often result in all the
shell's dependencies being copied to a remote builder, only for the
remote builder to run a trivial derivation build. This change makes
`nix develop` much faster on systems with remote builders configured.
2023-02-22 11:53:51 +01:00
github-actions[bot]
e3e8374b6f
Merge master into staging-next 2023-02-21 00:02:33 +00:00
Will Fancher
bb7cd63150
Merge pull request #215381 from lilyinstarlight/fix/make-initrd-ng-wrapped-executables
make-initrd-ng: support wrapped executables
2023-02-20 14:11:48 -05:00
Lily Foster
d01bc6f9cb
make-initrd-ng: document wrapped file behavior 2023-02-20 07:02:55 -05:00
Lily Foster
4df8f9a2f8
make-initrd-ng: support wrapped executables 2023-02-20 07:02:55 -05:00
github-actions[bot]
507feca606
Merge master into staging-next 2023-02-20 12:01:32 +00:00
Jörg Thalheim
d69bb82f56
Merge pull request #217256 from helsinki-systems/deb-closure-quote-urls
build-support/vm/deb/deb-closure: quote generated urls
2023-02-20 09:35:54 +01:00
Yureka
20539ac23d prefetch-npm-deps: add nix to PATH
Fixes "No such file or directory" error when running prefetch-npm-deps
in its default mode (print hashes, for update scripts etc),
in an environment that doesn't have a `nix` binary (for `nix hash`).
2023-02-20 01:20:56 -05:00
ajs124
3f8ad50f9a build-support/vm/deb/deb-closure: quote generated urls
otherwise, eval fails when the experimental no-url-literals feature is activated

unquoted urls are discouraged after https://github.com/NixOS/rfcs/pull/45
2023-02-20 01:38:31 +01:00
github-actions[bot]
85ba84c218
Merge master into staging-next 2023-02-19 12:01:25 +00:00
sternenseemann
bbe6402eca Merge remote-tracking branch 'origin/master' into haskell-updates 2023-02-18 21:56:57 +01:00
github-actions[bot]
05782cfb75
Merge master into staging-next 2023-02-18 18:01:22 +00:00
Naïm Favier
5de1815be9
Merge pull request #215990 from ncfavier/agda-tests
agda: fix passthru
2023-02-18 16:04:39 +01:00
Alyssa Ross
38f0121cce
Merge master (+ 11b095e revert) into staging-next
Conflicts:
	pkgs/development/libraries/libvisual/default.nix
2023-02-18 14:04:32 +00:00
Thiago Kenji Okada
aea640a73b buildGraalvmNativeImage: allow overriding attributes
Remove the previous function closure, that would make it difficult to
access the inner derivation attributes.

Fix issue #216787.
2023-02-18 12:38:09 +00:00
github-actions[bot]
f442a49be3
Merge master into haskell-updates 2023-02-17 00:14:22 +00:00
github-actions[bot]
164a7e44c7
Merge master into staging-next 2023-02-16 18:01:12 +00:00
superherointj
0eae5c0532
Merge pull request #205156 from yu-re-ka/musl-runinlinuxvm
runInLinuxVM: fix on musl
2023-02-16 12:24:34 -03:00
John Ericson
35d6d3d7b5
Merge pull request #216555 from jordanisaacs/rust-vendor
build-support/rust/lib: Add `toTargetVendor`
2023-02-16 09:33:06 -05:00
github-actions[bot]
5c852cc587
Merge master into staging-next 2023-02-16 12:01:36 +00:00
K900
31b278c0a4
Merge pull request #215837 from K900/fhsenv-x11-socket-permissions
buildFHSUserEnv: fix permissions on /tmp/.X11-unix
2023-02-16 12:25:04 +03:00
Jordan Isaacs
66dccd88b8
build-support/rust/lib: Add toTargetVendor
Used in cases where you need to get the vendor of a target. Such as when
you need to perform dependency resolution outside of Cargo (eg in
Kolloch's crate2nix).
2023-02-15 20:37:45 -05:00
github-actions[bot]
dd816c8cfd
Merge master into haskell-updates 2023-02-16 00:13:54 +00:00
github-actions[bot]
c4fe2133de
Merge staging-next into staging 2023-02-15 06:01:44 +00:00
John Ericson
179bff391b
Merge pull request #216360 from Stunkymonkey/use-optionals
treewide: use lib.optionals
2023-02-14 21:54:13 -05:00
github-actions[bot]
b56ce2853a
Merge master into haskell-updates 2023-02-15 00:14:20 +00:00
github-actions[bot]
58cfebde3e
Merge staging-next into staging 2023-02-15 00:02:50 +00:00
Bob van der Linden
e3a10a12c7 rustPlatform.cargoSetupHook: improve cargoHash instructions
Currently cargo-setup-hook instructs the builder upon cargoSha256 or
cargoHash being out-of-date compared to the Cargo.lock file.

The instructions can be simplified a bit, because nowadays it is fine to
keep a hash empty, instead of filling it with
`0000000000000000000000000000000000000000000000000000`.

Nix nowadays outputs SRI hashes, which should usually be placed in
`cargoHash` instead of `cargoSha256`, but the instructions are still
only referring to `cargoSha256`.

Lastly, the output of Nix doesn't include `got: sha256: ` anymore, as it
now outputs `got: sha256-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX=`.
It would be nice to make it clear that the trailing `=` is important as
well, so the full example SRI hash is mentioned.
2023-02-14 16:14:08 -05:00
Nikolay Korotkiy
8cf41cf4ef
Merge pull request #215713 from sikmir/vmtools
vmTools: update debian versions
2023-02-14 23:33:34 +04:00
Felix Buehler
bc3d5934d7 treewide: use lib.optionals 2023-02-14 19:11:59 +01:00
Ingo Blechschmidt
168d9a5f1e agda: 2.6.2.2 -> 2.6.3 2023-02-14 14:45:39 +01:00
Felix Buehler
cdb39a86e0 treewide: use optionalString 2023-02-13 21:52:34 +01:00
github-actions[bot]
f60ea3cf39
Merge staging-next into staging 2023-02-13 18:01:55 +00:00
Vladimír Čunát
f1f9ae6a3b
Merge #214010: staging-next 2023-02-01 2023-02-13 15:42:23 +01:00
Thiago Kenji Okada
04019089fd
Merge pull request #215583 from thiagokokada/graalvm-ce-refactor
graalvm*-ce: refactor, 22.3.0 -> 22.3.1
2023-02-13 14:39:15 +00:00
Thiago Kenji Okada
d2e047f112 graalvm-ce: add it to all-packages pointing to graalvm11-ce 2023-02-12 19:08:44 +00:00
Naïm Favier
65e774e2a4
agda: fix passthru
The current `//` override to `agda.passthru.tests` is non-recursive so
it destroys everything else under `passthru`, and furthermore does not
go through `mkDerivation` so that we end up with different values for
`agda.tests` and `agda.passthru.tests`.

Fix it by moving the `allPackages` test to the definition of
`withPackages`.
2023-02-12 14:44:16 +01:00
K900
9788650f52 buildFHSUserEnv: fix permissions on /tmp/.X11-unix
This is kinda cursed, but it makes things like `steam-run gamescope` work OOTB.
2023-02-11 17:33:06 +03:00
Thiago Kenji Okada
6704d4f4e4 bbin: inherit graalvmDrv from babashka 2023-02-11 14:03:22 +00:00
Nikolay Korotkiy
4ed059d041
vmTools: update debian versions 2023-02-10 21:39:15 +03:00
Artturi
aaa9ea8ec6
Merge pull request #208537 from Artturin/makesetuphooksupportstrictdeps 2023-02-10 20:08:32 +02:00
Thiago Kenji Okada
256195c07a native-image-installable-svm: init at 22.3.0
Also refactor the buildGraalvm derivation, allowing it to compose with
the other products.
2023-02-09 21:42:39 +00:00