From fbec39308aecc74dbc1e4bfcb43f2c6c52a21140 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Mon, 2 Feb 2026 05:49:09 +0100 Subject: [PATCH] sks: refactor and move to pkgs/by-name this shouldn't create any rebuilds --- pkgs/{servers => by-name/sk}/sks/adapt-to-nixos.patch | 0 .../sks/default.nix => by-name/sk/sks/package.nix} | 10 +++++----- pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 5 insertions(+), 9 deletions(-) rename pkgs/{servers => by-name/sk}/sks/adapt-to-nixos.patch (100%) rename pkgs/{servers/sks/default.nix => by-name/sk/sks/package.nix} (92%) diff --git a/pkgs/servers/sks/adapt-to-nixos.patch b/pkgs/by-name/sk/sks/adapt-to-nixos.patch similarity index 100% rename from pkgs/servers/sks/adapt-to-nixos.patch rename to pkgs/by-name/sk/sks/adapt-to-nixos.patch diff --git a/pkgs/servers/sks/default.nix b/pkgs/by-name/sk/sks/package.nix similarity index 92% rename from pkgs/servers/sks/default.nix rename to pkgs/by-name/sk/sks/package.nix index 910e3b0fad39..75c6fcccd034 100644 --- a/pkgs/servers/sks/default.nix +++ b/pkgs/by-name/sk/sks/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - ocamlPackages, + ocaml-ng, perl, zlib, db, @@ -10,7 +10,7 @@ }: let - inherit (ocamlPackages) + inherit (ocaml-ng.ocamlPackages_4_12) ocaml findlib cryptokit @@ -18,7 +18,7 @@ let ; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sks"; version = "unstable-2021-02-04"; @@ -81,9 +81,9 @@ stdenv.mkDerivation rec { servers, and even wildly out-of-date servers, or servers that experience spotty connectivity, can fully synchronize with rest of the system. ''; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3071fcbae403..ac5b20e38a95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3428,10 +3428,6 @@ with pkgs; # aka., pgp-tools simplescreenrecorder = libsForQt5.callPackage ../applications/video/simplescreenrecorder { }; - sks = callPackage ../servers/sks { - ocamlPackages = ocaml-ng.ocamlPackages_4_12; - }; - snapcast = callPackage ../applications/audio/snapcast { pulseaudioSupport = config.pulseaudio or stdenv.hostPlatform.isLinux; };