Commit Graph

737 Commits

Author SHA1 Message Date
Sergei Trofimovich
d2657c4a3d nixVersions.unstable: 2.21.0 -> 2.21.1
Changes: https://github.com/NixOS/nix/compare/2.21.0...2.21.1
2024-03-28 20:36:12 +00:00
github-actions[bot]
ac91cf83c1
Merge master into staging-next 2024-03-18 00:02:20 +00:00
Yt
3a8eeb4c49
Merge pull request #296670 from PerchunPak/nix-2-16-3
nixVersions.nix_2_16: 2.16.2 -> 2.16.3
2024-03-17 19:03:33 +00:00
PerchunPak
d1885787f6
nixVersions.nix_2_16: 2.16.2 -> 2.16.3 2024-03-17 15:59:49 +01:00
github-actions[bot]
7006358e6a
Merge master into staging-next 2024-03-16 00:02:02 +00:00
Jeremy Kolb
dedae6a564 nixVersions.nix_2_18: 2.18.1 -> 2.18.2 2024-03-13 10:11:16 -04:00
github-actions[bot]
0917422ffe
Merge staging-next into staging 2024-03-12 06:01:24 +00:00
Jörg Thalheim
13efa90535 nixVersions.unstable: 2.20 -> 2.21 2024-03-11 22:25:31 +01:00
Florian Klink
b221192048
Merge pull request #294932 from a-n-n-a-l-e-e/nix_2_3_serial
nixVersions.nix_2_3: disable parallel checking
2024-03-11 12:31:14 +02:00
annalee
d7f6885937
nixVersions.nix_2_3: disable parallel checking 2024-03-11 09:48:16 +00:00
Sandro Jäckel
9080c3655b
nixVersions.unstable: 2.19 -> 2.20 2024-03-07 22:28:33 +01:00
Sandro Jäckel
cbb540ed73
nixVersions.nix_2_20: init at 2.20.5
Changelog: https://github.com/NixOS/nix/blob/2.20.5/doc/manual/src/release-notes/rl-2.20.md
2024-03-07 22:28:01 +01:00
Robert Hensing
d1046938da
nix/boehmgc-nix: add patch for nix 2.20 2024-03-07 22:26:23 +01:00
Raito Bezarius
18c338a63a nixVersions.nix*: mark affected versions as vulnerable to CVE-2024-27297
https://www.cve.org/CVERecord?id=CVE-2024-27297
https://github.com/NixOS/nix/security/advisories/GHSA-2ffj-w4mj-pg37
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
2024-03-07 12:19:29 +01:00
Raito Bezarius
627771c19d nixVersions.nix_2_19: address CVE-2024-27297
https://github.com/NixOS/nix/security/advisories/GHSA-2ffj-w4mj-pg37
https://www.cve.org/CVERecord?id=CVE-2024-27297
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
2024-03-07 12:19:29 +01:00
Raito Bezarius
a5b2c71401 nixVersions.nix_2_18: address CVE-2024-27297
https://github.com/NixOS/nix/security/advisories/GHSA-2ffj-w4mj-pg37
https://www.cve.org/CVERecord?id=CVE-2024-27297
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
2024-03-07 12:19:24 +01:00
Raito Bezarius
11a23deee2 nixVersions.nix_2_3: address CVE-2024-27297
https://github.com/NixOS/nix/security/advisories/GHSA-2ffj-w4mj-pg37
https://www.cve.org/CVERecord?id=CVE-2024-27297
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
2024-03-05 16:48:21 +01:00
Francesco Gazzetta
e9e2111b28 nix: Revert "disable documentation on risc-v"
This reverts commit 95c77f3af9.

rustc now uses LLVM 17 which includes the bugfix this was blocked on.
2024-02-19 15:13:29 +01:00
github-actions[bot]
966fd30804
Merge master into staging-next 2024-02-07 06:01:02 +00:00
Maximilian Bosch
cde314b0c6
nix: add myself (ma27) as maintainer & codeowner
As discussed with RaitoBezarius on FOSDEM, I'm happy to assist in
maintaining the Nix packages of NixPkgs.
2024-02-06 17:55:21 +01:00
Sandro
4a70bf9d73
Merge pull request #268486 from panicgh/boehmgc 2024-01-31 13:46:14 +01:00
Jean-François Roche
4844b997d4 nix: fix installCheckPhase crashes on Darwin
While building nix on Darwin, I encountered an error in the `installCheckPhase`:

```
nix>     building '/private/tmp/nix-build-nix-2.17.1.drv-1/nix-test/tests/fetchurl/store/mkc9z3arar02wi5jii655cjhdinx4npy-fetchurl.sh.drv'...
nix>     waiting for children
nix>     building of '/private/tmp/nix-build-nix-2.17.1.drv-1/nix-test/tests/fetchurl/store/mkc9z3arar02wi5jii655cjhdinx4npy-fetchurl.sh.drv^out' from .drv file: read 377 bytes
nix>     objc[70707]: +[__NSCFConstantString initialize] may have been in progress in another thread when fork() was called.
nix>     objc[70707]: +[__NSCFConstantString initialize] may have been in progress in another thread when fork() was called. We cannot safely call it or ignore it in the fork() child process. Crashing instead. Set a breakpoint on objc_initializeAfterForkError to debug.
nix>     waiting for children
```

I noticed that #278802 should have addressed this problem, but it didn't.
The solution for me was to replace `yes` with `YES`.

As it turns out, most of the references to `OBJC_DISABLE_INITIALIZE_FORK_SAFETY` use `YES` instead of `yes`.

https://airflow.apache.org/blog/airflow-1.10.10/#running-airflow-on-macos
http://sealiesoftware.com/blog/archive/2017/6/5/Objective-C_and_fork_in_macOS_1013.html

The objective C code that parses the environment variable is defined in
the function `environ_init` in [here](cd5e62a559/runtime/objc-runtime.mm (L265)) and it does
`*opt->var = (0 == strcmp(value, "YES"));`.

```
% nix-info -m
 - system: `"aarch64-darwin"`
 - host os: `Darwin 21.3.0, macOS 12.2.1`
 - multi-user?: `yes`
 - sandbox: `yes`
 - version: `nix-env (Nix) 2.19.2`
 - channels(hetzner): `"darwin, nixpkgs-22.05-darwin"`
 - channels(root): `"darwin, nixpkgs-23.05-darwin"`
 - nixpkgs: `/Users/hetzner/git/nixpkgs`
```
2024-01-23 11:05:12 +01:00
Sergei Trofimovich
8a3cd26194 nixUnstable: 2.19.2 -> 2.19.3
Changes: https://github.com/NixOS/nix/compare/2.19.2...2.19.3
2024-01-20 10:33:19 +00:00
Bernardo Meurer
fae15249c5
Merge pull request #276892 from trofi/nix-set-pos-attribute 2024-01-15 13:05:51 -05:00
K900
e7b611e59d Merge remote-tracking branch 'origin/master' into staging-next 2024-01-12 13:59:54 +03:00
Ryan Lahfa
56df644cb4 Revert "nixVersions.stable: 2.18.1 -> 2.19.2"
This version does not pass our NixOS tests, e.g. `nixosTests.misc` and
potentially other fundamental tests such as lib-tests.
2024-01-11 19:15:07 +01:00
Weijia Wang
2f9e98ccf3 Merge branch 'master' into staging-next 2024-01-10 23:12:44 +01:00
éclairevoyant
c27bc49c43
nixVersions.stable: 2.18.1 -> 2.19.2 2024-01-10 14:04:30 -05:00
Randy Eckenrode
8dd78e6dc9
nix: fix installCheckPhase crashes on Darwin
Ensure that `OBJC_DISABLE_INITIALIZE_FORK_SAFETY=yes` is set when
starting the Nix daemon during tests, or the fetchurl.sh test will
crash trying to initialize libcurl. This is happening since IPv6 support
was enabled in https://github.com/NixOS/nixpkgs/pull/277471.

See also:
- http://sealiesoftware.com/blog/archive/2017/6/5/Objective-C_and_fork_in_macOS_1013.html
- https://github.com/NixOS/nix/pull/2674
2024-01-04 19:22:05 -05:00
Sergei Trofimovich
b88dcacafd nix: point nix edit and ofborf at the original version attribute
This way `nix edit` will just at the location close to the attribute
definition and not the common code.
2023-12-26 10:47:29 +00:00
Sergei Trofimovich
b1112b81c8 nixVersions.nix_2_3: fix build against current gcc
Without the change `nix_2_3` fails the build due to it's dependency
pulling in newer `libstdc++`:

    $ nix build --no-link -f. nix_2_3
    error: builder for '/nix/store/d3vqya9ka7sh4m7q53xkjrv1rzbc0qa1-nix-2.3.17.drv' failed with exit code 2;
           last 10 log lines:
           > Note: Writing nix-instantiate.1
           > Note: Writing nix-prefetch-url.1
           > Note: Writing nix.conf.5
           >   LD     src/libstore/libnixstore.so
           >   LD     src/libmain/libnixmain.so
           >   LD     src/libexpr/libnixexpr.so
           >   LD     src/nix/nix
           > /nix/store/xdqs45iclhp9dz8zz9pvn5zivjbhid1a-binutils-2.40/bin/ld: /nix/store/i3qy2bskybxz53kbi9bbz5a3ysbm8asi-aws-sdk-cpp-1.9.294/lib/libaws-cpp-sdk-transfer.so: undefined reference to `std::ios_base_library_init()@GLIBCXX_3.4.32'
           > collect2: error: ld returned 1 exit status
           > make: *** [mk/lib.mk:122: src/nix/nix] Error 1
2023-12-25 16:29:05 +00:00
github-actions[bot]
7ca491d676
Merge staging-next into staging 2023-12-17 12:01:44 +00:00
John Ericson
ab8cf01579 rapidcheck: Use stock installation, multiple outputs
We had neglected to nice `RC_INSTALL_ALL_EXTRAS`, which will take care
of installing the "extras" for us.

Now that they are in a standard directory, we don't need to smuggle in
the extra `-I` for Nix's tests either.
2023-12-14 16:55:02 -05:00
Adam Joseph
cc938b3306 nix_2_3: pin-to-gcc12-if-gcc13 2023-12-07 09:11:37 +00:00
Sandro Jäckel
ca9b6bc0a7 nixVersions.nix_2_19: 2.19.1 -> 2.19.2 2023-12-01 13:10:32 +00:00
Sandro Jäckel
709a9f6f06 nixVersions.unstable: 2.18 -> 2.19 2023-12-01 13:10:32 +00:00
Sandro Jäckel
3773ebf41a nixVersions.nix_2_19: init at 2.19.1 2023-12-01 13:10:32 +00:00
Sergei Trofimovich
79d09979cf nixVersions.unstable: fix patch name related to rapidcheck shared library 2023-11-27 08:42:34 +00:00
John Ericson
98bdc2b3bb nix: Fix build now that rapidcheck is a shared library
Backporting https://github.com/NixOS/nix/pull/9431
2023-11-21 23:35:38 -05:00
Florian Klink
94a5cfaae6 nix_2_3: configure different maintainers 2023-11-20 01:16:08 +02:00
Raito Bezarius
37e563cbc7 nixVersions.2_3: 2.3.16 -> 2.3.17
2.3.17 became a bit more like 2.4, so a lot of the conditionals can
be dropped.

The documentation for 2.3.17 needs libxslt/libxml2 as well as the
docbook stack to render docs.

Co-Authored-By: Florian Klink <flokli@flokli.de>
2023-11-20 01:16:07 +02:00
Nicolas Benes
b2d0641e34 nix: rebase boehmgc-coroutine-sp-fallback.patch 2023-11-19 12:28:05 +01:00
Robert Hensing
4105d387f4
nix.tests: Remove dead code
Co-authored-by: Artturi <Artturin@artturin.com>
2023-11-10 20:13:42 +01:00
Robert Hensing
c8b8ab8155 nix: Add fallback paths check to tests 2023-11-10 18:17:35 +01:00
Robert Hensing
6381cc0525 nix: 2.17.1 -> 2.18.1 2023-11-08 23:19:33 +01:00
Eelco Dolstra
f22fdce31b
Merge pull request #262236 from DeterminateSystems/colemickens/nix_2_16
nixVersions.nix_2_16: 2.16.1 -> 2.16.2
2023-10-20 12:23:09 +02:00
Cole Mickens
f423b624bd
nixVersions.nix_2_16: 2.16.1 -> 2.16.2 2023-10-20 10:27:44 +02:00
Cole Mickens
5001944ed7
nixVersions.nix_2_15: 2.15.2 -> 2.15.3 2023-10-20 10:27:15 +02:00
Cole Mickens
a55511468d
nix: drop unused patch-fix-aarch64-darwin-static patch 2023-10-19 15:37:28 +02:00
Cole Mickens
195a2e5be0
nixVersions.nix_2_13: 2.13.5 -> 2.13.6 2023-10-19 15:28:38 +02:00