From 37e664ed04d9b9a83d6981f5e048535d5f10c5f2 Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Sun, 11 May 2025 15:32:44 +0200 Subject: [PATCH 1/2] casync: move to `pkgs/by-name` --- .../sync/casync/default.nix => by-name/ca/casync/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 4 deletions(-) rename pkgs/{applications/networking/sync/casync/default.nix => by-name/ca/casync/package.nix} (100%) diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/by-name/ca/casync/package.nix similarity index 100% rename from pkgs/applications/networking/sync/casync/default.nix rename to pkgs/by-name/ca/casync/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af08305faa5c..541cba050e1d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2033,10 +2033,6 @@ with pkgs; capstone = callPackage ../development/libraries/capstone { }; capstone_4 = callPackage ../development/libraries/capstone/4.nix { }; - casync = callPackage ../applications/networking/sync/casync { - sphinx = buildPackages.python3Packages.sphinx; - }; - cataract = callPackage ../applications/misc/cataract { }; cataract-unstable = callPackage ../applications/misc/cataract/unstable.nix { }; From 4489ace41ad40caa3b87a5719b219267aef147da Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Sun, 11 May 2025 15:48:44 +0200 Subject: [PATCH 2/2] casync: 2-226-gbd8898e -> 2-unstable-2023-10-16 --- pkgs/by-name/ca/casync/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ca/casync/package.nix b/pkgs/by-name/ca/casync/package.nix index 3e8fa37f5d4b..703af1ab01c7 100644 --- a/pkgs/by-name/ca/casync/package.nix +++ b/pkgs/by-name/ca/casync/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation { pname = "casync"; - version = "2-226-gbd8898e"; + version = "2-unstable-2023-10-16"; src = fetchFromGitHub { owner = "systemd"; repo = "casync"; - rev = "bd8898ed92685e12022dd33a04c87786b5262344"; - sha256 = "04ibglizjzyd7ih13q6m7ic78n0mzw9nfmb3zd1fcm9j62qlq11i"; + rev = "e6817a79d89b48e1c6083fb1868a28f1afb32505"; + hash = "sha256-L7I80kSG4/ES2tGvHHgvOxJZzF76yeqy2WquKCPhnFk="; }; buildInputs = @@ -39,9 +39,9 @@ stdenv.mkDerivation { xz zstd ] - ++ lib.optionals (fuseSupport) [ fuse ] - ++ lib.optionals (selinuxSupport) [ libselinux ] - ++ lib.optionals (udevSupport) [ udev ]; + ++ lib.optionals fuseSupport [ fuse ] + ++ lib.optionals selinuxSupport [ libselinux ] + ++ lib.optionals udevSupport [ udev ]; nativeBuildInputs = [ meson ninja