plistcpp: migrate to by-name, refactor

This commit is contained in:
Weijia Wang 2024-01-05 21:07:17 +01:00
parent a0979ec041
commit 8590df67b9
4 changed files with 23 additions and 10 deletions

View file

@ -1,22 +1,36 @@
{ lib, stdenv, fetchFromGitHub, cmake, boost, NSPlist, pugixml }: { lib
, stdenv
, fetchFromGitHub
, cmake
, boost
, NSPlist
, pugixml
}:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "PlistCpp"; pname = "plistcpp";
version = "unstable-11615d"; version = "0-unstable-2017-04-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "matthewbauer"; owner = "matthewbauer";
repo = "PlistCpp"; repo = "PlistCpp";
rev = "11615deab3369356a182dabbf5bae30574967264"; rev = "11615deab3369356a182dabbf5bae30574967264";
sha256 = "10jn6bvm9vn6492zix2pd724v5h4lccmkqg3lxfw8r0qg3av0yzv"; hash = "sha256-+3uw1XgYZMRdp+PhWRmjBJZNxGlX9PhFIsbuVPcyVoI=";
}; };
postPatch = '' postPatch = ''
sed -i "1i #include <algorithm>" src/Plist.cpp sed -i "1i #include <algorithm>" src/Plist.cpp
''; '';
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [
buildInputs = [ boost NSPlist pugixml ]; cmake
];
buildInputs = [
boost
NSPlist
pugixml
];
meta = with lib; { meta = with lib; {
maintainers = with maintainers; [ matthewbauer ]; maintainers = with maintainers; [ matthewbauer ];

View file

@ -2,7 +2,7 @@
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, boost , boost
, PlistCpp , plistcpp
, pugixml , pugixml
}: }:
@ -19,7 +19,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
boost boost
PlistCpp plistcpp
pugixml pugixml
]; ];

View file

@ -792,6 +792,7 @@ mapAliases ({
pinentry_gtk2 = throw "'pinentry_gtk2' has been renamed to/replaced by 'pinentry-gtk2'"; # Converted to throw 2023-09-10 pinentry_gtk2 = throw "'pinentry_gtk2' has been renamed to/replaced by 'pinentry-gtk2'"; # Converted to throw 2023-09-10
pinentry_qt = throw "'pinentry_qt' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2023-09-10 pinentry_qt = throw "'pinentry_qt' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2023-09-10
pinentry_qt5 = pinentry-qt; # Added 2020-02-11 pinentry_qt5 = pinentry-qt; # Added 2020-02-11
PlistCpp = plistcpp; # Added 2024-01-05
poetry2nix = throw "poetry2nix is now maintained out-of-tree. Please use https://github.com/nix-community/poetry2nix/"; # Added 2023-10-26 poetry2nix = throw "poetry2nix is now maintained out-of-tree. Please use https://github.com/nix-community/poetry2nix/"; # Added 2023-10-26
prayer = throw "prayer has been removed from nixpkgs"; # Added 2023-11-09 prayer = throw "prayer has been removed from nixpkgs"; # Added 2023-11-09
privacyidea = throw "privacyidea has been removed from nixpkgs"; # Added 2023-10-31 privacyidea = throw "privacyidea has been removed from nixpkgs"; # Added 2023-10-31

View file

@ -41669,8 +41669,6 @@ with pkgs;
NSPlist = callPackage ../development/libraries/NSPlist { }; NSPlist = callPackage ../development/libraries/NSPlist { };
PlistCpp = callPackage ../development/libraries/PlistCpp { };
linode-cli = python3Packages.callPackage ../tools/virtualization/linode-cli { }; linode-cli = python3Packages.callPackage ../tools/virtualization/linode-cli { };
hss = callPackage ../tools/networking/hss { }; hss = callPackage ../tools/networking/hss { };