From 3c2a374da2bbb8e67b0b25f324cf617f78dd7644 Mon Sep 17 00:00:00 2001 From: Alice Carroll Date: Sat, 13 Jul 2024 17:52:59 +0300 Subject: [PATCH 1/2] clipper2: migrate to pkgs/by-name --- .../libraries => by-name/cl}/clipper2/0001-fix-pc-paths.patch | 0 .../clipper2/default.nix => by-name/cl/clipper2/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{development/libraries => by-name/cl}/clipper2/0001-fix-pc-paths.patch (100%) rename pkgs/{development/libraries/clipper2/default.nix => by-name/cl/clipper2/package.nix} (100%) diff --git a/pkgs/development/libraries/clipper2/0001-fix-pc-paths.patch b/pkgs/by-name/cl/clipper2/0001-fix-pc-paths.patch similarity index 100% rename from pkgs/development/libraries/clipper2/0001-fix-pc-paths.patch rename to pkgs/by-name/cl/clipper2/0001-fix-pc-paths.patch diff --git a/pkgs/development/libraries/clipper2/default.nix b/pkgs/by-name/cl/clipper2/package.nix similarity index 100% rename from pkgs/development/libraries/clipper2/default.nix rename to pkgs/by-name/cl/clipper2/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cfe1b3d7c7e1..1a68c4eb1449 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20080,8 +20080,6 @@ with pkgs; clipper = callPackage ../development/libraries/clipper { }; - clipper2 = callPackage ../development/libraries/clipper2 { }; - cln = callPackage ../development/libraries/cln { }; clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { }; From d09ac17c838dc066ac6f5dd4ed4667245eac903b Mon Sep 17 00:00:00 2001 From: Alice Carroll Date: Sat, 13 Jul 2024 17:55:37 +0300 Subject: [PATCH 2/2] clipper2: use lib.platforms.all While there might actually be broken platforms, there is no reason to limit supported platforms to just Linux systems. --- pkgs/by-name/cl/clipper2/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/cl/clipper2/package.nix b/pkgs/by-name/cl/clipper2/package.nix index ea3383871433..cbcee8a3aa9a 100644 --- a/pkgs/by-name/cl/clipper2/package.nix +++ b/pkgs/by-name/cl/clipper2/package.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/AngusJohnson/Clipper2"; license = lib.licenses.boost; maintainers = [ lib.maintainers.cadkin ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; }