Merge branch 'master' into staging-next

This commit is contained in:
Vladimír Čunát 2022-09-02 07:33:30 +02:00
commit 11656ec9a9
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
20 changed files with 160 additions and 75 deletions

View file

@ -7,14 +7,14 @@
let
pname = "krename";
version = "5.0.1";
version = "5.0.2";
in mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
sha256 = "0zbadxjp13jqxgb58wslhm0wy2lhpdq1bgbvyhyn21mssfppib6a";
sha256 = "sha256-sjxgp93Z9ttN1/VaxV/MqKVY+miq+PpcuJ4er2kvI+0=";
};
buildInputs = [ taglib exiv2 podofo ];

View file

@ -6,7 +6,7 @@ symlinkJoin {
name = "wrapped-${obs-studio.name}";
nativeBuildInputs = [ makeWrapper ];
paths = [ obs-studio ];
paths = [ obs-studio ] ++ plugins;
postBuild = with lib;
let
@ -19,13 +19,20 @@ symlinkJoin {
paths = plugins;
};
wrapCommand = [
wrapCommandLine = [
"wrapProgram"
"$out/bin/obs"
''--set OBS_PLUGINS_PATH "${pluginsJoined}/lib/obs-plugins"''
''--set OBS_PLUGINS_DATA_PATH "${pluginsJoined}/share/obs/obs-plugins"''
] ++ pluginArguments;
in concatStringsSep " " wrapCommand;
in ''
${concatStringsSep " " wrapCommandLine}
# Remove unused obs-plugins dir to not cause confusion
rm -r $out/share/obs/obs-plugins
# Leave some breadcrumbs
echo 'Plugins are at ${pluginsJoined}/share/obs/obs-plugins' > $out/share/obs/obs-plugins-README
'';
inherit (obs-studio) meta;
passthru = obs-studio.passthru // {

View file

@ -0,0 +1,33 @@
{ lib, stdenvNoCC, fetchFromGitHub, python3 }:
stdenvNoCC.mkDerivation rec {
name = "ovmfvartool";
version = "unstable-2021-06-16";
src = fetchFromGitHub {
owner = "hlandau";
repo = name;
rev = "c4c0c24dce1d201f95dfd69fd7fd9d51ea301377";
hash = "sha256-3OvYAB41apPn1c2YTKBIEITmHSUMQ0oEijY5DhZWWGo=";
};
postPatch = let
pythonPkg = python3.withPackages (p: with p; [ pyyaml ]);
in ''
# needed in build but /usr/bin/env is not available in sandbox
substituteInPlace ovmfvartool \
--replace "/usr/bin/env python3" "${pythonPkg.interpreter}"
'';
installPhase = ''
mkdir -p $out/bin
install -m 755 ovmfvartool $out/bin/
'';
meta = with lib; {
description = "Parse and generate OVMF_VARS.fd from Yaml";
homepage = "https://github.com/hlandau/ovmfvartool";
license = licenses.gpl3;
maintainers = with maintainers; [ baloo raitobezarius ];
};
}

View file

@ -1,28 +1,26 @@
{ lib, stdenv, fetchurl, fetchpatch }:
{ lib
, stdenv
, fetchFromGitHub
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mcpp";
version = "2.7.2";
version = "2.7.2.1";
src = fetchurl {
url = "mirror://sourceforge/mcpp/mcpp-${version}.tar.gz";
sha256 = "0r48rfghjm90pkdyr4khxg783g9v98rdx2n69xn8f6c5i0hl96rv";
src = fetchFromGitHub {
owner = "museoa";
repo = "mcpp";
rev = finalAttrs.version;
hash= "sha256-T4feegblOeG+NU+c+PAobf8HT8KDSfcINkRAa1hNpkY=";
};
configureFlags = [ "--enable-mcpplib" ];
patches = [
(fetchpatch {
name = "CVE-2019-14274.patch";
url = "https://github.com/h8liu/mcpp/commit/ea453aca2742be6ac43ba4ce0da6f938a7e5a5d8.patch";
sha256 = "0svkdr3w9b45v6scgzvggw9nsh6a3k7g19fqk0w3vlckwmk5ydzr";
})
];
meta = with lib; {
homepage = "http://mcpp.sourceforge.net/";
description = "A portable c preprocessor";
homepage = "https://github.com/museoa/mcpp";
description = "Matsui's C preprocessor";
license = licenses.bsd2;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
};
}
})

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "ecpdap";
version = "0.1.7";
version = "0.1.8";
src = fetchFromGitHub {
owner = "adamgreig";
repo = pname;
rev = "v${version}";
sha256 = "sha256-fdvpGmEy54i48H6YJ4E1LIuogimNEL8PJS5ScoW/6DM=";
sha256 = "sha256-KXfEQnbhUUKsCDKhPBjwjF9eJMuiCx5o7gOSzyWv36s=";
};
cargoSha256 = "sha256-2YARNoHVDBwGr8FE/oRlNZMX/vCPIre7OnZbr04eF/M=";
cargoSha256 = "sha256-BEfsNSzrdV/tnzWk4oOwchOupW6PzZ8TEx7zUzwLBV8=";
nativeBuildInputs = [ pkg-config ];

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper
, perlPackages, libxml2, libiconv }:
, perlPackages, libxml2, libintl }:
stdenv.mkDerivation rec {
pname = "hivex";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
libxml2
]
++ (with perlPackages; [ perl IOStringy ])
++ lib.optionals stdenv.isDarwin [ libiconv ];
++ lib.optionals stdenv.isDarwin [ libintl ];
postInstall = ''
wrapProgram $out/bin/hivexregedit \
@ -29,11 +29,10 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
broken = stdenv.isDarwin;
description = "Windows registry hive extraction library";
license = licenses.lgpl2;
homepage = "https://github.com/libguestfs/hivex";
maintainers = with maintainers; [offline];
platforms = platforms.linux ++ platforms.darwin;
platforms = platforms.unix;
};
}

View file

@ -13,10 +13,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ libjack2 libpulseaudio ]
++ lib.optional stdenv.isLinux alsa-lib
buildInputs = [ libjack2 ]
++ lib.optionals stdenv.isLinux [ libpulseaudio alsa-lib ]
++ lib.optional stdenv.isDarwin AudioUnit;
cmakeFlags = lib.optionals stdenv.isDarwin [
"-DBUILD_TESTS=OFF"
];
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-strict-prototypes";
meta = with lib; {

View file

@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "phpstan";
version = "1.8.2";
version = "1.8.3";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
sha256 = "sha256-NnbEN9dhPUBtgEiKj5mBtW9RnTE9jmx/ZqRdqmuyIog=";
sha256 = "sha256-hKpwTpeEYKDvkkmwU7olW+a1pWiQTPDlN7Wy1IDk4UY=";
};
dontUnpack = true;

View file

@ -1,31 +1,14 @@
{ lib, buildRubyGem, ruby, writeScript }:
{ buildRubyGem, ruby }:
buildRubyGem rec {
inherit ruby;
name = "${gemName}-${version}";
gemName = "bundler";
version = "2.3.21";
source.sha256 = "sha256-+u3H/8Fno8U7ZMRj2me1DVvkOAR2HeWmjdo0TCG/0d4=";
version = "2.3.20";
source.sha256 = "sha256-gJJ3vHzrJo6XpHS1iwLb77jd9ZB39GGLcOJQSrgaBHw=";
dontPatchShebangs = true;
passthru.updateScript = writeScript "gem-update-script" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl common-updater-scripts jq
set -eu -o pipefail
latest_version=$(curl -s https://rubygems.org/api/v1/gems/${gemName}.json | jq --raw-output .version)
update-source-version ${gemName} "$latest_version"
'';
postFixup = ''
sed -i -e "s/activate_bin_path/bin_path/g" $out/bin/bundle
'';
meta = with lib; {
description = "Manage your Ruby application's gem dependencies";
homepage = "https://bundler.io";
license = licenses.mit;
maintainers = with maintainers; [anthonyroussel];
};
}

View file

@ -0,0 +1,28 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "ctlptl";
version = "0.8.6";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-FJtp4g4kIkXFYvYcM9yF3BY6tgHmip11/oIyMSfTwqM=";
};
vendorSha256 = "sha256-s+Cc7pG/GLK0ZhXX/wK7jMNcDIeu/Am2vCgzrNXKpdw=";
ldflags = [
"-s"
"-w"
"-X main.version=${version}"
];
meta = with lib; {
description = "CLI for declaratively setting up local Kubernetes clusters";
homepage = "https://github.com/tilt-dev/ctlptl";
license = licenses.asl20;
maintainers = with maintainers; [ svrana ];
};
}

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "act";
version = "0.2.30";
version = "0.2.31";
src = fetchFromGitHub {
owner = "nektos";
repo = pname;
rev = "v${version}";
sha256 = "sha256-QNuCXBVSERNjn4ehqpOepAmLLqZAA2FvMBmMwceh4kI=";
sha256 = "sha256-6JMWt6svJwW7FNn2sOSUjFtXBqmC02uFEiybj5H9wTw=";
};
vendorSha256 = "sha256-T5HWT0h9ZSVQBbQbwIL1wu8BXvOkFIXtimz7QMUkWtQ=";
vendorSha256 = "sha256-caFM1A4SGZ8MIIoWnzBdKJOAgzscrf9eGtv/GCSfzag=";
doCheck = false;

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "pgrouting";
version = "3.3.1";
version = "3.3.2";
nativeBuildInputs = [ cmake perl ];
buildInputs = [ postgresql boost ];
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "pgRouting";
repo = pname;
rev = "v${version}";
sha256 = "sha256-QOIuJM0d1l56ESzTjtm5IIiZx+2oYrO5mIhkAD8kFpQ=";
sha256 = "sha256-H7h+eiH02qLscpiZ8yV5ofL7upeqRBXNQDGYS86f3og=";
};
installPhase = ''

View file

@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
pname = "timescaledb";
version = "2.7.2";
version = "2.8.0";
nativeBuildInputs = [ cmake ];
buildInputs = [ postgresql openssl libkrb5 ];
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
owner = "timescale";
repo = "timescaledb";
rev = version;
sha256 = "sha256-roM4a+WWn8aODkS/kvouM6rO4TnVR7hAZmCkJkLpHKQ=";
sha256 = "sha256-xJidQ25JPIFY0KMV9EVrp4+qbU+QWDLaCSNHKOQq+dI=";
};
cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ]

View file

@ -5,6 +5,7 @@
, runCommand, btrfs-progs
, gitUpdater
, udevSupport ? true
, enablePython ? true
}:
stdenv.mkDerivation rec {
@ -18,7 +19,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
pkg-config
] ++ lib.optionals enablePython [
python3 python3.pkgs.setuptools
] ++ [
sphinx
];
@ -32,12 +35,17 @@ stdenv.mkDerivation rec {
install -v -m 444 -D btrfs-completion $out/share/bash-completion/completions/btrfs
'';
configureFlags = lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace"
++ lib.optional (!udevSupport) "--disable-libudev";
configureFlags = lib.optionals stdenv.hostPlatform.isMusl [
"--disable-backtrace"
] ++ lib.optionals (!enablePython) [
"--disable-python"
] ++ lib.optionals (!udevSupport) [
"--disable-libudev"
];
makeFlags = [ "udevruledir=$(out)/lib/udev/rules.d" ];
installFlags = [ "install_python" ];
installFlags = lib.optionals enablePython [ "install_python" ];
enableParallelBuilding = true;

View file

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
--replace '.picocom_history' '.cache/picocom_history'
substituteInPlace picocom.c \
--replace '"rz -vv"' '"${lrzsz}/bin/rz -vv"' \
--replace '"rz -vv -E"' '"${lrzsz}/bin/rz -vv -E"' \
--replace '"sz -vv"' '"${lrzsz}/bin/sz -vv"'
'';

View file

@ -37,6 +37,10 @@ python3Packages.buildPythonApplication rec {
postInstall = ''
installManPage doc/ytcc.1
installShellCompletion --cmd ytcc \
--bash scripts/completions/bash/ytcc.completion.sh \
--fish scripts/completions/fish/ytcc.fish \
--zsh scripts/completions/zsh/_ytcc
'';
meta = {

View file

@ -20,6 +20,12 @@ stdenv.mkDerivation rec {
url = "https://github.com/jessek/hashdeep/commit/6ef69a26126ee4e69a25392fd456b8a66c51dffd.patch";
sha256 = "sha256-IrqcnrKINeoh56FR25FzSM1YJMkM2yFd/GwOeWGRLFo=";
})
(fetchpatch {
# Fix the spacing between the string literals and macros, see https://github.com/jessek/hashdeep/pull/385
name = "string-literal-spacing.patch";
url = "https://github.com/jessek/hashdeep/commit/18a6b5d57f7a648d2b7dcc6e50ff00a1e4b05fcc.patch";
sha256 = "sha256-S6hzC8jPtG3ozsvVq5JfAUMwqKxytLGwBAtNYNr6RJ0=";
})
];
nativeBuildInputs = [ autoreconfHook ];
@ -30,9 +36,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
maintainers = [ maintainers.karantan ];
platforms = platforms.all;
# Build fails on Darwin:
# > ./xml.h:103:82: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
# > void xmlout(const std::string &tag,const int64_t value){ xmlprintf(tag,"","%"PRId64,value); }
broken = stdenv.isDarwin;
};
}

View file

@ -1,4 +1,11 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
{ lib
, stdenv
, buildGoModule
, fetchFromGitHub
, fetchpatch
, installShellFiles
, IOKit
}:
buildGoModule rec {
pname = "gotop";
@ -11,19 +18,27 @@ buildGoModule rec {
hash = "sha256-jAUlaj9Nv/ipzxAkG2myd9DIboHj7IarNMVk/FQ274g=";
};
patches = [
# To remove after https://github.com/xxxserxxx/gotop/pull/234 is merged
(fetchpatch {
url = "https://github.com/xxxserxxx/gotop/commit/3e3243fa1f046c126bf9cb34d55a12963b3ac116.patch";
sha256 = "sha256-4q4dBTPpVfgXvApzUXdEEzIe31PoLHUK4mBWth6qCIg=";
})
];
proxyVendor = true;
vendorSha256 = "sha256-y4hVouvqMYUrdF7fowsvJLp0FCGCZDeVGUQXG8z8Lyg=";
vendorSha256 = "sha256-Sq9ol9bZb0BfR/C8phcMSEjG9qgWyTmwpo/TS30j3Vk=";
ldflags = [ "-s" "-w" "-X main.Version=v${version}" ];
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ IOKit ];
preCheck = ''
export HOME=$(mktemp -d)
'';
doCheck = !stdenv.isDarwin;
postInstall = ''
$out/bin/gotop --create-manpage > gotop.1
installManPage gotop.1
@ -35,6 +50,5 @@ buildGoModule rec {
changelog = "https://github.com/xxxserxxx/gotop/raw/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = [ maintainers.magnetophon ];
broken = stdenv.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042
};
}

View file

@ -34,7 +34,6 @@ rustPlatform.buildRustPackage rec {
'';
meta = with lib; {
broken = stdenv.isDarwin;
description = "Sort of like top or htop but with zoom-able charts, network, and disk usage"
+ lib.optionalString nvidiaSupport ", and NVIDIA GPU usage";
homepage = "https://github.com/bvaisvil/zenith";

View file

@ -5390,6 +5390,8 @@ with pkgs;
cron = callPackage ../tools/system/cron { };
ctlptl = callPackage ../development/tools/ctlptl { };
snooze = callPackage ../tools/system/snooze { };
cudaPackages_10_0 = callPackage ./cuda-packages.nix { cudaVersion = "10.0"; };
@ -23340,6 +23342,8 @@ with pkgs;
tpmSupport = true;
};
ovmfvartool = callPackage ../applications/virtualization/ovmfvartool { };
ops = callPackage ../applications/virtualization/ops { };
seabios = callPackage ../applications/virtualization/seabios { };
@ -24585,7 +24589,9 @@ with pkgs;
gotools = callPackage ../development/tools/gotools { };
gotop = callPackage ../tools/system/gotop { };
gotop = callPackage ../tools/system/gotop {
inherit (darwin.apple_sdk.frameworks) IOKit;
};
go-migrate = callPackage ../development/tools/go-migrate { };