mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-29 09:04:17 +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
1.0 KiB
Diff
25 lines
1.0 KiB
Diff
diff --color -Naur a/html/CharsetConverter.cc b/html/CharsetConverter.cc
|
|
--- a/html/CharsetConverter.cc 2018-12-29 03:13:56.000000000 +0000
|
|
+++ b/html/CharsetConverter.cc 2021-05-31 23:03:10.705334580 +0100
|
|
@@ -7,7 +7,7 @@
|
|
using namespace std;
|
|
using namespace htmlcxx;
|
|
|
|
-CharsetConverter::CharsetConverter(const string &from, const string &to) throw (Exception)
|
|
+CharsetConverter::CharsetConverter(const string &from, const string &to)
|
|
{
|
|
mIconvDescriptor = iconv_open(to.c_str(), from.c_str());
|
|
if (mIconvDescriptor == (iconv_t)(-1))
|
|
diff --color -Naur a/html/CharsetConverter.h b/html/CharsetConverter.h
|
|
--- a/html/CharsetConverter.h 2018-12-29 03:13:56.000000000 +0000
|
|
+++ b/html/CharsetConverter.h 2021-05-31 23:03:19.042574598 +0100
|
|
@@ -17,7 +17,7 @@
|
|
: std::runtime_error(arg) {}
|
|
};
|
|
|
|
- CharsetConverter(const std::string &from, const std::string &to) throw (Exception);
|
|
+ CharsetConverter(const std::string &from, const std::string &to);
|
|
~CharsetConverter();
|
|
|
|
std::string convert(const std::string &input);
|