mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-31 22:51:22 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
c69fbb8dc5
@ -11571,6 +11571,13 @@
|
||||
githubId = 2666479;
|
||||
name = "Y Nguyen";
|
||||
};
|
||||
superherointj = {
|
||||
name = "Sérgio G.";
|
||||
email = "5861043+superherointj@users.noreply.github.com";
|
||||
matrix = "@superherointj:matrix.org";
|
||||
github = "superherointj";
|
||||
githubId = 5861043;
|
||||
};
|
||||
SuperSandro2000 = {
|
||||
email = "sandro.jaeckel@gmail.com";
|
||||
matrix = "@sandro:supersandro.de";
|
||||
|
||||
@ -86,6 +86,15 @@ in
|
||||
and is set to be read only.
|
||||
'';
|
||||
};
|
||||
global.database_backend = mkOption {
|
||||
type = types.enum [ "sqlite" "rocksdb" ];
|
||||
default = "sqlite";
|
||||
example = "rocksdb";
|
||||
description = ''
|
||||
The database backend for the service. Switching it on an existing
|
||||
instance will require manual migration of data.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
default = {};
|
||||
|
||||
@ -16,7 +16,6 @@ import ./make-test-python.nix ({ pkgs, ...}: {
|
||||
frontend http
|
||||
bind *:80
|
||||
mode http
|
||||
option http-use-htx
|
||||
http-request use-service prometheus-exporter if { path /metrics }
|
||||
use_backend http_server
|
||||
'';
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||
name = "sway";
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ primeos synthetica ];
|
||||
@ -70,6 +68,14 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
enableOCR = true;
|
||||
|
||||
testScript = { nodes, ... }: ''
|
||||
import shlex
|
||||
|
||||
def swaymsg(command: str, succeed=True):
|
||||
with machine.nested(f"sending swaymsg {command!r}" + " (allowed to fail)" * (not succeed)):
|
||||
(machine.succeed if succeed else machine.execute)(
|
||||
f"su - alice -c {shlex.quote('swaymsg -- ' + command)}"
|
||||
)
|
||||
|
||||
start_all()
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
|
||||
@ -81,9 +87,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
machine.wait_for_file("/tmp/sway-ipc.sock")
|
||||
|
||||
# Test XWayland (foot does not support X):
|
||||
machine.succeed(
|
||||
"su - alice -c 'swaymsg exec WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY=invalid alacritty'"
|
||||
)
|
||||
swaymsg("exec WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY=invalid alacritty")
|
||||
machine.wait_for_text("alice@machine")
|
||||
machine.send_chars("test-x11\n")
|
||||
machine.wait_for_file("/tmp/test-x11-exit-ok")
|
||||
@ -107,9 +111,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
|
||||
# Test gpg-agent starting pinentry-gnome3 via D-Bus (tests if
|
||||
# $WAYLAND_DISPLAY is correctly imported into the D-Bus user env):
|
||||
machine.succeed(
|
||||
"su - alice -c 'swaymsg -- exec gpg --no-tty --yes --quick-generate-key test'"
|
||||
)
|
||||
swaymsg("exec gpg --no-tty --yes --quick-generate-key test")
|
||||
machine.wait_until_succeeds("pgrep --exact gpg")
|
||||
machine.wait_for_text("Passphrase")
|
||||
machine.screenshot("gpg_pinentry")
|
||||
@ -121,8 +123,15 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
machine.wait_for_text("You pressed the exit shortcut.")
|
||||
machine.screenshot("sway_exit")
|
||||
|
||||
swaymsg("exec swaylock")
|
||||
machine.wait_until_succeeds("pgrep -x swaylock")
|
||||
machine.sleep(3)
|
||||
machine.send_chars("${nodes.machine.config.users.users.alice.password}")
|
||||
machine.send_key("ret")
|
||||
machine.wait_until_fails("pgrep -x swaylock")
|
||||
|
||||
# Exit Sway and verify process exit status 0:
|
||||
machine.succeed("su - alice -c 'swaymsg exit || true'")
|
||||
swaymsg("exit", succeed=False)
|
||||
machine.wait_until_fails("pgrep -x sway")
|
||||
machine.wait_for_file("/tmp/sway-exit-ok")
|
||||
'';
|
||||
|
||||
@ -12,16 +12,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "electrs";
|
||||
version = "0.9.4";
|
||||
version = "0.9.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "romanz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-37KTcLFVzuXlLpz9INXbasUdzuY+T34ef8EtfczQ+D8=";
|
||||
hash = "sha256-6TR9OeIAVVbwDrshb9zHTS39x6taNWYK0UyRLbkW+g0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-aOSCpvejMUfSZCDwShqMPEc3vXw9ri2QvTaCuHODTwA=";
|
||||
cargoHash = "sha256-taOrbtx74DICvPLrwym70X3pv7EBA/H22VZmlxefANM=";
|
||||
|
||||
# needed for librocksdb-sys
|
||||
nativeBuildInputs = [ llvmPackages.clang ];
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lnd";
|
||||
version = "0.14.1-beta";
|
||||
version = "0.14.2-beta";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lightningnetwork";
|
||||
repo = "lnd";
|
||||
rev = "v${version}";
|
||||
sha256 = "0arm36682y4csdv9abqs0l8rgxkiqkamrps7q8wpyyg4n78yiij3";
|
||||
sha256 = "sha256-JOKitxxWcTlGlxYR1XpySZlI2fT9jgBrOxNUwT/sqdQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "13zhs0gb7chi0zz5rabmw3sd5fcpxc4s553crfcg7lrnbn5hcwzv";
|
||||
vendorSha256 = "sha256-shDmJcEyobY7Ih1MHMEY2GQnzAffsH/y4J1bme/bT7I=";
|
||||
|
||||
subPackages = [ "cmd/lncli" "cmd/lnd" ];
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hugo";
|
||||
version = "0.92.0";
|
||||
version = "0.92.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rzAt6jGj1MJ5AvkEKjAH91mKnUcLOPgHgiDkzkdibks=";
|
||||
sha256 = "sha256-fOurAHMDOEDdPSo1qCa6es7D0EZ+Zgucm43xwzAPYPI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ar5ctfKjqUuEM0mSygoQQFMgj0RURlvQu10dsCtGu3o=";
|
||||
vendorSha256 = "sha256-ZIbpzddgC1EHKia1KGWhQCSD663/0tK36GytsRpUB9c=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -161,21 +161,6 @@ let
|
||||
./patches/no-build-timestamps.patch
|
||||
# For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags:
|
||||
./patches/widevine-79.patch
|
||||
] ++ lib.optionals (versionRange "97" "98") [
|
||||
# A critical Ozone/Wayland fix:
|
||||
# (Note: The patch for surface_augmenter.cc doesn't apply on M97 so we extract that part.)
|
||||
(fetchpatch {
|
||||
# [linux/wayland] Fixed terminate caused by binding to wrong version.
|
||||
url = "https://github.com/chromium/chromium/commit/dd4c3ddadbb9869f59cee201a38e9ca3b9154f4d.patch";
|
||||
excludes = [ "ui/ozone/platform/wayland/host/surface_augmenter.cc" ];
|
||||
sha256 = "sha256-lp4kxPNAkafdE9NfD3ittTCpomRpX9Hqhtt9GFf4Ntw=";
|
||||
})
|
||||
./patches/m97-ozone-wayland-fix-surface_augmenter.patch
|
||||
(githubPatch {
|
||||
# [linux/wayland] Fixed terminate caused by binding to wrong version. (fixup)
|
||||
commit = "a84b79daa8897b822336b8f348ef4daaae07af37";
|
||||
sha256 = "sha256-2x6/rGGzTC6lKLMkVyD9RNCTsMVrtRQyr/NjSpaj2is=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
diff --git a/ui/ozone/platform/wayland/host/surface_augmenter.cc b/ui/ozone/platform/wayland/host/surface_augmenter.cc
|
||||
index d971d15e71426..6e5408398bcea 100644
|
||||
--- a/ui/ozone/platform/wayland/host/surface_augmenter.cc
|
||||
+++ b/ui/ozone/platform/wayland/host/surface_augmenter.cc
|
||||
@@ -13,7 +13,8 @@
|
||||
namespace ui {
|
||||
|
||||
namespace {
|
||||
-constexpr uint32_t kMaxSurfaceAugmenterVersion = 1;
|
||||
+constexpr uint32_t kMinVersion = 1;
|
||||
+constexpr uint32_t kMaxVersion = 1;
|
||||
}
|
||||
|
||||
// static
|
||||
@@ -27,11 +28,13 @@ void SurfaceAugmenter::Instantiate(WaylandConnection* connection,
|
||||
uint32_t version) {
|
||||
DCHECK_EQ(interface, kInterfaceName);
|
||||
|
||||
- if (connection->surface_augmenter_)
|
||||
+ if (connection->surface_augmenter_ ||
|
||||
+ !wl::CanBind(interface, version, kMinVersion, kMaxVersion)) {
|
||||
return;
|
||||
+ }
|
||||
|
||||
- auto augmenter = wl::Bind<surface_augmenter>(
|
||||
- registry, name, std::min(version, kMaxSurfaceAugmenterVersion));
|
||||
+ auto augmenter = wl::Bind<surface_augmenter>(registry, name,
|
||||
+ std::min(version, kMaxVersion));
|
||||
if (!augmenter) {
|
||||
LOG(ERROR) << "Failed to bind surface_augmenter";
|
||||
return;
|
||||
@ -19,22 +19,9 @@
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "98.0.4758.80",
|
||||
"sha256": "0wa1jhsw7qrym4x8wxmdvdvbilb8jdv0mizzib2342l61zi6cwn8",
|
||||
"sha256bin64": "12a69cbv2sbrly6g477ln4pssh8n1rdg6mr6cc17iy2jhfihry0q",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-12-07",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f",
|
||||
"sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh"
|
||||
}
|
||||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "99.0.4844.16",
|
||||
"sha256": "0xig6l1yx9glgb1a53idncnqc1imjvbszi5mrp39yvijarmx8s1f",
|
||||
"sha256bin64": "18p2hqykizijb9w96dm8yxwgvpjx37vabyw6n9wc59l6wyhbjkkw",
|
||||
"version": "99.0.4844.17",
|
||||
"sha256": "18bhfy64rz4bilbzml33856azwzq4bhiisc2jlbncdnmk3x6n71s",
|
||||
"sha256bin64": "1vaxcfgiww4skanny5ks431jyrnf0rgx7g850m29v8v49c3qflm8",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-01-10",
|
||||
@ -44,20 +31,33 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "97.0.4692.99",
|
||||
"sha256": "1fpc07zvashaqqalwn7wxnswxclrxvhjrxy1rzr6gcq5awhaw6y9",
|
||||
"sha256bin64": "18afashha667rzcscq3frkp5ixa7nrirs7i3061njqi4z9ql0cs8",
|
||||
"dev": {
|
||||
"version": "100.0.4867.0",
|
||||
"sha256": "1ay6p2aky90lf3gk3n87m4mrxyyhg4anr389kl648ijigsg6wlrd",
|
||||
"sha256bin64": "11g8rlw5aahpn4cd2fl4b942g1giv05zcs10y0qrvirnwmp2i3ha",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-11-03",
|
||||
"version": "2022-01-21",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "90294ccdcf9334ed25a76ac9b67689468e506342",
|
||||
"sha256": "0n0jml8s00ayy186jzrf207hbz70pxiq426znxwxd4gjcp60scsa"
|
||||
"rev": "0725d7827575b239594fbc8fd5192873a1d62f44",
|
||||
"sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr"
|
||||
}
|
||||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "98.0.4758.80",
|
||||
"sha256": "0wa1jhsw7qrym4x8wxmdvdvbilb8jdv0mizzib2342l61zi6cwn8",
|
||||
"sha256bin64": "0p2bh45ffgfhyh18bxw8fz4691g25s44lxxj4igk8b0bn71v1pgi",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-12-07",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f",
|
||||
"sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "97.0.4692.99-1",
|
||||
"sha256": "1jgxpp3wl24hq39291mgmdwcxbarxg4rpa6il53k8z3rf6gd2s4i"
|
||||
"rev": "98.0.4758.80-1",
|
||||
"sha256": "0a8y9yz6xyh025gk3dr0ndrdwmrslhd1ph2f8nivmqk61j7c2g8h"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
38
pkgs/applications/networking/cluster/cmctl/default.nix
Normal file
38
pkgs/applications/networking/cluster/cmctl/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ lib, buildGo117Module, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
buildGo117Module rec {
|
||||
pname = "cmctl";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cert-manager";
|
||||
repo = "cert-manager";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RO7YcGEfAQ9kTxfqgekYf6M5b6Fg64hCPLA/vt6IWp8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-4zhdpedOmLl/i1G0QCto4ACxguWRZLzOm5HfMBMtvPY=";
|
||||
|
||||
subPackages = [ "cmd/ctl" ];
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/ctl $out/bin/cmctl
|
||||
installShellCompletion --cmd cmctl \
|
||||
--bash <($out/bin/cmctl completion bash) \
|
||||
--fish <($out/bin/cmctl completion fish) \
|
||||
--zsh <($out/bin/cmctl completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A CLI tool for managing Cert-Manager service on Kubernetes clusters";
|
||||
downloadPage = "https://github.com/cert-manager/cert-manager";
|
||||
license = licenses.asl20;
|
||||
homepage = "https://cert-manager.io/";
|
||||
maintainers = with maintainers; [ superherointj ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -24,7 +24,7 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "5.29.1"; # Please backport all updates to the stable channel.
|
||||
version = "5.30.0"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "1a56mnmv0lnizmd4dl8fya3mdsy0jy5qr5bqb72m9cipq0069alc";
|
||||
sha256 = "sha256-+e3QzV4WIBOSGkpy6uk6vzIcNB5NpqQ05ZZfaoi58IU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -4,16 +4,16 @@ let
|
||||
common = { stname, target, postInstall ? "" }:
|
||||
buildGoModule rec {
|
||||
pname = stname;
|
||||
version = "1.18.6";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "syncthing";
|
||||
repo = "syncthing";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fkIHHyhwZV0/aB/JFwz3XrYVOaCn5ZK3ihY3GVoOAHg=";
|
||||
sha256 = "sha256-jQoY0mA/vAOCaCMR8Aapt49AF7HAmjPsr3MKLoaa24g=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-D16jlzP1amkiHW+/BqQV/DISf/H9MlZgvMJmlGtvrhg=";
|
||||
vendorSha256 = "sha256-hZcMt3LlK5FuhhlwCmYtlDAJv1QNK+YY7NvZaWMBuys=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -30,6 +30,11 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-O9jVDR7UROt5u8inUsZjbzB3dQTosiLYqXkeOyGrbaM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Required to fix the build with wlroots 0.15.1:
|
||||
./relax-the-version-constraint-for-wlroots.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
||||
@ -0,0 +1,29 @@
|
||||
From 21d8bfcf7899f5ec50b29f523ace4c19cbfbe919 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Weiss <dev.primeos@gmail.com>
|
||||
Date: Fri, 4 Feb 2022 21:17:05 +0100
|
||||
Subject: [PATCH] build: Relax the version constraint for wlroots to accept
|
||||
patch releases
|
||||
|
||||
Patch releases only contain backwards compatible changes (mainly bug
|
||||
fixes) so we want to allow them. This fixes the build with the recently
|
||||
released wlroots 0.15.1 and uses the same version constraints as other
|
||||
projects that depend on wlroots (e.g., Sway).
|
||||
---
|
||||
meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index f950b8e..1905dda 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -37,7 +37,7 @@ if git.found()
|
||||
endif
|
||||
add_project_arguments('-DLABWC_VERSION=@0@'.format(version), language: 'c')
|
||||
|
||||
-wlroots_version = ['=0.15.0']
|
||||
+wlroots_version = ['>=0.15.0', '<0.16.0']
|
||||
wlroots_proj = subproject(
|
||||
'wlroots',
|
||||
default_options: ['default_library=static', 'examples=false'],
|
||||
--
|
||||
2.34.1
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wayland-scanner
|
||||
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wayland-scanner, python3
|
||||
, wayland, libGL, mesa, libxkbcommon, cairo, libxcb
|
||||
, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev
|
||||
, colord, lcms2, pipewire ? null
|
||||
@ -10,14 +10,14 @@
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "weston";
|
||||
version = "9.0.0";
|
||||
version = "10.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "1zlql0xgiqc3pvgbpnnvj4xvpd91pwva8qf83xfb23if377ddxaw";
|
||||
sha256 = "1bj7wnadr7ssn6xw7k8ki0wpj6np3kjd2pcysfz3h0mr290rc8sw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ];
|
||||
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner python3 ];
|
||||
buildInputs = [
|
||||
wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm
|
||||
mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva
|
||||
|
||||
@ -17,14 +17,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libplacebo";
|
||||
version = "4.192.0";
|
||||
version = "4.192.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "code.videolan.org";
|
||||
owner = "videolan";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "19i7p9z8mmki5yq26059dp9055cccgxs0vfdlx0w1qak7pmv1vpm";
|
||||
sha256 = "13z2f0vwf9fgfzqgkqzvqwa8c8nkymrg5hv7xslfx53dacjfidhy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -38,7 +38,7 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
|
||||
|
||||
qtwebengine =
|
||||
let
|
||||
branchName = "5.15.7";
|
||||
branchName = "5.15.8";
|
||||
rev = "v${branchName}-lts";
|
||||
in
|
||||
{
|
||||
@ -46,7 +46,7 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/qt/qtwebengine.git";
|
||||
sha256 = "fssBN/CDgXAuiNj14MPeIDI15ZDRBGuF7wxSXns9exU=";
|
||||
sha256 = "04xhg5qpnxm8hzgkanml45za64c9i5pbxhki2l2wcq4b4y7f3hyr";
|
||||
inherit rev branchName;
|
||||
fetchSubmodules = true;
|
||||
leaveDotGit = true;
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wlroots";
|
||||
version = "0.15.0";
|
||||
version = "0.15.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "wlroots";
|
||||
repo = "wlroots";
|
||||
rev = version;
|
||||
sha256 = "0wdzs0wpv61pxgy3mx3xjsndyfmbj30v47d3w9ymmnd4r479n41n";
|
||||
sha256 = "sha256-MFR38UuB/wW7J9ODDUOfgTzKLse0SSMIRYTpEaEdRwM=";
|
||||
};
|
||||
|
||||
# $out for the library and $examples for the example programs (in examples):
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiogithubapi";
|
||||
version = "22.1.2";
|
||||
version = "22.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "ludeeus";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-n6OkyMh3HxsFY2zXqbpdvbv5NdFC+J30tW/tLEEaSeU=";
|
||||
sha256 = "sha256-2M0EcDs3WmgG2tusvnXK750+ALE93RktlPyQO36+Ojw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, buildPythonPackage
|
||||
, isPy27
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, pikepdf
|
||||
, pillow
|
||||
, stdenv
|
||||
@ -26,6 +27,15 @@ buildPythonPackage rec {
|
||||
sha256 = "sha256-jlHFBD76lddRSBtRYHGgBvh8KkBZlhqaxD7COJFd4J8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Disable tests broken by Pillow 9.0.0
|
||||
# https://gitlab.mister-muffin.de/josch/img2pdf/issues/130#issuecomment-586
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/debian/img2pdf/-/raw/f77fefc81e7c4b235c47ae6777d222d391c59536/debian/patches/pillow9";
|
||||
sha256 = "sha256-8giZCuv5PzSbrBQqslNqiLOhgxbg3LsdBVwt+DWnvh4=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pikepdf
|
||||
pillow
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jenkins-job-builder";
|
||||
version = "3.11.0";
|
||||
version = "3.12.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "42ea423f44beafee0e985009124968e300447f6e3be4180e83568cf21520d1b1";
|
||||
sha256 = "sha256-gpsot4LW1IBfYt8eb72WJqMzWEAMt4gqWOD1KhTQjds=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "renault-api";
|
||||
version = "0.1.7";
|
||||
version = "0.1.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "hacf-fr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-D0fsJ8mwBPcwuGuRkzgDTrwvnbe5yhilxTx49badKEQ=";
|
||||
sha256 = "sha256-gGr9yzcEgcte2uYhHzgmqT80JRJyRia31bK/v+42teU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ bokeh
|
||||
{ azure-core
|
||||
, bokeh
|
||||
, buildPythonPackage
|
||||
, click
|
||||
, configparser
|
||||
@ -11,6 +12,7 @@
|
||||
, jsonschema
|
||||
, lib
|
||||
, matplotlib
|
||||
, nbformat
|
||||
, pandas
|
||||
, pathtools
|
||||
, promise
|
||||
@ -35,13 +37,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wandb";
|
||||
version = "0.12.9";
|
||||
version = "0.12.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "client";
|
||||
rev = "v${version}";
|
||||
sha256 = "0704iv5dlsjs0gj6l4nx9hk9kzq46wlgd67ifw7i3qk6v4ljfs6y";
|
||||
sha256 = "198c6zx7xih74cw0dwfqw7s7b7whik7wv4nfq6x6xw0kw86r6hby";
|
||||
};
|
||||
|
||||
# The wandb requirements.txt does not distinguish python2/3 dependencies. We
|
||||
@ -74,10 +76,6 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Tests that require docker access, not possible in the nix build environment.
|
||||
"tests/launch/test_launch.py"
|
||||
"tests/launch/test_launch_cli.py"
|
||||
|
||||
# Tests that try to get chatty over sockets or spin up servers, not possible in the nix build environment.
|
||||
"tests/test_cli.py"
|
||||
"tests/test_data_types.py"
|
||||
@ -92,7 +90,6 @@ buildPythonPackage rec {
|
||||
"tests/test_metric_internal.py"
|
||||
"tests/test_mode_disabled.py"
|
||||
"tests/test_mp_full.py"
|
||||
"tests/test_notebooks.py"
|
||||
"tests/test_public_api.py"
|
||||
"tests/test_redir.py"
|
||||
"tests/test_runtime.py"
|
||||
@ -110,14 +107,19 @@ buildPythonPackage rec {
|
||||
|
||||
# Fails and borks the pytest runner as well.
|
||||
"tests/wandb_test.py"
|
||||
|
||||
# Tries to access /homeless-shelter
|
||||
"tests/test_tables.py"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
azure-core
|
||||
bokeh
|
||||
flask
|
||||
jsonref
|
||||
jsonschema
|
||||
matplotlib
|
||||
nbformat
|
||||
pandas
|
||||
pydantic
|
||||
pytest-mock
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
baseName = "scalafmt";
|
||||
version = "3.3.1";
|
||||
version = "3.4.0";
|
||||
deps = stdenv.mkDerivation {
|
||||
name = "${baseName}-deps-${version}";
|
||||
buildCommand = ''
|
||||
@ -13,7 +13,7 @@ let
|
||||
'';
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "hEfy8hNuWin7mKXs9yD9bEKHCVNuxrz5qasTeLOi1zY=";
|
||||
outputHash = "l5F09bjRev2eBHKTMzojC7+USkW7qf3YtA2KSoN7MxM=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2022.2.1";
|
||||
version = "2022.2.2";
|
||||
components = {
|
||||
"abode" = ps: with ps; [ abodepy ];
|
||||
"accuweather" = ps: with ps; [ accuweather ];
|
||||
|
||||
@ -121,7 +121,7 @@ let
|
||||
extraBuildInputs = extraPackages python.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2022.2.1";
|
||||
hassVersion = "2022.2.2";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -139,7 +139,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
hash = "sha256:1r2xwa4pdswl4wgbmhi2b87qqa6dn4gy31hpvwyqldvzpl0zjw0m";
|
||||
hash = "sha256:09hji1n6blnr10k5y1rhp4v66iz2gwfd7afcd0sz156kw4g5mq89";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "limesurvey";
|
||||
version = "3.23.7+201006";
|
||||
version = "3.27.33+220125";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LimeSurvey";
|
||||
repo = "LimeSurvey";
|
||||
rev = version;
|
||||
sha256 = "19p978p0flknsg3iqlrrbr76qsk5ha2a84nxywqsvjrjvqrh5jrc";
|
||||
sha256 = "sha256-iwTsn+glh8fwt1IaH9iDKDhEAnx1s1zvv1dmsdzUk8g=";
|
||||
};
|
||||
|
||||
phpConfig = writeText "config.php" ''
|
||||
@ -37,10 +37,5 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://www.limesurvey.org";
|
||||
maintainers = with maintainers; [offline];
|
||||
platforms = with platforms; unix;
|
||||
knownVulnerabilities = [
|
||||
# https://github.com/LimeSurvey/LimeSurvey/blob/3.x-LTS/docs/release_notes.txt
|
||||
"Unauthorized access to statistics of a survey with certain permission configurations"
|
||||
"Persistent XSS in browse response"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,22 +1,40 @@
|
||||
{ stdenv, lib, fetchFromGitLab, rustPlatform, }:
|
||||
{ stdenv, lib, fetchFromGitLab, rustPlatform, pkgs }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "matrix-conduit";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "famedly";
|
||||
repo = "conduit";
|
||||
rev = "v${version}";
|
||||
sha256 = "0k3313bnv399v738j1xja9hngsmi39r3vzvgwssl5c24yvkvskdr";
|
||||
sha256 = "sha256-jCBvenwXPgYms5Tbu16q/F8UNpvaw0Shao9kLEZLbHM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "0379dvc8m8clc9lrxd1x0aciqvcgv3hjq7xfspz3bh8aq2a43pcs";
|
||||
cargoSha256 = "sha256-fpjzc2HiWP6nV8YZOwxsIOhy4ht/tQqcvCkcLMIFUaQ=";
|
||||
|
||||
nativeBuildInputs = with pkgs; [
|
||||
clang
|
||||
llvmPackages.libclang
|
||||
];
|
||||
|
||||
buildInputs = with pkgs; [
|
||||
pkg-config
|
||||
clangStdenv
|
||||
llvmPackages.libclang.lib
|
||||
rocksdb
|
||||
];
|
||||
|
||||
preBuild = with pkgs; ''
|
||||
export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib";
|
||||
'';
|
||||
|
||||
cargoBuildFlags = "--bin conduit";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Matrix homeserver written in Rust";
|
||||
homepage = "https://conduit.rs/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ pstn piegames ];
|
||||
maintainers = with maintainers; [ pstn piegames pimeys ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -16,9 +16,9 @@ let
|
||||
owner = "gravitational";
|
||||
repo = "teleport";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/Dn2X1VMQI1OYHmvNDlAjrLI64DFxmVmS3PeEKLFVjQ=";
|
||||
sha256 = "sha256-ir2NMNIjSpv7l6dVNHczARg6b+doFofinsJy1smEC7o=";
|
||||
};
|
||||
version = "8.1.1";
|
||||
version = "8.1.3";
|
||||
|
||||
roleTester = rustPlatform.buildRustPackage {
|
||||
name = "teleport-roletester";
|
||||
@ -39,8 +39,8 @@ let
|
||||
webassets = fetchFromGitHub {
|
||||
owner = "gravitational";
|
||||
repo = "webassets";
|
||||
rev = "36ba49bb58dd6933d5ed5c9599e86d2b6c828137";
|
||||
sha256 = "sha256-XgH+IjTsaJUdM54Y+L8Rf/bt6y0vB4t8IcRES2EG70s=";
|
||||
rev = "ea3c67c941c56cfb6c228612e88100df09fb6f9c";
|
||||
sha256 = "sha256-oKvDXkxA73IJOi+ciBFVLkYcmeRUsTC+3rcYf64vDoY=";
|
||||
};
|
||||
in
|
||||
buildGo117Module rec {
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "diffoscope";
|
||||
version = "201";
|
||||
version = "202";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
|
||||
sha256 = "sha256-urvSZSpy5ksHhWqJM8ek0dyyKPeme/sJ16L6JfHg7Lg=";
|
||||
sha256 = "sha256-Cek5C55hCcD+zWGEDsL8Fx2nEJv1Ajy4UELMclysM/M=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
@ -50,7 +50,7 @@ python3Packages.buildPythonApplication rec {
|
||||
xz zip zstd
|
||||
]
|
||||
++ (with python3Packages; [
|
||||
argcomplete debian defusedxml jsondiff jsbeautifier libarchive-c
|
||||
argcomplete black debian defusedxml jsondiff jsbeautifier libarchive-c
|
||||
python_magic progressbar33 pypdf2 rpm tlsh
|
||||
])
|
||||
++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit dtc ]
|
||||
|
||||
@ -5,36 +5,45 @@
|
||||
, stdenv
|
||||
, pkg-config
|
||||
, openssl
|
||||
, just
|
||||
, pandoc
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dogdns";
|
||||
version = "0.1.0";
|
||||
version = "unstable-2021-10-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ogham";
|
||||
repo = "dog";
|
||||
rev = "v${version}";
|
||||
sha256 = "088ib0sncv0vrvnqfvxf5zc79v7pnxd2cmgp4378r6pmgax9z9zy";
|
||||
rev = "721440b12ef01a812abe5dc6ced69af6e221fad5";
|
||||
sha256 = "sha256-y3T0vXg7631FZ4bzcbQjz3Buui/DFxh9LG8BZWwynp0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ]
|
||||
nativeBuildInputs = [ installShellFiles just pandoc ]
|
||||
++ lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
cargoSha256 = "0zgzaq303zy8lymhldm6dpm5hwsxi2ph42zw5brvsdjmgm9ga0rb";
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
postBuild = ''
|
||||
just man
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-agepQVJbqbjzFbEBKbM7BNxc8FlklOrCsTgCAOcuptc=";
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion completions/dog.{bash,fish,zsh}
|
||||
installManPage ./target/man/*.1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command-line DNS client";
|
||||
homepage = "https://dns.lookup.dog";
|
||||
license = licenses.eupl12;
|
||||
maintainers = with maintainers; [ bbigras ];
|
||||
maintainers = with maintainers; [ bbigras ma27 ];
|
||||
mainProgram = "dog";
|
||||
};
|
||||
}
|
||||
|
||||
@ -11,11 +11,11 @@ assert usePcre -> pcre != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "haproxy";
|
||||
version = "2.3.14";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
|
||||
sha256 = "0ah6xsxlk1a7jsxdg0pbdhzhssz9ysrfxd3bs5hm1shql1jmqzh4";
|
||||
sha256 = "sha256-PpB5DfyDKvpspP30Uo3izi508+H3S+0NcK1UvVkg6VQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl zlib ]
|
||||
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||
"USE_SYSTEMD=yes"
|
||||
"USE_GETADDRINFO=1"
|
||||
] ++ lib.optionals withPrometheusExporter [
|
||||
"EXTRA_OBJS=contrib/prometheus-exporter/service-prometheus.o"
|
||||
"USE_PROMEX=yes"
|
||||
] ++ [ "CC=${stdenv.cc.targetPrefix}cc" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "step-cli";
|
||||
version = "0.17.7";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smallstep";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Qg71JcnA+20zme1ltG4J6qht4P46J5sHPjV3w4HCKPc=";
|
||||
sha256 = "sha256-kaOJHeTjn/f6teyssVXUEYh7cN4dCz6AtqlX+HkaPWQ=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@ -25,7 +25,7 @@ buildGoModule rec {
|
||||
rm command/certificate/remote_test.go
|
||||
'';
|
||||
|
||||
vendorSha256 = "sha256-kVvbSTybO23zb1ivCrjZqkM44ljPGD1GdBv76qCpTEQ=";
|
||||
vendorSha256 = "sha256-JrLJlqHrlPUqEA4COlfcK2eAcff8xc2JHU3acmlJ2zM=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc";
|
||||
|
||||
@ -24995,6 +24995,8 @@ with pkgs;
|
||||
|
||||
cmatrix = callPackage ../applications/misc/cmatrix { };
|
||||
|
||||
cmctl = callPackage ../applications/networking/cluster/cmctl { };
|
||||
|
||||
cmus = callPackage ../applications/audio/cmus {
|
||||
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio;
|
||||
libjack = libjack2;
|
||||
@ -29838,7 +29840,7 @@ with pkgs;
|
||||
|
||||
chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 {};
|
||||
|
||||
weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; };
|
||||
weston = callPackage ../applications/window-managers/weston { };
|
||||
|
||||
whalebird = callPackage ../applications/misc/whalebird {
|
||||
electron = electron_14;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user