From 311aa5d97b323beb816c81d93caca49a5bae961a Mon Sep 17 00:00:00 2001 From: eljamm Date: Mon, 16 Jun 2025 13:45:26 +0200 Subject: [PATCH 1/3] naja: drop unneded dependencies --- pkgs/by-name/na/naja/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/na/naja/package.nix b/pkgs/by-name/na/naja/package.nix index 24cf7ee71259..4c2ff3b7218e 100644 --- a/pkgs/by-name/na/naja/package.nix +++ b/pkgs/by-name/na/naja/package.nix @@ -8,7 +8,6 @@ capnproto, doxygen, flex, - libdwarf-lite, pkg-config, python3, tbb_2021_11, @@ -63,14 +62,11 @@ stdenv.mkDerivation { boost capnproto # cmake modules flex # include dir - libdwarf-lite tbb_2021_11 python3 ]; cmakeFlags = [ - (lib.cmakeBool "CPPTRACE_USE_EXTERNAL_LIBDWARF" true) - (lib.cmakeBool "CPPTRACE_USE_EXTERNAL_ZSTD" true) # provide correct executables for cross (lib.cmakeFeature "Python3_EXECUTABLE" (lib.getExe python3.pythonOnBuildForHost)) # TODO: remove these once capnp cross is fixed properly From 2974885704e67baf333c64d39b06e4f06d5c27a5 Mon Sep 17 00:00:00 2001 From: eljamm Date: Mon, 16 Jun 2025 13:54:04 +0200 Subject: [PATCH 2/3] naja: 0-unstable-2025-01-13 -> 0.1.16 Also: - use finalAttrs - add update script --- pkgs/by-name/na/naja/package.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/na/naja/package.nix b/pkgs/by-name/na/naja/package.nix index 4c2ff3b7218e..10695db23b28 100644 --- a/pkgs/by-name/na/naja/package.nix +++ b/pkgs/by-name/na/naja/package.nix @@ -12,16 +12,17 @@ python3, tbb_2021_11, buildPackages, + nix-update-script, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "naja"; - version = "0-unstable-2025-01-13"; + version = "0.1.16"; src = fetchFromGitHub { owner = "najaeda"; repo = "naja"; - rev = "ffc29daa22e02565b2a0a108f8e65236cdee413a"; - hash = "sha256-XGlgSUHSpHxNrms50pOQ9eoGZ6y79Rbm/sDYW2C4qsg="; + tag = "v${finalAttrs.version}"; + hash = "sha256-MwMpxmmr8fJN49RkRguiEEwPVUIm+OcNFjEixpjn9UY="; fetchSubmodules = true; }; @@ -74,12 +75,14 @@ stdenv.mkDerivation { (lib.cmakeFeature "CAPNPC_CXX_EXECUTABLE" (lib.getExe' buildPackages.capnproto "capnpc-c++")) ]; - doCheck = true; - postInstall = '' moveToOutput lib/libnaja_bne.so $lib ''; + doCheck = true; + + passthru.updateScript = nix-update-script { }; + meta = { description = "Structural Netlist API (and more) for EDA post synthesis flow development"; homepage = "https://github.com/najaeda/naja"; @@ -88,4 +91,4 @@ stdenv.mkDerivation { mainProgram = "naja_edit"; platforms = lib.platforms.all; }; -} +}) From b953f82fdc85ae68d1de70b993f316d5f825ba19 Mon Sep 17 00:00:00 2001 From: eljamm Date: Mon, 16 Jun 2025 13:58:11 +0200 Subject: [PATCH 3/3] libdwarf-lite: drop - Not used in any other derivation - Not needed as it's essentially a mirror of libdrawrf --- pkgs/by-name/li/libdwarf-lite/package.nix | 39 ----------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 pkgs/by-name/li/libdwarf-lite/package.nix diff --git a/pkgs/by-name/li/libdwarf-lite/package.nix b/pkgs/by-name/li/libdwarf-lite/package.nix deleted file mode 100644 index 7091ac3f9730..000000000000 --- a/pkgs/by-name/li/libdwarf-lite/package.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, -}: -stdenv.mkDerivation (finalAttrs: { - pname = "libdwarf-lite"; - version = "0.12.0"; - - src = fetchFromGitHub { - owner = "jeremy-rifkin"; - repo = "libdwarf-lite"; - rev = "v${finalAttrs.version}"; - hash = "sha256-/E0aUVEhEy1v4wm2/t5wLck93Xb/RrKMIwqFYpi6BLA="; - }; - - outputs = [ - "dev" - "lib" - "out" - ]; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - (lib.cmakeBool "BUILD_DWARFDUMP" false) - (lib.cmakeBool "PIC_ALWAYS" true) - ]; - - meta = { - description = "Minimal libdwarf mirror for faster cloning and configuration"; - homepage = "https://github.com/jeremy-rifkin/libdwarf-lite"; - license = lib.licenses.lgpl21Only; - maintainers = [ ]; - mainProgram = "libdwarf-lite"; - platforms = lib.platforms.all; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ebd26e9da9ea..8d1db14fbcfb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1024,6 +1024,7 @@ mapAliases { libbitcoin-network = throw "libbitcoin-network has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24 libbitcoin-protocol = throw "libbitcoin-protocol has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24 libchop = throw "libchop has been removed due to failing to build and being unmaintained upstream"; # Added 2025-05-02 + libdwarf-lite = throw "`libdwarf-lite` has been replaced by `libdwarf` as it's mostly a mirror"; # Added 2025-06-16 libdwg = throw "libdwg has been removed as upstream is unmaintained, the code doesn't build without significant patches, and the package had no reverse dependencies"; # Added 2024-12-28 libfpx = throw "libfpx has been removed as it was unmaintained in Nixpkgs and had known vulnerabilities"; # Added 2025-05-20 libgadu = throw "'libgadu' has been removed as upstream is unmaintained and has no dependents or maintainers in Nixpkgs"; # Added 2025-05-17