From 6d6ac15272e2b617b359a6a209523ea1a7c1be38 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Fri, 16 Jan 2026 20:26:44 -0600 Subject: [PATCH] =?UTF-8?q?ii:=20migrate=20to=20by-name=20-=20Moved=20ii?= =?UTF-8?q?=20from=20pkgs/applications/networking/irc/ii/=20to=20pkgs/by-n?= =?UTF-8?q?ame/ii/ii/=20-=20Renamed=20default.nix=20=E2=86=92=20package.ni?= =?UTF-8?q?x=20to=20follow=20by-name=20conventions=20-=20Switched=20stdenv?= =?UTF-8?q?=20=E2=86=92=20gccStdenv=20directly=20in=20the=20derivation=20-?= =?UTF-8?q?=20Updated=20mkDerivation=20to=20the=20modern=20finalAttrs=20fo?= =?UTF-8?q?rm=20-=20Converted=20fetchurl=20sha256=20=E2=86=92=20hash=20=3D?= =?UTF-8?q?=20style=20-=20Removed=20ii=20from=20all-packages.nix=20(auto-d?= =?UTF-8?q?iscovered=20via=20by-name)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../irc/ii/default.nix => by-name/ii/ii/package.nix} | 10 +++++----- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 5 insertions(+), 9 deletions(-) rename pkgs/{applications/networking/irc/ii/default.nix => by-name/ii/ii/package.nix} (65%) diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/by-name/ii/ii/package.nix similarity index 65% rename from pkgs/applications/networking/irc/ii/default.nix rename to pkgs/by-name/ii/ii/package.nix index fbab300a60bb..4e4133a246d2 100644 --- a/pkgs/applications/networking/irc/ii/default.nix +++ b/pkgs/by-name/ii/ii/package.nix @@ -1,16 +1,16 @@ { lib, - stdenv, + gccStdenv, fetchurl, }: -stdenv.mkDerivation rec { +gccStdenv.mkDerivation (finalAttrs: { pname = "ii"; version = "2.0"; src = fetchurl { - url = "https://dl.suckless.org/tools/${pname}-${version}.tar.gz"; - sha256 = "sha256-T2evzSCMB5ObiKrb8hSXpwKtCgf5tabOhh+fOf/lQls="; + url = "https://dl.suckless.org/tools/ii-${finalAttrs.version}.tar.gz"; + hash = "sha256-T2evzSCMB5ObiKrb8hSXpwKtCgf5tabOhh+fOf/lQls="; }; makeFlags = [ "CC:=$(CC)" ]; @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { mainProgram = "ii"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 566cb5480b7c..7e496e710e57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10783,10 +10783,6 @@ with pkgs; wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { }; - ii = callPackage ../applications/networking/irc/ii { - stdenv = gccStdenv; - }; - ikiwiki = callPackage ../applications/misc/ikiwiki { inherit (perlPackages.override {