diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/misc')
55 files changed, 486 insertions, 304 deletions
diff --git a/nixpkgs/pkgs/tools/misc/apkeep/default.nix b/nixpkgs/pkgs/tools/misc/apkeep/default.nix index d405302282f5..ef7699ccf284 100644 --- a/nixpkgs/pkgs/tools/misc/apkeep/default.nix +++ b/nixpkgs/pkgs/tools/misc/apkeep/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "apkeep"; - version = "0.9.0"; + version = "0.10.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-ST1ifON25mizKZQX3fKeqBloXWW9LXDq5JkZIeiguRY="; + sha256 = "14vm3b2gbmn9pil0aagwchn4kyvi9311id6qv4a376qfb6r1aybf"; }; - cargoSha256 = "sha256-/Xh1s4PO336B1ioKe0IKVGDACpMuXOpxA82U6zn2lj0="; + cargoSha256 = "0i8wzc58ji317kjdw3ls1908z4bqlh1cgjph0fxsvs5i552qjkzp"; prePatch = '' rm .cargo/config.toml diff --git a/nixpkgs/pkgs/tools/misc/azure-vhd-utils/default.nix b/nixpkgs/pkgs/tools/misc/azure-vhd-utils/default.nix index ad48eae7a87f..79dd9d6b538b 100644 --- a/nixpkgs/pkgs/tools/misc/azure-vhd-utils/default.nix +++ b/nixpkgs/pkgs/tools/misc/azure-vhd-utils/default.nix @@ -1,17 +1,16 @@ -# This file was generated by go2nix. -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "azure-vhd-utils"; - version = "20160614-${lib.strings.substring 0 7 rev}"; - rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8"; + version = "unstable-2016-06-14"; goPackagePath = "github.com/Microsoft/azure-vhd-utils"; - src = fetchgit { - inherit rev; - url = "https://github.com/Microsoft/azure-vhd-utils"; - sha256 = "0b9kbavlb92rhnb1swwq8bdn4l9a994rmf1ywyfq4yc0kd3gnhgh"; + src = fetchFromGitHub { + owner = "Microsoft"; + repo = "azure-vhd-utils"; + rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8"; + sha256 = "sha256-8EH7RpuAeYKd5z64mklKKlFi20KYcx2WhVmkRbdaMy0="; }; goDeps = ./deps.nix; diff --git a/nixpkgs/pkgs/tools/misc/bitbucket-cli/default.nix b/nixpkgs/pkgs/tools/misc/bitbucket-cli/default.nix deleted file mode 100644 index 4a770b187fe7..000000000000 --- a/nixpkgs/pkgs/tools/misc/bitbucket-cli/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, python2 -}: - -python2.pkgs.buildPythonApplication rec { - pname = "bitbucket-cli"; - version = "0.5.1"; - - src = python2.pkgs.fetchPypi { - inherit pname version; - sha256 = "1xmn73x6jirnwfwcdy380ncmkai9f9dhmld6zin01ypbqwgf50fq"; - }; - - propagatedBuildInputs = with python2.pkgs; [ - requests - ]; - - # No tests - doCheck = false; - - meta = with lib; { - description = "Bitbucket command line interface"; - homepage = "https://bitbucket.org/zhemao/bitbucket-cli"; - maintainers = with maintainers; [ refnil ]; - license = licenses.bsd2; - }; -} diff --git a/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix b/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix index b71b5b444e31..ee99e643b1f7 100644 --- a/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "broadlink-cli"; - version = "0.18.0"; + version = "0.18.1"; # the tools are available as part of the source distribution from GH but # not pypi, so we have to fetch them here. @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { owner = "mjg59"; repo = "python-broadlink"; rev = version; - sha256 = "0nh9rn1zpc44qsc50360ycg02gwbgq59784mnkp01nhavnwwwx10"; + sha256 = "sha256-x7RVCu5xOwhUOxXIHP7ZAe1/9F9ecf9RgL9I53e9Mcw="; }; format = "other"; diff --git a/nixpkgs/pkgs/tools/misc/calamares/default.nix b/nixpkgs/pkgs/tools/misc/calamares/default.nix index ad4158c10d50..08c7ab17e52d 100644 --- a/nixpkgs/pkgs/tools/misc/calamares/default.nix +++ b/nixpkgs/pkgs/tools/misc/calamares/default.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "calamares"; - version = "3.2.53"; + version = "3.2.54"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-LWkgQsvP7XmupBDSAnbwewWRT+ZaALyDFw3w7iz66X0="; + sha256 = "sha256-TfdLbDsjjPC/8BoEVm4mXePxQ8KX+9jgwKqUR1lcyOk="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index 787e4248d465..4ffffa636095 100644 --- a/nixpkgs/pkgs/tools/misc/chezmoi/default.nix +++ b/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.13.1"; + version = "2.14.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-Ui9zj/PI8vYkbT8M13dZ1N4sxhM8fo8ZVeOP9Oa35xg="; + sha256 = "sha256-WxOpmowRP8KSxxjW4JNQlQL6jZ2EhvpNb87NgeSO890="; }; - vendorSha256 = "sha256-6+T0UQDrCnoRZkMajyw50eH/AFIUzCgxCkWVmTfycD0="; + vendorSha256 = "sha256-ord4jHjgiW+Z2OD/x2ZAFOJYLyoB7Tja6SOd+JqxWDM="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index 7f1655b98437..17f57d31ab88 100644 --- a/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -50,7 +50,7 @@ python3Packages.buildPythonApplication rec { xz zip zstd ] ++ (with python3Packages; [ - argcomplete black debian defusedxml jsondiff jsbeautifier libarchive-c + argcomplete debian defusedxml jsondiff jsbeautifier libarchive-c python_magic progressbar33 pypdf2 rpm tlsh ]) ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit dtc ] @@ -66,20 +66,19 @@ python3Packages.buildPythonApplication rec { installManPage doc/diffoscope.1 ''; - # Disable flaky test and a failing one disabledTests = [ + # Disable flaky test and a failing one "test_android_manifest" "test_sbin_added_to_path" "test_diff_meta" "test_diff_meta2" "test_obj_no_differences" - # Failing because of file-v5.40 has a slightly different output. - # Upstream issue: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/271 - "test_text_proper_indentation" - # fails because it fails to determine llvm version "test_item3_deflate_llvm_bitcode" + + # disable formatting tests because they can break on black updates + "test_code_is_black_clean" ] ++ lib.optionals stdenv.isDarwin [ # Disable flaky tests on Darwin "test_non_unicode_filename" diff --git a/nixpkgs/pkgs/tools/misc/direnv/default.nix b/nixpkgs/pkgs/tools/misc/direnv/default.nix index 1920dac54343..624236462c2f 100644 --- a/nixpkgs/pkgs/tools/misc/direnv/default.nix +++ b/nixpkgs/pkgs/tools/misc/direnv/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "direnv"; - version = "2.30.3"; + version = "2.31.0"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "sha256-cLDafCZH0WKexO6jCdzUhRWaxmQYb1ay9w9lje3cQ+U="; + sha256 = "sha256-s3IzckePNjr8Bo4kDXj3/WJgybirvtBd9hW2+eWPorA="; }; vendorSha256 = "sha256-YhgQUl9fdictEtz6J88vEzznGd8Ipeb9AYo/p1ZLz5k="; @@ -29,9 +29,6 @@ buildGoModule rec { checkInputs = [ fish zsh ]; - # temporarily disable tests, check if they can be reenabled with the next release - doCheck = false; - checkPhase = '' export HOME=$(mktemp -d) make test-go test-bash test-fish test-zsh diff --git a/nixpkgs/pkgs/tools/misc/dsq/default.nix b/nixpkgs/pkgs/tools/misc/dsq/default.nix new file mode 100644 index 000000000000..2451800b41f9 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/dsq/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchFromGitHub +, buildGoModule +, runCommand +, nix-update-script +, dsq +, diffutils +}: + +buildGoModule rec { + pname = "dsq"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "multiprocessio"; + repo = "dsq"; + rev = version; + hash = "sha256-JzS94kfvgZDz4tIXa4veY3XSFeMDBN61sU8/+5V5y9Y="; + }; + + vendorSha256 = "sha256-9Exy2VLxOd4lgwbIOZ6NJ45NABO9a0rLjmZ+Cd7jjLM="; + + nativeBuildInputs = [ diffutils ]; + + passthru = { + updateScript = nix-update-script { attrPath = pname; }; + + tests = { + pretty-csv = runCommand "${pname}-test" { } '' + mkdir "$out" + cat <<EOF > "$out/input.csv" + first,second + 1,a + 2,b + EOF + cat <<EOF > "$out/expected.txt" + +-------+--------+ + | first | second | + +-------+--------+ + | 1 | a | + | 2 | b | + +-------+--------+ + EOF + ${dsq}/bin/dsq --pretty "$out/input.csv" 'select first, second from {}' > "$out/actual.txt" + diff "$out/expected.txt" "$out/actual.txt" + ''; + }; + }; + + meta = with lib; { + description = "Commandline tool for running SQL queries against JSON, CSV, Excel, Parquet, and more"; + homepage = "https://github.com/multiprocessio/dsq"; + license = licenses.asl20; + maintainers = with maintainers; [ liff ]; + # TODO: Remove once nixpkgs uses macOS SDK 10.14+ for x86_64-darwin + # Undefined symbols for architecture x86_64: "_SecTrustEvaluateWithError" + broken = stdenv.isDarwin && stdenv.isx86_64; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/dua/default.nix b/nixpkgs/pkgs/tools/misc/dua/default.nix index f0984696fe3f..d7f3eafe3eca 100644 --- a/nixpkgs/pkgs/tools/misc/dua/default.nix +++ b/nixpkgs/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.17.0"; + version = "2.17.1"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-yac/WUVL10JU1V5f9LYh57yYzZ2JMf24jMd8Mun7OMU="; + sha256 = "sha256-58l0E5wwRKbF/ja3fmMMBIONjuwVOxlwdKRT5BeO9MQ="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-Q0ZLMbnQeG/64QvAIPpa3k+lI6dbSSQcdYb5e2rX8U0="; + cargoSha256 = "sha256-nft0wrgTMrI8Tav6NcqPwSF8Q367twIOr1voBsW2488="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/esphome/default.nix b/nixpkgs/pkgs/tools/misc/esphome/default.nix index 72a624714307..23df784a78ef 100644 --- a/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -15,14 +15,14 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2022.2.6"; + version = "2022.3.1"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-AoSFtEg7GpUBdIrFCYlOMBRc2nBBtiFEkxoZnKC/xyQ="; + sha256 = "sha256-x2gdRUBpyhk6iKvuW6ZKSpokaHfYz1ugclBjP15rJsk="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/misc/esptool/default.nix b/nixpkgs/pkgs/tools/misc/esptool/default.nix index 5a543c6e2ad5..e1ec37063dea 100644 --- a/nixpkgs/pkgs/tools/misc/esptool/default.nix +++ b/nixpkgs/pkgs/tools/misc/esptool/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "esptool"; - version = "3.2"; + version = "3.3"; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; rev = "v${version}"; - sha256 = "1jic5kynfan5zirv9pm3pfjps12zf68cpnhl7i1vls2m79zdkfa3"; + sha256 = "sha256-CmGie+M3AboOk8X+LkRhIxTRQZgDlklouzmz8kiIZuI="; }; checkInputs = with python3.pkgs; diff --git a/nixpkgs/pkgs/tools/misc/fend/default.nix b/nixpkgs/pkgs/tools/misc/fend/default.nix index 94429323e091..07880c4fbdc5 100644 --- a/nixpkgs/pkgs/tools/misc/fend/default.nix +++ b/nixpkgs/pkgs/tools/misc/fend/default.nix @@ -1,17 +1,24 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, darwin +}: rustPlatform.buildRustPackage rec { pname = "fend"; - version = "0.1.29"; + version = "1.0.1"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g3TycwDtB8+5innRlJukuqD2pSRz71slxOKjgzHve7w="; + sha256 = "sha256-EV3uxoN6RuQ7grXLcFev1ZCfjVnVIDumQmHdpUm1Jbc="; }; - cargoSha256 = "sha256-LYUQeDoq5C9p5pMvFtLQegl7Cl6K+21DPzjSrnCqJo8="; + cargoSha256 = "sha256-lNpFdrriAglLaiWjxVP4JoiBuU+zdLlerAIApIvHHZw="; + + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; doInstallCheck = true; diff --git a/nixpkgs/pkgs/tools/misc/fwup/default.nix b/nixpkgs/pkgs/tools/misc/fwup/default.nix index f58b73a47233..3a49a9309e61 100644 --- a/nixpkgs/pkgs/tools/misc/fwup/default.nix +++ b/nixpkgs/pkgs/tools/misc/fwup/default.nix @@ -48,10 +48,11 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ coreutils - dosfstools - mtools unzip zip + ] ++ lib.optionals doCheck [ + mtools + dosfstools ]; checkInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/gawp/default.nix b/nixpkgs/pkgs/tools/misc/gawp/default.nix index 5c7953a766ee..bd102e868aeb 100644 --- a/nixpkgs/pkgs/tools/misc/gawp/default.nix +++ b/nixpkgs/pkgs/tools/misc/gawp/default.nix @@ -1,18 +1,16 @@ -{ lib, buildGoPackage, fetchgit }: - -with builtins; +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gawp"; - version = "20160121-${lib.strings.substring 0 7 rev}"; - rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f"; + version = "unstable-2016-01-21"; goPackagePath = "github.com/martingallagher/gawp"; - src = fetchgit { - inherit rev; - url = "https://github.com/martingallagher/gawp"; - sha256 = "0bbmbb1xxdgvqvg1ssn9d4j213li7bbbx3y42iz4fs10xv7x4r0c"; + src = fetchFromGitHub { + owner = "martingallagher"; + repo = "gawp"; + rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f"; + sha256 = "sha256-DGTSz+4gaEd+FMSPvtY6kY4gJGnJah3exvu13sNadS0="; }; goDeps = ./deps.nix; diff --git a/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/nixpkgs/pkgs/tools/misc/goreleaser/default.nix index 492e8a83a2fd..d0f44b933e94 100644 --- a/nixpkgs/pkgs/tools/misc/goreleaser/default.nix +++ b/nixpkgs/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.6.3"; + version = "1.7.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZNE+DfQdIlxA6sXMI8DAIQ3x+kcgXoGApUuoPncRfpc="; + sha256 = "sha256-vTik6KFOkKOik78/H0hvAv6xI+QSALOHD4N6befPaT4="; }; - vendorSha256 = "sha256-Kwa2hzsuw3BNLubcqd7Vmpg49P78Yjt3LboLotoGWYM="; + vendorSha256 = "sha256-ujtgcH5EF+PZAD/1Y0+yI4m7y2hNJ3w4KB2pvKbdgsU="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/tools/misc/gosu/default.nix b/nixpkgs/pkgs/tools/misc/gosu/default.nix index 033883ab1c8c..d4c233007d26 100644 --- a/nixpkgs/pkgs/tools/misc/gosu/default.nix +++ b/nixpkgs/pkgs/tools/misc/gosu/default.nix @@ -1,16 +1,16 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gosu"; - version = "2017-05-09"; - rev = "e87cf95808a7b16208515c49012aa3410bc5bba8"; + version = "unstable-2017-05-09"; goPackagePath = "github.com/tianon/gosu"; - src = fetchgit { - inherit rev; - url = "https://github.com/tianon/gosu"; - sha256 = "1qp1cfx0hrr4qlnh7rhjb4xlxv9697flmgzzl6jcdkrpk1f0bz8m"; + src = fetchFromGitHub { + owner = "tianon"; + repo = "gosu"; + rev = "e87cf95808a7b16208515c49012aa3410bc5bba8"; + sha256 = "sha256-Ff0FXJg3z8akof+/St1JJu1OO1kS5gMtxSRnCLpj4eI="; }; goDeps = ./deps.nix; diff --git a/nixpkgs/pkgs/tools/misc/gotify-desktop/default.nix b/nixpkgs/pkgs/tools/misc/gotify-desktop/default.nix index 1da729c706d4..e34afda94241 100644 --- a/nixpkgs/pkgs/tools/misc/gotify-desktop/default.nix +++ b/nixpkgs/pkgs/tools/misc/gotify-desktop/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gotify-desktop"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "desbma"; repo = pname; rev = version; - sha256 = "sha256-QQpZeXFv8BqFOQ+7ANWmtsgNlMakAL2ML4rlG2cFZJE="; + sha256 = "sha256-EDLOSxmODC7OzVSZJxwKNnFA2yh+QKE8aXmYJ+Dnv40="; }; - cargoSha256 = "sha256-zcSAsI/yGGJer7SPKDKZ6NQ3UgTdBcDighS6VTNITMo="; + cargoSha256 = "sha256-opSXndOjdmYG5DJ3CDUHWhN6O7AQp4Cleldzq1Hfr1o="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/misc/grub/trusted.nix b/nixpkgs/pkgs/tools/misc/grub/trusted.nix index 13f3c42faa46..4947949ac5bb 100644 --- a/nixpkgs/pkgs/tools/misc/grub/trusted.nix +++ b/nixpkgs/pkgs/tools/misc/grub/trusted.nix @@ -1,5 +1,20 @@ -{ lib, stdenv, fetchurl, fetchgit, fetchpatch, autogen, flex, bison, python2, autoconf, automake -, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2 +{ lib +, stdenv +, fetchurl +, fetchFromGitHub +, fetchpatch +, autogen +, flex +, bison +, python2 +, autoconf +, automake +, gettext +, ncurses +, libusb-compat-0_1 +, freetype +, qemu +, lvm2 , for_HP_laptop ? false }: @@ -32,17 +47,15 @@ stdenv.mkDerivation rec { pname = "trustedGRUB2"; inherit version; - src = if for_HP_laptop - then fetchgit { - url = "https://github.com/Sirrix-AG/TrustedGRUB2"; - rev = "ab483d389bda3115ca0ae4202fd71f2e4a31ad41"; - sha256 = "1760d9hsnqkdvlag9nn8f613mqhnsxmidgvdkpmb37b0yi7p6lhz"; - } - else fetchgit { - url = "https://github.com/Sirrix-AG/TrustedGRUB2"; - rev = "1ff54a5fbe02ea01df5a7de59b1e0201e08d4f76"; - sha256 = "0yrfwx67gpg9gij5raq0cfbx3jj769lkg3diqgb7i9n86hgcdh4k"; - }; + src = fetchFromGitHub { + owner = "Sirrix-AG"; + repo = "TrustedGRUB2"; + rev = version; + sha256 = + if for_HP_laptop + then "sha256-H1JzT/RgnbHqnW2/FmvXFuI6gnHI2vQU3W1iq2FqwJw=" + else "sha256-k8DGHjTIpnjWw7GNN2kyR8rRl2MAq1xkfOndd0znLns="; + }; nativeBuildInputs = [ autogen flex bison python2 autoconf automake ]; buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 ] @@ -91,9 +104,10 @@ stdenv.mkDerivation rec { ]; # save target that grub is compiled for - grubTarget = if inPCSystems - then "${pcSystems.${stdenv.hostPlatform.system}.target}-pc" - else ""; + grubTarget = + if inPCSystems + then "${pcSystems.${stdenv.hostPlatform.system}.target}-pc" + else ""; doCheck = false; # On -j16 races with early header creation: diff --git a/nixpkgs/pkgs/tools/misc/gummy/default.nix b/nixpkgs/pkgs/tools/misc/gummy/default.nix new file mode 100644 index 000000000000..f7950650f7fc --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/gummy/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, fetchFromGitHub +, testVersion +, gummy +, cmake +, libX11 +, libXext +, sdbus-cpp +, udev +, coreutils +}: + +stdenv.mkDerivation rec { + pname = "gummy"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "fushko"; + repo = "gummy"; + rev = version; + sha256 = "sha256-CbZFuvFMmbFVX8k3duhhsg0fd9kVmhsj0VeFYil9YiE="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + libX11 + libXext + sdbus-cpp + udev + ]; + + cmakeFlags = [ + "-DUDEV_DIR=${placeholder "out"}/lib/udev" + ]; + + # Fixes the "gummy start" command, without this it cannot find the binary. + # Setting this through cmake does not seem to work. + postPatch = '' + substituteInPlace src/gummy/gummy.cpp \ + --replace "CMAKE_INSTALL_DAEMON_PATH" "\"${placeholder "out"}/libexec/gummyd\"" + ''; + + preFixup = '' + substituteInPlace $out/lib/udev/99-gummy.rules \ + --replace "/bin/chmod" "${coreutils}/bin/chmod" + + ln -s $out/libexec/gummyd $out/bin/gummyd + ''; + + passthru.tests.version = testVersion { package = gummy; }; + + meta = with lib; { + homepage = "https://github.com/Fushko/gummy"; + description = "Brightness and temperature manager for X11"; + longDescription = '' + CLI screen manager for X11 that allows automatic and manual brightness/temperature adjustments, + via backlight (currently only for embedded displays) and gamma. Multiple monitors are supported. + ''; + license = licenses.gpl3Only; + maintainers = [ maintainers.ivar ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/hashit/default.nix b/nixpkgs/pkgs/tools/misc/hashit/default.nix index b9bf5f0ae5f8..5971939da174 100644 --- a/nixpkgs/pkgs/tools/misc/hashit/default.nix +++ b/nixpkgs/pkgs/tools/misc/hashit/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 libgee - pantheon.elementary-icon-theme pantheon.granite ]; diff --git a/nixpkgs/pkgs/tools/misc/i3cat/default.nix b/nixpkgs/pkgs/tools/misc/i3cat/default.nix index e91b17856ed7..79e93847932f 100644 --- a/nixpkgs/pkgs/tools/misc/i3cat/default.nix +++ b/nixpkgs/pkgs/tools/misc/i3cat/default.nix @@ -1,17 +1,24 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "i3cat"; - version = "20150321-${lib.strings.substring 0 7 rev}"; - rev = "b9ba886a7c769994ccd8d4627978ef4b51fcf576"; + version = "1.0"; goPackagePath = "github.com/vincent-petithory/i3cat"; - src = fetchgit { - inherit rev; - url = "https://github.com/vincent-petithory/i3cat"; - sha256 = "1xlm5c9ajdb71985nq7hcsaraq2z06przbl6r4ykvzi8w2lwgv72"; + src = fetchFromGitHub { + owner = "vincent-petithory"; + repo = "i3cat"; + rev = "v${version}"; + sha256 = "sha256-BxiiYzSjvXAMUQSUTKviLvrmGjkCLW6QPrgBBHvvF+Q="; }; goDeps = ./deps.nix; + + meta = with lib; { + description = "combine multiple i3bar JSON inputs into one to forward to i3bar"; + homepage = "https://vincent-petithory.github.io/i3cat/"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; } diff --git a/nixpkgs/pkgs/tools/misc/infracost/default.nix b/nixpkgs/pkgs/tools/misc/infracost/default.nix index 293ee08a2752..920d4a19e793 100644 --- a/nixpkgs/pkgs/tools/misc/infracost/default.nix +++ b/nixpkgs/pkgs/tools/misc/infracost/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "infracost"; - version = "0.9.18"; + version = "0.9.20"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-ukFY6Iy7RaUjECbMCMdOkulMdzUlsoBnyRiuzldXVc8="; + sha256 = "sha256-ujoKnf6f9rrPIxvWlzVnC6q+2BxzhpXgb66clgAuC+8="; }; - vendorSha256 = "sha256-D4tXBXtD3FlWvp4GPIuo/2p3MKg81DVPT5pKVOGe/5c="; + vendorSha256 = "sha256-TfO3+pGxR9dPzigkx89a/Ak+tKiBa6Z0a6U4kIdRsSQ="; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; @@ -23,9 +23,9 @@ buildGoModule rec { checkPhase = '' runHook preCheck - # Remove tests that require networking - rm cmd/infracost/{breakdown_test,diff_test,run_test}.go - + # remove tests that require networking + rm cmd/infracost/{breakdown,diff,hcl,run}_test.go + # checkFlags aren't correctly passed through via buildGoModule go test $checkFlags ''${ldflags:+-ldflags="$ldflags"} -v -p $NIX_BUILD_CORES ./... runHook postCheck diff --git a/nixpkgs/pkgs/tools/misc/license-generator/default.nix b/nixpkgs/pkgs/tools/misc/license-generator/default.nix new file mode 100644 index 000000000000..b880c66f971c --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/license-generator/default.nix @@ -0,0 +1,20 @@ +{ lib, fetchCrate, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "license-generator"; + version = "0.8.1"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-ZVhsbaJJ9WBcQPx2yikIAQJeBXwC6ZAJkfCRmokNV3I="; + }; + + cargoSha256 = "sha256-Yh9q/aYHXUF2eIFpJ7ccgeyIO5mQMgRDCNr+ZyS166Y="; + + meta = with lib; { + description = "Command-line tool for generating license files"; + homepage = "https://github.com/azu/license-generator"; + license = licenses.mit; + maintainers = with maintainers; [ loicreynier ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/mc/default.nix b/nixpkgs/pkgs/tools/misc/mc/default.nix index c2425cf94cab..6f80c2c5e928 100644 --- a/nixpkgs/pkgs/tools/misc/mc/default.nix +++ b/nixpkgs/pkgs/tools/misc/mc/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "mc"; - version = "4.8.27"; + version = "4.8.28"; src = fetchurl { url = "https://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "sha256-Mb5ZIl/6mSCBbpqLO+CrIloW0Z5Pr0aJDyW9/6AqT/Q="; + sha256 = "sha256-6ZTZvppxcumsSkrWIQeSH2qjEuZosFbf5bi867r1OAM="; }; nativeBuildInputs = [ pkg-config autoreconfHook unzip ] @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = [ "--enable-vfs-smb" "PERL=${perl}/bin/perl" ]; + configureFlags = [ "PERL=${perl}/bin/perl" ]; postPatch = '' substituteInPlace src/filemanager/ext.c \ @@ -92,6 +92,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ sander ]; platforms = with platforms; linux ++ darwin; - repositories.git = "https://github.com/MidnightCommander/mc.git"; }; } diff --git a/nixpkgs/pkgs/tools/misc/mcfly/default.nix b/nixpkgs/pkgs/tools/misc/mcfly/default.nix index 583e415f093c..bb7ccb375ba1 100644 --- a/nixpkgs/pkgs/tools/misc/mcfly/default.nix +++ b/nixpkgs/pkgs/tools/misc/mcfly/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.5.13"; + version = "0.6.0"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - sha256 = "sha256-6PGh+CUQH5LEV7/qctn+ihdZgqjt888wknXTfGPS3SI="; + sha256 = "sha256-k8Z/CS1vbnQvoddos7Y0KcM1zB8QDAbXaROjNCyPEN0="; }; postPatch = '' @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { substituteInPlace mcfly.fish --replace '(command which mcfly)' '${placeholder "out"}/bin/mcfly' ''; - cargoSha256 = "sha256-dpDuM+kGuCC2xm5EdV2OoxLNbKgi8wmTGrr8K16AnpM="; + cargoSha256 = "sha256-2SKgzVJdtzH9poHx/NJba6+lj/C0PBcEgI/2ITO18Bk="; meta = with lib; { homepage = "https://github.com/cantino/mcfly"; diff --git a/nixpkgs/pkgs/tools/misc/miniserve/default.nix b/nixpkgs/pkgs/tools/misc/miniserve/default.nix index 89607f13ac97..d24fae2a1fa9 100644 --- a/nixpkgs/pkgs/tools/misc/miniserve/default.nix +++ b/nixpkgs/pkgs/tools/misc/miniserve/default.nix @@ -11,19 +11,27 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.19.2"; + version = "0.19.3"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "sha256-/LmLz4hTmOjpR4Bqf+hABh3PSeaO/sSz/EgHp+nM20o="; + hash = "sha256-JlpjDUX8v7sGADhdKNQXoklbl/fw8DT0A6hEaUG61TQ="; }; - cargoSha256 = "sha256-/KL5c5OeflNDKWuE5Gzqgcew9zf8HFjvmBid+mQSqZE="; + cargoSha256 = "sha256-5V8+Mcuu3fxG399QjW++/uWpPMvVWBfhI/L/6pmbkVY="; - nativeBuildInputs = [ installShellFiles pkg-config zlib ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + nativeBuildInputs = [ + installShellFiles + pkg-config + zlib + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + Security + ]; checkFlags = [ "--skip=bind_ipv4_ipv6::case_2" @@ -38,7 +46,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "For when you really just want to serve some files over HTTP right now!"; + description = "CLI tool to serve files and directories over HTTP"; homepage = "https://github.com/svenstaro/miniserve"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/tools/misc/mmctl/default.nix b/nixpkgs/pkgs/tools/misc/mmctl/default.nix index 71e4de7479c0..c9de0bf14ca8 100644 --- a/nixpkgs/pkgs/tools/misc/mmctl/default.nix +++ b/nixpkgs/pkgs/tools/misc/mmctl/default.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "mmctl"; - version = "6.3.3"; + version = "6.4.2"; src = fetchFromGitHub { owner = "mattermost"; repo = "mmctl"; rev = "v${version}"; - sha256 = "sha256-V2p6diXymu37aJdHs0ZQJ7ak4LWe55KYCq15JRzMF48="; + sha256 = "sha256-FlqkY4LvAW9Cibs+3UkMDWA+uc62wMh13BllWuxjVZU="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/tools/misc/mmv/default.nix b/nixpkgs/pkgs/tools/misc/mmv/default.nix index 2c58381100a4..1f2d61c6c819 100644 --- a/nixpkgs/pkgs/tools/misc/mmv/default.nix +++ b/nixpkgs/pkgs/tools/misc/mmv/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "mmv"; - version = "2.1"; + version = "2.3"; src = fetchFromGitHub { owner = "rrthomas"; repo = "mmv"; rev = "v${version}"; - sha256 = "sha256-3XWXOp30P/bOd+c7PC8duidewX8h0hk9VsEUw05dAE4="; + sha256 = "sha256-lujar6QGlhNawGOIfM5RAUa4Sbs0BFgG8rEsCDLqDDE="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix b/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix index fce376bb32ed..deb610950e2d 100644 --- a/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix +++ b/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "mpdscribble"; - version = "0.23"; + version = "0.24"; src = fetchurl { url = "https://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.xz"; - sha256 = "0s66zqscb44p88cl3kcv5jkjcqsskcnrv7xgrjhzrchf2kcpwf53"; + sha256 = "sha256-9rTLp0izuH5wUnC0kjyOI+lMLgD+3VC+sUaNvi+yqOc="; }; nativeBuildInputs = [ pkg-config meson ninja ]; diff --git a/nixpkgs/pkgs/tools/misc/nbench/default.nix b/nixpkgs/pkgs/tools/misc/nbench/default.nix index dc9dcb1e5bec..16e67b848d65 100644 --- a/nixpkgs/pkgs/tools/misc/nbench/default.nix +++ b/nixpkgs/pkgs/tools/misc/nbench/default.nix @@ -9,13 +9,15 @@ stdenv.mkDerivation rec { sha256 = "1b01j7nmm3wd92ngvsmn2sbw43sl9fpx4xxmkrink68fz1rx0gbj"; }; - buildInputs = [ stdenv.cc.libc.static ]; prePatch = '' substituteInPlace nbench1.h --replace '"NNET.DAT"' "\"$out/NNET.DAT\"" + substituteInPlace sysspec.h --replace "malloc.h" "stdlib.h" + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile --replace "-static" "" ''; - preBuild = '' - makeFlagsArray=(CC=$CC) - ''; + + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + installPhase = '' mkdir -p $out/bin cp nbench $out/bin @@ -25,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.math.utah.edu/~mayer/linux/bmark.html"; description = "A synthetic computing benchmark program"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with lib.maintainers; [ bennofs ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix b/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix index f0fa2529f06f..731278cafe0e 100644 --- a/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix +++ b/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { pname = "nix-direnv"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; rev = version; - sha256 = "sha256-vMs4CyMhEy96gWMWXD74rTR1uNjU+y21i0dh6AdaMGE="; + sha256 = "sha256-WgNfo9GRqIrXsIgNRhoNPU2/uwyPd8xG8xEEImEy4KY="; }; # Substitute instead of wrapping because the resulting file is diff --git a/nixpkgs/pkgs/tools/misc/onefetch/default.nix b/nixpkgs/pkgs/tools/misc/onefetch/default.nix index 860a9758d4f4..d5e77d4461d7 100644 --- a/nixpkgs/pkgs/tools/misc/onefetch/default.nix +++ b/nixpkgs/pkgs/tools/misc/onefetch/default.nix @@ -22,8 +22,15 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-16oiZAyj6haBk6mgUT25pPDUrCMd7pGo2kAQ0gTe2kM="; }; - # enable pkg-config feature of zstd - cargoPatches = [ ./zstd-pkg-config.patch ]; + cargoPatches = [ + # enable pkg-config feature of zstd + ./zstd-pkg-config.patch + # fix flaky test + (fetchpatch { + url = "https://github.com/o2sh/onefetch/commit/2c1f2f0b2c666f6ce94af0299f88048dd1d83484.patch"; + sha256 = "sha256-pI3yCFYkqOmLgKnCwexv1LcCrCkhi44zhEAx0szaMkg="; + }) + ]; cargoSha256 = "sha256-6wnfn33mfye5o/vY1JQX1Lc4+jzHiKKgGsSLxeJWyFc="; diff --git a/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix index 57a21a2822db..384c448e1d93 100644 --- a/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.46.0"; + version = "0.47.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-VD/gN9lUwzhRTfr8rAQld+4sN+deYhUlNvCphtZncDU="; + sha256 = "sha256-IbpQd01uU6/Ihli+gVDjTB8T8cj//XHoZYcDjXD635Q="; }; # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorSha256 = "sha256-ojNDDPCo6TGp8BYio/pYykXSLjC5Qplw0WFD9UIiYM4="; + vendorSha256 = "sha256-1svBCXfutjXfXfVqVHUTAt9T1ON/qbiS+VCt5kP/YIc="; subPackages = [ "cmd/otelcontribcol" ]; diff --git a/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix b/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix index 851d4f2dc182..1feb290bb137 100644 --- a/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -12,17 +12,17 @@ let in buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.46.0"; + version = "0.47.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - sha256 = "sha256-ibaA9oCSsId9A4ul5sfM+L8ExBl+Wv7rhGnb6TZ4WJw="; + sha256 = "sha256-1dMdQWV+gxbMc/2iVsB1LCsYxR0bt5AJEvoFq2/KHCg="; }; # there is a nested go.mod sourceRoot = "source/cmd/otelcorecol"; - vendorSha256 = "sha256-Okmsd/skfBmkyLv9oPFH0QvewFZFPpUH2ahWxHt7cy8="; + vendorSha256 = "sha256-ps6fUVg7vhGgy47WTJv/U1qHQ2MGXIWXNZ5Rddo1yQY="; preBuild = '' # set the build version, can't be done via ldflags diff --git a/nixpkgs/pkgs/tools/misc/ostree/default.nix b/nixpkgs/pkgs/tools/misc/ostree/default.nix index a4ecb4c527aa..6da0de81cd56 100644 --- a/nixpkgs/pkgs/tools/misc/ostree/default.nix +++ b/nixpkgs/pkgs/tools/misc/ostree/default.nix @@ -41,13 +41,13 @@ let ])); in stdenv.mkDerivation rec { pname = "ostree"; - version = "2022.1"; + version = "2022.2"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "sha256-Q6AOeFaEK4o09mFvws4c4jjvQyEMykH3DmtLDSqfytU="; + sha256 = "sha256-duL1tXhNjLaG6QvjL87LtWxsaoJOA3ShpoILV3EDZ2s="; }; patches = [ diff --git a/nixpkgs/pkgs/tools/misc/pandoc-include/default.nix b/nixpkgs/pkgs/tools/misc/pandoc-include/default.nix new file mode 100644 index 000000000000..a0ce0f96b437 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/pandoc-include/default.nix @@ -0,0 +1,30 @@ +{ buildPythonApplication +, fetchFromGitHub +, lib +, natsort +, panflute +}: + +buildPythonApplication rec { + pname = "pandoc-include"; + version = "1.2.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "DCsunset"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-kuxud7m+sWcNqE8A+Fwb8ATgiUwxQvHeYBTyw1UzX4U="; + }; + + propagatedBuildInputs = [ natsort panflute ]; + + pythonImportsCheck = [ "pandoc_include.main" ]; + + meta = with lib; { + description = "Pandoc filter to allow file and header includes"; + homepage = "https://github.com/DCsunset/pandoc-include"; + license = licenses.mit; + maintainers = with maintainers; [ ppenguin ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/parallel/default.nix b/nixpkgs/pkgs/tools/misc/parallel/default.nix index 2eca9f6891a5..b39cfda17d6f 100644 --- a/nixpkgs/pkgs/tools/misc/parallel/default.nix +++ b/nixpkgs/pkgs/tools/misc/parallel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20220222"; + version = "20220322"; src = fetchurl { url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; - sha256 = "sha256-+BaCuGPq1/uaEUdUAB6ShvlUVQpXo882yQA6gEempEU="; + sha256 = "sha256-35PM9qn1Ka0hJrcEKu8EhmA+k4x3tAWTnEFwLTik5tg="; }; outputs = [ "out" "man" "doc" ]; diff --git a/nixpkgs/pkgs/tools/misc/pg_flame/default.nix b/nixpkgs/pkgs/tools/misc/pg_flame/default.nix index 7625e67e0010..ca58e2a65700 100644 --- a/nixpkgs/pkgs/tools/misc/pg_flame/default.nix +++ b/nixpkgs/pkgs/tools/misc/pg_flame/default.nix @@ -13,8 +13,6 @@ buildGoModule rec { vendorSha256 = "1rkx20winh66y2m7i7q13jpr83044i2d1pfd5p5l5kkpsix5mra5"; - doCheck = false; - meta = with lib; { description = "Flamegraph generator for Postgres EXPLAIN ANALYZE output"; homepage = "https://github.com/mgartner/pg_flame"; diff --git a/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix b/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix index 8b6c52446aa8..8be9c0eecee4 100644 --- a/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix +++ b/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix @@ -1,69 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, maven, jdk17_headless }: +{ lib, stdenv, fetchurl }: let version = "1.2022.2"; - - src = fetchFromGitHub { - owner = "plantuml"; - repo = "plantuml-server"; - rev = "v${version}"; - sha256 = "sha256-55IBhulFo42jscBFrHM39qA0GRgKBoYNye4q9QkmjsM="; - }; - - # perform fake build to make a fixed-output derivation out of the files downloaded from maven central - deps = stdenv.mkDerivation { - name = "plantuml-server-${version}-deps"; - inherit src; - nativeBuildInputs = [ jdk17_headless maven ]; - buildPhase = '' - runHook preBuild - - while mvn package -Dmaven.repo.local=$out/.m2; [ $? = 1 ]; do - echo "timeout, restart maven to continue downloading" - done - - runHook postBuild - ''; - # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside - installPhase = '' - find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete - ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-AheCBX5jFzDHqTI2pCWBIiDESEKMClXlvWIcFvu0goA="; - }; in - stdenv.mkDerivation rec { pname = "plantuml-server"; inherit version; - inherit src; - - nativeBuildInputs = [ jdk17_headless maven ]; - - buildPhase = '' - runHook preBuild - - # maven can output reproducible files after setting project.build.outputTimestamp property - # see https://maven.apache.org/guides/mini/guide-reproducible-builds.html#how-do-i-configure-my-maven-build - # 'maven.repo.local' must be writable so copy it out of nix store - cp -R $src repo - chmod +w -R repo - cd repo - mvn package --offline \ - -Dproject.build.outputTimestamp=0 \ - -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 - - runHook postBuild - ''; + src = fetchurl { + url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war"; + sha256 = "sha256-h4ulXzZ5L+VPhk2CnZQNxfnEJzWT3B9TNvDEWt4o9Hk="; + }; + dontUnpack = true; installPhase = '' - runHook preInstall - mkdir -p "$out/webapps" - cp "target/plantuml.war" "$out/webapps/plantuml.war" - - runHook postInstall + cp "$src" "$out/webapps/plantuml.war" ''; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/misc/remind/default.nix b/nixpkgs/pkgs/tools/misc/remind/default.nix index 91251abde131..6d5e0e37703b 100644 --- a/nixpkgs/pkgs/tools/misc/remind/default.nix +++ b/nixpkgs/pkgs/tools/misc/remind/default.nix @@ -16,11 +16,11 @@ let in tcl.mkTclDerivation rec { pname = "remind"; - version = "03.04.01"; + version = "03.04.02"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "sha256-8INtFmftMb1JSotUdDtMXdSm+UE/8zQW/wIOExr8nkI="; + sha256 = "sha256-kjDcO0l39l2KJXo0elZesKZWDZoSoUXIu1Ua7IxWY4w="; }; propagatedBuildInputs = tclLibraries; diff --git a/nixpkgs/pkgs/tools/misc/rockbox-utility/default.nix b/nixpkgs/pkgs/tools/misc/rockbox-utility/default.nix index a75b90d6f542..bf191beca3fe 100644 --- a/nixpkgs/pkgs/tools/misc/rockbox-utility/default.nix +++ b/nixpkgs/pkgs/tools/misc/rockbox-utility/default.nix @@ -1,9 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, cryptopp -, libusb1, qtbase, qttools, makeWrapper -, qmake, withEspeak ? false, espeak ? null -, qt5 }: - -let inherit (lib) getDev; in +{ lib +, stdenv +, fetchurl +, cryptopp +, libusb1 +, makeWrapper +, pkg-config +, qt5 +, withEspeak ? false, espeak ? null +}: stdenv.mkDerivation rec { pname = "rockbox-utility"; @@ -11,16 +15,27 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.rockbox.org/rbutil/source/RockboxUtility-v${version}-src.tar.bz2"; - sha256 = "0zm9f01a810y7aq0nravbsl0vs9vargwvxnfl4iz9qsqygwlj69y"; + hash = "sha256-PhlJ+fNY4/Qjoc72zV9WO+kNqF5bZQuwOh4EpAJwqX4="; }; - buildInputs = [ cryptopp libusb1 qtbase qttools ] - ++ lib.optional withEspeak espeak; - nativeBuildInputs = [ makeWrapper pkg-config qmake qt5.wrapQtAppsHook ]; + nativeBuildInputs = [ + makeWrapper + pkg-config + qt5.qmake + qt5.wrapQtAppsHook + ]; + + buildInputs = [ + cryptopp + libusb1 + qt5.qtbase + qt5.qttools + ] + ++ lib.optional withEspeak espeak; postPatch = '' sed -i rbutil/rbutilqt/rbutilqt.pro \ - -e '/^lrelease.commands =/ s|$$\[QT_INSTALL_BINS\]/lrelease -silent|${getDev qttools}/bin/lrelease|' + -e '/^lrelease.commands =/ s|$$\[QT_INSTALL_BINS\]/lrelease -silent|${lib.getDev qt5.qttools}/bin/lrelease|' ''; preConfigure = '' @@ -48,10 +63,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; meta = with lib; { - description = "Open source firmware for mp3 players"; homepage = "https://www.rockbox.org"; - license = licenses.gpl2; + description = "Open source firmware for digital music players"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres goibhniu ]; platforms = platforms.linux; - maintainers = with maintainers; [ goibhniu ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix b/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix index 09422cd2d4bc..2b7032929500 100644 --- a/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix +++ b/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2022.2"; + version = "2022.3"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-wy6zmVy7+31+wadLldWdf/IyT0dyLArYLmGw/Kgd+sU="; + sha256 = "sha256-ERDaCLj/qvyzAxmpUfFsCx9fsDjlhQ19PRyUTVZ2Z2w="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/sam-ba/default.nix b/nixpkgs/pkgs/tools/misc/sam-ba/default.nix index 60853d2cf7ef..291063f43cb1 100644 --- a/nixpkgs/pkgs/tools/misc/sam-ba/default.nix +++ b/nixpkgs/pkgs/tools/misc/sam-ba/default.nix @@ -1,40 +1,35 @@ -{ lib, stdenv, fetchzip, libX11, libXScrnSaver, libXext, libXft, libXrender -, freetype, zlib, fontconfig -}: - -let - maybe64 = if stdenv.isx86_64 then "_64" else ""; - libPath = lib.makeLibraryPath - [ stdenv.cc.cc.lib libX11 libXScrnSaver libXext libXft libXrender freetype - zlib fontconfig - ]; -in +{ lib, stdenv, fetchzip, glib, zlib, libglvnd, python3, autoPatchelfHook }: + stdenv.mkDerivation rec { - version = "2.16"; + version = "3.5"; pname = "sam-ba"; src = fetchzip { - url = "http://www.atmel.com/dyn/resources/prod_documents/sam-ba_${version}_linux.zip"; - sha256 = "18lsi4747900cazq3bf0a87n3pc7751j5papj9sxarjymcz9vks4"; + url = "https://ww1.microchip.com/downloads/en/DeviceDoc/sam-ba_${version}-linux_x86_64.tar.gz"; + sha256 = "1k0nbgyc98z94nphm2q7s82b274clfnayf4a2kv93l5594rzdbp1"; }; - # Pre-built binary package. Install everything to /opt/sam-ba to not mess up - # the internal directory structure. Then create wrapper in /bin. Attemts to - # use "patchelf --set-rpath" instead of setting LD_PRELOAD_PATH failed. + buildInputs = [ + glib + libglvnd + zlib + + (python3.withPackages (ps: [ps.pyserial])) + ]; + + nativeBuildInputs = [ autoPatchelfHook ]; + installPhase = '' + runHook preInstall + mkdir -p "$out/bin/" \ "$out/opt/sam-ba/" cp -a . "$out/opt/sam-ba/" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/opt/sam-ba/sam-ba${maybe64}" - cat > "$out/bin/sam-ba" << EOF - export LD_LIBRARY_PATH="${libPath}" - exec "$out/opt/sam-ba/sam-ba${maybe64}" - EOF - chmod +x "$out/bin/sam-ba" - ''; + ln -sr "$out/opt/sam-ba/sam-ba" "$out/bin/" + ln -sr "$out/opt/sam-ba/multi_sam-ba.py" "$out/bin/" - # Do our own thing - dontPatchELF = true; + runHook postInstall + ''; meta = with lib; { description = "Programming tools for Atmel SAM3/7/9 ARM-based microcontrollers"; @@ -42,10 +37,10 @@ stdenv.mkDerivation rec { Atmel SAM-BA software provides an open set of tools for programming the Atmel SAM3, SAM7 and SAM9 ARM-based microcontrollers. ''; + # Alternatively: https://www.microchip.com/en-us/development-tool/SAM-BA-In-system-Programmer homepage = "http://www.at91.com/linux4sam/bin/view/Linux4SAM/SoftwareTools"; - # License in <source>/doc/readme.txt - license = "BSD-like (partly binary-only)"; # according to Buildroot - platforms = [ "x86_64-linux" ]; # patchelf fails on i686-linux + license = lib.licenses.gpl2Only; + platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/sdl-jstest/default.nix b/nixpkgs/pkgs/tools/misc/sdl-jstest/default.nix index c299a140b079..d6c336990cf0 100644 --- a/nixpkgs/pkgs/tools/misc/sdl-jstest/default.nix +++ b/nixpkgs/pkgs/tools/misc/sdl-jstest/default.nix @@ -1,14 +1,15 @@ -{ lib, stdenv, fetchgit, cmake, pkg-config, SDL, SDL2, ncurses, docbook_xsl, git }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL, SDL2, ncurses, docbook_xsl, git }: stdenv.mkDerivation { pname = "sdl-jstest"; version = "2018-06-15"; - # Submodules - src = fetchgit { - url = "https://github.com/Grumbel/sdl-jstest"; + src = fetchFromGitHub { + owner = "Grumbel"; + repo = "sdl-jstest"; rev = "aafbdb1ed3e687583037ba55ae88b1210d6ce98b"; - sha256 = "0p4cjzcq0bbkzad19jwdklylqhq2q390q7dpg8bfzl2rwls883rk"; + sha256 = "sha256-Mw+ENOVZ0O8WercdDNLAAkNMPZ2NyxSa+nMtgNmXjFw="; + fetchSubmodules = true; }; buildInputs = [ SDL SDL2 ncurses ]; diff --git a/nixpkgs/pkgs/tools/misc/smug/default.nix b/nixpkgs/pkgs/tools/misc/smug/default.nix index afa21afa6666..cf78662620ce 100644 --- a/nixpkgs/pkgs/tools/misc/smug/default.nix +++ b/nixpkgs/pkgs/tools/misc/smug/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "smug"; @@ -9,12 +9,20 @@ buildGoModule rec { src = fetchFromGitHub { owner = "ivaaaan"; repo = "smug"; - rev = "3399f02a6e01324f5bb881f6b049c9e8d94733ee"; + rev = "v${version}"; sha256 = "178125835dhnaq9k42yv4pfxpyhgb5179wrxkimb59fy0nk8jzx8"; }; vendorSha256 = "1rba5rpvlr8dyhj145b5i57pm4skfpj3vm7vydkn79k6ak6x985x"; + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ "-s" "-w" "-X=main.version=${version}" ]; + + postInstall = '' + installManPage ./man/man1/smug.1 + ''; + meta = with lib; { homepage = "https://github.com/ivaaaan/smug"; description = "Smug - tmux session manager"; diff --git a/nixpkgs/pkgs/tools/misc/starship/default.nix b/nixpkgs/pkgs/tools/misc/starship/default.nix index d61fd9ddda98..a27674290d67 100644 --- a/nixpkgs/pkgs/tools/misc/starship/default.nix +++ b/nixpkgs/pkgs/tools/misc/starship/default.nix @@ -2,10 +2,10 @@ , stdenv , fetchFromGitHub , rustPlatform -, pkg-config -, openssl , installShellFiles , libiconv +, libgit2 +, pkg-config , nixosTests , Security , Foundation @@ -22,10 +22,9 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-mqUE4JzNBhvtDpT2LM23eHX8q93wtPqA+/zr/PxEDiE="; }; - nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = [ installShellFiles pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ libiconv Security Foundation ]; + buildInputs = [ libgit2 ] ++ lib.optionals stdenv.isDarwin [ libiconv Security Foundation ]; postInstall = '' for shell in bash fish zsh; do diff --git a/nixpkgs/pkgs/tools/misc/steampipe/default.nix b/nixpkgs/pkgs/tools/misc/steampipe/default.nix index cfdb2b79c6df..ee97166deb11 100644 --- a/nixpkgs/pkgs/tools/misc/steampipe/default.nix +++ b/nixpkgs/pkgs/tools/misc/steampipe/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "steampipe"; - version = "0.13.0"; + version = "0.13.3"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-+QtZmrPE3R98UVSwrC8xoehNKwd0Exg+AZ2BJxBIrfY="; + sha256 = "sha256-zU/FWrlE4TQhzRNOVED7hFub+lehPFD+fEJ3v0PFGdM="; }; - vendorSha256 = "sha256-rRp8pR2cpW88o0KPwuvgSkE263S5oGK/4df4CQSOlRo="; + vendorSha256 = "sha256-0jixQcgSXQJAd899EWOUKde5OXZcSZwQfH7LRdQlm7c="; proxyVendor = true; # tests are failing for no obvious reasons diff --git a/nixpkgs/pkgs/tools/misc/topgrade/default.nix b/nixpkgs/pkgs/tools/misc/topgrade/default.nix index e1b96d971779..dfa9b18afd22 100644 --- a/nixpkgs/pkgs/tools/misc/topgrade/default.nix +++ b/nixpkgs/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "8.2.0"; + version = "8.3.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WyiEKC5WUwIGCaxXqiqNyOcGVZgfd2lVFMxQxhgJhMc="; + sha256 = "sha256-iFS8Bf2IF0GoW168DwfBbkiPd7IGJhGShofFnBESpUc="; }; - cargoSha256 = "sha256-ZcOSHEZHGa1XhGQlW4pR5hBJ2SpSbkKuRS6OSHGg9Lo="; + cargoSha256 = "sha256-8Ag4rDXnDZgxdwFpiWnYNjDeau9vr9EIfbJzeQlqSDM="; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/nixpkgs/pkgs/tools/misc/ttchat/default.nix b/nixpkgs/pkgs/tools/misc/ttchat/default.nix new file mode 100644 index 000000000000..c88f4098b768 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/ttchat/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "ttchat"; + version = "0.1.6"; + + src = fetchFromGitHub { + owner = "atye"; + repo = "ttchat"; + rev = "v${version}"; + sha256 = "sha256-Km8aBThs2h8vVpQQaN/OuDeQcrewhP0hMMRuU8/1Ilk="; + }; + + vendorSha256 = "sha256-pJAwx7RmD2sSHsz1DxtsU7bjC/b0JujlrFeGL6zmTiI="; + + meta = with lib; { + description = "Connect to a Twitch channel's chat from your terminal"; + homepage = "https://github.com/atye/ttchat"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/up/default.nix b/nixpkgs/pkgs/tools/misc/up/default.nix index 47c504cd1a71..7737c67faa23 100644 --- a/nixpkgs/pkgs/tools/misc/up/default.nix +++ b/nixpkgs/pkgs/tools/misc/up/default.nix @@ -13,8 +13,6 @@ buildGoModule rec { vendorSha256 = "1q8wfsfl3rz698ck5q5s5z6iw9k134fxxvwipcp2b052n998rcrx"; - doCheck = false; - meta = with lib; { description = "Ultimate Plumber is a tool for writing Linux pipes with instant live preview"; homepage = "https://github.com/akavel/up"; diff --git a/nixpkgs/pkgs/tools/misc/upower-notify/default.nix b/nixpkgs/pkgs/tools/misc/upower-notify/default.nix index 79460f3a5b79..c46ad10a40af 100644 --- a/nixpkgs/pkgs/tools/misc/upower-notify/default.nix +++ b/nixpkgs/pkgs/tools/misc/upower-notify/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: # To use upower-notify, the maintainer suggests adding something like this to your configuration.nix: # @@ -8,16 +8,22 @@ # ''; buildGoPackage rec { pname = "upower-notify"; - version = "20160310-${lib.strings.substring 0 7 rev}"; - rev = "14c581e683a7e90ec9fa6d409413c16599a5323c"; + version = "unstable-2016-03-10"; goPackagePath = "github.com/omeid/upower-notify"; - src = fetchgit { - inherit rev; - url = "https://github.com/omeid/upower-notify"; + src = fetchFromGitHub { + owner = "omeid"; + repo = "upower-notify"; + rev = "14c581e683a7e90ec9fa6d409413c16599a5323c"; sha256 = "16zlvn53p9m10ph8n9gps51fkkvl6sf4afdzni6azk05j0ng49jw"; }; goDeps = ./deps.nix; + + meta = with lib; { + description = "simple tool to give you Desktop Notifications about your battery"; + homepage = "https://github.com/omeid/upower-notify"; + maintainers = with maintainers; [ kamilchm ]; + }; } diff --git a/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix b/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix index 4673ab41654e..79d3ab7b6388 100644 --- a/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix +++ b/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix @@ -31,11 +31,12 @@ buildPythonPackage rec { # # https://github.com/ytdl-org/youtube-dl/issues/29326 # - # The patch comes from PR https://github.com/ytdl-org/youtube-dl/pull/30188 + # The patch comes from PR https://github.com/ytdl-org/youtube-dl/pull/30184#issuecomment-1025261055 + # plus follow-up (1e677567) from https://github.com/ytdl-org/youtube-dl/pull/30582 (fetchpatch { name = "fix-youtube-dl-speed.patch"; - url = "https://github.com/ytdl-org/youtube-dl/pull/30188.patch"; - sha256 = "15liban37ina2y4bnykfdywdy4rbkfff2r6vd0kqn2k7rfkcczyz"; + url = "https://github.com/ytdl-org/youtube-dl/compare/57044eacebc6f2f3cd83c345e1b6e659a22e4773...1e677567cd083d43f55daef0cc74e5fa24575ae3.diff"; + sha256 = "11s0j3w60r75xx20p0x2j3yc4d3yvz99r0572si8b5qd93lqs4pr"; }) ]; @@ -70,13 +71,13 @@ buildPythonPackage rec { homepage = "https://ytdl-org.github.io/youtube-dl/"; description = "Command-line tool to download videos from YouTube.com and other sites"; longDescription = '' - youtube-dl is a small, Python-based command-line program - to download videos from YouTube.com and a few more sites. - youtube-dl is released to the public domain, which means - you can modify it, redistribute it or use it however you like. + youtube-dl is a small, Python-based command-line program to download + videos from YouTube.com and a few more sites. youtube-dl is released to + the public domain, which means you can modify it, redistribute it or use + it however you like. ''; license = licenses.publicDomain; + maintainers = with maintainers; [ bluescreen303 fpletz ma27 ]; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ bluescreen303 AndersonTorres fpletz ma27 ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/ytmdl/default.nix b/nixpkgs/pkgs/tools/misc/ytmdl/default.nix index 90a0590b8d95..c2a2a2adf2df 100644 --- a/nixpkgs/pkgs/tools/misc/ytmdl/default.nix +++ b/nixpkgs/pkgs/tools/misc/ytmdl/default.nix @@ -1,16 +1,17 @@ { lib , python3Packages +, yt-dlp , ffmpeg }: python3Packages.buildPythonApplication rec { pname = "ytmdl"; - version = "2021.08.01"; + version = "2022.03.16"; src = python3Packages.fetchPypi { inherit pname; version = builtins.replaceStrings [ ".0" ] [ "." ] version; - sha256 = "f5ef23dcba89aaf2307baf4ffc2326dc5c02324f646e5e5748219ed328202af4"; + sha256 = "sha256-2lEOgwSi4fAVK+gJXvjWQDBWIb1cODFmUiq0FUfpyXA="; }; postPatch = '' @@ -34,7 +35,7 @@ python3Packages.buildPythonApplication rec { itunespy mutagen pysocks - youtube-dl + yt-dlp ytmusicapi spotipy ]; diff --git a/nixpkgs/pkgs/tools/misc/zellij/default.nix b/nixpkgs/pkgs/tools/misc/zellij/default.nix index 7fc1c6e335a5..4855e979ed65 100644 --- a/nixpkgs/pkgs/tools/misc/zellij/default.nix +++ b/nixpkgs/pkgs/tools/misc/zellij/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.26.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-8PgEsRh2nBOIvKeX9SJ853NN8Szb4geKwv2qvTtkMxk="; + sha256 = "sha256-ngCE1DhbbuOu07R69gSlFvDKl5EFtTGOkfr5e4u4Dkw="; }; - cargoSha256 = "sha256-YaqaXn1Ol5RfwAzWi7767vt1je+wqWFtfgxMOSIy9UI="; + cargoSha256 = "sha256-lRnxZiJiq601oOXkxZqVNPXc0miK3TsAyGeVTjTxdhw="; nativeBuildInputs = [ mandown |