Skip to content

nixVersions.nix_2_18: 2.18.4 -> 2.18.5#325929

Merged
roberth merged 1 commit into
NixOS:masterfrom
jfroche:nix-2.18.5
Jul 11, 2024
Merged

nixVersions.nix_2_18: 2.18.4 -> 2.18.5#325929
roberth merged 1 commit into
NixOS:masterfrom
jfroche:nix-2.18.5

Conversation

@jfroche

@jfroche jfroche commented Jul 9, 2024

Copy link
Copy Markdown
Contributor

Fix sandbox on macos.

More details here: NixOS/nix@2.18.4...2.18.5

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@jfroche
nixVersions.nix_2_18: 2.18.4 -> 2.18.5
c08c795 
Fix sandbox on macos.

More details here: NixOS/nix@2.18.4...2.18.5
@jfroche
jfroche requested a review from RaitoBezarius as a code owner July 9, 2024 20:00
@github-actions github-actions Bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jul 9, 2024
@jfroche jfroche added backport release-24.05 and removed 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jul 9, 2024
@jfroche
jfroche requested a review from Artturin July 9, 2024 21:20
@ofborg
ofborg Bot requested review from edolstra and lovesegfault July 9, 2024 21:26
@ofborg ofborg Bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Jul 9, 2024
@emilazy emilazy mentioned this pull request Jul 10, 2024
Merged
13 tasks
@emilazy

emilazy commented Jul 10, 2024

Copy link
Copy Markdown
Member

It’d be great to get this in so that Darwin users don’t have a broken sandbox with the default version. The diff is very small; the only part that should even apply to a Linux build is a simple fix for build directory clean‐up that broke with the sandboxing patch that also broke the Darwin sandbox.

@emilazy

emilazy commented Jul 10, 2024

Copy link
Copy Markdown
Member

Result of nixpkgs-review pr 325929 run on x86_64-linux 1

2 packages blacklisted:
  • nixos-install-tools
  • tests.nixos-functions.nixos-test
120 packages built:
  • appvm
  • attic-client
  • attic-server
  • bundix
  • cabal2nix
  • cached-nix-shell
  • common-updater-scripts
  • crate2nix
  • crystal2nix
  • dep2nix
  • disko
  • dub-to-nix
  • dydisnix
  • fusionInventory
  • haskellPackages.cabal2nix-unstable
  • haskellPackages.cli-nix
  • haskellPackages.cli-nix.doc
  • haskellPackages.niv
  • haskellPackages.niv.bin
  • haskellPackages.niv.data
  • haskellPackages.niv.doc
  • haskellPackages.nix-paths
  • haskellPackages.nix-paths.doc
  • haskellPackages.nix-serve-ng
  • haskellPackages.nix-serve-ng.doc
  • haskellPackages.nix-thunk
  • haskellPackages.nix-thunk.doc
  • haskellPackages.nvfetcher
  • haskellPackages.nvfetcher.doc
  • haskellPackages.update-nix-fetchgit
  • haskellPackages.update-nix-fetchgit.doc
  • home-manager
  • libnixxml
  • lua51Packages.luarocks-nix
  • luarocks-nix (luaPackages.luarocks-nix)
  • lua53Packages.luarocks-nix
  • lua54Packages.luarocks-nix
  • luajitPackages.luarocks-nix
  • luarocks-packages-updater
  • nim_lk
  • niv (niv.bin ,niv.data)
  • nix (nixVersions.nix_2_18 ,nixVersions.stable)
  • nix-bundle
  • nix-direnv
  • nix-doc
  • nix-du
  • nix-index
  • nix-init
  • nix-pin
  • nix-plugins
  • nix-prefetch
  • nix-prefetch-bzr
  • nix-prefetch-cvs
  • nix-prefetch-docker
  • nix-prefetch-git
  • nix-prefetch-hg
  • nix-prefetch-scripts
  • nix-prefetch-svn
  • nix-required-mounts
  • nix-required-mounts.dist
  • nix-serve
  • nix-serve-ng
  • nix-simple-deploy
  • nix-template
  • nix-update
  • nix-update-source
  • nix-update-source.dist
  • nix-update.dist
  • nix-visualize
  • nix-visualize.dist
  • nix-web
  • nix.debug (nixVersions.nix_2_18.debug ,nixVersions.stable.debug)
  • nix.dev (nixVersions.nix_2_18.dev ,nixVersions.stable.dev)
  • nix.doc (nixVersions.nix_2_18.doc ,nixVersions.stable.doc)
  • nix.man (nixVersions.nix_2_18.man ,nixVersions.stable.man)
  • nixStatic
  • nixStatic.dev
  • nixos-anywhere
  • nixos-generators
  • nixos-option
  • nixos-rebuild
  • nixos-shell
  • nixpkgs-hammering
  • nixpkgs-review
  • nixpkgs-review.dist
  • node2nix
  • npins
  • nuget-to-nix
  • nurl
  • nvfetcher
  • outline
  • prefetch-yarn-deps
  • python311Packages.nix-kernel
  • python311Packages.nix-kernel.dist
  • python312Packages.nix-kernel
  • python312Packages.nix-kernel.dist
  • sbomnix
  • sbomnix.dist
  • sonarr
  • swiftpm2nix
  • terranix
  • tests.pkg-config.defaultPkgConfigPackages.nix-cmd
  • tests.pkg-config.defaultPkgConfigPackages.nix-expr
  • tests.pkg-config.defaultPkgConfigPackages.nix-main
  • tests.pkg-config.defaultPkgConfigPackages.nix-store
  • tests.testers.lycheeLinkCheck.network
  • tests.testers.nixosTest-example
  • tests.testers.runNixOSTest-example
  • tests.trivial-builders.references
  • typescript-language-server
  • update-nix-fetchgit
  • update-python-libraries
  • vimPluginsUpdater
  • vulnix
  • vulnix.dist
  • vulnix.doc
  • vulnix.man
  • wp4nix
  • yarn2nix
  • zon2nix

@emilazy

emilazy commented Jul 10, 2024

Copy link
Copy Markdown
Member

I’ve successfully built nix.tests.* on x86_64-linux with this PR.

@roberth
roberth merged commit ca6eda0 into NixOS:master Jul 11, 2024
@github-actions github-actions Bot mentioned this pull request Jul 11, 2024
Merged
1 task
@github-actions

github-actions Bot commented Jul 11, 2024

Copy link
Copy Markdown
Contributor

Successfully created backport PR for release-24.05:

@roberth

roberth commented Jul 11, 2024 •
edited
Loading

Copy link
Copy Markdown
Member

Thank you @jfroche, and Emily for testing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@roberth roberth roberth approved these changes
@emilazy emilazy emilazy approved these changes
@RaitoBezarius RaitoBezarius Awaiting requested review from RaitoBezarius
@Artturin Artturin Awaiting requested review from Artturin
@lovesegfault lovesegfault Awaiting requested review from lovesegfault
@edolstra edolstra Awaiting requested review from edolstra

Assignees

No one assigned

Labels

10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jfroche @emilazy @roberth