From e3837994a7478768f0c767e1825ee5df64bf35b7 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 20:47:47 +0100 Subject: [PATCH] gbl: remove --- pkgs/tools/archivers/gbl/default.nix | 57 ---------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 1 insertion(+), 61 deletions(-) delete mode 100644 pkgs/tools/archivers/gbl/default.nix diff --git a/pkgs/tools/archivers/gbl/default.nix b/pkgs/tools/archivers/gbl/default.nix deleted file mode 100644 index 889c6b5ad1a7..000000000000 --- a/pkgs/tools/archivers/gbl/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - fetchpatch, - pkg-config, - openssl, - testers, - gbl, - Security, -}: - -rustPlatform.buildRustPackage rec { - pname = "gbl"; - version = "0.3.1"; - - src = fetchFromGitHub { - owner = "dac-gmbh"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Xzx14fvYWTZYM9Pnowf1M3D0PTPRLwsXHUj/PJskRWw="; - }; - - cargoPatches = [ - # update ring to fix building on Mac M1 - # https://github.com/dac-gmbh/gbl/pull/64 - (fetchpatch { - url = "https://github.com/raboof/gbl/commit/17e154d66932af59abe8677309792606b7f64c7d.patch"; - sha256 = "sha256-5Itoi86Q+9FzSTtnggODKPwwYPp5BpIVgR2vYMLHBts="; - }) - # Upstream does not include Cargo.lock, even though this is recommended for applications. - (fetchpatch { - url = "https://github.com/raboof/gbl/commit/9423d36ee3168bca8db7a7cb65611dc7ddc2daf0.patch"; - sha256 = "sha256-zwHXgUVkAYiQs/AT/pINnZoECoXzh+9astWMYENGTL8="; - }) - ]; - - cargoHash = "sha256-CeGLSseKUe2XudRqZm5Y7o7ZLDtDBg/MFunOGqxFZGM="; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - - passthru.tests.version = testers.testVersion { package = gbl; }; - - meta = with lib; { - description = "GBL Firmware file manipulation"; - longDescription = '' - Utility to read, create and manipulate `.gbl` firmware update - files targeting the Silicon Labs Gecko Bootloader. - ''; - homepage = "https://github.com/jonas-schievink/gbl"; - license = licenses.mit; - maintainers = [ maintainers.raboof ]; - mainProgram = "gbl"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4718436a75ca..d4e0ecf63c6d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -443,6 +443,7 @@ mapAliases { g4music = gapless; # Added 2024-07-26 g4py = throw "'g4py' has been renamed to/replaced by 'python3Packages.geant4'"; # Converted to throw 2024-10-17 gamin = throw "'gamin' has been removed as it is unmaintained upstream"; # Added 2024-04-19 + gbl = throw "'gbl' has been removed because the upstream repository no longer exists"; # Added 2025-01-26 gcc48 = throw "gcc48 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-10 gcc49 = throw "gcc49 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11 gcc49Stdenv = throw "gcc49Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 932b425db79f..941bead4d7ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1765,10 +1765,6 @@ with pkgs; fluffychat-web = fluffychat.override { targetFlutterPlatform = "web"; }; - gbl = callPackage ../tools/archivers/gbl { - inherit (darwin.apple_sdk.frameworks) Security; - }; - genpass = callPackage ../tools/security/genpass { }; gammaray = qt6Packages.callPackage ../development/tools/gammaray { };