mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-26 06:44: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.
27 lines
856 B
Diff
27 lines
856 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 6d5a180..7254292 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -11,7 +11,7 @@ set(CMAKE_MODULE_PATH
|
|
)
|
|
|
|
include(TestHelper)
|
|
-include(VersionHelper)
|
|
+#include(VersionHelper)
|
|
include(ProjectHelper)
|
|
|
|
# NOTE: for sniper we want the exe suffix to be like 0.7.4, not just 0.7
|
|
diff --git a/vendor/samtools.patch b/vendor/samtools.patch
|
|
index f173017..654f878 100644
|
|
--- a/vendor/samtools.patch
|
|
+++ b/vendor/samtools.patch
|
|
@@ -6,7 +6,7 @@ diff -Nuar a/Makefile b/Makefile
|
|
|
|
samtools:lib $(AOBJS)
|
|
- $(CC) $(CFLAGS) -o $@ $(AOBJS) -lm $(LIBPATH) $(LIBCURSES) -lz -L. -lbam
|
|
-+ $(CC) $(CFLAGS) -o $@ $(AOBJS) -lm $(LIBPATH) $(LIBCURSES) -L. -lbam -lz
|
|
++ $(CC) $(CFLAGS) -o $@ $(AOBJS) -lm $(LIBPATH) -lncurses -L. -lbam -lz
|
|
|
|
razip:razip.o razf.o
|
|
$(CC) $(CFLAGS) -o $@ razf.o razip.o -lz
|