mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-28 00:24:18 +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.
26 lines
874 B
Diff
26 lines
874 B
Diff
diff --git a/SuperBuild/External-CLOUDFLARE-ZLIB.cmake b/SuperBuild/External-CLOUDFLARE-ZLIB.cmake
|
|
index 9f064eb..fe74df5 100644
|
|
--- a/SuperBuild/External-CLOUDFLARE-ZLIB.cmake
|
|
+++ b/SuperBuild/External-CLOUDFLARE-ZLIB.cmake
|
|
@@ -1,8 +1,5 @@
|
|
-set(CLOUDFLARE_BRANCH gcc.amd64) # Cloudflare zlib branch
|
|
-
|
|
ExternalProject_Add(zlib
|
|
- GIT_REPOSITORY "https://github.com/ningfei/zlib.git"
|
|
- GIT_TAG "${CLOUDFLARE_BRANCH}"
|
|
+ URL file://@cloudflareZlib@
|
|
SOURCE_DIR cloudflare-zlib
|
|
BINARY_DIR cloudflare-zlib-build
|
|
CMAKE_ARGS
|
|
diff --git a/SuperBuild/SuperBuild.cmake b/SuperBuild/SuperBuild.cmake
|
|
index 2a0a956..81354a7 100644
|
|
--- a/SuperBuild/SuperBuild.cmake
|
|
+++ b/SuperBuild/SuperBuild.cmake
|
|
@@ -1,6 +1,1 @@
|
|
-# Check if git exists
|
|
-find_package(Git)
|
|
-if(NOT GIT_FOUND)
|
|
- message(FATAL_ERROR "Cannot find Git. Git is required for Superbuild")
|
|
-endif()
|
|
|