diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-06-03 06:01:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-03 06:01:11 +0000 |
| commit | 6a837d8fb11efb666589234168461c2d71829e3c (patch) | |
| tree | 53e21bf1cf992ba0803dfef8734f62e9d4e39332 /pkgs/applications/misc | |
| parent | 4b2e2c8b395e9df099863279f6dfbbd07c6cd486 (diff) | |
| parent | f04dbdd29e954e51e98d2a0896c13180f5247143 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/has/default.nix | 29 | ||||
| -rw-r--r-- | pkgs/applications/misc/usql/default.nix | 6 |
2 files changed, 32 insertions, 3 deletions
diff --git a/pkgs/applications/misc/has/default.nix b/pkgs/applications/misc/has/default.nix new file mode 100644 index 0000000000000..144d8073ff0e2 --- /dev/null +++ b/pkgs/applications/misc/has/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation (finalAttrs: rec { + pname = "has"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "kdabir"; + repo = "has"; + rev = "v${finalAttrs.version}"; + hash = "sha256-3XsNSl4lQfJjEPNGoFj6ABXGkwOUsg9AFDAz8euZApE="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + install -Dm0555 ${pname} -t $out/bin + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/kdabir/has"; + description = "Checks presence of various command line tools and their versions on the path"; + license = licenses.mit; + maintainers = with maintainers; [ Freed-Wu ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix index 8f6bbf7fd0037..d25442dcf9b20 100644 --- a/pkgs/applications/misc/usql/default.nix +++ b/pkgs/applications/misc/usql/default.nix @@ -10,18 +10,18 @@ buildGoModule rec { pname = "usql"; - version = "0.14.6"; + version = "0.14.7"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-RxnxF+KzRNPQ5w5zsk9g1tr557vGe7bi32pSiGL2rK8="; + hash = "sha256-iR+gRWSSxAudDewGBVlEQunFfodYFAuShVq2Z1rZ2k4="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-66HQNh8GNPGYsA4PXIij2PMUnj/SxLSQ/+5junR22UE="; + vendorHash = "sha256-teVsEVCaSn0/t79LIig3gTw5J8j2YTRx7CoWVDGwQNI="; proxyVendor = true; # Exclude broken impala & hive driver |