From fac4a04df6079dd577abb775097497ca250db52f Mon Sep 17 00:00:00 2001 From: uku Date: Fri, 27 Sep 2024 14:43:18 +0200 Subject: [PATCH 1/3] chore: update flake.lock MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/8471fe90ad337a8074e957b69ca4d0089218391d' (2024-08-01) → 'github:hercules-ci/flake-parts/bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a' (2024-09-12) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/d0e1602ddde669d5beb01aec49d71a51937ed7be' (2024-08-24) → 'github:nixos/nixpkgs/30439d93eb8b19861ccbe3e581abf97bdc91b093' (2024-09-23) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index b6e9c93..2c8ae2c 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724479785, - "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", + "lastModified": 1727122398, + "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be", + "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093", "type": "github" }, "original": { From 06c8ae96d44378f7117fe9dc33406ed5326edc0b Mon Sep 17 00:00:00 2001 From: uku Date: Fri, 27 Sep 2024 14:48:24 +0200 Subject: [PATCH 2/3] 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"; - }; -}) From 9655e7bad4fb619e35ad22ede3a68a9f3ba314d3 Mon Sep 17 00:00:00 2001 From: uku Date: Fri, 27 Sep 2024 14:49:10 +0200 Subject: [PATCH 3/3] chore(pkgs): remove wine-discord-ipc-bridge package was upstreamed --- pkgs/all-packages.nix | 4 ---- pkgs/wine-discord-ipc-bridge.nix | 26 -------------------------- 2 files changed, 30 deletions(-) delete mode 100644 pkgs/wine-discord-ipc-bridge.nix diff --git a/pkgs/all-packages.nix b/pkgs/all-packages.nix index 3b507c4..e8738fc 100644 --- a/pkgs/all-packages.nix +++ b/pkgs/all-packages.nix @@ -2,8 +2,4 @@ final: prev: { enigma = prev.callPackage ./enigma.nix {}; vineflower = prev.callPackage ./vineflower.nix {}; koi = prev.kdePackages.callPackage ./koi.nix {}; - - wine-discord-ipc-bridge = prev.callPackage ./wine-discord-ipc-bridge.nix { - inherit (prev.pkgsCross.mingw32) stdenv; - }; } diff --git a/pkgs/wine-discord-ipc-bridge.nix b/pkgs/wine-discord-ipc-bridge.nix deleted file mode 100644 index bd7b7ae..0000000 --- a/pkgs/wine-discord-ipc-bridge.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - stdenv, - fetchFromGitHub, -}: -stdenv.mkDerivation { - name = "wine-discord-ipc-bridge"; - - src = fetchFromGitHub { - owner = "0e4ef622"; - repo = "wine-discord-ipc-bridge"; - rev = "f8198c9d52e708143301017a296f7557c4387127"; - hash = "sha256-tAknITFlG63+gI5cN9SfUIUZkbIq/MgOPoGIcvoNo4Q="; - }; - - postPatch = '' - patchShebangs winediscordipcbridge-steam.sh - ''; - - installPhase = '' - mkdir -p $out/bin - cp winediscordipcbridge.exe $out/bin - cp winediscordipcbridge-steam.sh $out/bin - ''; - - meta.platforms = ["i686-windows" "x86_64-linux"]; -}