From 4fad4c72af67ee8701a4be41e248c41ab5af30a9 Mon Sep 17 00:00:00 2001 From: John Shaffer Date: Mon, 9 Sep 2024 23:20:59 -0500 Subject: [PATCH] srvc: drop The upstream is unmaintained, and the build is currently broken due to Rust 1.80 changes. See https://github.com/NixOS/nixpkgs/issues/332957 --- .../version-management/srvc/default.nix | 34 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 pkgs/applications/version-management/srvc/default.nix diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix deleted file mode 100644 index c2dc0d8bd2be..000000000000 --- a/pkgs/applications/version-management/srvc/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin, git }: - -rustPlatform.buildRustPackage rec { - pname = "srvc"; - version = "0.20.0"; - - src = fetchFromGitHub { - owner = "insilica"; - repo = "rs-srvc"; - rev = "v${version}"; - hash = "sha256-pnlbMU/uoP9ZK8kzTRYTMY9+X9VIKJHwW2qMXXD8Udg="; - }; - - cargoHash = "sha256-+m8WJMn1aq3FBDO5c/ZwbcK2G+UE5pSwHTgOl2s6pDw="; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Security - ]; - - nativeCheckInputs = [ git ]; - - # remove timeouts in tests to make them less flaky - TEST_SRVC_DISABLE_TIMEOUT = 1; - - meta = with lib; { - description = "Sysrev version control"; - homepage = "https://github.com/insilica/rs-srvc"; - changelog = "https://github.com/insilica/rs-srvc/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ john-shaffer ]; - mainProgram = "sr"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 98a997e614bf..3ac307ad53b6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1466,6 +1466,7 @@ mapAliases ({ spotify-unwrapped = spotify; # added 2022-11-06 spring-boot = spring-boot-cli; # added 2020-04-24 squid4 = throw "'squid4' has been renamed to/replaced by 'squid'"; # Converted to throw 2023-09-10 + srvc = throw "'srvc' has been removed, as it was broken and unmaintained"; # Added 2024-09-09 ssb = throw "'ssb' has been removed, as it was broken and unmaintained"; # Added 2023-12-21 ssm-agent = amazon-ssm-agent; # Added 2023-10-17 starboard-octant-plugin = throw "starboard-octant-plugin has been dropped due to needing octant which is archived"; # Added 2023-09-29 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6eb3e18594de..bfe7e8903b8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6004,8 +6004,6 @@ with pkgs; spacevim = callPackage ../applications/editors/spacevim { }; - srvc = callPackage ../applications/version-management/srvc { }; - ssmsh = callPackage ../tools/admin/ssmsh { }; stacs = callPackage ../tools/security/stacs { };