diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-01 12:01:27 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-01 12:01:27 +0000 |
commit | 25043f0f28bd3ee7fa3bc57d87e9e5eba4328d2b (patch) | |
tree | b632181abb12e85ba02cf66acaaf13d127d967da /pkgs/applications | |
parent | 428401133f7131517399aa460258424e99cde1e2 (diff) | |
parent | bd6329dd115d52bf441b6532469e0cba60a56b50 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/blockchains/chia/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/fsv/default.nix | 65 | ||||
-rw-r--r-- | pkgs/applications/misc/heimer/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/hugo/default.nix | 12 | ||||
-rw-r--r-- | pkgs/applications/networking/cluster/kuttl/default.nix | 17 | ||||
-rw-r--r-- | pkgs/applications/networking/cluster/pluto/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/networking/cluster/terragrunt/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/networking/cluster/vcluster/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/logic/cbmc/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/vdr/plugins.nix | 16 | ||||
-rw-r--r-- | pkgs/applications/virtualization/distrobox/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/virtualization/umoci/default.nix | 4 |
12 files changed, 77 insertions, 67 deletions
diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 38262e7cd0cb5..33ce321cb4c6d 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -6,14 +6,14 @@ let chia = python3Packages.buildPythonApplication rec { pname = "chia"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; fetchSubmodules = true; - hash = "sha256-FzKdb6Z/ykKYjpjCr7QR5fxXPNnQbW3bBY97t7DxS90="; + hash = "sha256-TNaHPvN19fkRqkQHtqdeEDwhqbntcVhxXhY8TNIScEg="; }; patches = [ diff --git a/pkgs/applications/misc/fsv/default.nix b/pkgs/applications/misc/fsv/default.nix index a965c615dfd3c..9ffd520a7d56d 100644 --- a/pkgs/applications/misc/fsv/default.nix +++ b/pkgs/applications/misc/fsv/default.nix @@ -1,38 +1,47 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook -, libtool, pkg-config, gtk2, libGLU, file +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, cglm +, gtk3 +, libepoxy +, libGLU }: -let - gtkglarea = stdenv.mkDerivation rec { - pname = "gtkglarea"; - version = "2.1.0"; - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1pl2vdj6l64j864ilhkq1bcggb3hrlxjwk5m029i7xfjfxc587lf"; - }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 libGLU ]; - hardeningDisable = [ "format" ]; - }; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "fsv"; - version = "0.9-1"; + version = "3.0"; src = fetchFromGitHub { - owner = "mcuelenaere"; - repo = "fsv"; - rev = "${pname}-${version}"; - sha256 = "0n09jd7yqj18mx6zqbg7kab4idg5llr15g6avafj74fpg1h7iimj"; + owner = "jabl"; + repo = "fsv"; + rev = "${pname}-${version}"; + hash = "sha256-fxsA3qcBPvK4H5P4juGTe6eg1lkygvzFpNW36B9lsE4="; }; - postPatch = '' - # fix build with gettext 0.20 - sed -i 's/AM_GNU_GETTEXT/AM_GNU_GETTEXT([external])/' configure.in - ''; + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + cglm + gtk3 + libepoxy + libGLU + ]; - nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; - buildInputs = [ file gtk2 libGLU gtkglarea ]; + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp src/fsv $out/bin/fsv + + runHook postInstall + ''; meta = with lib; { description = "File system visualizer in cyberspace"; @@ -44,7 +53,7 @@ in stdenv.mkDerivation rec { hard drive, or any arbitrarily large collection of files, limited only by the host computer's memory and graphics hardware. ''; - homepage = "https://github.com/mcuelenaere/fsv"; + homepage = "https://github.com/jabl/fsv"; license = licenses.lgpl2; platforms = platforms.linux; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index 913b3a229769e..ec2d8d62d06d3 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "3.6.0"; + version = "3.6.1"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "sha256-GQf5S7mYuucJS5jsz0upe6DiniY8YXZXYQV7nyrjVmE="; + sha256 = "sha256-i4jgmqRvBX6g6IOitnBnQqWnFY5QoLk6/Cah0wCU8uc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 87b4f8df8e1b2..5481376af8c60 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles, buildPackages }: buildGoModule rec { pname = "hugo"; @@ -25,13 +25,13 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X github.com/gohugoio/hugo/common/hugo.vendorInfo=nixpkgs" ]; - postInstall = '' - $out/bin/hugo gen man + postInstall = let emulator = stdenv.hostPlatform.emulator buildPackages; in '' + ${emulator} $out/bin/hugo gen man installManPage man/* installShellCompletion --cmd hugo \ - --bash <($out/bin/hugo completion bash) \ - --fish <($out/bin/hugo completion fish) \ - --zsh <($out/bin/hugo completion zsh) + --bash <(${emulator} $out/bin/hugo completion bash) \ + --fish <(${emulator} $out/bin/hugo completion fish) \ + --zsh <(${emulator} $out/bin/hugo completion zsh) ''; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/kuttl/default.nix b/pkgs/applications/networking/cluster/kuttl/default.nix index 13a16c6c50c2f..5e6ca3a874eb6 100644 --- a/pkgs/applications/networking/cluster/kuttl/default.nix +++ b/pkgs/applications/networking/cluster/kuttl/default.nix @@ -1,23 +1,24 @@ -{ lib, buildGoModule, fetchFromGitHub}: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kuttl"; - version = "0.11.1"; + version = "0.13.0"; cli = "kubectl-kuttl"; src = fetchFromGitHub { - owner = "kudobuilder"; - repo = "kuttl"; - rev = "v${version}"; - sha256 = "sha256-jvearvhl2fQV5OOVmvf3C4MjE//wkVs8Ly9BIwv15/8="; + owner = "kudobuilder"; + repo = "kuttl"; + rev = "v${version}"; + sha256 = "sha256-liuP8ALcPxbU+hZ54KDFj2r2yZpAbVago0IxIv52N3o="; }; - vendorSha256 = "sha256-EytHUfr6RbgXowYlfuajvNt9VwmGmvw9TBRtwYMAIh4="; + vendorSha256 = "sha256-u8Ezk78CrAhSeeMVXj09/Hiegtx+ZNKlr/Fg0O7+iOY="; subPackages = [ "cmd/kubectl-kuttl" ]; ldflags = [ - "-s" "-w" + "-s" + "-w" "-X github.com/kudobuilder/kuttl/pkg/version.gitVersion=${version}" ]; diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/applications/networking/cluster/pluto/default.nix index a88cda718d5de..8fc55abe92822 100644 --- a/pkgs/applications/networking/cluster/pluto/default.nix +++ b/pkgs/applications/networking/cluster/pluto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pluto"; - version = "5.10.7"; + version = "5.11.0"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - sha256 = "sha256-AGzDs2KZt44uBJRBHvBL7nn5TpgWbcdLTEf9Vx9j89U="; + sha256 = "sha256-eyJ81i9kTuojBuo/rwfgnl3BRpiTnKst0SnL+oWfSWQ="; }; - vendorSha256 = "sha256-cA5QxI1lLBdzPOj3pFqqHPfMwJQPPiyqQA4FLwetNUs="; + vendorSha256 = "sha256-QH/mKq7QydYvUHZIPjoBWy015Sghh30VdEWu76KZdPE="; ldflags = [ "-w" "-s" diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 46cabf2e4d98a..98de91e3bd238 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.38.9"; + version = "0.39.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rfAVgnFAxEguFuY+Gfe/T0NcsD6LmPSquxuTR0bRqXQ="; + sha256 = "sha256-Y8t5rThkPD3FzY25L2lOIvktU5+NwBZtq9Pn3VzQQf4="; }; vendorSha256 = "sha256-CqImT90jFFLi6XR7jfzFKwhnCHK6B+aM+Ba/L+G3bEg="; diff --git a/pkgs/applications/networking/cluster/vcluster/default.nix b/pkgs/applications/networking/cluster/vcluster/default.nix index 8a477c543e6cb..5759257c4a05c 100644 --- a/pkgs/applications/networking/cluster/vcluster/default.nix +++ b/pkgs/applications/networking/cluster/vcluster/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vcluster"; - version = "0.11.1"; + version = "0.12.1"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aFTugqWr/9e3wQLL4yre2T8CUKq8P0HZLsES8lFZKHY="; + sha256 = "sha256-KRm6+WRMGzM7L17ABj/g6Nu+eU6F3C4a9CAa0ePC6i8="; }; vendorSha256 = null; diff --git a/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/applications/science/logic/cbmc/default.nix index cbc47fae37e2e..07c3b62d37dab 100644 --- a/pkgs/applications/science/logic/cbmc/default.nix +++ b/pkgs/applications/science/logic/cbmc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cbmc"; - version = "5.65.1"; + version = "5.67.0"; src = fetchFromGitHub { owner = "diffblue"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-6Cy3yScPl2Ax0N2pmJWJEPXrSlj+F0IAoM5G8rIjbT8="; + sha256 = "sha256-9w6GGi/yW7IYv3NoflpzO/UH712+LWp6f10+ak2hLIA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 4211faf3f9d4b..6719b0412b827 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchgit, vdr, fetchFromGitHub -, graphicsmagick, libav, pcre, xorgserver, ffmpeg +, graphicsmagick, pcre, xorgserver, ffmpeg , libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses , callPackage }: let @@ -53,16 +53,16 @@ in { markad = stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "2.0.4"; + version = "3.0.25"; src = fetchFromGitHub { repo = "vdr-plugin-markad"; - owner = "jbrundiers"; - sha256 = "sha256-Y4KsEtUq+KoUooXiw9O9RokBxNwWBkiGB31GncmHkYM="; - rev = "288e3dae93421b0176f4f62b68ea4b39d98e8793"; + owner = "kfb77"; + sha256 = "sha256-m7cUAxwXj62spelHYH6uTIoViSavSR0d4psr7+KLJg8="; + rev = "v${version}"; }; - buildInputs = [ vdr libav ]; + buildInputs = [ vdr ffmpeg ]; postPatch = '' substituteInPlace command/Makefile --replace '/usr' "" @@ -78,6 +78,8 @@ in { buildFlags = [ "DESTDIR=$(out)" "LIBDIR=/lib/vdr" + "BINDIR=/bin" + "MANDIR=/share/man" "APIVERSION=${vdr.version}" "VDRDIR=${vdr.dev}/include/vdr" "LOCDIR=/share/locale" @@ -86,7 +88,7 @@ in { installFlags = buildFlags; meta = with lib; { - homepage = "https://github.com/jbrundiers/vdr-plugin-markad"; + homepage = "https://github.com/kfb77/vdr-plugin-markad"; description = "MarkAd marks advertisements in VDR recordings."; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; diff --git a/pkgs/applications/virtualization/distrobox/default.nix b/pkgs/applications/virtualization/distrobox/default.nix index e9409004c8a60..aca97a811fb30 100644 --- a/pkgs/applications/virtualization/distrobox/default.nix +++ b/pkgs/applications/virtualization/distrobox/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "distrobox"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "89luca89"; repo = pname; rev = version; - sha256 = "sha256-XYqPwBiMbwG0bTiFRywZRWjp1OabTHcwhmbcx11SgPo="; + sha256 = "sha256-WIpl3eSdResAmWFc8OG8Jm0uLTGaovkItGAZTOEzhuE="; }; dontConfigure = true; diff --git a/pkgs/applications/virtualization/umoci/default.nix b/pkgs/applications/virtualization/umoci/default.nix index 22db5503c0d4e..99e8ddf34a518 100644 --- a/pkgs/applications/virtualization/umoci/default.nix +++ b/pkgs/applications/virtualization/umoci/default.nix @@ -26,9 +26,7 @@ buildGoModule rec { nativeBuildInputs = [ go-md2man installShellFiles ]; postInstall = '' - substituteInPlace Makefile --replace \ - '$(shell which bash)' '${lib.getBin bash}/bin/bash' - make docs + make docs SHELL="$SHELL" installManPage doc/man/*.[1-9] ''; |