Commit graph

7286 commits

Author SHA1 Message Date
github-actions[bot] 07e4594bf9
Merge staging-next into staging 2023-11-20 00:02:50 +00:00
Robert Hensing 2834c0cf2a
Merge pull request #268458 from Mic92/dockertools
nixos/dockerTools: fixup proot/fakeroot code (fixes dockertools nixos test)
2023-11-19 21:50:16 +01:00
github-actions[bot] bb547494d0
Merge staging-next into staging 2023-11-19 18:01:21 +00:00
Ryan Lahfa 7e869d89ee
Merge pull request #266787 from tvbeat/cargo-manifest-links 2023-11-19 16:14:58 +01:00
Jörg Thalheim 4911915512 nixos/dockerTools: fixup proot/fakeroot code
Not sure how this ever worked but tar was trying to archive /proc and /sys, which failed to work.
Since this is never useful for containers to do, we exclude this now in the proot case.
Also fakeroot is not needed when proot is used as it provideds the same feature.
We now cleanly seperate those cases as both are kind of hacks and it's more likely
that the combination will just trigger new bugs.
2023-11-19 08:30:27 +01:00
K900 b852b4fa5a autoPatchelfHook: fix arguments parsing 2023-11-17 20:46:13 +03:00
midchildan 79459354cb buildNpmPackages: add missing deependencies 2023-11-17 07:58:58 +00:00
Maciej Krüger f67b20cad6
Merge pull request #263939 from hacker1024/fix/dart-fod-wrapper 2023-11-17 05:00:37 +01:00
Weijia Wang b1044bdc9d
Merge pull request #258184 from mdarocha/dotnet-fixes
buildDotnetModule small improvements
2023-11-16 23:41:25 +01:00
Vladimír Čunát a7a8f8253d
Merge #263535: staging-next 2023-10-26 2023-11-16 22:06:22 +01:00
Felix Bühler 05a19f48a9
Merge pull request #267778 from lilyinstarlight/fix/yay-more-fixup-yarn-lock-stuff
prefetch-yarn-deps: re-add git hash for fixup
2023-11-16 21:06:38 +01:00
github-actions[bot] dba5c9ef4e
Merge master into staging-next 2023-11-16 18:01:17 +00:00
Thiago Kenji Okada d0e729bc26
Merge pull request #267861 from thiagokokada/graalvm-fixes
buildGraalvmNativeImage: fix Unicode issue by setting encoding explicitly
2023-11-16 13:48:13 +00:00
github-actions[bot] 301fcc69ba
Merge master into staging-next 2023-11-16 12:01:02 +00:00
happysalada 7fb490674f buildNpmPackage: allow passing npmDeps 2023-11-16 11:57:48 +00:00
Thiago Kenji Okada ca662df7bf buildGraalvmNativeImage: fix Unicode issue by setting encoding explicitly
Remove the old workaround where we set it by LC_ALL, that does not seem
to be working anymore.

Fixes #260161.
2023-11-16 10:13:46 +00:00
Lily Foster d02eb2d0e5
prefetch-yarn-deps: re-add git hash for fixup 2023-11-15 21:02:52 -05:00
Martin Weinelt 3c336a1647
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/libraries/gdcm/default.nix
2023-11-14 13:16:34 +01:00
Aaron Jheng c3104c4cad buildGoModule: deprecate vendorSha256 attribute 2023-11-14 09:37:22 +01:00
github-actions[bot] 772c3bbbf5
Merge master into staging-next 2023-11-14 00:02:14 +00:00
Janik 582f1e7321
Merge pull request #254420 from lilyinstarlight/fix/npm-pack-pls-😭
npmHooks.npmInstallHook: avoid script output in npm pack command
2023-11-13 22:43:57 +01:00
Weijia Wang 74d102ce50 Merge branch 'master' into staging-next 2023-11-12 19:45:20 +01:00
SharzyL b186e2d76e nix-prefetch-git: make it quiet
Some programs (e.g. nvfetcher) parse the output of nix-prefetch-git as
JSON. However, there is a pushd/popd command in nix-prefetch-git that
outputs the directory name, breaking the structure of the result JSON.
We suppressed it with `>/dev/null`.

Passingly fixes a mixuse of tab and spaces.
2023-11-12 15:20:16 +01:00
github-actions[bot] 33248a2caf
Merge master into staging-next 2023-11-12 00:02:14 +00:00
Elliot Cameron 3a99d1b642 nix-prefetch-git: respect NETRC
This script needs to support being run both as part of a `fetchgit`
derivation and as a standalone, command-line tool.

The use of `$NIX_BUILD_TOP` only works when used in `fetchgit` but not when
invoked as a standalone tool. Instead we try to respect `$NETRC` so that
the command-line invocation behaves more like standard tools and the
`fetchgit` derivation can explicitly set `$NETRC` when `netrcPhase` is used
to avoid all ambiguity.
2023-11-11 19:34:54 +01:00
Luka Blaskovic 8ffe19c099 build-rust-crate: set CARGO_MANIFEST_LINKS if links is set 2023-11-11 06:29:50 +00:00
github-actions[bot] e8096ee1e1
Merge staging-next into staging 2023-11-10 18:01:34 +00:00
Alyssa Ross afabc4a15d
Merge remote-tracking branch 'origin/master' into HEAD
Conflicts:
	pkgs/development/libraries/SDL2/default.nix
2023-11-10 15:18:19 +01:00
github-actions[bot] 2fe90802da
Merge master into haskell-updates 2023-11-10 00:12:24 +00:00
github-actions[bot] 6a669d1ab2
Merge staging-next into staging 2023-11-09 18:01:27 +00:00
github-actions[bot] e112f9b8bb
Merge master into staging-next 2023-11-09 18:00:56 +00:00
Yt 5aaeafbe26
buildNpmPackage: make nodejs overridable (#265171)
* buildNpmPackage: allow nodejs to be passed as argument

* Update doc/languages-frameworks/javascript.section.md

Co-authored-by: Lily Foster <lily@lily.flowers>

---------

Co-authored-by: Lily Foster <lily@lily.flowers>
2023-11-09 16:19:24 +00:00
Alyssa Ross e3e57b8f18 lib.systems: elaborate Rust metadata
We need this stuff to be available in lib so make-derivation.nix can
access it to construct the Meson cross file.

This has a couple of other advantages:

 - It makes Rust less special.  Now figuring out what Rust calls a
   platform is the same as figuring out what Linux or QEMU call it.

 - We can unify the schema used to define Rust targets, and the schema
   used to access those values later.  Just like you can set "config"
   or "system" in a platform definition, and then access those same
   keys on the elaborated platform, you can now set "rustcTarget" in
   your crossSystem, and then access "stdenv.hostPlatform.rustcTarget"
   in your code.

"rustcTarget", "rustcTargetSpec", "cargoShortTarget", and
"cargoEnvVarTarget" have the "rustc" and "cargo" prefixes because
these are not exposed to code by the compiler, and are not
standardized.  The arch/os/etc. variables are all named to match the
forms in the Rust target spec JSON.

The new rust.target-family only takes a list, since we don't need to
worry about backwards compatibility when that name is used.

The old APIs are all still functional with no warning for now, so that
it's possible for external code to use a single API on both 23.05 and
23.11.  We can introduce the warnings once 23.05 is EOL, and make them
hard errors when 23.11 is EOL.
2023-11-09 10:02:24 +01:00
github-actions[bot] fecd99b105
Merge staging-next into staging 2023-11-09 06:01:40 +00:00
github-actions[bot] 4aad65bfdb
Merge master into staging-next 2023-11-09 06:01:11 +00:00
Shogo Takata d6e1c7cae6
fetchgit: shallow clone for submodules (#254172) 2023-11-09 04:32:13 +02:00
github-actions[bot] d0018c61ff
Merge staging-next into staging 2023-11-07 18:01:28 +00:00
Maximilian Bosch be31242d37
Merge pull request #265414 from lheckemann/fix-empty-closureInfo
closureInfo: handle empty path set explicitly
2023-11-07 17:18:10 +01:00
Weijia Wang 8012034692 Merge branch 'staging-next' into staging 2023-11-07 03:41:49 +01:00
github-actions[bot] 8541e5ab09
Merge master into haskell-updates 2023-11-07 00:12:32 +00:00
github-actions[bot] 38bc2a577e
Merge master into staging-next 2023-11-07 00:02:31 +00:00
Artturi 59ff987fed
Merge pull request #264684 from ShamrockLee/shellcheck-minimal 2023-11-06 23:19:00 +02:00
Weijia Wang 32da89a1a1 Merge branch 'master' into staging-next 2023-11-06 14:33:18 +01:00
K900 fa40d6457a nix-prefetch-git: download submodules with --progress 2023-11-05 20:49:03 +03:00
Linus Heckemann bdd23d10b2 closureInfo: handle empty path set explicitly
Arguably, this is a bug in Nix's structuredAttrs: without
structuredAttrs, exportReferencesGraph with an empty path set would
still result in information being provided. With structuredAttrs, no
info is provided for an empty path set.

Nevertheless, we need to be able to build even if Nix has the bug, so
work around it by checking for an empty path set and handling it
explicitly.
2023-11-04 09:54:41 +01:00
github-actions[bot] 0f196bb1eb
Merge master into haskell-updates 2023-11-01 00:13:02 +00:00
Yueh-Shun Li 409f95731e shellcheck-minimal: init
Expose the minimal and stripped shellcheck package used by writeShellApplication.
2023-11-01 06:23:04 +08:00
github-actions[bot] f190372f1f
Merge staging-next into staging 2023-10-31 12:01:49 +00:00
github-actions[bot] 2fd5f8dd7a
Merge master into staging-next 2023-10-31 12:01:11 +00:00
Ryan Lahfa b10994c38c
Merge pull request #220429 from amjoseph-nixpkgs/pr/build-rust-crate/cross/linker 2023-10-31 12:12:17 +01:00