Commit Graph

7952 Commits

Author SHA1 Message Date
Yureka
e716bbbc22 tree-wide: switch initrd generators back to gnu cpio
Originally, we switched to bsdtar from libarchive to solve a reproducibility issue related to hardlinks

As of gnu cpio 2.14 the --ignore-dirnlink option is introduced and now included in --reproducible, which solves this issue

By switching back, we are in turn solving an issue in libarchive >=3.7.5 erroring out with "Error reading archive -: (null)"

Change-Id: Ib6140d599b6547d8e941b0251ce996e303c41fa6
(cherry picked from commit 0f216e2578)
2024-10-31 15:14:21 +00:00
Thomas Gerbet
4fa7aadebd fetchurl: enable TLS verification when credentials are used
This make sure the credentials cannot be leaked in a MITM attack.
Note that this change might break some existing deployments if the users
tries to fetch resources on endpoints with invalid certificates.
The impacted users will have the following choices:
* fix the endpoint providing the resource
* override SSL_CERT_FILE to either disable the verification (not
  recommended) or to set it to a path including their CA certificate.

(cherry picked from commit a169553f7e)
2024-09-24 14:15:40 +02:00
Axel Karjalainen
be7ee31fc3 treewide: Fix remaining Android sdkVer and ndkVer references (#341106)
Fix remaining sdkVer and ndkVer references

1144d46 renamed sdkVer and ndkVer, but forgot one reference and
incorrectly replaced another

(cherry picked from commit a99c334965)
2024-09-10 22:09:40 +00:00
aleksana
3a6e80c72f buildDotNetGlobalTool: add SRI hash support 2024-08-20 20:34:04 -03:00
aleksana
3e949b4bea nuget-to-nix: generate SRI hash instead of sha256 2024-08-20 20:34:04 -03:00
aleksana
eb19667cc2 mkNugetDeps: add SRI hash support 2024-08-20 20:34:04 -03:00
aleksana
9226dbbf89 fetchNuGet: add SRI hash support 2024-08-20 20:34:04 -03:00
Felix Schröter
ae643f1a9d make-startupitem: fix {prepend,append}ExtraArgs for Exec without arguments
(cherry picked from commit 498d662662)
2024-08-19 02:57:09 +00:00
adisbladis
aa97b8e293 fetchPypiLegacy: Pass cacert to enable TLS verification when username/password is used
The intent was for TLS verification to be enabled when transfering credentials only, and normally disabled for long-term reproducibility.

See https://github.com/nix-community/poetry2nix/issues/1740

(cherry picked from commit bed19bdf39)
2024-08-14 02:21:46 +00:00
adisbladis
be577e4f55 fetchPypiLegacy: pass NETRC via impureEnvVars if inPureEval
Co-authored-by: Matthew Croughan <matt@croughan.sh>
(cherry picked from commit 482a26382f)
2024-08-14 01:17:15 +00:00
adisbladis
a2c791f6c9 fetchPypiLegacy: Reformat with nixfmt
(cherry picked from commit 2a9ab9c1e0)
2024-08-14 01:17:15 +00:00
Felix Schröter
ce608db3b2 make-startupitem: add prependExtraArgs and appendExtraArgs
(cherry picked from commit c9de424f87)
2024-08-10 16:39:27 +00:00
Robert Hensing
9dd5768c0d
Merge pull request #330623 from NixOS/backport-323613-to-release-24.05
[Backport release-24.05] nix-channel: do not set empty nix-path when disabling channels
2024-08-08 18:39:30 +02:00
github-actions[bot]
22bc999d36
Merge release-24.05 into staging-next-24.05 2024-08-03 00:14:29 +00:00
Robert Schütz
6b4cef93c5
nextcloudPackages: update
We no longer use fetchzip because nc4nix no longer unpacks the tarball
before computing the hash.

Based on 2c1d58e90c, but regenerated
the apps to resolve merge conflicts.
2024-08-02 10:14:47 +02:00
Robert Hensing
2b357c3d6e testers.shellcheck: init
Needed for testing upcoming commit.

(cherry picked from commit 3fb14db08a)
2024-07-28 11:31:41 +00:00
Alyssa Ross
339d39157c separateDebugInfo: tell rustc not to strip
There's no point generating debug info if the compiler immediately
strips it before we get a chance to do anything with it.

This is especially important since Cargo 1.77, which asks rustc to
strip by default.

(cherry picked from commit f03d6497cb)
2024-07-28 12:16:04 +02:00
John Ericson
d85399b969 openbsd: Add static linking support
I've had better luck creating statically-linked binaries that work than
dynamically-linked ones, so this is needed quite practically.

(cherry picked from commit 676df1cf2d)
2024-07-10 09:48:00 -04:00
Vincent Laporte
110fd8d577 mkCoqDerivation: fix install path of ML plug-in built w/ dune
(cherry picked from commit be19b5ebc6)
2024-07-09 07:29:35 +02:00
Someone
34b75b8d8a
Merge pull request #316750 from NixOS/backport-306716-to-release-24.05
[Backport release-24.05] apptainer, singularity: refactor defaultPath substitution
2024-07-03 22:09:40 +00:00
PoweredByPie
d96f9b6bdc Resolve _all_ Windows DLL dependencies
The current DLL linker only links direct dependencies of the derivation. Indirect dependencies are sometimes missed.

(cherry picked from commit e72b347c1d)
2024-06-27 20:40:49 +00:00
github-actions[bot]
8f48343ec3
Merge release-24.05 into staging-next-24.05 2024-06-21 00:14:48 +00:00
Martino Fontana
da15d2931d buildFHSEnv: export GST_PLUGIN_SYSTEM_PATH_1_0
GStreamer searches for plugins relative to its binary's location.

However, since bd97973ce0, it uses its *real* binary location, breaking the FHS.

Fixes #311004 (tested on Heroic and Lutris too).

(cherry picked from commit 525636fec9)
2024-06-20 17:48:59 -05:00
github-actions[bot]
af5dfce50d
Merge staging-next-24.05 into staging-24.05 2024-06-12 00:15:37 +00:00
Pol Dellaiera
742021a734 php.packages.composer: do not use buildComposerProject
I decided to avoid the use of `buildComposerProject because it requires `composer-local-repo-plugin` which is going to be refactored.

(cherry picked from commit 450e9396fd)
2024-06-11 05:55:35 +00:00
Pol Dellaiera
a7e222dc6b build-support/php: use php.packages.composer-local-repo-plugin
(cherry picked from commit 6bad2e219e)
2024-06-11 05:55:35 +00:00
Pol Dellaiera
fc2cf2b126 php.buildComposerWithPlugin: init new builder
(cherry picked from commit bd92bef332)
2024-06-11 05:55:35 +00:00
Pol Dellaiera
023c4671c9 build-support/php: add composerGlobal variable
This doesn't change anything to the existing workflow

(cherry picked from commit b258b44a5d)
2024-06-11 05:55:35 +00:00
github-actions[bot]
074ea4eeac
Merge staging-next-24.05 into staging-24.05 2024-06-08 00:15:58 +00:00
Simon Žlender
d105e0e5fe deterministic-uname: Overridable platform
Some packages rely on `uname` to configure the host target which breaks cross-compilation.
We can have more control over the evaluation of `uname` by placing `deterministic-uname` into the package's `nativeBuildInputs`.
However the current `deterministic-uname` is hardcoded to `buildPlatform`.

This PR introduces a build argument `forPlatform` to `deterministic-uname` which allows you to override the platform it reports.

Example:
```nix
deterministic-uname.override { forPlatform = stdenv.hostPlatform; }
```

(cherry picked from commit 2ed51a3ff0)
2024-06-06 19:10:09 +00:00
Yueh-Shun Li
d600849170 singularity-tools.buildImage: increase default memSize
Increase the default RAM size for image-building QEMU VM.

Make singularity.tests.image-hello-cowsay build on aarch64-linux.

(cherry picked from commit d09aedb1a0)
2024-06-02 22:34:19 +00:00
github-actions[bot]
af1476980e
Merge staging-next-24.05 into staging-24.05 2024-05-29 00:16:02 +00:00
Robert Hensing
912abfa907 testers.lycheeLinkCheck: Edit documentation and messages
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
(cherry picked from commit 984b45c609)
2024-05-27 05:55:46 +00:00
Robert Hensing
871a6e4536 testers.lycheeLinkCheck: Validate regex...
... because of the odd choice of config syntax.

(cherry picked from commit 89092532e7)
2024-05-27 05:55:46 +00:00
Robert Hensing
5a51f54ec4 testers.lycheeLinkCheck: Fix plain derivation remap, showcase emptyDirectory
(cherry picked from commit 60536f85a3)
2024-05-27 05:55:46 +00:00
Robert Hensing
20fccd7b6c testers.lycheeLinkCheck: Update docs
A deep dive reveals that the needles in our haystack are actually
regular expressions.

(cherry picked from commit 076c5afd20)
2024-05-27 05:55:46 +00:00
Robert Hensing
25a5fced3c testers.lycheeLinkCheck: Generalize remapUrl convenience feature
(cherry picked from commit f6b7891368)
2024-05-27 05:55:46 +00:00
Robert Hensing
8567fac505 testers.lycheeLinkCheck: Add online attribute for nix run
(cherry picked from commit c2ebd3ea60)
2024-05-27 05:55:46 +00:00
Robert Hensing
bf8c7334f8 testers.lycheeLinkCheck: init
(cherry picked from commit 6af49f27ed)
2024-05-27 05:55:46 +00:00
Thomas Watson
d53b5e87af setup-hooks/strip: uniqify files by inode number before stripping
https://github.com/NixOS/nixpkgs/pull/246164 but for hardlinks.

Mesa, among other packages, has binaries that are linked together and
can end up corrupted when the same binary is stripped through two
different names.

To resolve this, print out the device and inode number before each file
name, sort/uniq based on that, then cut it back out before stripping.

The symlink resolution logic is removed as the same file accessed
through two different links in `$paths` will necessarily have the same
numbers. File/directory within the paths listed in `$paths` are
correctly not (and were never) processed due to the `-type f` predicate
and (implied) `-P` option to `find`.

(cherry picked from commit 4d6d293fad)
2024-05-26 01:04:11 -04:00
K900
ca2605c4e2
Merge pull request #312241 from tpwrules/bwrap-better-display
buildFHSEnvBubblewrap: allow more varied $DISPLAY syntax
2024-05-21 22:52:24 +03:00
Audrey Dutcher
718b237d0b bintools: Add dynamic loader path for FreeBSD native 2024-05-21 08:20:45 +02:00
Audrey Dutcher
8073fc75a8 bintools: Add an assertion which produces better error messages 2024-05-21 08:20:45 +02:00
Robert Hensing
28df2298ff
Merge pull request #311069 from nbraud/fix-307770
testers.hasPkgConfigModules: fix bug in `versionCheck` handling
2024-05-21 00:13:09 +02:00
Thomas Watson
dd99084843 buildFHSEnvBubblewrap: allow more varied $DISPLAY syntax
The $DISPLAY variable has a format of [host]:num[.screen]. Previously,
the number would only be extracted properly if it had the form :num.
Allow all forms but correctly discard the unused parts.
2024-05-16 10:14:07 -05:00
Atemu
b4047a0455
Merge pull request #279260 from SuperSamus/multiPkgs-false-remove
treewide: remove `multiArch=false` and wrong usage of `extraPkgs`
2024-05-14 09:59:43 +02:00
Martino Fontana
1ee25e4d13 wrapAppImage: default extraPkgs to pkgs: [ ]
Sane default in preparation for the next commit.
2024-05-13 20:32:47 +02:00
Pol Dellaiera
7325d7ec2d
Merge pull request #310325 from patka-123/php-default-updatescript2
buildsupport/php: add passthru.updateScript
2024-05-13 14:08:52 +02:00
nicoo
bf4d46e338 fixup! testers.hasPkgConfigModules: don't display on ignored version mismatches 2024-05-12 20:48:09 +00:00
nicoo
43efaaaae8 testers.hasPkgConfigModules: don't display on ignored version mismatches 2024-05-12 14:12:41 +00:00