From 9b2e60ec0aa05c2fee5e5c6bfb6c6105c52738a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 28 Apr 2022 11:13:32 +0200 Subject: [PATCH 1/3] topgrade: 8.3.0 -> 8.3.1 --- pkgs/tools/misc/topgrade/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index dfa9b18afd22..9caf5cd0fdd8 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "8.3.0"; + version = "8.3.1"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iFS8Bf2IF0GoW168DwfBbkiPd7IGJhGShofFnBESpUc="; + sha256 = "sha256-EsC17VUQDgrhCU26fsqf2zXOTKa/WeKHiWG0Zn1Qao4="; }; - cargoSha256 = "sha256-8Ag4rDXnDZgxdwFpiWnYNjDeau9vr9EIfbJzeQlqSDM="; + cargoSha256 = "sha256-e5QJw5yY+ZkijqoqRauA5ncvLWiRlalYZCwSG5U7uDk="; buildInputs = lib.optional stdenv.isDarwin Foundation; From 282320a780c68a2b7579af3ea60f7c4486c80e02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 28 Apr 2022 11:13:42 +0200 Subject: [PATCH 2/3] topgrade: mark as broken on darwin --- pkgs/tools/misc/topgrade/default.nix | 12 ++++++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 9caf5cd0fdd8..3279150961c9 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -1,4 +1,11 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, Foundation, installShellFiles }: +{ stdenv +, lib +, fetchFromGitHub +, rustPlatform +, Cocoa +, Foundation +, installShellFiles +}: rustPlatform.buildRustPackage rec { pname = "topgrade"; @@ -13,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-e5QJw5yY+ZkijqoqRauA5ncvLWiRlalYZCwSG5U7uDk="; - buildInputs = lib.optional stdenv.isDarwin Foundation; + buildInputs = lib.optionals stdenv.isDarwin [ Cocoa Foundation ]; nativeBuildInputs = [ installShellFiles ]; @@ -26,5 +33,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/r-darwish/topgrade"; license = licenses.gpl3Only; maintainers = with maintainers; [ Br1ght0ne hugoreeves SuperSandro2000 ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e1bda3c0e95..9926156e7cb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10851,7 +10851,7 @@ with pkgs; toml2nix = (callPackage ../tools/toml2nix { }).toml2nix { }; topgrade = callPackage ../tools/misc/topgrade { - inherit (darwin.apple_sdk.frameworks) Foundation; + inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; }; top-git = callPackage ../applications/version-management/git-and-tools/topgit { }; From bd29de6e0c3d238b3904b751b09604f93f9c09d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 28 Apr 2022 11:14:41 +0200 Subject: [PATCH 3/3] topgrade: prune inactive maintainers --- pkgs/tools/misc/topgrade/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 3279150961c9..78e2dc219b73 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { description = "Upgrade all the things"; homepage = "https://github.com/r-darwish/topgrade"; license = licenses.gpl3Only; - maintainers = with maintainers; [ Br1ght0ne hugoreeves SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; broken = stdenv.isDarwin; }; }