diff options
author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2024-06-21 03:24:13 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-21 03:24:13 -0400 |
commit | 1c0bec249943cd3e03f876554b8af7d1e32a09e1 (patch) | |
tree | 2a042731521185e34359be980a9a0361d084dd8e /pkgs/tools | |
parent | ad964c4ebf6d1edc4a5f40743add97e915b258f6 (diff) | |
parent | 8477d0c463f7aa76b8421501a8cda4e76995b797 (diff) |
Merge pull request #321436 from samueldr/ce n'est qu'un au revoir, à la prochaine!
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/bootloaders/refind/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/grub/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/mailman-rss/default.nix | 26 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix-top/default.nix | 53 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix-universal-prefetch/default.nix | 33 | ||||
-rw-r--r-- | pkgs/tools/system/vboot_reference/default.nix | 2 |
6 files changed, 3 insertions, 115 deletions
diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index 0a8af657ff44..9c4cda573e58 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -146,7 +146,7 @@ stdenv.mkDerivation rec { Linux kernels that provide EFI stub support. ''; homepage = "http://refind.sourceforge.net/"; - maintainers = with maintainers; [ AndersonTorres samueldr chewblacka ]; + maintainers = with maintainers; [ AndersonTorres chewblacka ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; license = licenses.gpl3Plus; }; diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index ce58f6ea0a18..545ef57d4b08 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -201,6 +201,6 @@ stdenv.mkDerivation rec { platforms = if xenSupport then [ "x86_64-linux" "i686-linux" ] else platforms.gnu ++ platforms.linux; - maintainers = [ maintainers.samueldr ]; + maintainers = [ ]; }; }) diff --git a/pkgs/tools/misc/mailman-rss/default.nix b/pkgs/tools/misc/mailman-rss/default.nix deleted file mode 100644 index d71ee8795528..000000000000 --- a/pkgs/tools/misc/mailman-rss/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, python3Packages, fetchPypi, withTwitter ? false}: - -python3Packages.buildPythonApplication rec { - pname = "mailman-rss"; - version = "0.2.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "1brrik70jyagxa9l0cfmlxvqpilwj1q655bphxnvjxyganxf4c00"; - }; - - propagatedBuildInputs = with python3Packages; [ python-dateutil future requests beautifulsoup4 ] - ++ lib.optional withTwitter python3Packages.twitter - ; - - # No tests in Pypi Tarball - doCheck = false; - - meta = with lib; { - description = "Mailman archive -> rss converter"; - homepage = "https://github.com/kyamagu/mailman-rss"; - license = licenses.mit; - maintainers = with maintainers; [ samueldr ]; - mainProgram = "mailman-rss"; - }; -} diff --git a/pkgs/tools/package-management/nix-top/default.nix b/pkgs/tools/package-management/nix-top/default.nix deleted file mode 100644 index d9dcc2d64ec6..000000000000 --- a/pkgs/tools/package-management/nix-top/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, ruby -, makeWrapper -, getent # /etc/passwd -, ncurses # tput -, binutils-unwrapped # strings -, coreutils -, findutils -}: - -# No gems used, so mkDerivation is fine. -let - additionalPath = lib.makeBinPath [ getent ncurses binutils-unwrapped coreutils findutils ]; -in -stdenv.mkDerivation rec { - pname = "nix-top"; - version = "0.3.0"; - - src = fetchFromGitHub { - owner = "samueldr"; - repo = "nix-top"; - rev = "v${version}"; - sha256 = "sha256-w/TKzbZmMt4CX2KnLwPvR1ydp5NNlp9nNx78jJvhp54="; - }; - - nativeBuildInputs = [ - makeWrapper - ]; - - buildInputs = [ - ruby - ]; - - installPhase = '' - mkdir -p $out/libexec/nix-top - install -D -m755 ./nix-top $out/bin/nix-top - wrapProgram $out/bin/nix-top \ - --prefix PATH : "$out/libexec/nix-top:${additionalPath}" - '' + lib.optionalString stdenv.isDarwin '' - ln -s /bin/stty $out/libexec/nix-top - ''; - - meta = with lib; { - description = "Tracks what nix is building"; - homepage = "https://github.com/samueldr/nix-top"; - license = licenses.mit; - maintainers = with maintainers; [ samueldr ]; - platforms = platforms.linux ++ platforms.darwin ++ platforms.freebsd; - mainProgram = "nix-top"; - }; -} diff --git a/pkgs/tools/package-management/nix-universal-prefetch/default.nix b/pkgs/tools/package-management/nix-universal-prefetch/default.nix deleted file mode 100644 index be31ca34ad60..000000000000 --- a/pkgs/tools/package-management/nix-universal-prefetch/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, ruby -}: - -# No gems used, so mkDerivation is fine. -stdenv.mkDerivation rec { - pname = "nix-universal-prefetch"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "samueldr"; - repo = "nix-universal-prefetch"; - rev = "v${version}"; - sha256 = "sha256-HGn4qHWqpUwlS3yQrD3j5oH0yOlphsoSPD2vkyyRv+0="; - }; - - installPhase = '' - mkdir -pv $out/bin - cp nix-universal-prefetch $out/bin/nix-universal-prefetch - substituteInPlace "$out/bin/nix-universal-prefetch" \ - --replace "/usr/bin/env nix-shell" "${ruby}/bin/ruby" - ''; - - meta = with lib; { - description = "Uses nixpkgs fetchers to figure out hashes"; - homepage = "https://github.com/samueldr/nix-universal-prefetch"; - license = licenses.mit; - maintainers = with maintainers; [ samueldr ]; - platforms = platforms.linux ++ platforms.darwin; - mainProgram = "nix-universal-prefetch"; - }; -} diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index 4718173e430d..b5cd5cd19320 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { description = "Chrome OS partitioning and kernel signing tools"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ lheckemann samueldr ]; + maintainers = with maintainers; [ lheckemann ]; }; } |