From 06c8ae96d44378f7117fe9dc33406ed5326edc0b Mon Sep 17 00:00:00 2001 From: uku Date: Fri, 27 Sep 2024 14:48:24 +0200 Subject: [PATCH] chore(pkgs): remove reposilite package was upstreamed two months ago --- flake.nix | 2 +- modules/reposilite.nix | 6 ++---- pkgs/all-packages.nix | 1 - pkgs/reposilite.nix | 38 -------------------------------------- 4 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 pkgs/reposilite.nix diff --git a/flake.nix b/flake.nix index bc90af4..7176ec7 100644 --- a/flake.nix +++ b/flake.nix @@ -38,7 +38,7 @@ overlays.default = import ./pkgs/all-packages.nix; nixosModules = { - reposilite = import ./modules/reposilite.nix self; + reposilite = import ./modules/reposilite.nix; }; }; }; diff --git a/modules/reposilite.nix b/modules/reposilite.nix index 7dab9ea..a25da76 100644 --- a/modules/reposilite.nix +++ b/modules/reposilite.nix @@ -1,4 +1,4 @@ -self: { +{ lib, config, pkgs, @@ -6,8 +6,6 @@ self: { }: let cfg = config.services.reposilite; - inherit (pkgs.stdenv.hostPlatform) system; - inherit (lib) getExe @@ -23,7 +21,7 @@ self: { in { options.services.reposilite = { enable = mkEnableOption "reposilite"; - package = mkPackageOption self.packages.${system} "reposilite" {}; + package = mkPackageOption pkgs "reposilite" {}; environmentFile = mkOption { description = mdDoc '' Environment file as defined in {manpage}`systemd.exec(5)` diff --git a/pkgs/all-packages.nix b/pkgs/all-packages.nix index 48c3943..3b507c4 100644 --- a/pkgs/all-packages.nix +++ b/pkgs/all-packages.nix @@ -1,5 +1,4 @@ final: prev: { - reposilite = prev.callPackage ./reposilite.nix {}; enigma = prev.callPackage ./enigma.nix {}; vineflower = prev.callPackage ./vineflower.nix {}; koi = prev.kdePackages.callPackage ./koi.nix {}; diff --git a/pkgs/reposilite.nix b/pkgs/reposilite.nix deleted file mode 100644 index ebb9195..0000000 --- a/pkgs/reposilite.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - makeWrapper, - jre_headless, -}: -stdenv.mkDerivation (finalAttrs: { - name = "reposilite"; - version = "3.5.16"; - - src = fetchurl { - url = with finalAttrs; "https://maven.reposilite.com/releases/com/reposilite/reposilite/${version}/reposilite-${version}-all.jar"; - hash = "sha256-zketAvn0XgBRAS+Bb3KcUcpdydbQQruS+gZ5Bfrjiig="; - }; - - nativeBuildInputs = [makeWrapper]; - - dontUnpack = true; - - installPhase = with finalAttrs; '' - runHook preInstall - - mkdir -p $out/bin $out/share/${name} - cp ${src} $out/share/${name}/${name}.jar - makeWrapper ${jre_headless}/bin/java $out/bin/${name} --add-flags "-jar $out/share/${name}/${name}.jar" - - runHook postInstall - ''; - - meta = with lib; { - description = "Lightweight and easy-to-use repository management software dedicated for the Maven based artifacts in the JVM ecosystem"; - homepage = "https://reposilite.com/"; - license = licenses.asl20; - platforms = platforms.unix; - mainProgram = "reposilite"; - }; -})