mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-21 20:34:06 +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.
67 lines
1.6 KiB
Diff
67 lines
1.6 KiB
Diff
diff -crb --new-file a/lib/error.h b/lib/error.h
|
|
*** a/lib/error.h 1969-12-31 19:00:00.000000000 -0500
|
|
--- b/lib/error.h 2021-01-21 04:38:25.000000000 -0500
|
|
***************
|
|
*** 0 ****
|
|
--- 1,27 ----
|
|
+ #ifndef _ERROR_H_
|
|
+ #define _ERROR_H_
|
|
+
|
|
+ #include <stdarg.h>
|
|
+ #include <stdio.h>
|
|
+ #include <stdlib.h>
|
|
+ #include <string.h>
|
|
+ #include <errno.h>
|
|
+
|
|
+ static unsigned int error_message_count = 0;
|
|
+
|
|
+ static inline void error(int status, int errnum, const char* format, ...)
|
|
+ {
|
|
+ va_list ap;
|
|
+ fprintf(stderr, "%s: ", program_invocation_name);
|
|
+ va_start(ap, format);
|
|
+ vfprintf(stderr, format, ap);
|
|
+ va_end(ap);
|
|
+ if (errnum)
|
|
+ fprintf(stderr, ": %s", strerror(errnum));
|
|
+ fprintf(stderr, "\n");
|
|
+ error_message_count++;
|
|
+ if (status)
|
|
+ exit(status);
|
|
+ }
|
|
+
|
|
+ #endif /* _ERROR_H_ */
|
|
diff -crb --new-file a/src/error.h b/src/error.h
|
|
*** a/src/error.h 1969-12-31 19:00:00.000000000 -0500
|
|
--- b/src/error.h 2021-01-21 04:38:29.000000000 -0500
|
|
***************
|
|
*** 0 ****
|
|
--- 1,27 ----
|
|
+ #ifndef _ERROR_H_
|
|
+ #define _ERROR_H_
|
|
+
|
|
+ #include <stdarg.h>
|
|
+ #include <stdio.h>
|
|
+ #include <stdlib.h>
|
|
+ #include <string.h>
|
|
+ #include <errno.h>
|
|
+
|
|
+ static unsigned int error_message_count = 0;
|
|
+
|
|
+ static inline void error(int status, int errnum, const char* format, ...)
|
|
+ {
|
|
+ va_list ap;
|
|
+ fprintf(stderr, "%s: ", program_invocation_name);
|
|
+ va_start(ap, format);
|
|
+ vfprintf(stderr, format, ap);
|
|
+ va_end(ap);
|
|
+ if (errnum)
|
|
+ fprintf(stderr, ": %s", strerror(errnum));
|
|
+ fprintf(stderr, "\n");
|
|
+ error_message_count++;
|
|
+ if (status)
|
|
+ exit(status);
|
|
+ }
|
|
+
|
|
+ #endif /* _ERROR_H_ */
|