Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-08-06 00:03:34 +00:00 committed by GitHub
commit 7735ca9858
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
57 changed files with 3004 additions and 146 deletions

View File

@ -103,7 +103,8 @@ let
fstab = pkgs.writeText "initrd-fstab" (lib.concatMapStringsSep "\n"
({ fsType, mountPoint, device, options, autoFormat, autoResize, ... }@fs: let
opts = options ++ optional autoFormat "x-systemd.makefs" ++ optional autoResize "x-systemd.growfs";
in "${device} /sysroot${mountPoint} ${fsType} ${lib.concatStringsSep "," opts}") fileSystems);
finalDevice = if (lib.elem "bind" options) then "/sysroot${device}" else device;
in "${finalDevice} /sysroot${mountPoint} ${fsType} ${lib.concatStringsSep "," opts}") fileSystems);
needMakefs = lib.any (fs: fs.autoFormat) fileSystems;
needGrowfs = lib.any (fs: fs.autoResize) fileSystems;

View File

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "pipecontrol";
version = "0.2.2";
version = "0.2.4";
src = fetchFromGitHub {
owner = "portaloffreedom";
repo = pname;
rev = "v${version}";
sha256 = "sha256-BeubRDx82MQX1gB7GnGJlQ2FyYX1S83C3gqPZgIjgoM=";
sha256 = "sha256-F3faJMkvjAY6A5ieNpAxjk6BHPb6uCvYYfwrI9/Iskg=";
};
nativeBuildInputs = [

View File

@ -2,12 +2,12 @@
let
pname = "plexamp";
version = "4.2.1";
version = "4.3.0";
src = fetchurl {
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
name="${pname}-${version}.AppImage";
sha512 = "S2/T+T24X6D0oTbGPMp2BVfWTvzsUCWS1xsigLT/vFr12PlZgPfOWgo987W3YE30WJJDdybLqnkTl+uhNndC+A==";
sha512 = "c9d2rp7tibb73tZdoFONW7eoy+u+GaUZ0RPhYWCBk5MYwtY81xrsdka64x60xzxOopWZ6JkmGs9AWI1XifqBTQ==";
};
appimageContents = appimageTools.extractType2 {
@ -33,7 +33,7 @@ in appimageTools.wrapType2 {
meta = with lib; {
description = "A beautiful Plex music player for audiophiles, curators, and hipsters";
homepage = "https://plexamp.com/";
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/44";
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/45";
license = licenses.unfree;
maintainers = with maintainers; [ killercup synthetica ];
platforms = [ "x86_64-linux" ];

View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "usql";
version = "0.11.12";
version = "0.12.0";
src = fetchFromGitHub {
owner = "xo";
repo = "usql";
rev = "v${version}";
sha256 = "sha256-0uXcCwMIhr+8snH3HqQ+ZXtTrYD6ufCTVaZPi1+RwUw=";
sha256 = "sha256-OOu3zWK/ccmaEVriXKl7SZUJLLYaJB3tgF+eR9p+TmM=";
};
vendorSha256 = "sha256-9XyG0Fu3idxGG01MoBr5BMoQSz+dyZFEXRNvvb+XWjA=";

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,36 @@
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, pkg-config
, openssl
}:
rustPlatform.buildRustPackage rec {
pname = "zine";
version = "0.6.0";
src = fetchFromGitHub {
owner = "zineland";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Pd/UAg6O9bOvrdvbY46Vf8cxFzjonEwcwPaaW59vH6E=";
};
cargoPatches = [ ./Cargo.lock.patch ]; # Repo does not provide Cargo.lock
cargoSha256 = "sha256-qpzBDyNSZblmdimnnL4T/wS+6EXpduJ1U2+bfxM7piM=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
openssl
];
meta = with lib; {
description = "A simple and opinionated tool to build your own magazine";
homepage = "https://github.com/zineland/zine";
license = licenses.asl20;
maintainers = with maintainers; [ dit7ya ];
};
}

View File

@ -7,7 +7,6 @@ enable_js_type_check=false
enable_mdns=false
enable_mse_mpeg2ts_stream_parser=true
enable_nacl=false
enable_one_click_signin=false
enable_reading_list=false
enable_remoting=false
enable_reporting=false

View File

@ -45,19 +45,19 @@
}
},
"ungoogled-chromium": {
"version": "103.0.5060.134",
"sha256": "0wdmy15602qxrb403p8yyx69k7py85fbawdsgap1l6z4h4j2g2p4",
"sha256bin64": "143jc70cyns2bh5cizy32fdsfl6hq22rphx216vywhncdsd96cnw",
"version": "104.0.5112.81",
"sha256": "0x17jzzvn2aqx3ahqyi6ijyn70sn79kg648r0ks9m5gib1bbgf0y",
"sha256bin64": null,
"deps": {
"gn": {
"version": "2022-05-11",
"version": "2022-06-08",
"url": "https://gn.googlesource.com/gn",
"rev": "578a7fe4c3c6b0bc2ae1fd2e37f14857d09895bf",
"sha256": "03dqfrdpf5xxl64dby3qmbwpzdq2gsa8g7xl438py3a629rgxg63"
"rev": "2ecd43a10266bd091c98e6dcde507c64f6a0dad3",
"sha256": "1q06vsz9b4bb764wy1wy8n177z2pgpm97kq3rl1hmq185mz5fhra"
},
"ungoogled-patches": {
"rev": "103.0.5060.134-1",
"sha256": "00mpmyaa8bqxf1f4vhk1waxhjbhcwab8m1x1vf341al64f6bmr1r"
"rev": "104.0.5112.81-1",
"sha256": "0dvwh470h06x5a4p8kw22pi4lvch16knh90i2kh10y0wfggqz78w"
}
}
}

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "argocd-autopilot";
version = "0.4.2";
version = "0.4.3";
src = fetchFromGitHub {
owner = "argoproj-labs";
repo = "argocd-autopilot";
rev = "v${version}";
sha256 = "sha256-xwcETaeoxnfZqW48IJRpJkONuPNuFR5ngUYAMDKWMtk=";
sha256 = "sha256-24PWSW0qXTUqAmIAb2a/cNs3y5lXnhvzp4y92OlIaxE=";
};
vendorSha256 = "sha256-rJj9GFNX9OUMzkdr9D9dzucSZe10iW2LpqybhXD0m6s=";

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cilium-cli";
version = "0.12.0";
version = "0.12.1";
src = fetchFromGitHub {
owner = "cilium";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/fVPo9aO2UhX/qsyjFUykFz4am7R2USmdvYqhQcT7q8=";
sha256 = "sha256-WCOZuHJBssRM75+EO9s11t7ASkLxHbsVe+qmb/glFWU=";
};
vendorSha256 = null;

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "civo";
version = "1.0.30";
version = "1.0.31";
src = fetchFromGitHub {
owner = "civo";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-7UEnp42IHW7CyfnUr+j8HP9qV1vtIk9j5mDOXOTi4LY=";
sha256 = "sha256-QyGsO8rvc+noAbG2IN4uvTaX1PGW5zHv3YRbYGm2Iq4=";
};
vendorSha256 = "sha256-2vbjYki+i7DfegvdTFo7XNf9droNeLDzAP2skpLDjDU=";
vendorSha256 = "sha256-2D+MJK8vf0AlLUHjR2elaHlIcvmrVovYsBfy0ax0aXg=";
CGO_ENABLED = 0;

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "k9s";
version = "0.26.1";
version = "0.26.3";
src = fetchFromGitHub {
owner = "derailed";
repo = "k9s";
rev = "v${version}";
sha256 = "sha256-Ta4gKtqYquylSLZ6pALYEnPXQG6jJuaabyr7sepNL5A=";
sha256 = "sha256-Czjx6YTyFKAP8ZuwBpTpRfjDdRdd8GQ0ggbe5LMb8uA=";
};
ldflags = [
@ -20,7 +20,7 @@ buildGoModule rec {
tags = [ "netgo" ];
vendorSha256 = "sha256-17jyQXF8O5iNFR/5L+51W3LcPrSQ6gPf9M6qqV4otn0=";
vendorSha256 = "sha256-rnROcJA4f0YjDGKEncrMmf/43VKrbgpmM3TvV1MMiWU=";
# TODO investigate why some config tests are failing
doCheck = !(stdenv.isDarwin && stdenv.isAarch64);

View File

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "kubeone";
version = "1.4.5";
version = "1.4.6";
src = fetchFromGitHub {
owner = "kubermatic";
repo = "kubeone";
rev = "v${version}";
sha256 = "sha256-2+67ctiFkEV4UU7vcF/s+qJWDpdzSRaiy9pa9zt+ccA=";
sha256 = "sha256-2abuKLAqOaRceokmNb7YG0qg/iYbPhSTG75Rs5mwHDU=";
};
vendorSha256 = "sha256-kI5i1us3Ooh603HOz9Y+HlfPUy/1J8z89/jvKEenpLw=";

View File

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "nerdctl";
version = "0.22.1";
version = "0.22.2";
src = fetchFromGitHub {
owner = "containerd";
repo = pname;
rev = "v${version}";
sha256 = "sha256-B9C35uxu/l4hFaSnjvXn7SChsCvXok/LcHkiwcndyts=";
sha256 = "sha256-D5NnCJrQQ2Iam9A5rxuiT6XOf00x/LOiwEC8SjSZdt0=";
};
vendorSha256 = "sha256-cwtjjb0a1VsZbTyz0TintD5Hdc8K0j7EBiE4UwhGU7c=";
vendorSha256 = "sha256-5QcltDNvhfyzUsFNbSjVnh0OMTxj+JU0VnDADSWTD48=";
nativeBuildInputs = [ makeWrapper installShellFiles ];

View File

@ -11,16 +11,16 @@
buildGoModule rec {
pname = "werf";
version = "1.2.144";
version = "1.2.146";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
sha256 = "sha256-5hfXHoU7hmiuLaS9nS6MAS6tJAmTwxE9VqBZ29hv56A=";
sha256 = "sha256-6OIV9vs0XWlhosWrKX/GL5q2REYzX5UMd1IHEiM1/qA=";
};
vendorSha256 = "sha256-m+qt+pqLzQyzQkKzEbBkzgTlRjpaqJNF8tcirBx4Htc=";
vendorSha256 = "sha256-yWKIaH0KXiJR1EVu/htqeDi7qEGu8IvD6m1GcMUdgJo=";
proxyVendor = true;

View File

@ -31,5 +31,8 @@ mkFranzDerivation' rec {
maintainers = with maintainers; [ davidtwco ma27 ];
platforms = [ "x86_64-linux" ];
hydraPlatforms = [ ];
knownVulnerabilities = [
"CVE-2022-32320"
];
};
}

View File

@ -40,6 +40,7 @@ python.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with python.pkgs; [
django
future
django-compressor
django-statici18n
django-webpack-loader
django-simple-captcha
@ -48,7 +49,6 @@ python.pkgs.buildPythonApplication rec {
mysqlclient
pillow
python-dateutil
django_compressor
djangorestframework
openpyxl
requests

View File

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#! nix-shell -I nixpkgs=../../../.. -i python3 -p bundix bundler nix-update nix nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log prefetch-yarn-deps
#! nix-shell -I nixpkgs=../../../.. -i python3 -p bundix bundler nix-update nix nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log python3Packages.packaging prefetch-yarn-deps
import click
import click_log
@ -10,7 +10,7 @@ import subprocess
import json
import pathlib
import tempfile
from distutils.version import LooseVersion
from packaging.version import Version
from typing import Iterable
import requests
@ -37,7 +37,7 @@ class GitLabRepo:
versions = list(filter(self.version_regex.match, tags))
# sort, but ignore v and -ee for sorting comparisons
versions.sort(key=lambda x: LooseVersion(x.replace("v", "").replace("-ee", "")), reverse=True)
versions.sort(key=lambda x: Version(x.replace("v", "").replace("-ee", "")), reverse=True)
return versions
def get_git_hash(self, rev: str):

View File

@ -10,13 +10,13 @@
buildGoModule rec {
pname = "containerd";
version = "1.6.6";
version = "1.6.7";
src = fetchFromGitHub {
owner = "containerd";
repo = "containerd";
rev = "v${version}";
sha256 = "sha256-cmarbad6VzcGTCHT/NtApkYsK/oo6WZQ//q8Fvh+ez8=";
sha256 = "sha256-JrpsASeDz6sUpYdBlkTvPdsl4LQ7PcUwFss5uWFEO84=";
};
vendorSha256 = null;

View File

@ -2,21 +2,22 @@
rustPlatform.buildRustPackage rec {
pname = "wasmtime";
version = "0.38.0";
version = "0.39.1";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = pname;
rev = "v${version}";
sha256 = "sha256-q+6w22MbI3HRpmkybZXXWbkK7jbd6lyxodC3EpSovRI=";
sha256 = "sha256-cU03wm1+V++mV7j7VyMtjAYrPldzTysNzpJ8m0q4Rx8=";
fetchSubmodules = true;
};
cargoSha256 = "sha256-uuhGb0/RDz1/3O8WYiyGIUQFh0WZWJgujqtvH+hgbdA=";
cargoSha256 = "sha256-DnThste0SbBdpGAUYhmwbdQFNEB3LozyDf0X8r2A90Q=";
doCheck = true;
checkFlags = [
"--skip=cli_tests::run_cwasm"
"--skip=commands::compile::test::test_unsupported_flags_compile"
"--skip=commands::compile::test::test_aarch64_flags_compile"
"--skip=commands::compile::test::test_successful_compile"
"--skip=commands::compile::test::test_x64_flags_compile"

View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "ncnn";
version = "20220721";
version = "20220729";
src = fetchFromGitHub {
owner = "Tencent";
repo = pname;
rev = version;
sha256 = "sha256-35OwvYYZtfugvujWl6bL8p8HU+z1kQsvnJ+aQOgO8V8=";
sha256 = "sha256-hZVeW3svuVpwQhQz67uqTPZ7B9pisLCwHhXB2zMLygo=";
};
patches = [

View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "qtstyleplugin-kvantum";
version = "1.0.3";
version = "1.0.4";
src = fetchFromGitHub {
owner = "tsujan";
repo = "Kvantum";
rev = "V${version}";
sha256 = "hY8QQVcP3E+GAdLOqtVbqCWBcxS2M6sMOr/vr+DryyQ=";
sha256 = "chdtcx73mfr/b1P3yVevx0m7HkMFzEYG7YLuhSyG7rk=";
};
nativeBuildInputs = [

View File

@ -4,11 +4,11 @@
lib.fix (self:
stdenv.mkDerivation rec {
pname = "xmlsec";
version = "1.2.33";
version = "1.2.34";
src = fetchurl {
url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz";
sha256 = "sha256-JgQdNaIKJF7Vovue4HXxCCVmTSdCIMtRkDQPqHpNCTE=";
sha256 = "sha256-Us7UlD81vX0IGKOCmMFSjKSsilRED9cRNKB9LRNwomI=";
};
patches = [

View File

@ -20,7 +20,7 @@
let
pname = "ansible";
version = "6.1.0";
version = "6.2.0";
in
buildPythonPackage {
inherit pname version;
@ -30,7 +30,7 @@ buildPythonPackage {
src = fetchPypi {
inherit pname version;
sha256 = "sha256-keSyOUXxkKqhI8a6T4rMuOf4kFmRvTuxm4mvvcpFaCI=";
sha256 = "sha256-va8rL9km/xifveL+/nI0cz8yw2/EEwM/pdk5RfvcBqY=";
};
postPatch = ''

View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "cock";
version = "0.9.0";
version = "0.10.0";
src = fetchPypi {
inherit pname version;
sha256 = "0d9021c2d9ce0dbf495a3c5ef960a9996a0681bb96ff6099f37302a3813a184e";
sha256 = "sha256-B6r6+b+x5vEp4+yfhV03dfjlVjRbW2W6Pm91PC0Tb+o=";
};
propagatedBuildInputs = [ click sortedcontainers pyyaml ];

View File

@ -0,0 +1,55 @@
{ lib
, buildPythonPackage
, fetchPypi
, rcssmin
, rjsmin
, django-appconf
, beautifulsoup4
, brotli
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "django-compressor";
version = "4.1";
format = "setuptools";
src = fetchPypi {
pname = "django_compressor";
inherit version;
hash = "sha256-js5iHSqY9sZjVIDLizcB24kKmfeT+VyiDLAKvBlNMx0=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "rcssmin == 1.1.0" "rcssmin>=1.1.0" \
--replace "rjsmin == 1.2.0" "rjsmin>=1.2.0"
'';
propagatedBuildInputs = [
rcssmin
rjsmin
django-appconf
];
pythonImportsCheck = [
"compressor"
];
doCheck = false; # missing package django-sekizai
checkInputs = [
beautifulsoup4
brotli
pytestCheckHook
];
DJANGO_SETTINGS_MODULE = "compressor.test_settings";
meta = with lib; {
description = "Compresses linked and inline JavaScript or CSS into single cached files";
homepage = "https://django-compressor.readthedocs.org/en/latest/";
license = licenses.mit;
maintainers = with maintainers; [ desiderius ];
};
}

View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, django-gravatar2, django_compressor
{ lib, buildPythonPackage, fetchPypi, django-gravatar2, django-compressor
, django-allauth, mailmanclient, django, mock
}:
@ -12,7 +12,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
django-gravatar2 django_compressor django-allauth mailmanclient
django-gravatar2 django-compressor django-allauth mailmanclient
];
checkInputs = [ django mock ];

View File

@ -1,29 +0,0 @@
{ lib, buildPythonPackage, fetchPypi,
rcssmin, rjsmin, django-appconf }:
buildPythonPackage rec {
pname = "django_compressor";
version = "4.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-HbkbbQQpNjami9Eyjce7kNY2sClfZ7HMbU+hArn9JfY=";
};
postPatch = ''
substituteInPlace setup.py \
--replace 'rcssmin == 1.0.6' 'rcssmin' \
--replace 'rjsmin == 1.1.0' 'rjsmin'
'';
# requires django-sekizai, which we don't have packaged yet
doCheck = false;
propagatedBuildInputs = [ rcssmin rjsmin django-appconf ];
meta = with lib; {
description = "Compresses linked and inline JavaScript or CSS into single cached files";
homepage = "https://django-compressor.readthedocs.org/en/latest/";
license = licenses.mit;
maintainers = with maintainers; [ desiderius ];
};
}

View File

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "nclib";
version = "1.0.1";
version = "1.0.2";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "9d41adb7df01a3fead10bc9698a175936b263d6bd18997078ed17e4fa61734d1";
sha256 = "sha256-rA8oeYvMhw8HURxPLBRqpMHnAez/xBjyPFoKXIIvBjg=";
};
# Project has no tests

View File

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "nocasedict";
version = "1.0.3";
version = "1.0.4";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-giC5e6BrCOst7e13TEBsd+DKDVNSrnEkn2+dHyoXvXs=";
sha256 = "sha256-fBEdpM79JEQzy2M3ev8IGkD4S92unm83bGfwhsD4Bto=";
};
propagatedBuildInputs = [

View File

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "nocaselist";
version = "1.0.5";
version = "1.0.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-4cEsoq6dNFs0lI8sj2DjiUYZ4r4u0otOzF5/HeoRfR0=";
sha256 = "sha256-SPBn+MuEEkXzTQMSC8G6mQDxOxnLUbzGx77gF/fIdNo=";
};
checkInputs = [

View File

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "pytest-mpl";
version = "0.16.0";
version = "0.16.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-TTqagfB15FEAxk+VWsEfaELT+B6Tw0wtXFi3wD2kD/0=";
sha256 = "sha256-LVcWgRJOj/X04rnA0EfTfQSZ1rbY8vSaG1DN2ZMQRGk=";
};
nativeBuildInputs = [

View File

@ -1,11 +1,11 @@
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "rcssmin";
version = "1.1.0";
version = "1.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "27fc400627fd3d328b7fe95af2a01f5d0af6b5af39731af5d071826a1f08e362";
sha256 = "sha256-T5QAtDZtKfX1RG9Y54VJr6gzjmpZdAxzEV6fasQT3GQ=";
};
# The package does not ship tests, and the setup machinary confuses

View File

@ -1,11 +1,11 @@
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "rjsmin";
version = "1.2.0";
version = "1.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "6c529feb6c400984452494c52dd9fdf59185afeacca2afc5174a28ab37751a1b";
sha256 = "sha256-H5gr6OARQ4d3qUMHJ5tAE0o5NfwPB5MS7imXJbivVBE=";
};
# The package does not ship tests, and the setup machinary confuses

View File

@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "setuptools-declarative-requirements";
version = "1.2.0";
version = "1.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "1l8zmcnp9h8sp8hsw7b81djaa1a9yig0y7i4phh5pihqz1gdn7yi";
sha256 = "sha256-V6W5u5rTUMJ46Kpr5M3rvNklubpx1qcSoXimGM+4mPc=";
};
buildInputs = [ setuptools-scm ];

View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "zeroc-ice";
version = "3.7.7";
version = "3.7.8";
src = fetchPypi {
inherit version pname;
sha256 = "415f4a673009fe9a5ef67b61c4469ddf14b73857b6d40f02d6b74f02ad935147";
sha256 = "sha256-kodRHIkMXdFUBGNVRtSyjbVqGQRxPaHqgp6ddFT5ZIY=";
};
buildInputs = [ openssl bzip2 ];

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tflint";
version = "0.39.1";
version = "0.39.2";
src = fetchFromGitHub {
owner = "terraform-linters";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ELf1keTf/iznOBZNvyliAH/4UQo5w8CNEJNf0Z6eDV8=";
sha256 = "sha256-TOI3rkh6v0Ewo+gPo8N7at1orbSTjQkEZKA6sYDv0u8=";
};
vendorSha256 = "sha256-6sk1bFuSCrKt9uMrrwOpX/SBZrjFvtqVPFylbRNHpz4=";

View File

@ -14,13 +14,13 @@
buildGoModule rec {
pname = "buildah";
version = "1.26.2";
version = "1.26.4";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
sha256 = "sha256-FQ0fYiQBz+Ba8Xe8PWIYpIKyWOYa+NlTNJqzBC64O6M=";
sha256 = "sha256-9cTV1CEf1784oEPns5QULFtcC+w3yU4uafnMCCgpVqQ=";
};
outputs = [ "out" "man" ];

View File

@ -1,4 +1,4 @@
{ lib, buildGoModule, callPackage, fetchFromGitHub }:
{ lib, buildGoModule, callPackage, fetchFromGitHub, fetchpatch }:
let
common = callPackage ./common.nix { };
in
@ -7,6 +7,16 @@ buildGoModule {
inherit (common) version src ldflags postBuild;
vendorSha256 = null;
patches = [
# Fixes https://github.com/NixOS/nixpkgs/issues/184875, until a new version
# is released.
(fetchpatch {
name = "display-system-ca-error-only-if-there-is-an-error.patch";
url = "https://github.com/woodpecker-ci/woodpecker/commit/1fb800329488de74c9db7cfc5dc43fb5a4efbad8.patch";
sha256 = "sha256-wKI/7PhbxsAD/qrl4nnkHyyQhQcvGlySysnxytGJzfU=";
})
];
subPackages = "cmd/cli";
CGO_ENABLED = 0;

View File

@ -0,0 +1,28 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "cuelsp";
version = "0.3.3";
src = fetchFromGitHub {
owner = "dagger";
repo = "cuelsp";
rev = "v${version}";
sha256 = "sha256-78snbfxm6nSNDQRhj7cC4FSkKeOEUw+wfjhJtP/CpwY=";
};
vendorSha256 = "sha256-zg4aXPY2InY5VEX1GLJkGhMlfa5EezObAjIuX/bGvlc=";
doCheck = false;
subPackages = [
"cmd/cuelsp"
];
meta = with lib; {
description = "Language Server implementation for CUE, with built-in support for Dagger";
homepage = "https://github.com/dagger/cuelsp";
license = licenses.asl20;
maintainers = with maintainers; [ sagikazarmark ];
};
}

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "earthly";
version = "0.6.20";
version = "0.6.21";
src = fetchFromGitHub {
owner = "earthly";
repo = "earthly";
rev = "v${version}";
sha256 = "sha256-2tdmAoHh9sqX3zWrerNqnwluQB79iZHPuE0xsPOB09w=";
sha256 = "sha256-i/iMrIvslxK+iqTKL7vEZc1ir8A9a0WVQ0J/KfSGyxo=";
};
vendorSha256 = "sha256-LHpmzQeonLFLCs2D1gRACZSdAtRkzzQ7Ftq/2D+PI80=";
vendorSha256 = "sha256-oK8fWi7zThzd1TrN6yd08T9QyVCOA4SAKZ2OPJTcgY8=";
ldflags = [
"-s" "-w"

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "go-task";
version = "3.14.0";
version = "3.14.1";
src = fetchFromGitHub {
owner = pname;
repo = "task";
rev = "v${version}";
sha256 = "sha256-J/pWx/osqP29GERBdzWwPNeA4Rzo6CYdW7GrmspevwM=";
sha256 = "sha256-GbCrMsMxhSjJOsZX4Gq9ZzBJ+F5vXDMi9vSyFrHNt44=";
};
vendorSha256 = "sha256-NlQ/5ibRgmuGDcuiUdzvuexYGnR/34v9fw1DUe3yXxE=";
vendorSha256 = "sha256-xp1s1aixPyXq9oVD8IZYSlUiL8UkIx5c8gYJRpIRD7I=";
doCheck = false;

View File

@ -7,15 +7,15 @@
python3.pkgs.buildPythonApplication rec {
pname = "pokete";
version = "0.8.0";
version = "0.8.2";
format = "other";
src = fetchFromGitHub {
owner = "lxgr-linux";
repo = "pokete";
rev = version;
sha256 = "sha256-DDKqxscXtl/i+YKiXAoFHXsGBQpcUvyHfOqwpe0hSgg=";
rev = "v${version}";
sha256 = "sha256-carQ/m7akdXLO4h5o0cE0EiQmsAyarMAV4AtG3KATYQ=";
};
pythonPath = with python3.pkgs; [

View File

@ -1,23 +1,23 @@
{ fetchurl, fetchzip }:
{
x86_64-darwin = fetchzip {
sha256 = "sha256-PYq6AKX3Ifo8vMnPYGjqHwFejOBuQjhfDG5nXnccfvE=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.8/AdGuardHome_darwin_amd64.zip";
sha256 = "sha256-SLGzciTzzvW0DTG8v6lNb1IovbOjxBFgFVjNY6MEyKY=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.9/AdGuardHome_darwin_amd64.zip";
};
aarch64-darwin = fetchzip {
sha256 = "sha256-ep5/VMO7LmfD6+chG2SGwkc5awoeqACQeP04YpMXI1s=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.8/AdGuardHome_darwin_arm64.zip";
sha256 = "sha256-d7hnCM7BJuYfSH89jv516uVyKTMueQmVKQxEeTGIDUE=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.9/AdGuardHome_darwin_arm64.zip";
};
i686-linux = fetchurl {
sha256 = "sha256-rD5UDkAMeBfnrEpxfZWgDQEUN+82D6Ul2gjclS8A8CU=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.8/AdGuardHome_linux_386.tar.gz";
sha256 = "sha256-wTmUF6NHWis4dyw/bPjAjvZ0aQ1l1BCDlm6eLu4m/0o=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.9/AdGuardHome_linux_386.tar.gz";
};
x86_64-linux = fetchurl {
sha256 = "sha256-buBp5WZ1jIzQDbxzVOZC/t3iv1Dw0P/PN3wGBbGaYvU=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.8/AdGuardHome_linux_amd64.tar.gz";
sha256 = "sha256-Mxe9Gb1ErrZZl3a+0SqC/0ghoeV51X93YxIOs9gM2lY=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.9/AdGuardHome_linux_amd64.tar.gz";
};
aarch64-linux = fetchurl {
sha256 = "sha256-d6Z46L6qeXi5UNPY3/nlTJvVCuQ0lamtR49Z73O87Wc=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.8/AdGuardHome_linux_arm64.tar.gz";
sha256 = "sha256-SyHuzXAe24Nf0v9Ds3Z+cbXoIVLCJSj243I6B0XWBlM=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.9/AdGuardHome_linux_arm64.tar.gz";
};
}

View File

@ -7,7 +7,7 @@ in
stdenv.mkDerivation rec {
pname = "adguardhome";
version = "0.107.8";
version = "0.107.9";
src = sources.${system} or (throw "Source for ${pname} is not available for ${system}");
installPhase = ''

View File

@ -46,7 +46,7 @@ buildPythonPackage rec {
django-haystack
django-mailman3
django-q
django_compressor
django-compressor
django-extensions
djangorestframework
flufl_lock

View File

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "cadvisor";
version = "0.44.1";
version = "0.45.0";
src = fetchFromGitHub {
owner = "google";
repo = "cadvisor";
rev = "v${version}";
sha256 = "sha256-OVUKQGP9zzlzoC/25BHNbJuP6ELstBMaRFAzUnDSR0U=";
sha256 = "sha256-hH3unhGRrB8IegVaX+j2idY0woMqzchEEXZB/ppzIf0=";
};
modRoot = "./cmd";
vendorSha256 = "sha256-LGMouB76GT/ZvG3kLoo/jmnHT0CEeND9pObTOKaS9T0=";
vendorSha256 = "sha256-Mcelh/nYFcNTrI1Kq9KqkJeSnbgJhd7HfbexhNYbPFg=";
ldflags = [ "-s" "-w" "-X github.com/google/cadvisor/version.Version=${version}" ];

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "soft-serve";
version = "0.3.2";
version = "0.3.3";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = "soft-serve";
rev = "v${version}";
sha256 = "sha256-W/2MNiECzwgRv3jJG0To8vsQjQs8amaEP+dgig6JnOg=";
sha256 = "sha256-LxtVum/yM+G3lyGSsOv3bICQrQC6kZKIMoAA7AnQ8VY=";
};
vendorSha256 = "sha256-98YT0UiVX+ONP+Vgsxf0UWOLF0VV4glEOfHYkGwB3Dg=";
vendorSha256 = "sha256-KUB6w03Dw57baRYhRK1wWVWFvjMLx3KOJnS/YLbE7GE=";
doCheck = false;

View File

@ -38,7 +38,7 @@ py.pkgs.buildPythonApplication rec {
cronsim
cryptography
django
django_compressor
django-compressor
fido2
minio
psycopg2

View File

@ -15,7 +15,7 @@
let
pname = "wallabag";
version = "2.5.0";
version = "2.5.1";
in
stdenv.mkDerivation {
inherit pname version;
@ -23,7 +23,7 @@ stdenv.mkDerivation {
# GitHub distribution does not include vendored files
src = fetchurl {
url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz";
hash = "sha256-fE/4bVwImQ03wrfdrx6AlulO2xU1M2HIaSOGpTAb02E=";
hash = "sha256-vurjWI5Sh/SFPtxd5cHaaw7edcAzNub/duhOUF+Wshk=";
};
patches = [

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wordpress";
version = "6.0";
version = "6.0.1";
src = fetchurl {
url = "https://wordpress.org/${pname}-${version}.tar.gz";
sha256 = "sha256-GIfzIj2wHW2Ijfd+oLO43eTGJDlhprSG0b7hvpMkvwg=";
sha256 = "sha256-9nhZaASqidfNySgIYpOEZOqyWurr/vqRrhdeFao+8FQ=";
};
installPhase = ''

View File

@ -33,7 +33,7 @@ xorg,
}:
let
version = "1.32.5";
version = "1.32.6";
rpath = lib.makeLibraryPath [
alsa-lib
@ -82,7 +82,7 @@ let
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb";
sha256 = "sha256-ANktXRokO0rIkiSj6OQDepB+UfTItBMDkEhD9ia52s4=";
sha256 = "sha256-lrdDy8wtkIBQC/OPdSoKmOFIuajKeu1qtyRHOLZSSVI=";
}
else
throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";

View File

@ -0,0 +1,26 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "sipexer";
version = "1.0.3";
src = fetchFromGitHub {
owner = "miconda";
repo = pname;
rev = "v${version}";
sha256 = "sha256-cM40hxHMBH0wT1prSRipAZscSBxkZX7riwCrnLQUT0k=";
};
vendorSha256 = "sha256-q2uNqKZc6Zye7YimPDrg40o68Fo4ux4fygjVjJdhqQU=";
meta = with lib; {
description = "Modern and flexible SIP CLI tool";
homepage = "https://github.com/miconda/sipexer";
changelog = "https://github.com/miconda/sipexer/releases/tag/v${version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ astro ];
};
}

View File

@ -18,13 +18,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "strongswan";
version = "5.9.5"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading!
version = "5.9.7"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading!
src = fetchFromGitHub {
owner = "strongswan";
repo = "strongswan";
rev = version;
sha256 = "sha256-Jx0Wd/xgkl/WrBfcEvZPogPAQp0MW9HE+AQR2anP5Vo=";
sha256 = "sha256-4FOeY3a6DyftrbFtBqtY0nLxdIXPnY91wMAVIBm/KvY=";
};
dontPatchELF = true;

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cosign";
version = "1.10.0";
version = "1.10.1";
src = fetchFromGitHub {
owner = "sigstore";
repo = pname;
rev = "v${version}";
sha256 = "sha256-EJ1NOaGLLBkEkWLWn8wfyFA6Kgsb9mctkw4G2um9cWE=";
sha256 = "sha256-DMNjzTor22uyTzieWsni9wvscfU7uCFuf3AXOYP4LRo=";
};
buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite)
@ -16,7 +16,7 @@ buildGoModule rec {
nativeBuildInputs = [ pkg-config installShellFiles ];
vendorSha256 = "sha256-JL7bqdLrNwOQPVUhlIktRM1cAPycq0PVpB1xXXiJiKM=";
vendorSha256 = "sha256-onRfo3ZK/+uEa0xR7P9IlEsd2aXy9foJjZl0UBO/cbs=";
subPackages = [
"cmd/cosign"

View File

@ -2307,6 +2307,8 @@ with pkgs;
cue = callPackage ../development/tools/cue { };
cuelsp = callPackage ../development/tools/cuelsp {};
cyclone-scheme = callPackage ../development/interpreters/cyclone { };
cyclonedx-python = callPackage ../tools/misc/cyclonedx-python { };
@ -10663,6 +10665,8 @@ with pkgs;
simplescreenrecorder = libsForQt5.callPackage ../applications/video/simplescreenrecorder { };
sipexer = callPackage ../tools/networking/sipexer { };
sipsak = callPackage ../tools/networking/sipsak { };
sipvicious = python3Packages.callPackage ../tools/security/sipvicious { };
@ -31797,6 +31801,8 @@ with pkgs;
zim = callPackage ../applications/office/zim { };
zine = callPackage ../applications/misc/zine { };
zita-ajbridge = callPackage ../applications/audio/zita-ajbridge { };
zita-at1 = callPackage ../applications/audio/zita-at1 { };

View File

@ -2386,7 +2386,7 @@ in {
django_compat = callPackage ../development/python-modules/django-compat { };
django_compressor = callPackage ../development/python-modules/django_compressor { };
django-compressor = callPackage ../development/python-modules/django-compressor { };
django-configurations = callPackage ../development/python-modules/django-configurations { };