nsplist: migrate to by-name, refactor

4 files changed, 16 insertions, 9 deletions

diff --git a/pkgs/development/libraries/NSPlist/default.nix b/pkgs/by-name/ns/nsplist/package.nix
index 0ad160673973f..92495409f65a7 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/by-name/pl/plistcpp/package.nix b/pkgs/by-name/pl/plistcpp/package.nix
index d973c7da05ef7..c2e765e4f5d05 100644
--- a/pkgs/by-name/pl/plistcpp/package.nix
+++ b/pkgs/by-name/pl/plistcpp/package.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , cmake
 , boost
-, NSPlist
+, nsplist
 , pugixml
 }:
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     boost
-    NSPlist
+    nsplist
     pugixml
   ];
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 61b2e1bef4543..05b7ef5d4b759 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -705,6 +705,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 ###
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 639aeb4955294..4a19758a2b322 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -41667,8 +41667,6 @@ with pkgs;
 
   chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing { };
 
-  NSPlist = callPackage ../development/libraries/NSPlist { };
-
   linode-cli = python3Packages.callPackage ../tools/virtualization/linode-cli { };
 
   hss = callPackage ../tools/networking/hss { };