Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nix-everything: Remove libs, add dev and devdoc package outputs #11869

Merged
merged 2 commits into from
Nov 13, 2024

Conversation

roberth
Copy link
Member

@roberth roberth commented Nov 12, 2024

Reshuffle everything.nix so that it's still tested, has multiple package outputs, but is not bloated.

Motivation

Bring out back to its old size

$ nix path-info -Sh nix/2.24.10#default.out
copying '/nix/store/n41ic7p1zsjir4ra9g7khrdlgyb4jgvl-source' to the store/nix/store/hdy82qidsybc3fg561pqfwagv44vschb-nix-2.24.10          93.8 MiB

$ nix path-info -Sh result/
/nix/store/q3rv37qwyskxs9g4gpa7pfwl7gx6mj80-nix-2.26.0pre20241112_dirty   92.9 MiB

Context

The new package output attributes are somewhat experimental, and provided for compatibility most of all.

We'll see how well this goes before the changes proposed in #6507

Priorities and Process

Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.

The new package output attributes are somewhat experimental, and
provided for compatibility most of all.

We'll see how well this goes before the changes proposed in
#6507
@roberth roberth requested review from Ericson2314 and removed request for edolstra November 12, 2024 19:13
Copy link
Member

@edolstra edolstra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. In a perfect world, buildEnv would have multiple output support so it could do this for us...

@Enzime
Copy link
Member

Enzime commented Nov 13, 2024

Looks like this is still missing Library/LaunchDaemons/org.nixos.nix-daemon.plist as per #11862

$ diff -u <(tree -l $(nix build --no-link nix/2.24.10 --json | jq -r '.[0].outputs.out')) <(tree -l $(nix build --no-link nix/unbloat-nix-everything --json | jq -r '.[0].outputs.out'))
--- /dev/fd/11	2024-11-13 11:19:08
+++ /dev/fd/13	2024-11-13 11:19:08
@@ -1,8 +1,5 @@
-/nix/store/3f81gjiv836rjmsb29zab0pbjwf9did8-nix-2.24.10
-├── Library
-│   └── LaunchDaemons
-│       └── org.nixos.nix-daemon.plist
-├── bin
+/nix/store/ypy5n5j6vgnpcnsnssifpz6lxn3npjk2-nix-2.26.0pre20241112_f312a7c
+├── bin -> /nix/store/113gk8k1c83b33b6nps5iz64vlc7nzk7-nix-2.26.0pre20241112_f312a7c/bin
 │   ├── nix
 │   ├── nix-build -> nix
 │   ├── nix-channel -> nix
@@ -15,34 +12,30 @@
 │   ├── nix-prefetch-url -> nix
 │   ├── nix-shell -> nix
 │   └── nix-store -> nix
-├── etc
+├── etc -> /nix/store/113gk8k1c83b33b6nps5iz64vlc7nzk7-nix-2.26.0pre20241112_f312a7c/etc
 │   └── profile.d
 │       ├── nix-daemon.fish
 │       ├── nix-daemon.sh
 │       ├── nix.fish
 │       └── nix.sh
-├── lib
-│   ├── libnixcmd.dylib
-│   ├── libnixexpr.dylib
-│   ├── libnixexprc.dylib
-│   ├── libnixfetchers.dylib
-│   ├── libnixflake.dylib
-│   ├── libnixmain.dylib
-│   ├── libnixstore.dylib
-│   ├── libnixstorec.dylib
-│   ├── libnixutil.dylib
-│   └── libnixutilc.dylib
-├── libexec
+├── lib -> /nix/store/113gk8k1c83b33b6nps5iz64vlc7nzk7-nix-2.26.0pre20241112_f312a7c/lib
+│   ├── systemd
+│   │   └── system
+│   │       ├── nix-daemon.service
+│   │       └── nix-daemon.socket
+│   └── tmpfiles.d
+│       └── nix-daemon.conf
+├── libexec -> /nix/store/113gk8k1c83b33b6nps5iz64vlc7nzk7-nix-2.26.0pre20241112_f312a7c/libexec
 │   └── nix
 │       └── build-remote -> ../../bin/nix
 └── share
-    ├── bash-completion
+    ├── bash-completion -> /nix/store/113gk8k1c83b33b6nps5iz64vlc7nzk7-nix-2.26.0pre20241112_f312a7c/share/bash-completion
     │   └── completions
     │       └── nix
-    ├── fish
+    ├── fish -> /nix/store/113gk8k1c83b33b6nps5iz64vlc7nzk7-nix-2.26.0pre20241112_f312a7c/share/fish
     │   └── vendor_completions.d
     │       └── nix.fish
-    ├── man
+    ├── man -> /nix/store/fgm1gdq7qirvq0gk47hpfw9g5vcidn2d-nix-manual-2.26.0pre20241112_f312a7c-man/share/man
     │   ├── man1
     │   │   ├── nix-build.1.gz
     │   │   ├── nix-channel.1.gz
@@ -88,7 +81,6 @@
     │   │   ├── nix.1.gz
     │   │   ├── nix3-build.1.gz
     │   │   ├── nix3-bundle.1.gz
-    │   │   ├── nix3-config-check.1.gz
     │   │   ├── nix3-config-show.1.gz
     │   │   ├── nix3-config.1.gz
     │   │   ├── nix3-copy.1.gz
@@ -98,8 +90,6 @@
     │   │   ├── nix3-derivation.1.gz
     │   │   ├── nix3-develop.1.gz
     │   │   ├── nix3-edit.1.gz
-    │   │   ├── nix3-env-shell.1.gz
-    │   │   ├── nix3-env.1.gz
     │   │   ├── nix3-eval.1.gz
     │   │   ├── nix3-flake-archive.1.gz
     │   │   ├── nix3-flake-check.1.gz
@@ -114,7 +104,6 @@
     │   │   ├── nix3-flake-update.1.gz
     │   │   ├── nix3-flake.1.gz
     │   │   ├── nix3-fmt.1.gz
-    │   │   ├── nix3-hash-convert.1.gz
     │   │   ├── nix3-hash-file.1.gz
     │   │   ├── nix3-hash-path.1.gz
     │   │   ├── nix3-hash-to-base16.1.gz
@@ -128,11 +117,9 @@
     │   │   ├── nix3-key-generate-secret.1.gz
     │   │   ├── nix3-key.1.gz
     │   │   ├── nix3-log.1.gz
-    │   │   ├── nix3-manpages.gz
     │   │   ├── nix3-nar-cat.1.gz
     │   │   ├── nix3-nar-dump-path.1.gz
     │   │   ├── nix3-nar-ls.1.gz
-    │   │   ├── nix3-nar-pack.1.gz
     │   │   ├── nix3-nar.1.gz
     │   │   ├── nix3-path-info.1.gz
     │   │   ├── nix3-print-dev-env.1.gz
@@ -157,7 +144,6 @@
     │   │   ├── nix3-search.1.gz
     │   │   ├── nix3-store-add-file.1.gz
     │   │   ├── nix3-store-add-path.1.gz
-    │   │   ├── nix3-store-add.1.gz
     │   │   ├── nix3-store-cat.1.gz
     │   │   ├── nix3-store-copy-log.1.gz
     │   │   ├── nix3-store-copy-sigs.1.gz
@@ -165,7 +151,6 @@
     │   │   ├── nix3-store-diff-closures.1.gz
     │   │   ├── nix3-store-dump-path.1.gz
     │   │   ├── nix3-store-gc.1.gz
-    │   │   ├── nix3-store-info.1.gz
     │   │   ├── nix3-store-ls.1.gz
     │   │   ├── nix3-store-make-content-addressed.1.gz
     │   │   ├── nix3-store-optimise.1.gz
@@ -183,9 +168,9 @@
     │   │   └── nix.conf.5.gz
     │   └── man8
     │       └── nix-daemon.8.gz
-    └── zsh
+    └── zsh -> /nix/store/113gk8k1c83b33b6nps5iz64vlc7nzk7-nix-2.26.0pre20241112_f312a7c/share/zsh
         └── site-functions
             ├── _nix
             └── run-help-nix
 
-20 directories, 169 files
+21 directories, 153 files

@Ericson2314 Ericson2314 merged commit 03dc3c5 into master Nov 13, 2024
19 of 20 checks passed
@Ericson2314 Ericson2314 deleted the unbloat-nix-everything branch November 13, 2024 21:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants