mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-21 04:13:12 +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.
25 lines
667 B
Diff
25 lines
667 B
Diff
diff --git a/cccc/cccc_tbl.cc b/cccc/cccc_tbl.cc
|
|
index df98e2b..59f2572 100644
|
|
--- a/cccc/cccc_tbl.cc
|
|
+++ b/cccc/cccc_tbl.cc
|
|
@@ -96,7 +96,7 @@ bool CCCC_Table<T>::remove(T* old_item_ptr)
|
|
typename map_t::iterator value_iterator=map_t::find(old_item_ptr->key());
|
|
if(value_iterator!=map_t::end())
|
|
{
|
|
- erase(value_iterator);
|
|
+ map_t::erase(value_iterator);
|
|
retval=true;
|
|
}
|
|
return retval;
|
|
diff --git a/makefile b/makefile
|
|
index 23ad004..2cca469 100644
|
|
--- a/makefile
|
|
+++ b/makefile
|
|
@@ -20,5 +20,5 @@ test :
|
|
cd test ; make -f posix.mak
|
|
|
|
install :
|
|
- cd install ; su root -c "make -f install.mak"
|
|
+ cd install ; make -f install.mak
|
|
|