From e6a9076f9c81ce8d03a7290d408a723b258c9677 Mon Sep 17 00:00:00 2001 From: tcmal Date: Mon, 13 May 2024 23:58:35 +0100 Subject: [PATCH] fix: remove some mentions to removed update scripts --- pkgs/build-support/install-shell-files/default.nix | 14 +++----------- pkgs/by-name/cm/cmake/default.nix | 8 +------- pkgs/by-name/li/libseccomp/default.nix | 5 ++--- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/pkgs/build-support/install-shell-files/default.nix b/pkgs/build-support/install-shell-files/default.nix index 68c0eea..f736686 100644 --- a/pkgs/build-support/install-shell-files/default.nix +++ b/pkgs/build-support/install-shell-files/default.nix @@ -1,12 +1,4 @@ -{ makeSetupHook, tests }: +{ makeSetupHook }: -# See the header comment in ../setup-hooks/install-shell-files.sh for example usage. -let - setupHook = makeSetupHook { name = "install-shell-files"; } - ../setup-hooks/install-shell-files.sh; - -in setupHook.overrideAttrs (oldAttrs: { - passthru = (oldAttrs.passthru or { }) // { - tests = tests.install-shell-files; - }; -}) +makeSetupHook { name = "install-shell-files"; } +../setup-hooks/install-shell-files.sh diff --git a/pkgs/by-name/cm/cmake/default.nix b/pkgs/by-name/cm/cmake/default.nix index 8b7f59e..a61dfe0 100644 --- a/pkgs/by-name/cm/cmake/default.nix +++ b/pkgs/by-name/cm/cmake/default.nix @@ -10,7 +10,7 @@ else , uiToolkits ? [ ] # can contain "ncurses" and/or "qt5" , buildDocs ? !(isMinimalBuild || (uiToolkits == [ ])), darwin # , libsForQt5 -, gitUpdater }: +}: let inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration; @@ -151,12 +151,6 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; # fails - passthru.updateScript = gitUpdater { - url = "https://gitlab.kitware.com/cmake/cmake.git"; - rev-prefix = "v"; - ignoredVersions = "-"; # -rc1 and friends - }; - meta = { homepage = "https://cmake.org/"; description = "Cross-platform, open-source build system generator"; diff --git a/pkgs/by-name/li/libseccomp/default.nix b/pkgs/by-name/li/libseccomp/default.nix index f41d874..3a4bd4a 100644 --- a/pkgs/by-name/li/libseccomp/default.nix +++ b/pkgs/by-name/li/libseccomp/default.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, fetchurl, getopt, util-linuxMinimal, which, gperf -, nix-update-script }: +{ lib, stdenv, fetchurl, getopt, util-linuxMinimal, which, gperf }: stdenv.mkDerivation rec { pname = "libseccomp"; @@ -33,7 +32,7 @@ stdenv.mkDerivation rec { tar -zcf $pythonsrc --mtime="@$SOURCE_DATE_EPOCH" --sort=name --transform s/tmp-pythonsrc/python-foundationdb/ ./tmp-pythonsrc/ ''; - passthru = { updateScript = nix-update-script { }; }; + passthru = { }; meta = with lib; { description = "High level library for the Linux Kernel seccomp filter";