mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-29 00:53:57 +00:00
571c71e6f7
We are migrating packages that meet below requirements: 1. using `callPackage` 2. called path is a directory 3. overriding set is empty (`{ }`) 4. not containing path expressions other than relative path (to makenixpkgs-vet happy) 5. not referenced by nix files outside of the directory, other than`pkgs/top-level/all-packages.nix` 6. not referencing nix files outside of the directory 7. not referencing `default.nix` (since it's changed to `package.nix`) 8. `outPath` doesn't change after migration The tool is here: https://github.com/Aleksanaa/by-name-migrate.
25 lines
632 B
Diff
25 lines
632 B
Diff
Avoid build-only store references embedding into 'mutt -v'.
|
|
--- a/txt2c.sh
|
|
+++ b/txt2c.sh
|
|
@@ -21,8 +21,18 @@ txt2c_fallback () {
|
|
echo ";"
|
|
}
|
|
|
|
+nix_store_mangle() {
|
|
+ # consume stdin
|
|
+
|
|
+ # Avoid build-only references to nix store. These are usually
|
|
+ # 'gcc -v' output embedded into 'mutt -v'. But also might be
|
|
+ # ./configure-passed arguments.
|
|
+ sed \
|
|
+ -e "s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g"
|
|
+}
|
|
+
|
|
if ./txt2c test </dev/null >/dev/null 2>&1; then
|
|
- ./txt2c "$1"
|
|
+ nix_store_mangle | ./txt2c "$1"
|
|
else
|
|
- txt2c_fallback "$1"
|
|
+ nix_store_mangle | txt2c_fallback "$1"
|
|
fi
|