3
0
Fork 0
forked from mirrors/nixpkgs

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-08-03 06:01:37 +00:00 committed by GitHub
commit d4de56330c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 949 additions and 887 deletions

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, pixman, libpthreadstubs, gtkmm3, libXau
, libXdmcp, lcms2, libiptcdata, libcanberra-gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook
, lensfun, librsvg
, lensfun, librsvg, gtk-mac-integration
}:
stdenv.mkDerivation rec {
@ -17,11 +17,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ];
# This patch is upstream; remove it in 5.9.
patches = [ ./fix-6324.patch ];
patches = [ ./fix-6324.patch ]
# Disable upstream-enforced bundling on macOS.
++ lib.optionals stdenv.isDarwin [ ./do-not-bundle.patch ];
buildInputs = [
pixman libpthreadstubs gtkmm3 libXau libXdmcp
lcms2 libiptcdata libcanberra-gtk3 fftw expat pcre libsigcxx lensfun librsvg
lcms2 libiptcdata fftw expat pcre libsigcxx lensfun librsvg
] ++ lib.optionals stdenv.isLinux [
libcanberra-gtk3
] ++ lib.optionals stdenv.isDarwin [
gtk-mac-integration
];
cmakeFlags = [
@ -40,6 +46,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.rawtherapee.com/";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ jcumming mahe ];
platforms = with lib.platforms; linux;
platforms = with lib.platforms; unix;
};
}

View file

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a55ca6d5..68c059aa5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -233,6 +233,6 @@ if(WIN32 OR APPLE)
endif()
- set(BUILD_BUNDLE ON FORCE)
+ set(BUILD_BUNDLE OFF)
endif()
if(NOT DEFINED BUNDLE_BASE_INSTALL_DIR)
- if(APPLE)
+ if(FALSE)

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gum";
version = "0.1.0";
version = "0.2.0";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = pname;
rev = "v${version}";
sha256 = "sha256-od0jJPfvczlru9hhO8ravGou6yYP91L2k37NYm2hD+k=";
sha256 = "sha256-LP/vUfmUja3y7t6gT/YLt08mV+owp5cWolkiw8kfn78=";
};
vendorSha256 = "sha256-uX0CQRqrM0/fj14owcUUpYph2j5ZwJITG53na31N6kg=";

View file

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "glooctl";
version = "1.11.25";
version = "1.12.0";
src = fetchFromGitHub {
owner = "solo-io";
repo = "gloo";
rev = "v${version}";
hash = "sha256-AwzqaysSjVlWJAzib0i1T76fe/C9bKGlSofa6Ipk8Go=";
hash = "sha256-LRCdKz7vaxxQTFveHbF2WrSinPtjWP96GhqtSMLIiDs=";
};
subPackages = [ "projects/gloo/cli/cmd" ];
vendorSha256 = "sha256-/H1gpQy2NVGiKZVEgTsvde/+x/ae/txu3HaBGNjhMKM=";
vendorSha256 = "sha256-1FbcNgTD5+YI29LOmkJMjhE+MnxrKmomTKK4DgyXCws=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -6,6 +6,8 @@
helm-git = callPackage ./helm-git.nix { };
helm-cm-push = callPackage ./helm-cm-push.nix { };
helm-s3 = callPackage ./helm-s3.nix { };
helm-secrets = callPackage ./helm-secrets.nix { };

View file

@ -0,0 +1,44 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "helm-cm-push";
version = "0.10.3";
src = fetchFromGitHub {
owner = "chartmuseum";
repo = "helm-push";
rev = "v${version}";
hash = "sha256-GyVhjCosVaUS1DtztztFxKuuRlUdxlsOP4/QMQ7+TaU=";
};
vendorSha256 = "sha256-9LhokpQrREmcyBqwb33BSMyG8z7IAsl9NtE3B631PnM=";
subPackage = [ "cmd/helm-cm-push" ];
# Remove hooks.
postPatch = ''
sed -e '/^hooks:/,+2 d' -i plugin.yaml
'';
CGO_ENABLED = 0;
ldflags = [ "-s" "-w" ];
postInstall = ''
install -Dm644 plugin.yaml $out/helm-cm-push/plugin.yaml
mv $out/bin $out/helm-cm-push
'';
# Tests require the ChartMuseum service.
doCheck = false;
meta = with lib; {
description = "Helm plugin to push chart package to ChartMuseum";
homepage = "https://github.com/chartmuseum/helm-push";
license = licenses.asl20;
maintainers = with maintainers; [ azahi ];
};
}

View file

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "ncgopher";
version = "0.3.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "jansc";
repo = "ncgopher";
rev = "v${version}";
sha256 = "sha256-1tiijW3q/8zS9437G9gJDzBtxqVE3QUxgw74P7rcv98=";
sha256 = "sha256-GLt+ByZzQ9v+PPyebTa8LFqySixXw85RjGZ2e3yLRss=";
};
cargoSha256 = "sha256-LA8LjY8oZslGFQhKR8fJ2heYxSBqUnmeejXKRvZXjIs=";
cargoSha256 = "sha256-VI+BTxgocv434wTr7nBeJRdt12wE53fEeqczE3o3768=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [

View file

@ -14,11 +14,11 @@
mkDerivation rec {
pname = "kstars";
version = "3.5.9";
version = "3.6.0";
src = fetchurl {
url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz";
sha256 = "sha256-SO8W1juP+MkXvXyNCP45AauYTbDrurAUtw4Gp4AA6X4=";
sha256 = "sha256-wdv2TOOPIB3VRG3XMs58i/HvMDZ9wvERAhBQNslJ25E=";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "virt-what";
version = "1.21";
version = "1.24";
src = fetchurl {
url = "https://people.redhat.com/~rjones/virt-what/files/${pname}-${version}.tar.gz";
sha256 = "0yqz1l4di57d4y1z94yhdmkiykg9a8i7xwkqmd9zsk5a6i9lbjqj";
sha256 = "sha256-C9fllw/y1SwJKIEa4mgnlYQjF/7L5VN0z84EI88uS9Y=";
};
meta = with lib; {

View file

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "zita-alsa-pcmi";
version = "0.4.0";
version = "0.5.1";
src = fetchurl {
url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
sha256 = "sha256-vYyfNg37VB+2DkinE7rx4i1BssdMGaD+ny005y9Q8cU=";
sha256 = "sha256-zyAKaO22She1e/+zPjiwSHeCctGLVYnT0vWgHODzSwc=";
};
buildInputs = [ alsa-lib ];

View file

@ -8,13 +8,13 @@
nv-codec-headers = nv-codec-headers-11;
}).overrideAttrs (old: rec {
pname = "jellyfin-ffmpeg";
version = "5.0.1-8";
version = "5.1-1";
src = fetchFromGitHub {
owner = "jellyfin";
repo = "jellyfin-ffmpeg";
rev = "v${version}";
sha256 = "sha256-zr1WuTkOBAVk7JkpDT52rfGGOaXEqiPFIGmJUDPhI/w=";
sha256 = "sha256-R3+SJ2RNaRRK6+N9eGOf/0qUgaXkT/cswkxf+7W2+Fo=";
};
configureFlags = old.configureFlags ++ [

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "simpleitk";
version = "2.1.1.1";
version = "2.1.1.2";
outputs = [ "out" "dev" ];
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "SimpleITK";
repo = "SimpleITK";
rev = "v${version}";
sha256 = "sha256-W53TbrgIwY9jj0GXz1LIrsBO9YL4VkH6531UYV0IqbE=";
sha256 = "sha256-sokJXOz6p+0eTeps5Tt24pjB3u+L1s6mDlaWN7K9m3g=";
};
nativeBuildInputs = [ cmake swig4 ];

View file

@ -12,13 +12,13 @@
rustPlatform.buildRustPackage rec {
pname = "kdash";
version = "0.3.2";
version = "0.3.3";
src = fetchFromGitHub {
owner = "kdash-rs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-aZjt4Xptv1R0qs1IqjTMfWYOD5ZgJR6atAUSQhY5250=";
sha256 = "sha256-u5Qa1rStWeFku3VA2ljg+RQxh12byfyBHXC+NQJTr0w=";
};
nativeBuildInputs = [ perl python3 pkg-config ];
@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl xorg.xcbutil ]
++ lib.optional stdenv.isDarwin AppKit;
cargoSha256 = "sha256-QlQ+mqhl9Dsajc2xSZP1mKTvCEMI/IbtaNtu2r7G1aM=";
cargoSha256 = "sha256-rSPe7kkeHEYDqF80oO+Z+bGkWewtjnKut13EP6tmUIc=";
meta = with lib; {
description = "A simple and fast dashboard for Kubernetes";

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "grpc-client-cli";
version = "1.13.0";
version = "1.13.1";
src = fetchFromGitHub {
owner = "vadimi";
repo = "grpc-client-cli";
rev = "v${version}";
sha256 = "sha256-lm+XPZB1USYV3bSYyQCgHJwG6DkhDuAbTaUycxu+CeM=";
sha256 = "sha256-ILQuo0UO8L71mdCgyf+rQNZ2LXzZ7kVdbL1X7Z+H9P4=";
};
vendorSha256 = "sha256-benXxv//bB4fcfAsZ69DZu9E+4iKQgVbaWGYcFsnyfM=";

View file

@ -12,20 +12,20 @@
rustPlatform.buildRustPackage rec {
pname = "rust-analyzer-unwrapped";
version = "2022-07-11";
cargoSha256 = "sha256-XpLXx3f+BC8+O4Df/PJ4LWuLxX14e/ga+aFu/JxVdpg=";
version = "2022-08-01";
cargoSha256 = "sha256-7ZYrIFSIOlL1JojtaQBIvvlfvjZGlR40PKVjmEtMBMo=";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust-analyzer";
rev = version;
sha256 = "sha256-HU1+Rql35ouZe0lx1ftCMDDwC9lqN3COudvMe+8XIx0=";
sha256 = "sha256-OUezy1BkIoqpkTE5wOtsjJ/Gy48Ql8EL1/t6MZzRkWw=";
};
patches = [
# Code format and git history check require more dependencies but don't really matter for packaging.
# So just ignore them.
./ignore-git-and-rustfmt-tests.patch
# Code format check requires more dependencies but don't really matter for packaging.
# So just ignore it.
./ignore-rustfmt-test.patch
];
buildAndTestSubdir = "crates/rust-analyzer";

View file

@ -1,18 +0,0 @@
--- a/crates/rust-analyzer/tests/slow-tests/tidy.rs
+++ b/crates/rust-analyzer/tests/slow-tests/tidy.rs
@@ -6,6 +6,7 @@ use std::{
use xshell::{cmd, pushd, pushenv, read_file};
#[test]
+#[ignore]
fn check_code_formatting() {
let _dir = pushd(sourcegen::project_root()).unwrap();
let _e = pushenv("RUSTUP_TOOLCHAIN", "stable");
@@ -138,6 +139,7 @@ fn check_cargo_toml(path: &Path, text: String) -> () {
}
#[test]
+#[ignore]
fn check_merge_commits() {
let stdout = cmd!("git rev-list --merges --invert-grep --author 'bors\\[bot\\]' HEAD~19..")
.read()

View file

@ -0,0 +1,10 @@
--- a/crates/rust-analyzer/tests/slow-tests/tidy.rs
+++ b/crates/rust-analyzer/tests/slow-tests/tidy.rs
@@ -6,6 +6,7 @@ use std::{
use xshell::{cmd, pushd, pushenv, read_file};
#[test]
+#[ignore]
fn check_code_formatting() {
let _dir = pushd(sourcegen::project_root()).unwrap();
let _e = pushenv("RUSTUP_TOOLCHAIN", "stable");

View file

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A free 2D physics sandbox game";
homepage = "http://powdertoy.co.uk/";
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
platforms = platforms.unix;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ abbradar siraben ];
mainProgram = "powder";

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "sndio";
version = "1.8.1";
version = "1.9.0";
src = fetchurl {
url = "https://www.sndio.org/sndio-${version}.tar.gz";
sha256 = "08b33bbrhbva1lyzzsj5k6ggcqzrfjfhb2n99a0b8b07kqc3f7gq";
sha256 = "sha256-8wgm/JwH42nTkk1fzt9qClPA30rh9atQ/pzygFQPaZo=";
};
nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "xpadneo";
version = "0.9.1";
version = "0.9.4";
src = fetchFromGitHub {
owner = "atar-axis";
repo = pname;
rev = "v${version}";
hash = "sha256-VUcS4OzvPj0o627ZWIOBqEAQJ4JuMCMjgaZoMkL/IHc=";
rev = "refs/tags/v${version}";
sha256 = "sha256-4zd+x9uYl0lJgePM9LEgLYFqvcw6VPF/CbR1XiYSwGE=";
};
setSourceRoot = ''
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Advanced Linux driver for Xbox One wireless controllers";
homepage = "https://atar-axis.github.io/xpadneo";
license = licenses.gpl3Plus;
license = licenses.gpl3Only;
maintainers = with maintainers; [ kira-bruneau ];
platforms = platforms.linux;
};

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "VictoriaMetrics";
version = "1.77.2";
version = "1.79.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-S0HXIjZI48A+tMv+gT8UfYqmCI4NOwWAFykfhW73WPc=";
sha256 = "sha256-+LirbGbKeazXMtgVh5kZP+KEk/fDbSxceZ26OlE0hbY=";
};
vendorSha256 = null;

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rss-bridge";
version = "2022-01-20";
version = "2022-06-14";
src = fetchFromGitHub {
owner = "RSS-Bridge";
repo = "rss-bridge";
rev = version;
sha256 = "sha256-wQW6U24TMnRxQ9zxdq8cMzO0OGX/re065YDhl1AbwO8=";
sha256 = "sha256-yH+m65CIZokZSbnv1zfpKC/Qr/mPPC6dG49Zn62X0l4=";
};
postPatch = ''

View file

@ -3,14 +3,14 @@ let
package = (import ./node.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; }).package;
in
package.override rec {
version = "1.26.0";
version = "1.27.0";
reconstructLock = true;
src = pkgs.fetchFromGitHub {
owner = "Koenkk";
repo = "zigbee2mqtt";
rev = version;
sha256 = "eK1Hk+P4pVfv5tk5Nl9GvUjGfcrYO+6mipkqFd8uA74=";
sha256 = "8qkoVXHXlvVK5GROVNhTkN52g9RQ/CuAMtDLq0Fx3T0=";
};
passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt;

File diff suppressed because it is too large Load diff

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "copilot-cli";
version = "1.19.0";
version = "1.20.0";
src = fetchFromGitHub {
owner = "aws";
repo = pname;
rev = "v${version}";
sha256 = "sha256-2zF/cBc6TjAcFAI3zJ0yBQrVWDK5nkxYYkb04bjSjgY=";
sha256 = "sha256-l6XFaM5eShXrpuZgTfzceNu8U7Z5WnKBi/qoimj/8HM=";
};
vendorSha256 = "sha256-1UFahXol1Lceccr/f24Mbhtk8bWyh4+Mb5VYZvF6VWs=";
vendorSha256 = "sha256-AXwiccfSxeX0NDIODEK+JvVjhcBNNpnZnLKGlDPWy48=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -16,14 +16,14 @@ let binPath = lib.makeBinPath [
];
in stdenv.mkDerivation rec {
pname = "debootstrap";
version = "1.0.126";
version = "1.0.127";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "installer-team";
repo = pname;
rev = version;
sha256 = "0hfx6k86kby4xf0xqskpllq00g159j4khh66hfi6dhcdb91dgyd7";
sha256 = "sha256-KKH9F0e4HEO2FFh1/V5UIY5C95ZOUm4nUhVUGqpZWaI=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "fclones";
version = "0.26.0";
version = "0.27.0";
src = fetchFromGitHub {
owner = "pkolaczk";
repo = pname;
rev = "v${version}";
sha256 = "sha256-GimCHMUUjD1q5CfKXKtucIs/HLIJZnIbp+wtN+/jjhY=";
sha256 = "sha256-SmYRhOxyptY/DVc+JRT9Yn52WRHOS0B5tfmrqp05hxE=";
};
cargoSha256 = "sha256-/qSaPvI4K9AinewMlsCp2funJrZtwvoBUQ6816NQ8zw=";
cargoSha256 = "sha256-chiKNVZg6sUN9s1fhWCk64UOsw0nXkrjopfkAFbZbwI=";
buildInputs = lib.optionals stdenv.isDarwin [
AppKit

View file

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "infracost";
version = "0.10.8";
version = "0.10.9";
src = fetchFromGitHub {
owner = "infracost";
rev = "v${version}";
repo = "infracost";
sha256 = "sha256-2jA6X/emjRl3hiy1riOUAhtb9gocs3rcs8i4TvzXXvc=";
sha256 = "sha256-qDMGeuNY/Y7A6ZGd6giztQrx4psUAjOamUbC0Z4H80k=";
};
vendorSha256 = "sha256-uoGkckOIEUa5aoiUMEY1f+emgLo8hyUqKtcNvOGPOMI=";
vendorSha256 = "sha256-ccoFTg5OYpaagyzb2lJLr6WlTO/L4YevXK09gZOELOw=";
ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ];

View file

@ -28,11 +28,11 @@
stdenv.mkDerivation rec {
pname = "apt";
version = "2.4.4";
version = "2.5.2";
src = fetchurl {
url = "mirror://debian/pool/main/a/apt/apt_${version}.tar.xz";
hash = "sha256-1tg9Ei3dfMg7LC+DmlWUDBOrk+XPYCSgENamtBENzw4=";
hash = "sha256-zFw3TCgxyeOQ2cXwgCmoHDyit3irwN0UJsgcZXYo/p0=";
};
nativeBuildInputs = [

View file

@ -13,7 +13,7 @@
buildGoModule rec {
pname = "gopass";
version = "1.14.3";
version = "1.14.4";
nativeBuildInputs = [ installShellFiles makeWrapper ];
@ -21,10 +21,10 @@ buildGoModule rec {
owner = "gopasspw";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Tep57FowoDWujgh0pyawzOu3w37cCWKAkb4SOT/5L10=";
sha256 = "sha256-UQvwkprHGez5qRpk6KodtgX99013rcezbgpaCateI4k=";
};
vendorSha256 = "sha256-8Ergb3qYCAlyYVQw6433jEi7cHiqwvwiZHIgnOS6D8w=";
vendorSha256 = "sha256-169KBsJhytzfOgIOHb54gEsLAmhVv+O64hP/DU6cT6A=";
subPackages = [ "." ];