diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/misc')
54 files changed, 315 insertions, 223 deletions
diff --git a/nixpkgs/pkgs/tools/misc/aspcud/default.nix b/nixpkgs/pkgs/tools/misc/aspcud/default.nix index e3f75693803c..cd290d5e085e 100644 --- a/nixpkgs/pkgs/tools/misc/aspcud/default.nix +++ b/nixpkgs/pkgs/tools/misc/aspcud/default.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { buildInputs = [ boost clingo re2c ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DASPCUD_GRINGO_PATH=${clingo}/bin/gringo" "-DASPCUD_CLASP_PATH=${clingo}/bin/clasp" ]; diff --git a/nixpkgs/pkgs/tools/misc/betterdiscordctl/default.nix b/nixpkgs/pkgs/tools/misc/betterdiscordctl/default.nix index 6a20ebc10c5c..c2c935c0d981 100644 --- a/nixpkgs/pkgs/tools/misc/betterdiscordctl/default.nix +++ b/nixpkgs/pkgs/tools/misc/betterdiscordctl/default.nix @@ -36,6 +36,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/bb010g/betterdiscordctl"; description = "A utility for managing BetterDiscord on Linux"; license = licenses.mit; + mainProgram = "betterdiscordctl"; maintainers = with maintainers; [ ivar bb010g ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/misc/bkt/default.nix b/nixpkgs/pkgs/tools/misc/bkt/default.nix index e359ab2fd332..61926352ce33 100644 --- a/nixpkgs/pkgs/tools/misc/bkt/default.nix +++ b/nixpkgs/pkgs/tools/misc/bkt/default.nix @@ -4,16 +4,16 @@ }: rustPlatform.buildRustPackage rec { pname = "bkt"; - version = "0.6.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "dimo414"; repo = pname; rev = version; - sha256 = "sha256-NgNXuTpI1EzgmxKRsqzxTOlQi75BHCcbjFnouhnfDDM="; + sha256 = "sha256-CMCO1afTWhXlWpy9D7txqI1FHxGDgdVdkKtyei6oFJU="; }; - cargoSha256 = "sha256-PvcKviyXtiHQCHgJLGR2Mr+mPpTd06eKWQ5h6eGdl40="; + cargoHash = "sha256-T4JT8GzKqsQQfe3zfst6gNEvdY7zs2h2H3s6slaRhYY="; meta = { description = "A subprocess caching utility"; diff --git a/nixpkgs/pkgs/tools/misc/broot/default.nix b/nixpkgs/pkgs/tools/misc/broot/default.nix index 16222050f30a..3e136a39f85a 100644 --- a/nixpkgs/pkgs/tools/misc/broot/default.nix +++ b/nixpkgs/pkgs/tools/misc/broot/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.25.1"; + version = "1.25.2"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-CgWng5b0w6LGt2m9bx3IVMxOXwqYjgsIddTQdBnN/IY="; + hash = "sha256-VN78nFMn2+EN1Zwh8t9ptge3ko0kjsiJJCcz+RDBxaA="; }; - cargoHash = "sha256-xcUDg2vfGq4nmdbN6kFfWwbwaH/WqdLpIO0qrvQ7/t4="; + cargoHash = "sha256-IR7AOefx5Ly1G0UM3UhNOE2pYcZNmNRdiYNH48eAKXs="; nativeBuildInputs = [ installShellFiles diff --git a/nixpkgs/pkgs/tools/misc/calamares/default.nix b/nixpkgs/pkgs/tools/misc/calamares/default.nix index 00a06b857b0d..a82d62aed0df 100644 --- a/nixpkgs/pkgs/tools/misc/calamares/default.nix +++ b/nixpkgs/pkgs/tools/misc/calamares/default.nix @@ -51,7 +51,6 @@ mkDerivation rec { "-DPYTHON_LIBRARY=${python}/lib/lib${python.libPrefix}.so" "-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}" "-DCMAKE_VERBOSE_MAKEFILE=True" - "-DCMAKE_BUILD_TYPE=Release" "-DWITH_PYTHONQT:BOOL=ON" ]; diff --git a/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix b/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix index 05f8586a1455..70e6aa04e6f4 100644 --- a/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix +++ b/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cf-terraforming"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cf-terraforming"; rev = "v${version}"; - sha256 = "sha256-s2xsFJ+8ivkdG2F52iRdTbJDEw8ALmFDR7Ct6d84p+s="; + sha256 = "sha256-9aGN3TP4bMz4V0MRrNFxMm16k9RfvU5iDVwe+Ws4Ask="; }; - vendorHash = "sha256-pe5ieCstUe3ZHlJs83lzwNS2qAIhIGJG9E5P4Ri3E/s="; + vendorHash = "sha256-fswT6t2LP6gRmCHrSHVJGdNc6gic3rMSrE+STe5oiyQ="; ldflags = [ "-X github.com/cloudflare/cf-terraforming/internal/app/cf-terraforming/cmd.versionString=${version}" ]; # The test suite insists on downloading a binary release of Terraform from diff --git a/nixpkgs/pkgs/tools/misc/clipboard-jh/default.nix b/nixpkgs/pkgs/tools/misc/clipboard-jh/default.nix index 9cebe31dd7b8..fe4f18eea8d2 100644 --- a/nixpkgs/pkgs/tools/misc/clipboard-jh/default.nix +++ b/nixpkgs/pkgs/tools/misc/clipboard-jh/default.nix @@ -42,8 +42,9 @@ stdenv.mkDerivation rec { darwin.apple_sdk.frameworks.AppKit ]; + cmakeBuildType = "MinSizeRel"; + cmakeFlags = [ - "-DCMAKE_BUILD_TYPE='MinSizeRel'" "-Wno-dev" "-DINSTALL_PREFIX=${placeholder "out"}" ]; diff --git a/nixpkgs/pkgs/tools/misc/cod/default.nix b/nixpkgs/pkgs/tools/misc/cod/default.nix index e80abc03a794..c681930032fc 100644 --- a/nixpkgs/pkgs/tools/misc/cod/default.nix +++ b/nixpkgs/pkgs/tools/misc/cod/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "dim-an"; repo = pname; rev = "v${version}"; - sha256 = "0wi680sxpv0kp1ggy21qp4c4ms79hw4z9w9kvp278p8z3y8wwglr"; + hash = "sha256-mT7OkR8fXXTE3TPx9AmH6ehKGLk4CP9euBPs2zVAJnI="; }; - vendorSha256 = "0ann1fbh8rqys3rwbz5h9mfnvkpqiw5rgkd4c30y99706h2dzv4i"; + vendorHash = "sha256-kezfBDTgpOTBYKTNlwuP+M5tXU2w/MXz0B5nBJcL1io="; ldflags = [ "-s" "-w" "-X main.GitSha=${src.rev}" ]; diff --git a/nixpkgs/pkgs/tools/misc/cpulimit/default.nix b/nixpkgs/pkgs/tools/misc/cpulimit/default.nix index a0ee76ec46fa..75c3ba733b14 100644 --- a/nixpkgs/pkgs/tools/misc/cpulimit/default.nix +++ b/nixpkgs/pkgs/tools/misc/cpulimit/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { description = "CPU usage limiter"; platforms = platforms.unix; license = licenses.gpl2; + mainProgram = "cpulimit"; maintainers = [ maintainers.jsoo1 ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/debianutils/default.nix b/nixpkgs/pkgs/tools/misc/debianutils/default.nix deleted file mode 100644 index 4f5055cdc155..000000000000 --- a/nixpkgs/pkgs/tools/misc/debianutils/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, stdenv -, fetchurl -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "debianutils"; - version = "5.8"; - - src = fetchurl { - url = "mirror://debian/pool/main/d/debianutils/debianutils_${finalAttrs.version}.orig.tar.gz"; - hash = "sha256-WwhtJ+uQY95NdGdg0PrrQNlGT7hV/IqOf7k7A+/OxiI="; - }; - - outputs = [ "out" "man" ]; - - meta = { - homepage = "https://packages.debian.org/sid/debianutils"; - description = "Miscellaneous utilities specific to Debian"; - longDescription = '' - This package provides a number of small utilities which are used - primarily by the installation scripts of Debian packages, although you - may use them directly. - - The specific utilities included are: add-shell installkernel ischroot - remove-shell run-parts savelog tempfile which - ''; - license = with lib.licenses; [ gpl2Plus publicDomain smail ]; - mainProgram = "ischroot"; - maintainers = with lib.maintainers; [ AndersonTorres ]; - platforms = lib.platforms.all; - }; -}) diff --git a/nixpkgs/pkgs/tools/misc/dgoss/default.nix b/nixpkgs/pkgs/tools/misc/dgoss/default.nix index 3c5c2ff8bbab..0ca97c9f63f1 100644 --- a/nixpkgs/pkgs/tools/misc/dgoss/default.nix +++ b/nixpkgs/pkgs/tools/misc/dgoss/default.nix @@ -9,13 +9,13 @@ resholve.mkDerivation rec { pname = "dgoss"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "goss-org"; repo = "goss"; rev = "refs/tags/v${version}"; - hash = "sha256-dpMTUBMEG5tDi7E6ZRg1KHqIj5qDlvwfwJEgq/5z7RE="; + hash = "sha256-FDn1OETkYIpMenk8QAAHvfNZcSzqGl5xrD0fAZPVmRM="; }; dontConfigure = true; diff --git a/nixpkgs/pkgs/tools/misc/docui/default.nix b/nixpkgs/pkgs/tools/misc/docui/default.nix index dd4dd26efa25..122bc20279ba 100644 --- a/nixpkgs/pkgs/tools/misc/docui/default.nix +++ b/nixpkgs/pkgs/tools/misc/docui/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "skanehira"; repo = "docui"; rev = version; - sha256 = "0jya0wdp8scjmsr44krdbbb8q4gplf44gsng1nyn12a6ldqzayxl"; + hash = "sha256-tHv1caNGiWC9Dc/qR4ij9xGM1lotT0KyrpJpdBsHyks="; }; - vendorSha256 = "1ggdczvv03lj0g6cq26vrk1rba6pk0805n85w9hkbjx9c4r3j577"; + vendorHash = "sha256-5xQ5MmGpyzVh4gXZAhCY16iVw8zbCMzMA5IOsPdn7b0="; meta = with lib; { description = "TUI Client for Docker"; diff --git a/nixpkgs/pkgs/tools/misc/dooit/default.nix b/nixpkgs/pkgs/tools/misc/dooit/default.nix index 6610c13b6a74..ab7db4a2cb7c 100644 --- a/nixpkgs/pkgs/tools/misc/dooit/default.nix +++ b/nixpkgs/pkgs/tools/misc/dooit/default.nix @@ -1,48 +1,54 @@ { lib , fetchFromGitHub +, dooit , python3 +, testers }: python3.pkgs.buildPythonApplication rec { pname = "dooit"; - version = "1.0.1"; + version = "2.0.1"; format = "pyproject"; src = fetchFromGitHub { owner = "kraanzu"; - repo = pname; + repo = "dooit"; rev = "v${version}"; - hash = "sha256-7a6xoqbAmnGVUVppQTSo4hH44XFCqBnF7xO7sOVySY0="; + hash = "sha256-iQAGD6zrBBd4fJONaB7to1OJpAJUO0zeA1xhVQZBkMc="; }; - # Required versions not available - pythonRelaxDeps = [ - "textual" - "tzlocal" - ]; - nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ - textual + appdirs pyperclip + python-dateutil pyyaml - dateparser + textual tzlocal - appdirs ]; + # NOTE pyproject version was bumped after release tag 2.0.1 - remove after next release. + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "version = \"2.0.0\"" "version = \"2.0.1\"" + ''; + # No tests available doCheck = false; + passthru.tests.version = testers.testVersion { + package = dooit; + command = "HOME=$(mktemp -d) dooit --version"; + }; + meta = with lib; { description = "A TUI todo manager"; homepage = "https://github.com/kraanzu/dooit"; changelog = "https://github.com/kraanzu/dooit/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ wesleyjrz ]; + maintainers = with maintainers; [ khaneliman wesleyjrz ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/entr/default.nix b/nixpkgs/pkgs/tools/misc/entr/default.nix index a44a30a6dd7a..b46b94037083 100644 --- a/nixpkgs/pkgs/tools/misc/entr/default.nix +++ b/nixpkgs/pkgs/tools/misc/entr/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { checkTarget = "test"; installFlags = [ "PREFIX=$(out)" ]; + TARGET_OS = stdenv.hostPlatform.uname.system; + meta = with lib; { homepage = "https://eradman.com/entrproject/"; description = "Run arbitrary commands when files change"; diff --git a/nixpkgs/pkgs/tools/misc/eza/default.nix b/nixpkgs/pkgs/tools/misc/eza/default.nix index c8ea3fe2a751..c28f7971a86b 100644 --- a/nixpkgs/pkgs/tools/misc/eza/default.nix +++ b/nixpkgs/pkgs/tools/misc/eza/default.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-vgjoDmWtLMP/dpBeydgBNZjSQRuvv0Fm/PcKKAIoIdc="; + hash = "sha256-EvNdE9SYO8+DEJoIxJEh3Fy/+AbtoAyUrOnZtd23K7Q="; }; - cargoHash = "sha256-L1i/1dqOXm97Wugc5ZazQiq3T3PFvMaWK7LpCshpxgw="; + cargoHash = "sha256-1QluALqSwu49/oz89m3KDDgGo91lqOj+WDP8erGmA/8="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] @@ -64,7 +64,7 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/eza-community/eza/releases/tag/v${version}"; license = licenses.mit; mainProgram = "eza"; - maintainers = with maintainers; [ cafkafk ]; + maintainers = with maintainers; [ cafkafk _9glenda ]; platforms = platforms.unix ++ platforms.windows; }; } diff --git a/nixpkgs/pkgs/tools/misc/fend/default.nix b/nixpkgs/pkgs/tools/misc/fend/default.nix index ad65708b4356..7caff9523724 100644 --- a/nixpkgs/pkgs/tools/misc/fend/default.nix +++ b/nixpkgs/pkgs/tools/misc/fend/default.nix @@ -5,22 +5,25 @@ , darwin , pandoc , installShellFiles +, copyDesktopItems +, makeDesktopItem +, nix-update-script }: rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vV7P2e6kv6CCHbI5Roz9WElntl3t/5ySXUw3XXEXMv4="; + sha256 = "sha256-9O+2vCi3CagpIU5pZPA8tLVhyC7KHn93trYdNhsT4n4="; }; - cargoHash = "sha256-oAkZHx33YrwRUUIoooqpy72QCq0ZkAgBZ8W8XDe2fNE="; + cargoHash = "sha256-mRIwmZwO/uqfUJ12ZYKZFPoefvo055Tp+DrfKsoP9q4="; - nativeBuildInputs = [ pandoc installShellFiles ]; + nativeBuildInputs = [ pandoc installShellFiles copyDesktopItems ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; postBuild = '' @@ -38,10 +41,30 @@ rustPlatform.buildRustPackage rec { [[ "$($out/bin/fend "1 km to m")" = "1000 m" ]] ''; + postInstall = '' + install -D -m 444 $src/icon/fend-icon-256.png $out/share/icons/hicolor/256x256/apps/fend.png + ''; + + desktopItems = [ + (makeDesktopItem { + name = "fend"; + desktopName = "fend"; + genericName = "Calculator"; + comment = "Arbitrary-precision unit-aware calculator"; + icon = "fend"; + exec = "fend"; + terminal = true; + categories = [ "Utility" "Calculator" "ConsoleOnly" ]; + }) + ]; + + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Arbitrary-precision unit-aware calculator"; homepage = "https://github.com/printfn/fend"; license = licenses.mit; - maintainers = with maintainers; [ djanatyn ]; + maintainers = with maintainers; [ djanatyn liff ]; + mainProgram = "fend"; }; } diff --git a/nixpkgs/pkgs/tools/misc/frei/default.nix b/nixpkgs/pkgs/tools/misc/frei/default.nix index 22e627646432..6e8a2181abb1 100644 --- a/nixpkgs/pkgs/tools/misc/frei/default.nix +++ b/nixpkgs/pkgs/tools/misc/frei/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-9CV6B7fRHXl73uI2JRv3RiaFczLHHBOd7/8UoCAwK6w="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "Modern replacement for free"; diff --git a/nixpkgs/pkgs/tools/misc/glasgow/default.nix b/nixpkgs/pkgs/tools/misc/glasgow/default.nix index a2c8019e190d..693660667ea7 100644 --- a/nixpkgs/pkgs/tools/misc/glasgow/default.nix +++ b/nixpkgs/pkgs/tools/misc/glasgow/default.nix @@ -9,17 +9,15 @@ python3.pkgs.buildPythonApplication rec { pname = "glasgow"; - version = "unstable-2023-04-15"; + version = "unstable-2023-09-20"; # python -m setuptools_scm - realVersion = "0.1.dev2+g${lib.substring 0 7 src.rev}"; - - patches = [ ./0001-Relax-Amaranth-git-dependency.patch ]; + realVersion = "0.1.dev1798+g${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "GlasgowEmbedded"; repo = "glasgow"; - rev = "406e06fae5c85f6f773c9839747513874bc3ec77"; - sha256 = "sha256-s4fWpKJj6n2+CIAsD2bjr5K8RhJz1H1sFnjiartNGf0="; + rev = "e9a9801d5be3dcba0ee188dd8a6e9115e337795d"; + sha256 = "sha256-ztB3I/jrDSm1gKB1e5igivUVloq+YYhkshDlWg75NMA="; }; nativeBuildInputs = [ @@ -30,6 +28,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ aiohttp amaranth + appdirs bitarray crc fx2 @@ -52,7 +51,14 @@ python3.pkgs.buildPythonApplication rec { # installCheck tries to build_ext again doInstallCheck = false; + postInstall = '' + mkdir -p $out/etc/udev/rules.d + cp $src/config/99-glasgow.rules $out/etc/udev/rules.d + ''; + checkPhase = '' + # tests attempt to cache bitstreams + export XDG_CACHE_HOME=$TMPDIR ${python3.interpreter} -W ignore::DeprecationWarning test.py ''; diff --git a/nixpkgs/pkgs/tools/misc/goss/default.nix b/nixpkgs/pkgs/tools/misc/goss/default.nix index ef3d60aa0756..55fafb1059be 100644 --- a/nixpkgs/pkgs/tools/misc/goss/default.nix +++ b/nixpkgs/pkgs/tools/misc/goss/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "goss"; # Don't forget to update dgoss to the same version. - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "goss-org"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dpMTUBMEG5tDi7E6ZRg1KHqIj5qDlvwfwJEgq/5z7RE="; + hash = "sha256-FDn1OETkYIpMenk8QAAHvfNZcSzqGl5xrD0fAZPVmRM="; }; vendorHash = "sha256-n+k7f9e2iqf4KrcDkzX0CWk+Bq2WE3dyUEid4PTP1FA="; @@ -51,7 +51,7 @@ buildGoModule rec { Once the test suite is written they can be executed, waited-on, or served as a health endpoint. ''; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ hyzual jk anthonyroussel ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/hdf5/default.nix b/nixpkgs/pkgs/tools/misc/hdf5/default.nix index 3c9c6169192d..dc2a1d284527 100644 --- a/nixpkgs/pkgs/tools/misc/hdf5/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdf5/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, cmake , removeReferencesTo , cppSupport ? false , fortranSupport ? false @@ -34,10 +35,12 @@ stdenv.mkDerivation rec { + lib.optionalString threadsafe "-threadsafe"; src = fetchurl { - url = let + url = + let majorMinor = lib.versions.majorMinor version; majorMinorPatch = with lib.versions; "${major version}.${minor version}.${patch version}"; - in "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${majorMinor}/hdf5-${majorMinorPatch}/src/hdf5-${version}.tar.bz2"; + in + "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${majorMinor}/hdf5-${majorMinorPatch}/src/hdf5-${version}.tar.bz2"; sha256 = "sha256-6jxeJX7zIq9ed/weUurTrWvzu0rAZIDdF+45ANeiTPs="; }; @@ -57,7 +60,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ removeReferencesTo ] + nativeBuildInputs = [ removeReferencesTo cmake ] ++ optional fortranSupport fortran; buildInputs = optional fortranSupport fortran @@ -67,24 +70,17 @@ stdenv.mkDerivation rec { propagatedBuildInputs = optional zlibSupport zlib ++ optional mpiSupport mpi; - configureFlags = optional cppSupport "--enable-cxx" - ++ optional fortranSupport "--enable-fortran" - ++ optional szipSupport "--with-szlib=${szip}" - ++ optionals mpiSupport [ "--enable-parallel" "CC=${mpi}/bin/mpicc" ] - ++ optional enableShared "--enable-shared" - ++ optional javaSupport "--enable-java" - ++ optional usev110Api "--with-default-api-version=v110" - # hdf5 hl (High Level) library is not considered stable with thread safety and should be disabled. - ++ optionals threadsafe [ "--enable-threadsafe" "--disable-hl" ]; - - patches = [ - # Avoid non-determinism in autoconf build system: - # - build time - # - build user - # - uname -a (kernel version) - # Can be dropped once/if we switch to cmake. - ./hdf5-more-determinism.patch - ]; + cmakeFlags = [ + "-DHDF5_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake" + ] ++ lib.optional cppSupport "-DHDF5_BUILD_CPP_LIB=ON" + ++ lib.optional fortranSupport "-DHDF5_BUILD_FORTRAN=ON" + ++ lib.optional szipSupport "-DHDF5_ENABLE_SZIP_SUPPORT=ON" + ++ lib.optionals mpiSupport [ "-DHDF5_ENABLE_PARALLEL=ON" "CC=${mpi}/bin/mpicc" ] + ++ lib.optional enableShared "-DBUILD_SHARED_LIBS=ON" + ++ lib.optional javaSupport "-DHDF5_BUILD_JAVA=ON" + ++ lib.optional usev110Api "-DDEFAULT_API_VERSION=v110" + ++ lib.optionals threadsafe [ "-DDHDF5_ENABLE_THREADSAFE:BOOL=ON" "-DHDF5_BUILD_HL_LIB=OFF" ] + ; postInstall = '' find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' + diff --git a/nixpkgs/pkgs/tools/misc/hdf5/hdf5-more-determinism.patch b/nixpkgs/pkgs/tools/misc/hdf5/hdf5-more-determinism.patch deleted file mode 100644 index 9a9bfe24af7b..000000000000 --- a/nixpkgs/pkgs/tools/misc/hdf5/hdf5-more-determinism.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/libhdf5.settings.in b/src/libhdf5.settings.in -index a4d4af6..70f1909 100644 ---- a/src/libhdf5.settings.in -+++ b/src/libhdf5.settings.in -@@ -4,10 +4,7 @@ - General Information: - ------------------- - HDF5 Version: @H5_VERSION@ -- Configured on: @CONFIG_DATE@ -- Configured by: @CONFIG_USER@ - Host system: @host_cpu@-@host_vendor@-@host_os@ -- Uname information: @UNAME_INFO@ - Byte sex: @BYTESEX@ - Installation point: @prefix@ - diff --git a/nixpkgs/pkgs/tools/misc/interactsh/default.nix b/nixpkgs/pkgs/tools/misc/interactsh/default.nix index 7621333b3f1a..cbf023d79099 100644 --- a/nixpkgs/pkgs/tools/misc/interactsh/default.nix +++ b/nixpkgs/pkgs/tools/misc/interactsh/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "interactsh"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cSqDiJEJdtHwL/xumZPOp1JHg7SUZ/47nKFv4bWBo5U="; + hash = "sha256-9mUyVFm/UZw0bQkI3JumFoyzYBz7X6m1YLdpEsypb7s="; }; - vendorHash = "sha256-xtV+QLheWU6RJSjmoOunrsOfUhNCDWJORQDBAmJd2Io="; + vendorHash = "sha256-C4tlyvKQ2sG6uqbO06eT9E72JCPc44PhFAcek+O8sN4="; modRoot = "."; subPackages = [ diff --git a/nixpkgs/pkgs/tools/misc/lazydocker/default.nix b/nixpkgs/pkgs/tools/misc/lazydocker/default.nix index 8c45351b385c..33ac06306558 100644 --- a/nixpkgs/pkgs/tools/misc/lazydocker/default.nix +++ b/nixpkgs/pkgs/tools/misc/lazydocker/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, lazydocker, testers }: buildGoModule rec { pname = "lazydocker"; @@ -21,6 +21,10 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + passthru.tests.version = testers.testVersion { + package = lazydocker; + }; + meta = with lib; { description = "A simple terminal UI for both docker and docker-compose"; homepage = "https://github.com/jesseduffield/lazydocker"; diff --git a/nixpkgs/pkgs/tools/misc/lektor/default.nix b/nixpkgs/pkgs/tools/misc/lektor/default.nix index b9c6cd4a69de..638ce2ee3ce7 100644 --- a/nixpkgs/pkgs/tools/misc/lektor/default.nix +++ b/nixpkgs/pkgs/tools/misc/lektor/default.nix @@ -1,13 +1,25 @@ { lib , fetchFromGitHub , fetchNpmDeps +, fetchPypi , nodejs , npmHooks , python3 }: let - python = python3; + python = python3.override { + packageOverrides = self: super: { + mistune = super.mistune.overridePythonAttrs (old: rec { + version = "2.0.5"; + src = fetchPypi { + inherit (old) pname; + inherit version; + hash = "sha256-AkYRPLJJLbh1xr5Wl0p8iTMzvybNkokchfYxUc7gnTQ="; + }; + }); + }; + }; in python.pkgs.buildPythonApplication rec { pname = "lektor"; version = "3.4.0b8"; diff --git a/nixpkgs/pkgs/tools/misc/less/default.nix b/nixpkgs/pkgs/tools/misc/less/default.nix deleted file mode 100644 index 76b057235360..000000000000 --- a/nixpkgs/pkgs/tools/misc/less/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, stdenv -, fetchurl -, ncurses -, pcre2 -}: - -stdenv.mkDerivation rec { - pname = "less"; - version = "633"; - - # Only tarballs on the website are valid releases, - # other versions, e.g. git tags are considered snapshots. - src = fetchurl { - url = "https://www.greenwoodsoftware.com/less/less-${version}.tar.gz"; - hash = "sha256-LyAdZLgouIrzbf5s/bo+CBns4uRG6+YiSBMgmq7+0E8="; - }; - - configureFlags = [ - # Look for ‘sysless’ in /etc. - "--sysconfdir=/etc" - "--with-regex=pcre2" - ]; - - buildInputs = [ - ncurses - pcre2 - ]; - - meta = with lib; { - homepage = "https://www.greenwoodsoftware.com/less/"; - description = "A more advanced file pager than ‘more’"; - platforms = platforms.unix; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ eelco dtzWill ]; - }; -} diff --git a/nixpkgs/pkgs/tools/misc/lnch/default.nix b/nixpkgs/pkgs/tools/misc/lnch/default.nix index 211df2186f78..70d52d2ea8bd 100644 --- a/nixpkgs/pkgs/tools/misc/lnch/default.nix +++ b/nixpkgs/pkgs/tools/misc/lnch/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-Iro/FjPFMqulcK90MbludnOXkMEHW0QSCoQRL01/LDE"; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" ]; diff --git a/nixpkgs/pkgs/tools/misc/mapcidr/default.nix b/nixpkgs/pkgs/tools/misc/mapcidr/default.nix index a3a916618515..773aa7589fa5 100644 --- a/nixpkgs/pkgs/tools/misc/mapcidr/default.nix +++ b/nixpkgs/pkgs/tools/misc/mapcidr/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "mapcidr"; - version = "1.1.2"; + version = "1.1.9"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LnEoe9H3KbR2DfHKjDnhzBB8NCoU2wG9+7n7qBktYls="; + hash = "sha256-/DKUB7ylOUh1kj1l5C6TbhfgmagJcTBFCoqjQIsbWg4="; }; - vendorHash = "sha256-hbV93MhlXhF4j5MS5agNrG8JcdoHMBKIVn9aUusvBpo="; + vendorHash = "sha256-YQEXOxu2IPvXNvqw0bzHnx0ALC/W4x9sU4m1GgvVH+g="; modRoot = "."; subPackages = [ diff --git a/nixpkgs/pkgs/tools/misc/moar/default.nix b/nixpkgs/pkgs/tools/misc/moar/default.nix index d301d5a0bcd9..01a283b09680 100644 --- a/nixpkgs/pkgs/tools/misc/moar/default.nix +++ b/nixpkgs/pkgs/tools/misc/moar/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "moar"; - version = "1.16.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-r1M47KYFJYhLX1HK0uPVkupghyoqdbhStgaquvC4MQI="; + hash = "sha256-PknHG0ODrR5YbaZgWdwt/PtNf+q1uyK5KYlrntYZT64="; }; vendorHash = "sha256-aFCv6VxHD1bOLhCHXhy4ubik8Z9uvU6AeqcMqIZI2Oo="; diff --git a/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix b/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix index 1e674fe36c4d..8f0790b67df3 100644 --- a/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix +++ b/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix @@ -33,7 +33,7 @@ xorg, }: let - version = "1.39.3"; + version = "1.39.4"; 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-6HK1t05amGd7H6MS9Lg+vJvWdOWi+ukqz5gY1IaPw9E="; + sha256 = "sha256-FK42DJLxY9gMNt92/UEdrseT3p1xPDVn1+5Cnbc+WnY="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; diff --git a/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix b/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix index 416f33244152..2df98d5a00b3 100644 --- a/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mongo-tools"; - version = "100.7.3"; + version = "100.7.5"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-tools"; rev = version; - sha256 = "sha256-Ls2/P+0aqnTN4alP36aJ+86BjOZoULEuPMyW7NX5px8="; + sha256 = "sha256-7osM21fLDwO5eFv+28hbkzmqFCVbmI7vOria5vbnrP0="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/tools/misc/ncdu/default.nix b/nixpkgs/pkgs/tools/misc/ncdu/default.nix index 264753464500..47a1365b5367 100644 --- a/nixpkgs/pkgs/tools/misc/ncdu/default.nix +++ b/nixpkgs/pkgs/tools/misc/ncdu/default.nix @@ -4,6 +4,7 @@ , ncurses , zig_0_11 , installShellFiles +, testers , pie ? stdenv.isDarwin }: @@ -31,6 +32,10 @@ stdenv.mkDerivation (finalAttrs: { installManPage ncdu.1 ''; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + meta = { homepage = "https://dev.yorhel.nl/ncdu"; description = "Disk usage analyzer with an ncurses interface"; diff --git a/nixpkgs/pkgs/tools/misc/paperlike-go/default.nix b/nixpkgs/pkgs/tools/misc/paperlike-go/default.nix index 0278fb1f791d..63390f427d40 100644 --- a/nixpkgs/pkgs/tools/misc/paperlike-go/default.nix +++ b/nixpkgs/pkgs/tools/misc/paperlike-go/default.nix @@ -11,12 +11,12 @@ buildGoModule { owner = "leoluk"; repo = "paperlike-go"; rev = "bd658d88ea9a3b21e1b301b96253abab7cf56d79"; - sha256 = "1h0n2n5w5pn3r08qf6hbmiib5m71br27y66ki9ajnaa890377qaj"; + hash = "sha256-UuFzBkhIKStVitMYf0Re4dSyYqwLGocRyMPewosVFsA="; }; - subPackages = [ "cmd/paperlike-cli" ]; + vendorHash = "sha256-OfTeJd3VS/WoUpyPY7XfQZWLrvS+vqPPgeL2Hd0HtgI="; - vendorSha256 = "00mn0zfivxp2h77s7gmyyjp8p5a1vysn73wwaalgajymvljxxx1r"; + subPackages = [ "cmd/paperlike-cli" ]; meta = { description = "paperlike-go is a Linux Go library and CLI utility to control a Dasung Paperlike display via I2C DDC."; diff --git a/nixpkgs/pkgs/tools/misc/parallel/default.nix b/nixpkgs/pkgs/tools/misc/parallel/default.nix index c36393dab29d..704f30d9dbe2 100644 --- a/nixpkgs/pkgs/tools/misc/parallel/default.nix +++ b/nixpkgs/pkgs/tools/misc/parallel/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, perl, makeWrapper, procps, coreutils }: +{ fetchurl, lib, stdenv, perl, makeWrapper, procps, coreutils, buildPackages }: stdenv.mkDerivation rec { pname = "parallel"; @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl procps ]; + postPatch = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + substituteInPlace Makefile.in \ + --replace '$(DESTDIR)$(bindir)/parallel --shell-completion' '${lib.getExe buildPackages.parallel} --shell-completion' + ''; + preInstall = '' patchShebangs ./src/parallel ''; @@ -48,5 +53,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ pSub vrthra tomberek ]; + mainProgram = "parallel"; }; } diff --git a/nixpkgs/pkgs/tools/misc/pferd/default.nix b/nixpkgs/pkgs/tools/misc/pferd/default.nix index caaa69416270..46b525cd578b 100644 --- a/nixpkgs/pkgs/tools/misc/pferd/default.nix +++ b/nixpkgs/pkgs/tools/misc/pferd/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "pferd"; - version = "3.4.3"; + version = "3.5.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Garmelon"; repo = "PFERD"; rev = "refs/tags/v${version}"; - sha256 = "sha256-m9u4CLvyF2n61JQyxEKlVzWZCUhzVEVqpSZMNDZXCAo="; + sha256 = "sha256-iGMqKRM/8pnnew/U1r7Od9Giyn9z4BxVGO85nw3FI9Y="; }; nativeBuildInputs = with python3Packages; [ diff --git a/nixpkgs/pkgs/tools/misc/pg_flame/default.nix b/nixpkgs/pkgs/tools/misc/pg_flame/default.nix index ca58e2a65700..f35706bfc674 100644 --- a/nixpkgs/pkgs/tools/misc/pg_flame/default.nix +++ b/nixpkgs/pkgs/tools/misc/pg_flame/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "mgartner"; repo = pname; rev = "v${version}"; - sha256 = "1a03vxqnga83mhjp7pkl0klhkyfaby7ncbwm45xbl8c7s6zwhnw2"; + hash = "sha256-glvIv9GHIbp6IZUvZo9fyvkJ6QR03nMlrAOpZ3HfA6g="; }; - vendorSha256 = "1rkx20winh66y2m7i7q13jpr83044i2d1pfd5p5l5kkpsix5mra5"; + vendorHash = "sha256-ReVaetR3zkLLLc3d0EQkBAyUrxwBn3iq8MZAGzkQfeY="; meta = with lib; { description = "Flamegraph generator for Postgres EXPLAIN ANALYZE output"; diff --git a/nixpkgs/pkgs/tools/misc/pricehist/default.nix b/nixpkgs/pkgs/tools/misc/pricehist/default.nix new file mode 100644 index 000000000000..04333a290731 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/pricehist/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonApplication +, fetchFromGitLab +, requests +, lxml +, cssselect +, curlify +, poetry-core +, pytest-mock +, responses +, pytestCheckHook +}: + +buildPythonApplication rec { + pname = "pricehist"; + version = "1.4.6"; + format = "pyproject"; + + src = fetchFromGitLab { + owner = "chrisberkhout"; + repo = "pricehist"; + rev = version; + hash = "sha256-RMZKp0JXQLt9tBZPkb3e/au85lV/FkRBCRYzd2lgUPc="; + }; + + propagatedBuildInputs = [ + requests + lxml + cssselect + curlify + poetry-core + ]; + + nativeCheckInputs = [ + responses + pytest-mock + pytestCheckHook + ]; + meta = with lib; { + description = "A command-line tool for fetching and formatting historical price data, with support for multiple data sources and output formats"; + homepage = "https://gitlab.com/chrisberkhout/pricehist"; + license = licenses.mit; + mainProgram = "pricehist"; + maintainers = with maintainers; [ chrpinedo ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/seaborn-data/default.nix b/nixpkgs/pkgs/tools/misc/seaborn-data/default.nix new file mode 100644 index 000000000000..2ff8c4d40a5c --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/seaborn-data/default.nix @@ -0,0 +1,41 @@ +{ lib, newScope, fetchFromGitHub, unzip, stdenvNoCC }: +let + base = { + version = "unstable-2023-01-26"; + dontBuild = true; + meta = with lib; { + description = "Data repository for seaborn examples."; + homepage = "https://github.com/mwaskom/seaborn-data"; + platforms = platforms.all; + maintainers = with maintainers; [ mbalatsko ]; + }; + }; + makeSeabornDataPackage = {pname, hash}: + let + src = fetchFromGitHub { + owner = "mwaskom"; + repo = "seaborn-data"; + rev = "2b29313169bf8dfa77d8dc930f7bd3eba559a906"; + inherit hash; + sparseCheckout = [ "${pname}.csv" ]; + }; + in + stdenvNoCC.mkDerivation (base // { + inherit pname src; + version = base.version; + installPhase = '' + runHook preInstall + + mkdir -p $out + cp ${pname}.csv $out/${pname}.csv + + runHook postInstall + ''; + }); +in +lib.makeScope newScope (self: { + exercise = makeSeabornDataPackage ({ + pname = "exercise"; + hash = "sha256-icoc2HkG303A8hCoW6kZxD5qhOKIpdxErLr288o04wE="; + }); +}) diff --git a/nixpkgs/pkgs/tools/misc/snapper/default.nix b/nixpkgs/pkgs/tools/misc/snapper/default.nix index c12727a11864..06eb7d920082 100644 --- a/nixpkgs/pkgs/tools/misc/snapper/default.nix +++ b/nixpkgs/pkgs/tools/misc/snapper/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "snapper"; - version = "0.10.5"; + version = "0.10.6"; src = fetchFromGitHub { owner = "openSUSE"; repo = "snapper"; rev = "v${version}"; - sha256 = "sha256-PJ1KfZZdo+wyeK1NyEg6SSqs/dxqNdiZ4z/BKuVFwSc="; + sha256 = "sha256-tKxjzJ69wr48QQEgYLp7G6aOqxs9CCUiTHV1kaRCiHM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/spacer/default.nix b/nixpkgs/pkgs/tools/misc/spacer/default.nix index 4452b72ba836..0101b581f6a7 100644 --- a/nixpkgs/pkgs/tools/misc/spacer/default.nix +++ b/nixpkgs/pkgs/tools/misc/spacer/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "spacer"; - version = "0.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "samwho"; repo = "spacer"; rev = "v${version}"; - hash = "sha256-6RGwOyp/TzO7Z2xpcNFtAb+UaiMmgiuac9nqZs4fC10="; + hash = "sha256-gxqUMtONjYPjSmxyguE9/GBC91PUK1rdFGsISGaSe44="; }; - cargoHash = "sha256-XWXrivx0TJZmu5jJYJAzKm6dzqOwiWwU8mRuehZkQbA="; + cargoHash = "sha256-pMYqIl0Td2awAxe3BRglBcOychwTmFZ+pZV0QOT0CL4="; meta = with lib; { description = "CLI tool to insert spacers when command output stops"; diff --git a/nixpkgs/pkgs/tools/misc/staruml/default.nix b/nixpkgs/pkgs/tools/misc/staruml/default.nix index 57584ff7c90e..388a407a52b7 100644 --- a/nixpkgs/pkgs/tools/misc/staruml/default.nix +++ b/nixpkgs/pkgs/tools/misc/staruml/default.nix @@ -23,14 +23,13 @@ let cups ]; in -stdenv.mkDerivation rec { - version = "6.0.0"; +stdenv.mkDerivation (finalAttrs: { + version = "6.0.1"; pname = "staruml"; - src = - fetchurl { - url = "https://files.staruml.io/releases-v6/StarUML_${version}_amd64.deb"; - sha256 = "sha256-g35d9YcZrP4D8X9NU84Fz0qmb/2lUUOuZ30iIwgThA0="; + src = fetchurl { + url = "https://files.staruml.io/releases-v6/StarUML_${finalAttrs.version}_amd64.deb"; + sha256 = "sha256-LxulOfYjdJrDjRL661S0W9slIXvhLc+kXZN6e3TfXVs="; }; nativeBuildInputs = [ wrapGAppsHook dpkg ]; @@ -77,4 +76,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ kashw2 ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/nixpkgs/pkgs/tools/misc/system-config-printer/default.nix b/nixpkgs/pkgs/tools/misc/system-config-printer/default.nix index 8b5d8d9e14f7..cafc35790193 100644 --- a/nixpkgs/pkgs/tools/misc/system-config-printer/default.nix +++ b/nixpkgs/pkgs/tools/misc/system-config-printer/default.nix @@ -1,20 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, udev, intltool, pkg-config, glib, xmlto, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, udev, pkg-config, glib, xmlto, wrapGAppsHook , docbook_xml_dtd_412, docbook_xsl , libxml2, desktop-file-utils, libusb1, cups, gdk-pixbuf, pango, atk, libnotify , gobject-introspection, libsecret, packagekit -, cups-filters -, python3Packages, autoreconfHook, bash +, cups-filters, gettext, libtool, autoconf-archive +, python3Packages, autoreconfHook, bash, fetchpatch }: stdenv.mkDerivation rec { pname = "system-config-printer"; - version = "1.5.15"; + version = "1.5.18"; src = fetchFromGitHub { owner = "openPrinting"; repo = pname; rev = "v${version}"; - sha256 = "0a3v8fp1dfb5cwwpadc3f6mv608b5yrrqd8ddkmnrngizqwlswsc"; + sha256 = "sha256-l3HEnYycP56vZWREWkAyHmcFgtu09dy4Ds65u7eqNZk="; }; prePatch = '' @@ -26,6 +26,12 @@ stdenv.mkDerivation rec { patches = [ ./detect_serverbindir.patch + # fix typeerror, remove on next release + (fetchpatch { + url = "https://github.com/OpenPrinting/system-config-printer/commit/399b3334d6519639cfe7f1c0457e2475b8ee5230.patch"; + sha256 = "sha256-JCdGmZk2vRn3X1BDxOJaY3Aw8dr0ODVzi0oY20ZWfRs="; + excludes = [ "NEWS" ]; + }) ]; buildInputs = [ @@ -36,17 +42,13 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - intltool pkg-config + pkg-config gettext libtool autoconf-archive xmlto libxml2 docbook_xml_dtd_412 docbook_xsl desktop-file-utils python3Packages.wrapPython wrapGAppsHook autoreconfHook gobject-introspection ]; - pythonPath = with python3Packages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ]; - - preConfigure = '' - intltoolize --copy --force --automake - ''; + pythonPath = with python3Packages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 pycairo pysmbc ]; configureFlags = [ "--with-udev-rules" diff --git a/nixpkgs/pkgs/tools/misc/tcat/default.nix b/nixpkgs/pkgs/tools/misc/tcat/default.nix index 3556eb232c1e..1f6c45f32dc1 100644 --- a/nixpkgs/pkgs/tools/misc/tcat/default.nix +++ b/nixpkgs/pkgs/tools/misc/tcat/default.nix @@ -9,7 +9,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "1szzfz5xsx9l8gjikfncgp86hydzpvsi0y5zvikd621xkp7g7l21"; }; - vendorSha256 = null; + vendorHash = null; subPackages = "."; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/misc/tldr/default.nix b/nixpkgs/pkgs/tools/misc/tldr/default.nix index eb5caa836c51..01d50e5f7cf8 100644 --- a/nixpkgs/pkgs/tools/misc/tldr/default.nix +++ b/nixpkgs/pkgs/tools/misc/tldr/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "tldr-pages"; - repo = "tldr-cpp-client"; + repo = "tldr-c-client"; rev = "v${version}"; sha256 = "sha256-9pBMo+t/44tuT/CisS0w60KaKXjPfNTMr2v6Ftjaf1k="; }; diff --git a/nixpkgs/pkgs/tools/misc/toilet/default.nix b/nixpkgs/pkgs/tools/misc/toilet/default.nix index 41eaa6b03bf5..d67383e4d521 100644 --- a/nixpkgs/pkgs/tools/misc/toilet/default.nix +++ b/nixpkgs/pkgs/tools/misc/toilet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libcaca }: +{ lib, stdenv, fetchurl, pkg-config, libcaca, toilet, testers }: stdenv.mkDerivation rec { pname = "toilet"; @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libcaca ]; + passthru.tests.version = testers.testVersion { + package = toilet; + }; + meta = with lib; { description = "Display large colourful characters in text mode"; homepage = "http://caca.zoy.org/wiki/toilet"; diff --git a/nixpkgs/pkgs/tools/misc/trdl-client/default.nix b/nixpkgs/pkgs/tools/misc/trdl-client/default.nix index 3748f1755d18..e0d92c140ced 100644 --- a/nixpkgs/pkgs/tools/misc/trdl-client/default.nix +++ b/nixpkgs/pkgs/tools/misc/trdl-client/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "trdl-client"; - version = "0.6.5"; + version = "0.7.0"; src = fetchFromGitHub { owner = "werf"; repo = "trdl"; rev = "v${version}"; - hash = "sha256-jJwRIfxmjlhfS/0+IN2IdQPlO9FkTb64PWUiLwkarfM="; + hash = "sha256-umeoiEq+Cp/cKpiNxCnMDghubm3LPFPJA18ChuYmIVo="; }; sourceRoot = "${src.name}/client"; diff --git a/nixpkgs/pkgs/tools/misc/upterm/default.nix b/nixpkgs/pkgs/tools/misc/upterm/default.nix index f1a28f1af407..76c39f665a15 100644 --- a/nixpkgs/pkgs/tools/misc/upterm/default.nix +++ b/nixpkgs/pkgs/tools/misc/upterm/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { hash = "sha256-wjbptcGy3wOZPm/11El7Xqz6NrR8G19V9zfU5pKFGuk="; }; - vendorSha256 = null; + vendorHash = null; subPackages = [ "cmd/upterm" "cmd/uptermd" ]; diff --git a/nixpkgs/pkgs/tools/misc/urlencode/default.nix b/nixpkgs/pkgs/tools/misc/urlencode/default.nix new file mode 100644 index 000000000000..896f77398bd1 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/urlencode/default.nix @@ -0,0 +1,24 @@ +{ fetchFromGitHub +, lib +, rustPlatform +}: +rustPlatform.buildRustPackage rec { + pname = "urlencode"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "dead10ck"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-LvLUbtMPVbYZMUb9vWhTscYfZPtEM5GrZme3azvVlPE="; + }; + + cargoSha256 = "sha256-UPw+/wVOEM+kciOr70P+gdMCxtCKQ/SXsNAWA44v4v8="; + + meta = with lib; { + description = "A CLI utility for URL-encoding or -decoding strings"; + homepage = "https://github.com/dead10ck/urlencode"; + license = licenses.mit; + maintainers = with maintainers; [ l0b0 ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/vial/default.nix b/nixpkgs/pkgs/tools/misc/vial/default.nix index 40d3a7c3322d..613abcdf7dbf 100644 --- a/nixpkgs/pkgs/tools/misc/vial/default.nix +++ b/nixpkgs/pkgs/tools/misc/vial/default.nix @@ -1,12 +1,12 @@ { lib, fetchurl, appimageTools }: let name = "vial-${version}"; - version = "0.7"; + version = "0.7.1"; pname = "Vial"; src = fetchurl { url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage"; - hash = "sha256-IvOjwboxc3KRKUMXW3dWoHMy8Oh7NGsu0GIJcLZ6WR8="; + hash = "sha256-pOcrxZ6vbnbdE/H4Kxufxm/ZovaYBXjFpVpKZYV7f3c="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; diff --git a/nixpkgs/pkgs/tools/misc/vsh/default.nix b/nixpkgs/pkgs/tools/misc/vsh/default.nix index c7f65527e081..cfe014d3f9aa 100644 --- a/nixpkgs/pkgs/tools/misc/vsh/default.nix +++ b/nixpkgs/pkgs/tools/misc/vsh/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { }; # vendor directory is part of repository - vendorSha256 = null; + vendorHash = null; # make sure version gets set at compile time ldflags = [ "-s" "-w" "-X main.vshVersion=v${version}" ]; diff --git a/nixpkgs/pkgs/tools/misc/vtm/default.nix b/nixpkgs/pkgs/tools/misc/vtm/default.nix index 331b880aa86d..bd4941afe5bf 100644 --- a/nixpkgs/pkgs/tools/misc/vtm/default.nix +++ b/nixpkgs/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vtm"; - version = "0.9.9t"; + version = "0.9.9u"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${version}"; - sha256 = "sha256-WbigrJohLYCRvgsCNd4Cid1zGaP1aQbj59QhZ6ymLms="; + sha256 = "sha256-ySelsabe5J3Wne8L/F01R/CMPibUR18ZKWH2s25t+KY="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix b/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix index 057413c54ce9..c5e9cba47b54 100644 --- a/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix @@ -5,17 +5,17 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.0.40"; + version = "1.0.42"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-ZDQPIEDroi+YgEtQ9IsVvFSErfeyDf4KFuybEbGu91E="; + hash = "sha256-RDP4sPHwf1/C9eheHNZsd45CZlR6qkJL2I1Fv94iHhU="; fetchSubmodules = true; }; - cargoHash = "sha256-Nynn7pxQyqfMAMGmp3eZFg7y5nj7UPyK6FLbVbN07AA="; + cargoHash = "sha256-94bd2L+zRdHK/632JWQBIA8QnCTxrvfTeXRpiOV0yoQ="; cargoBuildFlags = [ "--package" "wasm-tools" ]; cargoTestFlags = [ "--all" ]; diff --git a/nixpkgs/pkgs/tools/misc/ytcast/default.nix b/nixpkgs/pkgs/tools/misc/ytcast/default.nix index a918f56fbedc..163329a60da1 100644 --- a/nixpkgs/pkgs/tools/misc/ytcast/default.nix +++ b/nixpkgs/pkgs/tools/misc/ytcast/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0f45ai1s4njhcvbv088yn10i3vdvlm6wlfi0ijq5gak1dg02klma"; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-X main.progVersion=${version}" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/misc/ytfzf/default.nix b/nixpkgs/pkgs/tools/misc/ytfzf/default.nix index af0c01cd318a..92b9864c3589 100644 --- a/nixpkgs/pkgs/tools/misc/ytfzf/default.nix +++ b/nixpkgs/pkgs/tools/misc/ytfzf/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ytfzf"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - hash = "sha256-b/rsujR3GRwxrVc0iPVbxyPTRTr8kk2WKqEMwdb9lac="; + hash = "sha256-wd7IgJRSh8UJ28slItIz1OhAg7cgVSDUldCyaObn6Ak="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/misc/zellij/default.nix b/nixpkgs/pkgs/tools/misc/zellij/default.nix index cc69b4550ad0..670ad866dff8 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.38.1"; + version = "0.38.2"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - hash = "sha256-3khMo5qMG0qonMnPvuErVYFohUrZLAkaxKZzkMHou8E="; + hash = "sha256-rq7M4g+s44j9jh5GzOjOCBr7VK3m/EQej/Qcnp67NhY="; }; - cargoHash = "sha256-d4UNkbp/ryN/VbK8VO8oYvZ1j6qHKeLRSDqgdT+zIeU="; + cargoHash = "sha256-xK7lLgjVFUISo4stF6MgfgI4mT5qHuph70cyYaLYZ30="; nativeBuildInputs = [ mandown |