From e8c134f783a909edfdc673938c9559c5f4eadb95 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 21 Aug 2024 23:42:02 -0300 Subject: [PATCH 1/3] libbytesize: migrate to by-name --- .../default.nix => by-name/li/libbytesize/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/libbytesize/default.nix => by-name/li/libbytesize/package.nix} (100%) diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/by-name/li/libbytesize/package.nix similarity index 100% rename from pkgs/development/libraries/libbytesize/default.nix rename to pkgs/by-name/li/libbytesize/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86ab62a60c81..45d31c3d5cb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21167,8 +21167,6 @@ with pkgs; libbs2b = callPackage ../development/libraries/audio/libbs2b { }; - libbytesize = callPackage ../development/libraries/libbytesize { }; - libcaca = callPackage ../development/libraries/libcaca { }; libcacard = callPackage ../development/libraries/libcacard { }; From 487bca6f29095fd55888ad8eee8e55af334c0ab8 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 25 Aug 2024 11:30:29 -0300 Subject: [PATCH 2/3] libbytesize: nixfmt-rfc-style --- pkgs/by-name/li/libbytesize/package.nix | 38 ++++++++++++++----------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/li/libbytesize/package.nix b/pkgs/by-name/li/libbytesize/package.nix index f0af39cc8810..57942d672fba 100644 --- a/pkgs/by-name/li/libbytesize/package.nix +++ b/pkgs/by-name/li/libbytesize/package.nix @@ -1,17 +1,18 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, docbook_xml_dtd_43 -, docbook_xsl -, gettext -, gmp -, gtk-doc -, libxslt -, mpfr -, pcre2 -, pkg-config -, python3 +{ + lib, + autoreconfHook, + docbook_xml_dtd_43, + docbook_xsl, + fetchFromGitHub, + gettext, + gmp, + gtk-doc, + libxslt, + mpfr, + pcre2, + pkg-config, + python3, + stdenv, }: stdenv.mkDerivation (finalAttrs: { @@ -25,7 +26,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-IPBoYcnSQ1/ws3mzPUXxgbetZkXRWrGhtakXaVVFb6U="; }; - outputs = [ "out" "dev" "devdoc" "man" ]; + outputs = [ + "out" + "dev" + "devdoc" + "man" + ]; nativeBuildInputs = [ autoreconfHook @@ -49,8 +55,8 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/storaged-project/libbytesize"; description = "Tiny library providing a C 'class' for working with arbitrary big sizes in bytes"; - mainProgram = "bscalc"; license = lib.licenses.lgpl2Plus; + mainProgram = "bscalc"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; }; From 207d668c49bd21de51c6804eb0647e3b989e0d85 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 25 Aug 2024 11:34:55 -0300 Subject: [PATCH 3/3] libbytesize: 2.10 -> 2.11 --- pkgs/by-name/li/libbytesize/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libbytesize/package.nix b/pkgs/by-name/li/libbytesize/package.nix index 57942d672fba..bd395682cc14 100644 --- a/pkgs/by-name/li/libbytesize/package.nix +++ b/pkgs/by-name/li/libbytesize/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libbytesize"; - version = "2.10"; + version = "2.11"; src = fetchFromGitHub { owner = "storaged-project"; repo = "libbytesize"; rev = finalAttrs.version; - hash = "sha256-IPBoYcnSQ1/ws3mzPUXxgbetZkXRWrGhtakXaVVFb6U="; + hash = "sha256-scOnucn7xp6KKEtkpwfyrdzcntJF2l0h0fsQotcceLc="; }; outputs = [