mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-02 19:14:14 +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.
56 lines
1.8 KiB
Diff
56 lines
1.8 KiB
Diff
diff -ru gfan0.6.2.orig/src/app_librarytest.cpp gfan0.6.2/src/app_librarytest.cpp
|
|
--- gfan0.6.2.orig/src/app_librarytest.cpp 2020-10-19 08:41:27.981863500 +0900
|
|
+++ gfan0.6.2/src/app_librarytest.cpp 2020-10-19 08:42:44.551863500 +0900
|
|
@@ -12,8 +12,8 @@
|
|
#include "setoper.h"
|
|
#include "cdd.h"
|
|
#else
|
|
-#include "cdd/setoper.h"
|
|
-#include "cdd/cdd.h"
|
|
+#include "cddlib/setoper.h"
|
|
+#include "cddlib/cdd.h"
|
|
#endif
|
|
#include <iostream>
|
|
#include <fstream>
|
|
diff -ru gfan0.6.2.orig/src/gfanlib_zcone.cpp gfan0.6.2/src/gfanlib_zcone.cpp
|
|
--- gfan0.6.2.orig/src/gfanlib_zcone.cpp 2020-10-19 08:41:27.981863500 +0900
|
|
+++ gfan0.6.2/src/gfanlib_zcone.cpp 2020-10-19 08:42:44.571863500 +0900
|
|
@@ -16,8 +16,8 @@
|
|
#include "setoper.h"
|
|
#include "cdd.h"
|
|
#else
|
|
-#include "cdd/setoper.h"
|
|
-#include "cdd/cdd.h"
|
|
+#include "cddlib/setoper.h"
|
|
+#include "cddlib/cdd.h"
|
|
#endif
|
|
//}
|
|
|
|
@@ -52,8 +52,8 @@
|
|
"dd_free_global_constants()\n"
|
|
"in your deinitialisation code (only available for cddlib version>=094d).\n"
|
|
"This requires the header includes:\n"
|
|
- "#include \"cdd/setoper.h\"\n"
|
|
- "#include \"cdd/cdd.h\"\n"
|
|
+ "#include \"cddlib/setoper.h\"\n"
|
|
+ "#include \"cddlib/cdd.h\"\n"
|
|
"\n"
|
|
"Alternatively, you may call gfan:initializeCddlibIfRequired() and deinitializeCddlibIfRequired()\n"
|
|
"if gfanlib is the only code using cddlib. If at some point cddlib is no longer required by gfanlib\n"
|
|
diff -ru gfan0.6.2.orig/src/lp_cdd.cpp gfan0.6.2/src/lp_cdd.cpp
|
|
--- gfan0.6.2.orig/src/lp_cdd.cpp 2020-10-19 08:41:27.991863500 +0900
|
|
+++ gfan0.6.2/src/lp_cdd.cpp 2020-10-19 08:42:44.571863500 +0900
|
|
@@ -5,9 +5,9 @@
|
|
#include "cdd.h"
|
|
#include "cdd_f.h"
|
|
#else
|
|
-#include "cdd/setoper.h"
|
|
-#include "cdd/cdd.h"
|
|
-#include "cdd/cdd_f.h"
|
|
+#include "cddlib/setoper.h"
|
|
+#include "cddlib/cdd.h"
|
|
+#include "cddlib/cdd_f.h"
|
|
#endif
|
|
//}
|
|
#include "termorder.h"
|