mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-02 05:42:15 +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.
21 lines
675 B
Diff
21 lines
675 B
Diff
uname -s is used to determine the differences between the command line
|
|
utilities like stat or awk in linux and darwin. However, in nix, guilt
|
|
will be using the nix versions of this programs, not the ones
|
|
installed in the system. Therefore, guilt should use the command-line
|
|
parameters that the linux forms of these commands expect, even if it
|
|
is being run on Darwin.
|
|
|
|
diff --git a/guilt b/guilt
|
|
index bf50343..cfc9332 100755
|
|
--- a/guilt
|
|
+++ b/guilt
|
|
@@ -986,7 +986,7 @@ guards_file="$GUILT_DIR/$branch/guards"
|
|
pager="more"
|
|
[ ! -z "$PAGER" ] && pager="$PAGER"
|
|
|
|
-UNAME_S=`uname -s`
|
|
+UNAME_S="Linux"
|
|
|
|
if [ -r "$GUILT_PATH/os.$UNAME_S" ]; then
|
|
. "$GUILT_PATH/os.$UNAME_S"
|