mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-07 21:43:32 +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.
29 lines
675 B
Diff
29 lines
675 B
Diff
From c7eafa2d7bde0d735b125912542acec2d5896c17 Mon Sep 17 00:00:00 2001
|
|
From: George Huebner <george@feyor.sh>
|
|
Date: Sat, 20 Jul 2024 02:31:20 -0500
|
|
Subject: [PATCH 3/4] remove erroneous HAVE_LIBFLTK guard
|
|
|
|
---
|
|
src/icas.cc | 4 ----
|
|
1 file changed, 4 deletions(-)
|
|
|
|
diff --git a/src/icas.cc b/src/icas.cc
|
|
index f91885b..17a0373 100644
|
|
--- a/src/icas.cc
|
|
+++ b/src/icas.cc
|
|
@@ -2407,11 +2407,7 @@ int main(int ARGC, char *ARGV[]){
|
|
#ifdef __APPLE__
|
|
startc=clock();
|
|
#endif
|
|
-#ifdef HAVE_LIBFLTK
|
|
xcas::icas_eval(gq,e,reading_file,filename,contextptr);
|
|
-#else
|
|
- e=eval(gq,1,contextptr);
|
|
-#endif
|
|
#ifdef __APPLE__
|
|
startc=clock()-startc;
|
|
#endif
|
|
--
|
|
2.44.1
|
|
|