diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-01 06:22:40 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-01 06:22:40 +0000 |
commit | 8500f595a18fefbc3791aeb9709750e5f6775030 (patch) | |
tree | 339931c3c294b776a1f5b97bb47b080c9624f357 /pkgs/tools | |
parent | 999c670119eee8017d2de703e766e6c9ed8527d7 (diff) | |
parent | 299c95ac165e9e4c5e55788e02031a155e8f7723 (diff) | |
download | nixpkgs-8500f595a18fefbc3791aeb9709750e5f6775030.tar nixpkgs-8500f595a18fefbc3791aeb9709750e5f6775030.tar.gz nixpkgs-8500f595a18fefbc3791aeb9709750e5f6775030.tar.bz2 nixpkgs-8500f595a18fefbc3791aeb9709750e5f6775030.tar.lz nixpkgs-8500f595a18fefbc3791aeb9709750e5f6775030.tar.xz nixpkgs-8500f595a18fefbc3791aeb9709750e5f6775030.tar.zst nixpkgs-8500f595a18fefbc3791aeb9709750e5f6775030.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/misc/betterdiscordctl/default.nix | 37 | ||||
-rw-r--r-- | pkgs/tools/misc/disfetch/default.nix | 29 |
2 files changed, 66 insertions, 0 deletions
diff --git a/pkgs/tools/misc/betterdiscordctl/default.nix b/pkgs/tools/misc/betterdiscordctl/default.nix new file mode 100644 index 00000000000..9d6159bda50 --- /dev/null +++ b/pkgs/tools/misc/betterdiscordctl/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, fetchpatch }: + +stdenv.mkDerivation rec { + pname = "betterdiscordctl"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "bb010g"; + repo = "betterdiscordctl"; + rev = "v${version}"; + sha256 = "0qpmm5l8jhm7k0kqblc0bnr9fl4b6z8iddhjar03bb4kqgr962fa"; + }; + + patches = [ + (fetchpatch { # Required till https://github.com/bb010g/betterdiscordctl/pull/67 is merged upstream. + url = "https://github.com/bb010g/betterdiscordctl/pull/67/commits/f1c7170fc2626d9aec4d244977b5a73c401aa1d4.patch"; + sha256 = "003zqd9ljb9h674sjwjvvdfs7q4cw0p1ydg3lax132vb4vz9k0zi"; + }) + ]; + + preBuild = "sed -i 's/^nix=$/&yes/g;s/^DISABLE_UPGRADE=$/&yes/g' ./betterdiscordctl"; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/doc/betterdiscordctl + install -Dm744 betterdiscordctl $out/bin/betterdiscordctl + install -Dm644 README.md $out/share/doc/betterdiscordctl/README.md + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/bb010g/betterdiscordctl"; + description = "A utility for managing BetterDiscord on Linux"; + license = licenses.mit; + maintainers = with maintainers; [ ivar bb010g ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/disfetch/default.nix b/pkgs/tools/misc/disfetch/default.nix new file mode 100644 index 00000000000..d80247801f0 --- /dev/null +++ b/pkgs/tools/misc/disfetch/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, lib +, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "disfetch"; + version = "1.12"; + + src = fetchFromGitHub { + owner = "llathasa-veleth"; + repo = "disfetch"; + rev = version; + sha256 = "1zm8q0fx695x28zg8ihzk3w41439v47n68cw6k551x31mls939yn"; + }; + + dontBuild = true; + + installPhase = '' + install -Dm755 -t $out/bin disfetch + ''; + + meta = with lib; { + description = "Yet another *nix distro fetching program, but less complex"; + homepage = "https://github.com/llathasa-veleth/disfetch"; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.vel ]; + }; +} |