diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/misc')
55 files changed, 312 insertions, 71 deletions
diff --git a/nixpkgs/pkgs/tools/misc/aptly/default.nix b/nixpkgs/pkgs/tools/misc/aptly/default.nix index 7af1612acdd3..f6dcd8e80aa1 100644 --- a/nixpkgs/pkgs/tools/misc/aptly/default.nix +++ b/nixpkgs/pkgs/tools/misc/aptly/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-LqGOLXXaGfQfoj2r+aY9SdOKUDI9+22EsHKBhHMidyk="; }; - vendorSha256 = "sha256-6l3OFKFTtFWT68Ylav6woczBlMhD75C9ZoQ6OeLz0Cs="; + vendorHash = "sha256-6l3OFKFTtFWT68Ylav6woczBlMhD75C9ZoQ6OeLz0Cs="; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/misc/bunnyfetch/default.nix b/nixpkgs/pkgs/tools/misc/bunnyfetch/default.nix index d03fea2cefd2..e14fe8244313 100644 --- a/nixpkgs/pkgs/tools/misc/bunnyfetch/default.nix +++ b/nixpkgs/pkgs/tools/misc/bunnyfetch/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-6MnjCXc9/8twdf8PHKsVJY1yWYwUf5R01vtQFJbyy7M="; }; - vendorSha256 = "sha256-w+O1dU8t7uNvdlFnYhCdJCDixpWWZAnj9GrtsCbu9SM="; + vendorHash = "sha256-w+O1dU8t7uNvdlFnYhCdJCDixpWWZAnj9GrtsCbu9SM="; # No upstream tests doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/clematis/default.nix b/nixpkgs/pkgs/tools/misc/clematis/default.nix index c1997876aee9..ea3c209600ad 100644 --- a/nixpkgs/pkgs/tools/misc/clematis/default.nix +++ b/nixpkgs/pkgs/tools/misc/clematis/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-TjoXHbY0vUQ2rhwdCJ/s/taRd9/MG0P9HaEw2BOIy/s="; }; - vendorSha256 = "sha256-YKu+7LFUoQwCH//URIswiaqa0rmnWZJvuSn/68G3TUA="; + vendorHash = "sha256-YKu+7LFUoQwCH//URIswiaqa0rmnWZJvuSn/68G3TUA="; meta = with lib; { description = "Discord rich presence for MPRIS music players."; diff --git a/nixpkgs/pkgs/tools/misc/direnv/default.nix b/nixpkgs/pkgs/tools/misc/direnv/default.nix index 179e719528a4..04b9dd5fad88 100644 --- a/nixpkgs/pkgs/tools/misc/direnv/default.nix +++ b/nixpkgs/pkgs/tools/misc/direnv/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-TDr2eL7Jft1r2IMm6CToVCEhiNo+Rj1H/Skoe+wx1MM="; }; - vendorSha256 = "sha256-eQaQ77pOYC8q+IA26ArEhHQ0DCU093TbzaYhdV3UydE="; + vendorHash = "sha256-eQaQ77pOYC8q+IA26ArEhHQ0DCU093TbzaYhdV3UydE="; # we have no bash at the moment for windows BASH_PATH = diff --git a/nixpkgs/pkgs/tools/misc/djenrandom/default.nix b/nixpkgs/pkgs/tools/misc/djenrandom/default.nix new file mode 100644 index 000000000000..f55329a66180 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/djenrandom/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "djenrandom"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "dj-on-github"; + repo = "djenrandom"; + rev = "${version}"; + hash = "sha256-r5UT8z8vvFZDffsl6CqBXuvBaZ/sl1WLxJi26CxkpAw="; + }; + + preBuild = '' + sed -i s/gcc/${stdenv.cc.targetPrefix}gcc/g Makefile + '' + + lib.optionalString (!stdenv.hostPlatform.isx86_64) '' + sed -i s/-m64//g Makefile + ''; + + installPhase = '' + runHook preInstall + install -D djenrandom $out/bin/djenrandom + runHook postInstall + ''; + + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + + meta = { + homepage = "http://www.deadhat.com/"; + description = '' + A C program to generate random data using several random models, + with parameterized non uniformities and flexible output formats + ''; + license = lib.licenses.gpl2Only; + # djenrandom uses x86 specific instructions, therefore we can only compile for the x86 architechture + platforms = lib.platforms.x86; + maintainers = with lib.maintainers; [ orichter thillux ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/docker-ls/default.nix b/nixpkgs/pkgs/tools/misc/docker-ls/default.nix index 230887ffd09f..6f6a322cc28f 100644 --- a/nixpkgs/pkgs/tools/misc/docker-ls/default.nix +++ b/nixpkgs/pkgs/tools/misc/docker-ls/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-4+REt0NH4S367qFsyJncVedUrC4t1zw5o0CLTiQfIz8="; }; - vendorSha256 = "sha256-UulcjQOLEIP++eoYQTEIbCJW51jyE312dMxB8+AKcdU="; + vendorHash = "sha256-UulcjQOLEIP++eoYQTEIbCJW51jyE312dMxB8+AKcdU="; meta = with lib; { description = "Tools for browsing and manipulating docker registries"; diff --git a/nixpkgs/pkgs/tools/misc/dsq/default.nix b/nixpkgs/pkgs/tools/misc/dsq/default.nix index 8542f97aad74..9d05e567fb10 100644 --- a/nixpkgs/pkgs/tools/misc/dsq/default.nix +++ b/nixpkgs/pkgs/tools/misc/dsq/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { hash = "sha256-FZBJe+2y4HV3Pgeap4yvD0a8M/j+6pAJEFpoQVVE1ec="; }; - vendorSha256 = "sha256-MbBR+OC1OGhZZGcZqc+Jzmabdc5ZfFEwzqP5YMrj6mY="; + vendorHash = "sha256-MbBR+OC1OGhZZGcZqc+Jzmabdc5ZfFEwzqP5YMrj6mY="; ldflags = [ "-X" "main.Version=${version}" ]; diff --git a/nixpkgs/pkgs/tools/misc/dtool/default.nix b/nixpkgs/pkgs/tools/misc/dtool/default.nix new file mode 100644 index 000000000000..26eb0ab9ed83 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/dtool/default.nix @@ -0,0 +1,33 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "dtool"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "guoxbin"; + repo = "dtool"; + rev = "v${version}"; + hash = "sha256-m4H+ANwEbK6vGW3oIVZqnqvMiAKxNJf2TLIGh/G6AU4="; + }; + + cargoHash = "sha256-r8r3f4yKMQgjtB3j4qE7cqQL18nIqAGPO5RsFErqh2c="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + checkType = "debug"; + + meta = with lib; { + description = "A command-line tool collection to assist development written in RUST"; + homepage = "https://github.com/guoxbin/dtool"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ linuxissuper ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/duf/default.nix b/nixpkgs/pkgs/tools/misc/duf/default.nix index 62c873ccfcc7..dbc50346ca55 100644 --- a/nixpkgs/pkgs/tools/misc/duf/default.nix +++ b/nixpkgs/pkgs/tools/misc/duf/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-bVuqX88KY+ky+fd1FU9GWP78jQc4fRDk9yRSeIesHyI="; }; - vendorSha256 = "sha256-oihi7E67VQmym9U1gdD802AYxWRrSowhzBiKg0CBDPc="; + vendorHash = "sha256-oihi7E67VQmym9U1gdD802AYxWRrSowhzBiKg0CBDPc="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; diff --git a/nixpkgs/pkgs/tools/misc/dwarf2json/default.nix b/nixpkgs/pkgs/tools/misc/dwarf2json/default.nix index 57aaf861186d..813c1fb36838 100644 --- a/nixpkgs/pkgs/tools/misc/dwarf2json/default.nix +++ b/nixpkgs/pkgs/tools/misc/dwarf2json/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-hnS00glAcj78mZp5as63CsEn+dcr+GNEkz8iC3KM0h0="; }; - vendorSha256 = "sha256-tgs0l+sYdAxMHwVTew++keNpDyrHmevpmOBVIiuL+34="; + vendorHash = "sha256-tgs0l+sYdAxMHwVTew++keNpDyrHmevpmOBVIiuL+34="; meta = with lib; { homepage = "https://github.com/volatilityfoundation/dwarf2json"; diff --git a/nixpkgs/pkgs/tools/misc/eget/default.nix b/nixpkgs/pkgs/tools/misc/eget/default.nix index b4fa3edb1cff..1bf2b7f10110 100644 --- a/nixpkgs/pkgs/tools/misc/eget/default.nix +++ b/nixpkgs/pkgs/tools/misc/eget/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { sha256 = "sha256-OOqfZ2uS3sYBH9xrlQN1iSNdNE9RGi6qiDXfPgf2aB0="; }; - vendorSha256 = "sha256-A3lZtV0pXh4KxINl413xGbw2Pz7OzvIQiFSRubH428c="; + vendorHash = "sha256-A3lZtV0pXh4KxINl413xGbw2Pz7OzvIQiFSRubH428c="; ldflags = [ "-s" "-w" "-X main.Version=v${version}" ]; diff --git a/nixpkgs/pkgs/tools/misc/esphome/default.nix b/nixpkgs/pkgs/tools/misc/esphome/default.nix index ea6cfdfb282f..3fdc11c3a4f2 100644 --- a/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -16,14 +16,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2023.8.2"; + version = "2023.8.3"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-KizeBaDw/9XoPwIjjc3VKkiaHTK5VYQXss4cQZZaGzs="; + hash = "sha256-qiB3VZzqQeimkLTlTNK2/UFt+YJw9sglfF/ogMl239o="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/misc/ets/default.nix b/nixpkgs/pkgs/tools/misc/ets/default.nix index cccd0db35e2f..43d26e269392 100644 --- a/nixpkgs/pkgs/tools/misc/ets/default.nix +++ b/nixpkgs/pkgs/tools/misc/ets/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { sha256 = "sha256-SGCISHkWNFubgKkQYx8Vf5/fknNDfPNYkSuw1mMhZaE="; }) ]; - vendorSha256 = "sha256-+8dXfqOu8XTw2uEx3GAynQSHtzifejZtddr1CdxrupA="; + vendorHash = "sha256-+8dXfqOu8XTw2uEx3GAynQSHtzifejZtddr1CdxrupA="; ldflags = [ "-s" "-w" "-X main.version=v${version}-nixpkgs" ]; diff --git a/nixpkgs/pkgs/tools/misc/eza/default.nix b/nixpkgs/pkgs/tools/misc/eza/default.nix index de77265d832e..9a29ab76f15f 100644 --- a/nixpkgs/pkgs/tools/misc/eza/default.nix +++ b/nixpkgs/pkgs/tools/misc/eza/default.nix @@ -10,20 +10,23 @@ , Security , libiconv , installShellFiles + # once eza upstream gets support for setting up a compatibilty symlink for exa, we should change + # the handling here from postInstall to passing the required argument to the builder. +, exaAlias ? true }: rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-qA9oXAHJyEf5yI1AlofAKs5fNpNQev9FlY/GHNsfo2Q="; + hash = "sha256-Wboe1ww15GVlL9crNMbVHJnlXghcGM7fL5We2+PFII8="; }; - cargoHash = "sha256-xcw2fhEnUheDSJ5vE7Z1EqahVdCluClC7TmC1PFUUV4="; + cargoHash = "sha256-uUUzyDGTYF6hKmP0Wno/btjhC1RjyqdkWu4torGwA0g="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] @@ -43,6 +46,8 @@ rustPlatform.buildRustPackage rec { --bash completions/bash/eza \ --fish completions/fish/eza.fish \ --zsh completions/zsh/_eza + '' + lib.optionalString exaAlias '' + ln -s eza $out/bin/exa ''; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix b/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix index 6fb4c5df775d..1e9b16a84855 100644 --- a/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix +++ b/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix @@ -1,11 +1,11 @@ { lib, appimageTools, fetchurl, asar }: let pname = "flexoptix-app"; - version = "5.13.4"; + version = "5.16.0-latest"; src = fetchurl { name = "${pname}-${version}.AppImage"; url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage"; - hash = "sha256-W+9KmKZ1bPfQfv1DXCJrIswriw4ivBVZPW81tfvRBc0="; + hash = "sha256-A10r8IUB3zWKWmjen90vLXPF7V/Cgo+DhFn/Hsc1Nhg="; }; udevRules = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix b/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix index 0bf56cdba639..3d0b0899dfaf 100644 --- a/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix +++ b/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fluent-bit"; - version = "2.1.8"; + version = "2.1.9"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${finalAttrs.version}"; - hash = "sha256-iWbWkKd0Rpg0EU3H//sAxth1v1S52yPwGn1AzeC9xkA="; + hash = "sha256-G/DYGmZMB1vMJJK6vIWxGqhN8WRNjNXoMn9AY75Gw4M="; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/nixpkgs/pkgs/tools/misc/fsql/default.nix b/nixpkgs/pkgs/tools/misc/fsql/default.nix index 7111d7c82306..96ce250499d5 100644 --- a/nixpkgs/pkgs/tools/misc/fsql/default.nix +++ b/nixpkgs/pkgs/tools/misc/fsql/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-6KqlpFBaAWrlEjkFQhOEic569+eoYVAsnhMrg8AEPV4="; }; - vendorSha256 = "sha256-xuD7/gTssf1Iu1VuIRysjtUjve16gozOq0Wz4w6mIB8="; + vendorHash = "sha256-xuD7/gTssf1Iu1VuIRysjtUjve16gozOq0Wz4w6mIB8="; ldflags = [ "-s" "-w" ]; diff --git a/nixpkgs/pkgs/tools/misc/gh-eco/default.nix b/nixpkgs/pkgs/tools/misc/gh-eco/default.nix index b95232751870..98f84659a40e 100644 --- a/nixpkgs/pkgs/tools/misc/gh-eco/default.nix +++ b/nixpkgs/pkgs/tools/misc/gh-eco/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-TE1AymNlxjUtkBnBO/VBjYaqLuRyxL75s6sMidKUXTE="; }; - vendorSha256 = "sha256-K85fYV1uP/qSw8GPoG1u6UQo94vQOUo4cd9Ro+UApQ0="; + vendorHash = "sha256-K85fYV1uP/qSw8GPoG1u6UQo94vQOUo4cd9Ro+UApQ0="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/tools/misc/go-ios/default.nix b/nixpkgs/pkgs/tools/misc/go-ios/default.nix index d16e023a9eb1..0c926cb289a6 100644 --- a/nixpkgs/pkgs/tools/misc/go-ios/default.nix +++ b/nixpkgs/pkgs/tools/misc/go-ios/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-pvgdGBLgRHvnGdAyA4Rrexkh5oRzVT7AYgKfLNfSf7M="; }; - vendorSha256 = "sha256-lLpvpT0QVVyy12HmtOQxagT0JNwRO7CcfkGhCpouH8w="; + vendorHash = "sha256-lLpvpT0QVVyy12HmtOQxagT0JNwRO7CcfkGhCpouH8w="; excludedPackages = [ "restapi" diff --git a/nixpkgs/pkgs/tools/misc/go.rice/default.nix b/nixpkgs/pkgs/tools/misc/go.rice/default.nix index e608ad121cca..3ee268f2a829 100644 --- a/nixpkgs/pkgs/tools/misc/go.rice/default.nix +++ b/nixpkgs/pkgs/tools/misc/go.rice/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-jO4otde/m52L2NrE88aXRjdGDBNxnbP1Zt+5fEqfNIc="; }; - vendorSha256 = "sha256-VlpdZcqg7yWUADN8oD/IAgAXVdzJeIeymx2Pu/7E21o="; + vendorHash = "sha256-VlpdZcqg7yWUADN8oD/IAgAXVdzJeIeymx2Pu/7E21o="; subPackages = [ "." "rice" ]; diff --git a/nixpkgs/pkgs/tools/misc/grit/default.nix b/nixpkgs/pkgs/tools/misc/grit/default.nix index 5b3aca5e25ce..0b31627ece27 100644 --- a/nixpkgs/pkgs/tools/misc/grit/default.nix +++ b/nixpkgs/pkgs/tools/misc/grit/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-c8wBwmXFjpst6UxL5zmTxMR4bhzpHYljQHiJFKiNDms="; }; - vendorSha256 = "sha256-iMMkjJ5dnlr0oSCifBQPWkInQBCp1bh23s+BcKzDNCg="; + vendorHash = "sha256-iMMkjJ5dnlr0oSCifBQPWkInQBCp1bh23s+BcKzDNCg="; meta = with lib; { broken = stdenv.isDarwin; diff --git a/nixpkgs/pkgs/tools/misc/interactsh/default.nix b/nixpkgs/pkgs/tools/misc/interactsh/default.nix index bf4d79a72aa7..7621333b3f1a 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.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-p6VB3BB8iP65ZDgwIM+DqilxRx1+8l9bBickqLMAYqk="; + hash = "sha256-cSqDiJEJdtHwL/xumZPOp1JHg7SUZ/47nKFv4bWBo5U="; }; - vendorHash = "sha256-NXBqFARgItXXhFIhRNz/DDbKGm7MH3kgawFiXHbV/RQ="; + vendorHash = "sha256-xtV+QLheWU6RJSjmoOunrsOfUhNCDWJORQDBAmJd2Io="; modRoot = "."; subPackages = [ diff --git a/nixpkgs/pkgs/tools/misc/kepubify/default.nix b/nixpkgs/pkgs/tools/misc/kepubify/default.nix index 0a6888bb3421..1820b3a4dca6 100644 --- a/nixpkgs/pkgs/tools/misc/kepubify/default.nix +++ b/nixpkgs/pkgs/tools/misc/kepubify/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-H6W+C5twXit7Z9hLIJKAftbnvYDA9HAb9tR6yeQGRKI="; }; - vendorSha256 = "sha256-QOMLwDDvrDQAaK4M4QhBFTGD1CzblkDoA3ZqtCoRHtQ="; + vendorHash = "sha256-QOMLwDDvrDQAaK4M4QhBFTGD1CzblkDoA3ZqtCoRHtQ="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/nixpkgs/pkgs/tools/misc/kt/default.nix b/nixpkgs/pkgs/tools/misc/kt/default.nix index 3e9bac0e09e9..af837ee3cebb 100644 --- a/nixpkgs/pkgs/tools/misc/kt/default.nix +++ b/nixpkgs/pkgs/tools/misc/kt/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-1UGsiMMmAyIQZ62hNIi0uzyX2uNL03EWupIazjznqDc="; }; - vendorSha256 = "sha256-PeNpDro6G78KLN6B2CDhsTKamRTWQyxPJYWuuv6sUyw="; + vendorHash = "sha256-PeNpDro6G78KLN6B2CDhsTKamRTWQyxPJYWuuv6sUyw="; ldflags = [ "-s" "-w" ]; diff --git a/nixpkgs/pkgs/tools/misc/librespeed-cli/default.nix b/nixpkgs/pkgs/tools/misc/librespeed-cli/default.nix index 60fee9b5f153..175deef985e3 100644 --- a/nixpkgs/pkgs/tools/misc/librespeed-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/librespeed-cli/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-LFGlKYWUaHi/byoRPD6zsdr0U5r0zWxxRa2NJNB2yb8="; }; - vendorSha256 = "sha256-psZyyySpY06J+ji+9uHUtX7Ks1hzZC3zINszYP75NfQ="; + vendorHash = "sha256-psZyyySpY06J+ji+9uHUtX7Ks1hzZC3zINszYP75NfQ="; # Tests have additional requirements doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/lifecycled/default.nix b/nixpkgs/pkgs/tools/misc/lifecycled/default.nix index c2648e41bb20..728424f8d89e 100644 --- a/nixpkgs/pkgs/tools/misc/lifecycled/default.nix +++ b/nixpkgs/pkgs/tools/misc/lifecycled/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "sha256-zskN2T0+1xZPjppggeGpPFuQ8/AgPNyN77F33rDoghc="; }; - vendorSha256 = "sha256-q5wYKSLHRzL+UGn29kr8+mUupOPR1zohTscbzjMRCS0="; + vendorHash = "sha256-q5wYKSLHRzL+UGn29kr8+mUupOPR1zohTscbzjMRCS0="; postInstall = '' mkdir -p $out/lib/systemd/system diff --git a/nixpkgs/pkgs/tools/misc/livedl/default.nix b/nixpkgs/pkgs/tools/misc/livedl/default.nix index bbda8b6c8fd8..f5c68be68d60 100644 --- a/nixpkgs/pkgs/tools/misc/livedl/default.nix +++ b/nixpkgs/pkgs/tools/misc/livedl/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { modRoot = "src"; proxyVendor = true; - vendorSha256 = "sha256-C7lUusq/cWBCnA2wP9fzQglJCXvQyvFG4JY13H0cP6g="; + vendorHash = "sha256-C7lUusq/cWBCnA2wP9fzQglJCXvQyvFG4JY13H0cP6g="; meta = with lib; { description = "Command-line tool to download nicovideo.jp livestreams"; diff --git a/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix b/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix index e5e7d4bcdb41..693b65687899 100644 --- a/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-U8XN7cH64ICVxcjmIWBeelOT3qQlGt6MhOPgUWkCPF0="; }; - vendorSha256 = "sha256-PM3Jjgq6mbM6iVCXRos9UsqqFNaXOqq713GZ2R9tQww="; + vendorHash = "sha256-PM3Jjgq6mbM6iVCXRos9UsqqFNaXOqq713GZ2R9tQww="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/mdr/default.nix b/nixpkgs/pkgs/tools/misc/mdr/default.nix index c3d5afa9a94e..13af7192cf50 100644 --- a/nixpkgs/pkgs/tools/misc/mdr/default.nix +++ b/nixpkgs/pkgs/tools/misc/mdr/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-ibM3303pXnseAFP9qFTOzj0G/SxRPX+UeRfbJ+MCABk="; }; - vendorSha256 = "sha256-5jzU4EybEGKoEXCFhnu7z4tFRS9fgf2wJXhkvigRM0E="; + vendorHash = "sha256-5jzU4EybEGKoEXCFhnu7z4tFRS9fgf2wJXhkvigRM0E="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/tools/misc/microplane/default.nix b/nixpkgs/pkgs/tools/misc/microplane/default.nix index a44ae344bf59..53d5cc567f09 100644 --- a/nixpkgs/pkgs/tools/misc/microplane/default.nix +++ b/nixpkgs/pkgs/tools/misc/microplane/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-ZrBkVXRGZp8yGFIBo7sLGvJ8pMQq7Cq0xJiko57z164="; }; - vendorSha256 = "sha256-PqSjSFTVrIsQ065blIxZ9H/ARku6BEcnjboH+0K0G14="; + vendorHash = "sha256-PqSjSFTVrIsQ065blIxZ9H/ARku6BEcnjboH+0K0G14="; ldflags = [ "-s" "-w" "-X main.version=${version}" diff --git a/nixpkgs/pkgs/tools/misc/mmake/default.nix b/nixpkgs/pkgs/tools/misc/mmake/default.nix index b95033bea24b..acf571f7c5ac 100644 --- a/nixpkgs/pkgs/tools/misc/mmake/default.nix +++ b/nixpkgs/pkgs/tools/misc/mmake/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-JPsVfLIl06PJ8Nsfu7ogwrttB1G93HTKbZFqUTSV9O8="; }; - vendorSha256 = "sha256-0z+sujzzBl/rtzXbhL4Os+jYfLUuO9PlXshUDxAH9DU="; + vendorHash = "sha256-0z+sujzzBl/rtzXbhL4Os+jYfLUuO9PlXshUDxAH9DU="; ldflags = [ "-s" "-w" ]; diff --git a/nixpkgs/pkgs/tools/misc/mnc/default.nix b/nixpkgs/pkgs/tools/misc/mnc/default.nix index b6ee577d07cd..d84ff6643aec 100644 --- a/nixpkgs/pkgs/tools/misc/mnc/default.nix +++ b/nixpkgs/pkgs/tools/misc/mnc/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "mnc"; version = "0.4"; - vendorSha256 = "sha256-H0KmGTWyjZOZLIEWophCwRYPeKLxBC050RI7cMXNbPs="; + vendorHash = "sha256-H0KmGTWyjZOZLIEWophCwRYPeKLxBC050RI7cMXNbPs="; src = fetchFromSourcehut { owner = "~anjan"; diff --git a/nixpkgs/pkgs/tools/misc/moar/default.nix b/nixpkgs/pkgs/tools/misc/moar/default.nix index 7c163859dfdb..d301d5a0bcd9 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.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-m3IG5xZITh+iAE233NFMI+25VRt6GvK694oVd1wU5jA="; + hash = "sha256-r1M47KYFJYhLX1HK0uPVkupghyoqdbhStgaquvC4MQI="; }; vendorHash = "sha256-aFCv6VxHD1bOLhCHXhy4ubik8Z9uvU6AeqcMqIZI2Oo="; diff --git a/nixpkgs/pkgs/tools/misc/mynewt-newtmgr/default.nix b/nixpkgs/pkgs/tools/misc/mynewt-newtmgr/default.nix index 416645738c2d..1ad1bb7ac1bb 100644 --- a/nixpkgs/pkgs/tools/misc/mynewt-newtmgr/default.nix +++ b/nixpkgs/pkgs/tools/misc/mynewt-newtmgr/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { sha256 = "sha256-fobaMkYLLK5qclogtClGdOjgTbmuse/72T3APNssYa4="; }; - vendorSha256 = "sha256-+vOZoueoMqlGnopLKc6pCgTmcgI34pxaMNbr6Y+JCfQ="; + vendorHash = "sha256-+vOZoueoMqlGnopLKc6pCgTmcgI34pxaMNbr6Y+JCfQ="; passthru.tests.version = testers.testVersion { package = mynewt-newtmgr; diff --git a/nixpkgs/pkgs/tools/misc/near-cli/default.nix b/nixpkgs/pkgs/tools/misc/near-cli/default.nix new file mode 100644 index 000000000000..8741f694782c --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/near-cli/default.nix @@ -0,0 +1,49 @@ +{ lib +, mkYarnPackage +, fetchFromGitHub +, fetchYarnDeps +}: + +mkYarnPackage rec { + pname = "near-cli"; + version = "3.4.2"; + + src = fetchFromGitHub { + owner = "near"; + repo = "near-cli"; + rev = "v${version}"; + hash = "sha256-C+viNYk+6BA11cdi5GqARU3QTTONTR2B2VEZf/SeeSQ="; + }; + + packageJSON = ./package.json; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-G/Y8xGGOlXH37Bup7mKhEaNh05GTP5CC9e/Xw4TBNMU="; + }; + + doDist = false; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/lib/node_modules" + mv deps/near-cli "$out/lib/node_modules" + rm "$out/lib/node_modules/near-cli/node_modules" + mv node_modules "$out/lib/node_modules/near-cli" + + mkdir -p "$out/bin" + ln -s "$out/lib/node_modules/near-cli/bin/near" "$out/bin" + + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/near/near-cli/blob/${src.rev}/CHANGELOG.md"; + description = "General purpose command line tools for interacting with NEAR Protocol"; + homepage = "https://github.com/near/near-cli"; + license = with lib.licenses; [ asl20 mit ]; + mainProgram = "near"; + maintainers = with lib.maintainers; [ ekleog ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/near-cli/package.json b/nixpkgs/pkgs/tools/misc/near-cli/package.json new file mode 100644 index 000000000000..a6b794a99115 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/near-cli/package.json @@ -0,0 +1,83 @@ +{ + "name": "near-cli", + "version": "3.4.2", + "description": "General purpose command line tools for interacting with NEAR Protocol", + "engines": { + "node": ">= 12" + }, + "main": "index.js", + "scripts": { + "pretest": "rm -rf tmp-project", + "test": "npm run test:unit && npm run test:integration", + "test:unit": "jest", + "test:integration": "bash ./test/index.sh", + "lint": "eslint .", + "fix": "eslint . --fix" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/near/near-cli.git" + }, + "author": "Jane Degtiareva", + "license": "(MIT AND Apache-2.0)", + "bugs": { + "url": "https://github.com/near/near-cli/issues" + }, + "homepage": "https://github.com/near/near-cli#readme", + "bin": { + "near": "bin/near" + }, + "devDependencies": { + "danger": "^10.6.6", + "lodash": "^4.17.21", + "eslint": "^7.0.0", + "jest": "^26.1.0", + "strip-ansi": "^7.0.0", + "strip-ansi-cli": "^3.0.0", + "ts-node": "^10.4.0", + "typescript": "^4.5.4" + }, + "dependencies": { + "analytics-node": "^6.1.0", + "ascii-table": "0.0.9", + "bn.js": "^5.1.1", + "bs58": "^4.0.1", + "chalk": "^4.0.0", + "flagged-respawn": "^1.0.1", + "is-ci": "^2.0.0", + "jest-environment-node": "^27.0.6", + "ncp": "^2.0.0", + "near-api-js": "^0.44.2", + "near-seed-phrase": "^0.2.0", + "open": "^8.0.7", + "rimraf": "^3.0.0", + "stoppable": "^1.1.0", + "tcp-port-used": "^1.0.1", + "update-notifier": "^5.0.0", + "uuid": "^8.0.0", + "v8flags": "^3.1.3", + "yargs": "^16.0.3" + }, + "optionalDependencies": { + "@ledgerhq/hw-transport-node-hid": "^6.1.0", + "near-ledger-js": "^0.2.0" + }, + "keywords": [ + "blockchain", + "crypto", + "dapps", + "distributed", + "applications", + "distributed applications" + ], + "files": [ + "bin", + "commands", + "middleware", + "utils", + "config.js", + "get-config.js", + "test_environment.js", + "context" + ] +} diff --git a/nixpkgs/pkgs/tools/misc/notify/default.nix b/nixpkgs/pkgs/tools/misc/notify/default.nix index 8c8158174c76..09f1d238fbb1 100644 --- a/nixpkgs/pkgs/tools/misc/notify/default.nix +++ b/nixpkgs/pkgs/tools/misc/notify/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-CXzxrY8G7Zh5xafuiIY9SsPkrYoSkMt15v2KLZBs0Jo="; }; - vendorSha256 = "sha256-tjaVEmOd/MJnDcS/mhvw95ZZ8giaUDTdDTyAMbjTckM="; + vendorHash = "sha256-tjaVEmOd/MJnDcS/mhvw95ZZ8giaUDTdDTyAMbjTckM="; modRoot = "."; subPackages = [ diff --git a/nixpkgs/pkgs/tools/misc/panicparse/default.nix b/nixpkgs/pkgs/tools/misc/panicparse/default.nix index 08be475a2300..9c87e1fb87c7 100644 --- a/nixpkgs/pkgs/tools/misc/panicparse/default.nix +++ b/nixpkgs/pkgs/tools/misc/panicparse/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-Bwvxj9Ifcq2WpicUBK+03fbGuoVAVF2Zmtpy/utUxoo="; }; - vendorSha256 = "sha256-ZHUxzGqsGX1c4mBA4TBO2+WnGDhwAOGi0uYQx+3OgL8="; + vendorHash = "sha256-ZHUxzGqsGX1c4mBA4TBO2+WnGDhwAOGi0uYQx+3OgL8="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/tools/misc/pcp/default.nix b/nixpkgs/pkgs/tools/misc/pcp/default.nix index fa2c64dabb06..eb73e128533e 100644 --- a/nixpkgs/pkgs/tools/misc/pcp/default.nix +++ b/nixpkgs/pkgs/tools/misc/pcp/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-aZO8VuOiYhOPctFKZ6a2psJB0lKHlPc+NLy2RWDU4JI="; }; - vendorSha256 = "sha256-3bkzBQ950Phg4A9p+IjeUx7Xw7eVmUbeYnQViNjghFk="; + vendorHash = "sha256-3bkzBQ950Phg4A9p+IjeUx7Xw7eVmUbeYnQViNjghFk="; meta = with lib; { description = "Command line peer-to-peer data transfer tool based on libp2p"; diff --git a/nixpkgs/pkgs/tools/misc/pgcenter/default.nix b/nixpkgs/pkgs/tools/misc/pgcenter/default.nix index ac1c0bd356d2..507beb498952 100644 --- a/nixpkgs/pkgs/tools/misc/pgcenter/default.nix +++ b/nixpkgs/pkgs/tools/misc/pgcenter/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-xaY01T12/5Peww9scRgfc5yHj7QA8BEwOK5l6OedziY="; }; - vendorSha256 = "sha256-9hYiyZ34atmSL7JvuXyiGU7HR4E6qN7bGZlyU+hP+FU="; + vendorHash = "sha256-9hYiyZ34atmSL7JvuXyiGU7HR4E6qN7bGZlyU+hP+FU="; subPackages = [ "cmd" ]; diff --git a/nixpkgs/pkgs/tools/misc/rtx/default.nix b/nixpkgs/pkgs/tools/misc/rtx/default.nix index 1da490915918..c169f9f28cad 100644 --- a/nixpkgs/pkgs/tools/misc/rtx/default.nix +++ b/nixpkgs/pkgs/tools/misc/rtx/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "rtx"; - version = "2023.8.2"; + version = "2023.9.0"; src = fetchFromGitHub { owner = "jdxcode"; repo = "rtx"; rev = "v${version}"; - hash = "sha256-I5S9HR+syvj5H7xJKhtM7Ja+8wlKL6A01SDb9TjeoS8="; + hash = "sha256-TH2JC+Cjw+ed1O33QKGq+lonIKlu6pHuY1jtrZh/FMM="; }; - cargoHash = "sha256-zbJ+U3PZIGp+BYQbc50+Kgh1KFF7svela3DsyogO/r8="; + cargoHash = "sha256-zJVCzVgwU9lR3E61w+71eUd7Au9LmJcbHtgLvzTj7r4="; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/nixpkgs/pkgs/tools/misc/sloth/default.nix b/nixpkgs/pkgs/tools/misc/sloth/default.nix index e46991cadfac..c0621419fd37 100644 --- a/nixpkgs/pkgs/tools/misc/sloth/default.nix +++ b/nixpkgs/pkgs/tools/misc/sloth/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { hash = "sha256-KMVD7uH3Yg9ThnwKKzo6jom0ctFywt2vu7kNdfjiMCs="; }; - vendorSha256 = "sha256-j6qXUQ/Tu3VNQL5xBOHloRn5DH3KG/znCLi1s8RIoL8="; + vendorHash = "sha256-j6qXUQ/Tu3VNQL5xBOHloRn5DH3KG/znCLi1s8RIoL8="; subPackages = [ "cmd/sloth" ]; diff --git a/nixpkgs/pkgs/tools/misc/smug/default.nix b/nixpkgs/pkgs/tools/misc/smug/default.nix index 11d5c17eb8b0..c620ba67b0cf 100644 --- a/nixpkgs/pkgs/tools/misc/smug/default.nix +++ b/nixpkgs/pkgs/tools/misc/smug/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "sha256-dQp9Ov8Si9DfziVtX3dXsJg+BNKYOoL9/WwdalQ5TVw="; }; - vendorSha256 = "sha256-vaDUzVRmpmNn8/vUPeR1U5N6T4llFRIk9A1lum8uauU="; + vendorHash = "sha256-vaDUzVRmpmNn8/vUPeR1U5N6T4llFRIk9A1lum8uauU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/misc/staruml/default.nix b/nixpkgs/pkgs/tools/misc/staruml/default.nix index 41c47f7054c7..57584ff7c90e 100644 --- a/nixpkgs/pkgs/tools/misc/staruml/default.nix +++ b/nixpkgs/pkgs/tools/misc/staruml/default.nix @@ -24,13 +24,13 @@ let ]; in stdenv.mkDerivation rec { - version = "5.1.0"; + version = "6.0.0"; pname = "staruml"; src = fetchurl { - url = "https://files.staruml.io/releases-v5/StarUML_${version}_amd64.deb"; - sha256 = "sha256-da1mY3OW24g6Ix0L57CBPbaMeSLzhOOjoBsyZszmNOc="; + url = "https://files.staruml.io/releases-v6/StarUML_${version}_amd64.deb"; + sha256 = "sha256-g35d9YcZrP4D8X9NU84Fz0qmb/2lUUOuZ30iIwgThA0="; }; nativeBuildInputs = [ wrapGAppsHook dpkg ]; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { homepage = "https://staruml.io/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ kashw2 ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/tdfgo/default.nix b/nixpkgs/pkgs/tools/misc/tdfgo/default.nix index b575085916f6..91a0345c99f8 100644 --- a/nixpkgs/pkgs/tools/misc/tdfgo/default.nix +++ b/nixpkgs/pkgs/tools/misc/tdfgo/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-Lr4+bXdVxYbCXKVzE+fjeLD559HuABK6lOLJ0sBBGNY="; }; - vendorSha256 = "sha256-T6PSs5NfXSXvzlq67rIDbzURyA+25df3nMMfufo0fow="; + vendorHash = "sha256-T6PSs5NfXSXvzlq67rIDbzURyA+25df3nMMfufo0fow="; meta = with lib; { description = "TheDraw font parser and console text renderer."; diff --git a/nixpkgs/pkgs/tools/misc/tea/default.nix b/nixpkgs/pkgs/tools/misc/tea/default.nix index a576e70a3714..13bd0f8f2b3f 100644 --- a/nixpkgs/pkgs/tools/misc/tea/default.nix +++ b/nixpkgs/pkgs/tools/misc/tea/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { sha256 = "sha256-sZfg8+LIu1Ejvmr/o4X3EOz3fv+RvLhrGRf2yy+6t8c="; }; - vendorSha256 = "sha256-nb0lQEAaIYlGpodFQLhMk/24DmTgg5K3zQ4s/XY+Z1w="; + vendorHash = "sha256-nb0lQEAaIYlGpodFQLhMk/24DmTgg5K3zQ4s/XY+Z1w="; meta = with lib; { description = "Gitea official CLI client"; diff --git a/nixpkgs/pkgs/tools/misc/tfk8s/default.nix b/nixpkgs/pkgs/tools/misc/tfk8s/default.nix index 0a8a446b908c..a694360db373 100644 --- a/nixpkgs/pkgs/tools/misc/tfk8s/default.nix +++ b/nixpkgs/pkgs/tools/misc/tfk8s/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { sha256 = "sha256-VLpXL5ABnCxc+7dV3sZ6wsY2nKn2yfu7eTjtn881/XQ="; }; - vendorSha256 = "sha256-eTADcUW9b6l47BkWF9YLxdcgvMbCzWTjLF28FneJHg8="; + vendorHash = "sha256-eTADcUW9b6l47BkWF9YLxdcgvMbCzWTjLF28FneJHg8="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/tools/misc/traefik-certs-dumper/default.nix b/nixpkgs/pkgs/tools/misc/traefik-certs-dumper/default.nix index 50954dab7ae8..410f85de4d12 100644 --- a/nixpkgs/pkgs/tools/misc/traefik-certs-dumper/default.nix +++ b/nixpkgs/pkgs/tools/misc/traefik-certs-dumper/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-o5nTxTyLuKtWcJvcWZuVwK970DMJfEaJw8vDcShulr0="; }; - vendorSha256 = "sha256-rBSRZ7gKUx3tBXqhkTOmAyEx9pLw41/Bt3O+AiHqXpw="; + vendorHash = "sha256-rBSRZ7gKUx3tBXqhkTOmAyEx9pLw41/Bt3O+AiHqXpw="; excludedPackages = "integrationtest"; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/misc/turbo/default.nix b/nixpkgs/pkgs/tools/misc/turbo/default.nix index 0928348666ea..f3fcd8cd0f30 100644 --- a/nixpkgs/pkgs/tools/misc/turbo/default.nix +++ b/nixpkgs/pkgs/tools/misc/turbo/default.nix @@ -63,7 +63,7 @@ let pname = "go-turbo"; modRoot = "cli"; - vendorSha256 = "sha256-8quDuT8VwT3B56jykkbX8ov+DNFZwxPf31+NLdfX1p0="; + vendorHash = "sha256-8quDuT8VwT3B56jykkbX8ov+DNFZwxPf31+NLdfX1p0="; nativeBuildInputs = [ git diff --git a/nixpkgs/pkgs/tools/misc/ugs/default.nix b/nixpkgs/pkgs/tools/misc/ugs/default.nix index 4350c23ac773..61a124faaa1b 100644 --- a/nixpkgs/pkgs/tools/misc/ugs/default.nix +++ b/nixpkgs/pkgs/tools/misc/ugs/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "ugs"; - version = "2.0.18"; + version = "2.0.20"; src = fetchzip { url = "https://github.com/winder/Universal-G-Code-Sender/releases/download/v${version}/UniversalGcodeSender.zip"; - hash = "sha256-NaEDG3dmpPRwfVvwYJQXqpCcAkRPeQ1EcKoa0xKeDFA="; + hash = "sha256-EPB7irROvFSGeo8XwOGoN9OLcIVJIDUySJ4DLomZPgM="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/tools/misc/umlet/default.nix b/nixpkgs/pkgs/tools/misc/umlet/default.nix index 41da294d19a5..67cf61ebe5a1 100644 --- a/nixpkgs/pkgs/tools/misc/umlet/default.nix +++ b/nixpkgs/pkgs/tools/misc/umlet/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, fetchurl, jre, unzip, runtimeShell }: -let - major = "15"; - minor = "0"; - patch = "0"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "umlet"; - version = "${major}.${minor}.${patch}"; + version = "15.1.0"; src = fetchurl { - url = "https://www.umlet.com/umlet_${major}_${minor}/umlet-standalone-${version}.zip"; - sha256 = "sha256-gdvhqYGyrFuQhhrkF26wXb3TQLRCLm59/uSxTPmHdAE="; + # NOTE: The download URL breaks consistency - sometimes w/ patch versions + # and sometimes w/o. Furthermore, for 15.1.0 they moved everything to the + # new /download subfolder. + # As releases are very rarely, just modify it by hand.. + url = "https://www.umlet.com/download/umlet_15_1/umlet-standalone-15.1.zip"; + hash = "sha256-M6oVWbOmPBTygS+TFkY9PWucFfYLD33suNUuWpFLMIo="; }; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/tools/misc/unparam/default.nix b/nixpkgs/pkgs/tools/misc/unparam/default.nix index 30bb408ffae1..3f87e0edd64b 100644 --- a/nixpkgs/pkgs/tools/misc/unparam/default.nix +++ b/nixpkgs/pkgs/tools/misc/unparam/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-kbEdOqX/p/FrNfWQ2WjXX+lERprSV2EI9l+kapHuFi4="; }; - vendorSha256 = "sha256-gEZFAMcr1okqG2IXcS3hDzZKMINohd2JzxezGbzyeBE="; + vendorHash = "sha256-gEZFAMcr1okqG2IXcS3hDzZKMINohd2JzxezGbzyeBE="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/tools/misc/vsc-leetcode-cli/default.nix b/nixpkgs/pkgs/tools/misc/vsc-leetcode-cli/default.nix new file mode 100644 index 000000000000..cb70f9a80eed --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/vsc-leetcode-cli/default.nix @@ -0,0 +1,28 @@ +{ buildNpmPackage +, fetchFromGitHub +, lib +}: + +buildNpmPackage { + pname = "vsc-leetcode-cli"; + version = "unstable-2021-04-11"; + + src = fetchFromGitHub { + owner = "leetcode-tools"; + repo = "leetcode-cli"; + rev = "c5f6b8987185ae9f181e138f999825516240f44c"; + hash = "sha256-N8hQqIzCUYTT5RAd0eqNynSNkGiN4omFY+8QLBemIbs="; + }; + + npmDepsHash = "sha256-t8eEnyAKeDmbmduUXuxo/WbJTced5dLeJTbtjxrrxY8="; + + dontNpmBuild = true; + + meta = with lib; { + description = "A CLI tool for leetcode.com"; + homepage = "https://github.com/leetcode-tools/leetcode-cli"; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud ]; + mainProgram = "leetcode"; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/yai/default.nix b/nixpkgs/pkgs/tools/misc/yai/default.nix index 6b99671fbe90..916328cdcde6 100644 --- a/nixpkgs/pkgs/tools/misc/yai/default.nix +++ b/nixpkgs/pkgs/tools/misc/yai/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "sha256-MoblXLfptlIYJbXQTpbc8GBo2a3Zgxdvwra8IUEGiZs=="; }; - vendorSha256 = "sha256-+NhYK8FXd5B3GsGUPJOMM7Tt3GS1ZJ7LeApz38Xkwx8="; + vendorHash = "sha256-+NhYK8FXd5B3GsGUPJOMM7Tt3GS1ZJ7LeApz38Xkwx8="; ldflags = [ "-w -s" diff --git a/nixpkgs/pkgs/tools/misc/zabbixctl/default.nix b/nixpkgs/pkgs/tools/misc/zabbixctl/default.nix index 3b25d479388e..e42ccb86c417 100644 --- a/nixpkgs/pkgs/tools/misc/zabbixctl/default.nix +++ b/nixpkgs/pkgs/tools/misc/zabbixctl/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-fWT3cgIHjHcKwFDjWIf3BUUUaVZ7hyc2ibkpU+AsW0I="; }; - vendorSha256 = "sha256-BphQcPPmeNU7RDtaHJQxIoW8xxD86xWgqLBsLR08Tag="; + vendorHash = "sha256-BphQcPPmeNU7RDtaHJQxIoW8xxD86xWgqLBsLR08Tag="; ldflags = [ "-s" "-w" ]; |