From a127b5d14a6732f3f241fe7c549957468fd184bd Mon Sep 17 00:00:00 2001 From: Katalin Rebhan Date: Fri, 9 May 2025 01:00:11 +0200 Subject: [PATCH 1/2] nix-plugin-pijul: disown --- pkgs/by-name/ni/nix-plugin-pijul/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ni/nix-plugin-pijul/package.nix b/pkgs/by-name/ni/nix-plugin-pijul/package.nix index c39ef2281118..85ef2e67eea9 100644 --- a/pkgs/by-name/ni/nix-plugin-pijul/package.nix +++ b/pkgs/by-name/ni/nix-plugin-pijul/package.nix @@ -89,7 +89,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Plugin to add Pijul support to the Nix package manager"; homepage = "https://nest.pijul.com/dblsaiko/nix-plugin-pijul"; license = lib.licenses.lgpl3Plus; - maintainers = [ lib.maintainers.dblsaiko ]; platforms = lib.platforms.unix; }; }) From 33c6c204d0b0a9973e819285d12cd818e0c05803 Mon Sep 17 00:00:00 2001 From: Katalin Rebhan Date: Fri, 9 May 2025 01:00:20 +0200 Subject: [PATCH 2/2] nix-plugin-pijul: drop --- pkgs/by-name/ni/nix-plugin-pijul/package.nix | 94 -------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 pkgs/by-name/ni/nix-plugin-pijul/package.nix diff --git a/pkgs/by-name/ni/nix-plugin-pijul/package.nix b/pkgs/by-name/ni/nix-plugin-pijul/package.nix deleted file mode 100644 index 85ef2e67eea9..000000000000 --- a/pkgs/by-name/ni/nix-plugin-pijul/package.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - lib, - stdenv, - fetchzip, - meson, - ninja, - pkg-config, - boost, - howard-hinnant-date, - - # for tests - runCommand, - pijul, - nixVersions, - nixOverride ? null, - nix-plugin-pijul, -}: -let - nix = if nixOverride != null then nixOverride else nixVersions.nix_2_24; -in -stdenv.mkDerivation (finalAttrs: { - pname = "nix-plugin-pijul"; - version = "0.1.6"; - - src = fetchzip { - url = "https://dblsaiko.net/pub/nix-plugin-pijul/nix-plugin-pijul-${finalAttrs.version}.tar.gz"; - hash = "sha256-BOuBaFvejv1gffhBlAJADLtd5Df71oQbuCnniU07nF4="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - boost - howard-hinnant-date - nix - ]; - - passthru.tests = - let - localRepoCheck = - nixOverride: - runCommand "localRepoCheck-${nixOverride.name}" - { - nativeBuildInputs = [ - pijul - nix - ]; - } - '' - export HOME=$(mktemp -d) - export EDITOR=true - pijul identity new --no-link --no-prompt --display-name 'Test User' --email 'test@example.com' - - pijul init repo - cd repo - - echo "it works" > foo - pijul add foo - pijul record --message 'Add foo' - - output=$( - nix \ - --option plugin-files ${ - nix-plugin-pijul.override { inherit nixOverride; } - }/lib/nix/plugins/pijul.so \ - --extra-experimental-features 'nix-command flakes' \ - eval --impure --raw --expr "builtins.readFile ((builtins.fetchTree \"pijul+file://$PWD\") + \"/foo\")" - ) - - echo $output - - [[ "$output" = "it works" ]] - - mkdir $out - ''; - in - { - stable = localRepoCheck nixVersions.stable; - latest = localRepoCheck nixVersions.latest; - git = localRepoCheck nixVersions.git; - nix_2_24 = localRepoCheck nixVersions.nix_2_24; - }; - - meta = { - description = "Plugin to add Pijul support to the Nix package manager"; - homepage = "https://nest.pijul.com/dblsaiko/nix-plugin-pijul"; - license = lib.licenses.lgpl3Plus; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d31267a5cd39..f5b13025e609 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1316,6 +1316,7 @@ mapAliases { newlib-nanoCross = newlib-nano; # Added 2024-09-06 nix-direnv-flakes = nix-direnv; nix-ld-rs = nix-ld; # Added 2024-08-17 + nix-plugin-pijul = throw "nix-plugin-pijul has been removed due to being discontinued"; # added 2025-05-18 nix-repl = throw ( # Added 2018-08-26 "nix-repl has been removed because it's not maintained anymore, "