diff options
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/archi/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/blahaj/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/cowsay/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/misc/ddcutil/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/fastfetch/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/flashrom-stable/default.nix | 48 | ||||
-rw-r--r-- | pkgs/tools/misc/mongodb-compass/default.nix | 4 |
7 files changed, 19 insertions, 63 deletions
diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix index e5850f8871e7..23c5372e5eef 100644 --- a/pkgs/tools/misc/archi/default.nix +++ b/pkgs/tools/misc/archi/default.nix @@ -42,9 +42,7 @@ stdenv.mkDerivation rec { autoPatchelfHook ]; - unpackPhase = if stdenv.hostPlatform.isDarwin then '' - 7zz x $src - '' else null; + sourceRoot = if stdenv.isDarwin then "." else null; installPhase = if stdenv.hostPlatform.system == "x86_64-linux" then diff --git a/pkgs/tools/misc/blahaj/default.nix b/pkgs/tools/misc/blahaj/default.nix index c0e591515cdf..a37d37bf4184 100644 --- a/pkgs/tools/misc/blahaj/default.nix +++ b/pkgs/tools/misc/blahaj/default.nix @@ -1,6 +1,10 @@ { lib +, stdenv , crystal , fetchFromGitHub + # https://crystal-lang.org/2019/09/06/parallelism-in-crystal/ +, multithreading ? true +, static ? stdenv.hostPlatform.isStatic }: crystal.buildCrystalPackage rec { @@ -14,6 +18,8 @@ crystal.buildCrystalPackage rec { hash = "sha256-CmMF9jDKUo+c8dYc2UEHKdBDE4dgwExcRS5sSUsUJik="; }; + buildTargets = [ "${if static then "static" else "build"}${if multithreading then "_mt" else ""}" ]; + meta = with lib; { description = "Gay sharks at your local terminal - lolcat-like CLI tool"; homepage = "https://blahaj.queer.software"; diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix index 62ae9994fff8..874299905e07 100644 --- a/pkgs/tools/misc/cowsay/default.nix +++ b/pkgs/tools/misc/cowsay/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, perl, fetchFromGitHub, fetchpatch, makeWrapper, nix-update-script, testers, cowsay }: +{ lib, stdenv, perl, fetchFromGitHub, fetchpatch, makeWrapper, nix-update-script, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cowsay"; version = "3.7.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "cowsay-org"; repo = "cowsay"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-t1grmCPQhRgwS64RjEwkK61F2qxxMBKuv0/DzBTnL3s="; }; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = nix-update-script { }; tests.version = testers.testVersion { - package = cowsay; + package = finalAttrs.finalPackage; command = "cowsay --version"; }; }; @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A program which generates ASCII pictures of a cow with a message"; homepage = "https://cowsay.diamonds"; - changelog = "https://github.com/cowsay-org/cowsay/releases/tag/v${version}"; + changelog = "https://github.com/cowsay-org/cowsay/releases/tag/v${finalAttrs.version}"; license = licenses.gpl3Only; platforms = platforms.all; maintainers = with maintainers; [ rob anthonyroussel ]; }; -} +}) diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index c8e009569cd5..28a31a16d078 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "ddcutil"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { url = "https://www.ddcutil.com/tarballs/ddcutil-${version}.tar.gz"; - hash = "sha256-l6C9cJ0MfffzULuH9DIoNzGKqp7o4cwpbDrbC93yc/g="; + hash = "sha256-4U/igqtgw2rwyuhEkV1pWYPIyNZEt2N6hlXJ9bDUyRw="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index b3d5b6f1fcbe..2e727896905d 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.8.6"; + version = "2.8.7"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-n15p26zZaote8cB0NfBnb69hb27l4hHBZG+3D1yrrCA="; + hash = "sha256-lJRTw8Z//x6tMpwfwSodTz7aVbnJPt3rac7AudqF+DA="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/flashrom-stable/default.nix b/pkgs/tools/misc/flashrom-stable/default.nix deleted file mode 100644 index 81beb2346e34..000000000000 --- a/pkgs/tools/misc/flashrom-stable/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ fetchgit -, installShellFiles -, lib -, libftdi1 -, libgpiod_1 -, libjaylink -, libusb1 -, pciutils -, pkg-config -, stdenv -}: - -stdenv.mkDerivation rec { - pname = "flashrom-stable"; - version = "1.1"; - - src = fetchgit { - url = "https://review.coreboot.org/flashrom-stable"; - rev = "272aae888ce5abf5e999d750ee4577407db32246"; - hash = "sha256-DR4PAING69+TMsyycGxt1cu0ba1tTlG36+H/pJ0oP4E="; - }; - - nativeBuildInputs = [ - installShellFiles - pkg-config - ]; - - buildInputs = [ - libftdi1 - libjaylink - libusb1 - ] ++ lib.optionals (!stdenv.isDarwin) [ - libgpiod_1 - pciutils - ]; - - makeFlags = [ "PREFIX=$(out)" "libinstall" ] ++ lib.optionals stdenv.isDarwin [ "CONFIG_ENABLE_LIBPCI_PROGRAMMERS=no" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "CONFIG_INTERNAL_X86=no" "CONFIG_INTERNAL_DMI=no" "CONFIG_RAYER_SPI=0" ]; - - meta = with lib; { - homepage = "https://www.flashrom.org"; - description = "Utility for reading, writing, erasing and verifying flash ROM chips"; - license = with licenses; [ gpl2 gpl2Plus ]; - maintainers = with maintainers; [ felixsinger ]; - platforms = platforms.all; - mainProgram = "flashrom"; - }; -} diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 7e3185b489d9..0bd72f25689d 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -33,7 +33,7 @@ xorg, }: let - version = "1.42.1"; + version = "1.42.2"; rpath = lib.makeLibraryPath [ alsa-lib @@ -82,7 +82,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "sha256-URxzoMb03p8UTLbn8tmtaSQQV27hYRSwlTiacF/48F8="; + sha256 = "sha256-NvHFsB+wXNq2XmHb2tYI1P9vUXwVcwbhR645LjHM0/Y="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; |