Commit Graph

709 Commits

Author SHA1 Message Date
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
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
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
Eelco Dolstra
2f8f328b17
Merge pull request #261627 from DeterminateSystems/nix_2_18_1
nixVersions.unstable: 2.17 -> 2.18.1
2023-10-19 15:17:30 +02:00
Cole Mickens
b4612f975b nixVersions.nix_2_17: 2.17 -> 2.17.1 2023-10-18 08:35:01 -07:00
Cole Mickens
4f0b4199e7
nixVersions.unstable: 2.17 -> 2.18.1 2023-10-17 13:51:07 +02:00
Artturin
7f224f59ea nixVersions.nix_2_18: 2.18.0 -> 2.18.1
Diff: https://github.com/NixOS/nix/compare/2.18.0...2.18.1
2023-10-03 20:36:54 +03:00
Will Fancher
62fe6266e6 Revert "nixVersions.unstable: 2.17 -> 2.18"
This reverts commit 13ec86514d.

This has caused widespread pain because of https://github.com/NixOS/nix/issues/9052
2023-10-01 12:07:28 -04:00
Sandro Jäckel
13ec86514d
nixVersions.unstable: 2.17 -> 2.18 2023-09-21 22:09:33 +02:00
Sandro Jäckel
979709b036
nixVersions.nix_2_18: init 2023-09-21 22:05:48 +02:00
Yureka
f732e2cbb1 nix: disable fortify hardening on musl 2023-09-06 10:42:05 +02:00
Eelco Dolstra
399252962b nixVersions.nix_2_15: 2.15.1 -> 2.15.2 2023-08-14 11:48:20 +02:00
Bernardo Meurer
70dd76d94f
Merge pull request #247475 from qowoz/nix217 2023-08-13 13:27:20 -04:00
Francesco Gazzetta
e9297c8161
Merge pull request #242019 from fgaz/nix/riscv-no-docs
nix: disable documentation on risc-v
2023-08-09 12:15:50 +02:00
Eelco Dolstra
bcb02bd1a5 nixVersions.nix_2_13: 2.13.3 -> 2.13.5 2023-08-08 07:35:13 -07:00
zowoq
3132d2406e nixVersions.stable: 2.15 -> 2.17 2023-08-06 16:12:44 +10:00
Francesco Gazzetta
95c77f3af9 nix: disable documentation on risc-v
mdbook fails due to a rustc bug
https://github.com/rust-lang/rust/issues/114473
2023-08-05 18:42:02 +02:00
Robert Hensing
34ee0260ec treewide: Add meta.mainProgram
Based on ofborg feedback.
Part of https://github.com/NixOS/nixpkgs/pull/246386
2023-08-01 12:21:05 +02:00
figsoda
6bbf5ef59d
Merge pull request #245411 from figsoda/unused-3 2023-07-26 12:01:09 -04:00
figsoda
eab90cce8f pkgs/tools/package-management: remove dead code 2023-07-25 12:12:32 -04:00
zowoq
df4d4190de nixVersions.unstable: 2.16 -> 2.17 2023-07-25 11:06:59 +10:00
zowoq
a5e12bb624 nixVersions.nix_2_17: init at 2.17.0 2023-07-25 11:06:44 +10:00
Jan Malakhovski
917e133273 nix: patchShebangs tests
Without this, building a newer nix (2.15) on an older nix (2.3) with sandboxing
enabled will fail, which is problematic for doing a self-contained update on an
older system.
2023-07-22 05:08:39 +03:00
Alyssa Ross
63bd7437bd nixVersions: hide removed versions for allowAliases = false
By convention, we don't include attributes for throws for removed
versions in Nixpkgs when config.allowAliases is disabled.  (This can
be confirmed by grepping for "allowAliases".)  This makes it possible
to e.g. iterate over nixVersions.
2023-07-02 07:38:09 +00:00
Uri Baghin
f97423f87d nixStatic: backport fix for aarch64-darwin 2023-06-22 15:33:54 +10:00
zowoq
03972059c3 nixVersions.nix_2_16: 2.16.0 -> 2.16.1
https://github.com/NixOS/nix/releases/tag/2.16.1
2023-06-06 22:12:39 +10:00
Silvan Mosberger
4ebf00ed43 nix: 2.13.3 -> 2.15.1 2023-06-01 20:33:31 +02:00
Robert Hensing
fb21e6d7dd
Merge pull request #234070 from tweag/pathType-tests
Init `nixVersions.minimum` and fix `lib` tests for all Nix versions
2023-06-01 20:00:36 +02:00
Silvan Mosberger
29124b85cf nixVersions.minver: init
Co-Authored-By: Robert Hensing <robert@roberthensing.nl>
2023-06-01 18:07:18 +02:00
Bernardo Meurer
95b8221087
nixVersions.unstable: 2.15 -> 2.16 2023-05-31 11:50:55 -04:00
Bernardo Meurer
6964ee2bea
nixVersions.nix_2_16: init at 2.16.0 2023-05-31 11:50:14 -04:00