From 6a41df472d208befeb71250943b1d337a9657abf Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Mon, 2 Feb 2026 04:31:09 +0100 Subject: [PATCH] libasn1c: refactor and move to pkgs/by-name this shouldn't create any rebuilds --- .../default.nix => by-name/li/libasn1c/package.nix} | 8 ++++---- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) rename pkgs/{servers/osmocom/libasn1c/default.nix => by-name/li/libasn1c/package.nix} (85%) diff --git a/pkgs/servers/osmocom/libasn1c/default.nix b/pkgs/by-name/li/libasn1c/package.nix similarity index 85% rename from pkgs/servers/osmocom/libasn1c/default.nix rename to pkgs/by-name/li/libasn1c/package.nix index 01eb7cf3bd45..941eacf4ea6d 100644 --- a/pkgs/servers/osmocom/libasn1c/default.nix +++ b/pkgs/by-name/li/libasn1c/package.nix @@ -7,19 +7,19 @@ talloc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libasn1c"; version = "0.9.38"; src = fetchFromGitHub { owner = "osmocom"; repo = "libasn1c"; - rev = version; + tag = finalAttrs.version; hash = "sha256-cnXcUvP6WwHVvpdsIVsMkizlLyg9KMwVj8XYX/nIfic="; }; postPatch = '' - echo "${version}" > .tarball-version + echo "${finalAttrs.version}" > .tarball-version ''; nativeBuildInputs = [ @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6eaf5d77c5af..21a0fdf8a6ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6752,7 +6752,6 @@ with pkgs; libappindicator-gtk2 = libappindicator.override { gtkVersion = "2"; }; libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; }; - libasn1c = callPackage ../servers/osmocom/libasn1c/default.nix { }; libbass = (callPackage ../development/libraries/audio/libbass { }).bass; libbass_fx = (callPackage ../development/libraries/audio/libbass { }).bass_fx;