mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-01 10:34:16 +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.
34 lines
808 B
Diff
34 lines
808 B
Diff
diff --git a/dotoolc b/dotoolc
|
|
index e2f7bba..6d1879e 100755
|
|
--- a/dotoolc
|
|
+++ b/dotoolc
|
|
@@ -7,7 +7,7 @@ is $DOTOOL_PIPE else /tmp/dotool-pipe.' >&2
|
|
fi
|
|
|
|
fifo_being_read(){
|
|
- [ -p "$1" ] && /bin/echo 1<>"$1" >"$1"
|
|
+ [ -p "$1" ] && echo 1<>"$1" >"$1"
|
|
}
|
|
|
|
p="${DOTOOL_PIPE:-/tmp/dotool-pipe}"
|
|
diff --git a/dotoold b/dotoold
|
|
index 48a7789..c405312 100755
|
|
--- a/dotoold
|
|
+++ b/dotoold
|
|
@@ -12,7 +12,7 @@ for the pipe is $DOTOOL_PIPE else /tmp/dotool-pipe.' >&2
|
|
done
|
|
|
|
fifo_being_read(){
|
|
- [ -p "$1" ] && /bin/echo 1<>"$1" >"$1"
|
|
+ [ -p "$1" ] && echo 1<>"$1" >"$1"
|
|
}
|
|
|
|
p="${DOTOOL_PIPE:-/tmp/dotool-pipe}"
|
|
@@ -25,5 +25,5 @@ fi
|
|
rm -f -- "$p" || exit 1
|
|
trap 'rm -f -- "$p"; pkill -P $$; trap - EXIT; exit' EXIT INT TERM HUP
|
|
mkfifo -m 660 "$p" || exit 1
|
|
-dotool "$@" <> "$p" &
|
|
+@dotool@ "$@" <> "$p" &
|
|
wait $!
|