diff --git a/pkgs/development/libraries/NSPlist/default.nix b/pkgs/by-name/ns/nsplist/package.nix similarity index 69% rename from pkgs/development/libraries/NSPlist/default.nix rename to pkgs/by-name/ns/nsplist/package.nix index 0ad160673973..92495409f65a 100644 --- a/pkgs/development/libraries/NSPlist/default.nix +++ b/pkgs/by-name/ns/nsplist/package.nix @@ -1,17 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, flex, cmake }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, flex +}: stdenv.mkDerivation { - pname = "NSPlist"; - version = "unstable-2017-04-11"; + pname = "nsplist"; + version = "0-unstable-2017-04-11"; src = fetchFromGitHub { owner = "matthewbauer"; repo = "NSPlist"; rev = "713decf06c1ef6c39a707bc99eb45ac9925f2b8a"; - sha256 = "0v4yfiwfd08hmh2ydgy6pnmlzjbd96k78dsla9pfd56ka89aw74r"; + hash = "sha256-mRyuElLTlOZuUlQ3dKZJbclPq73Gv+YFrBCB5nh0nmw="; }; - nativeBuildInputs = [ flex cmake ]; + nativeBuildInputs = [ + cmake + flex + ]; preConfigure = '' # Regenerate the lexer for improved compatibility with clang 16. diff --git a/pkgs/development/libraries/PlistCpp/default.nix b/pkgs/by-name/pl/plistcpp/package.nix similarity index 58% rename from pkgs/development/libraries/PlistCpp/default.nix rename to pkgs/by-name/pl/plistcpp/package.nix index 4eea44e3ba0b..c2e765e4f5d0 100644 --- a/pkgs/development/libraries/PlistCpp/default.nix +++ b/pkgs/by-name/pl/plistcpp/package.nix @@ -1,22 +1,36 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, NSPlist, pugixml }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, boost +, nsplist +, pugixml +}: stdenv.mkDerivation { - pname = "PlistCpp"; - version = "unstable-11615d"; + pname = "plistcpp"; + version = "0-unstable-2017-04-11"; src = fetchFromGitHub { owner = "matthewbauer"; repo = "PlistCpp"; rev = "11615deab3369356a182dabbf5bae30574967264"; - sha256 = "10jn6bvm9vn6492zix2pd724v5h4lccmkqg3lxfw8r0qg3av0yzv"; + hash = "sha256-+3uw1XgYZMRdp+PhWRmjBJZNxGlX9PhFIsbuVPcyVoI="; }; postPatch = '' sed -i "1i #include " src/Plist.cpp ''; - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost NSPlist pugixml ]; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + boost + nsplist + pugixml + ]; meta = with lib; { maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/development/tools/xib2nib/default.nix b/pkgs/by-name/xi/xib2nib/package.nix similarity index 59% rename from pkgs/development/tools/xib2nib/default.nix rename to pkgs/by-name/xi/xib2nib/package.nix index b579e3674334..56f1e2878343 100644 --- a/pkgs/development/tools/xib2nib/default.nix +++ b/pkgs/by-name/xi/xib2nib/package.nix @@ -1,18 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, pugixml, boost, PlistCpp }: +{ lib +, stdenv +, fetchFromGitHub +, boost +, plistcpp +, pugixml +}: stdenv.mkDerivation { pname = "xib2nib"; - version = "unstable-2017-04-12"; + version = "0-unstable-2017-04-12"; src = fetchFromGitHub { owner = "matthewbauer"; repo = "xib2nib"; rev = "97c6a53aab83d919805efcae33cf80690e953d1e"; - sha256 = "08442f4xg7racknj35nr56a4c62gvdgdw55pssbkn2qq0rfzziqq"; + hash = "sha256-GMf/XQYYCzuX1rcU3l7bTxhGlCnZliHtZCqf14kThCA="; }; - buildInputs = [ PlistCpp pugixml boost ]; - makeFlags = [ "PREFIX=$(out)" ]; + buildInputs = [ + boost + plistcpp + pugixml + ]; + + makeFlags = [ + "PREFIX=$(out)" + ]; meta = with lib; { maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ce168d038e60..ecff8d259255 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -728,6 +728,7 @@ mapAliases ({ noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16 noto-fonts-emoji = noto-fonts-color-emoji; # Added 2023-09-09 noto-fonts-extra = noto-fonts; # Added 2023-04-08 + NSPlist = nsplist; # Added 2024-01-05 nvidia-thrust = throw "nvidia-thrust has been removed because the project was deprecated; use cudaPackages.cuda_cccl"; ### O ### @@ -817,6 +818,7 @@ mapAliases ({ 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_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 prayer = throw "prayer has been removed from nixpkgs"; # Added 2023-11-09 privacyidea = throw "privacyidea has been removed from nixpkgs"; # Added 2023-10-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bdfb60fec1fa..4185d7e3224a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -41631,12 +41631,6 @@ with pkgs; chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing { }; - NSPlist = callPackage ../development/libraries/NSPlist { }; - - PlistCpp = callPackage ../development/libraries/PlistCpp { }; - - xib2nib = callPackage ../development/tools/xib2nib { }; - linode-cli = python3Packages.callPackage ../tools/virtualization/linode-cli { }; hss = callPackage ../tools/networking/hss { };