Merge master into staging-next

This commit is contained in:
github-actions[bot]
2023-12-16 18:00:55 +00:00
committed by GitHub
49 changed files with 175 additions and 121 deletions
+1 -1
View File
@@ -591,7 +591,7 @@ See also the section about [`passthru.tests`](#var-meta-tests).
`stdenv.mkDerivation` sets the Nix [derivation](https://nixos.org/manual/nix/stable/expressions/derivations.html#derivations)'s builder to a script that loads the stdenv `setup.sh` bash library and calls `genericBuild`. Most packaging functions rely on this default builder.
This generic command invokes a number of *phases*. Package builds are split into phases to make it easier to override specific parts of the build (e.g., unpacking the sources or installing the binaries).
This generic command either invokes a script at *buildCommandPath*, or a *buildCommand*, or a number of *phases*. Package builds are split into phases to make it easier to override specific parts of the build (e.g., unpacking the sources or installing the binaries).
Each phase can be overridden in its entirety either by setting the environment variable `namePhase` to a string containing some shell commands to be executed, or by redefining the shell function `namePhase`. The former is convenient to override a phase from the derivation, while the latter is convenient from a build script. However, typically one only wants to *add* some commands to a phase, e.g. by defining `postInstall` or `preFixup`, as skipping some of the default actions may have unexpected consequences. The default script for each phase is defined in the file `pkgs/stdenv/generic/setup.sh`.
+10
View File
@@ -10730,6 +10730,16 @@
githubId = 8555953;
name = "Laure Tavard";
};
ltstf1re = {
email = "ltstf1re@disroot.org";
github = "lsf1re";
githubId = 153414530;
matrix = "@ltstf1re:converser.eu";
name = "Little Starfire";
keys = [{
fingerprint = "FE6C C3C9 2ACF 4367 2B56 5B22 8603 2ACC 051A 873D";
}];
};
lu15w1r7h = {
email = "lwirth2000@gmail.com";
github = "LU15W1R7H";
+1
View File
@@ -18,6 +18,7 @@ in
};
config = lib.mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
networking.firewall.allowedUDPPorts = lib.optionals cfg.openFirewall [ 5678 ];
};
}
@@ -6599,18 +6599,6 @@ final: prev:
meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
};
nlua-nvim = buildVimPlugin {
pname = "nlua.nvim";
version = "2022-12-20";
src = fetchFromGitHub {
owner = "tjdevries";
repo = "nlua.nvim";
rev = "01aa428ff00605d52d0c0ece560f6a6d7971726b";
sha256 = "1v80qmhhqc1frpvnz42wa84qaz6xkasyrz59aisifp1vqcn01lgk";
};
meta.homepage = "https://github.com/tjdevries/nlua.nvim/";
};
nnn-vim = buildVimPlugin {
pname = "nnn.vim";
version = "2023-05-23";
@@ -554,7 +554,6 @@ https://github.com/EdenEast/nightfox.nvim/,,
https://github.com/zah/nim.vim/,,
https://github.com/figsoda/nix-develop.nvim/,HEAD,
https://github.com/tamago324/nlsp-settings.nvim/,main,
https://github.com/tjdevries/nlua.nvim/,,
https://github.com/mcchrish/nnn.vim/,,
https://github.com/shortcuts/no-neck-pain.nvim/,HEAD,
https://github.com/folke/noice.nvim/,HEAD,
+2 -2
View File
@@ -38,14 +38,14 @@ let
in
stdenv.mkDerivation rec {
pname = "mame";
version = "0.260";
version = "0.261";
srcVersion = builtins.replaceStrings [ "." ] [ "" ] version;
src = fetchFromGitHub {
owner = "mamedev";
repo = "mame";
rev = "mame${srcVersion}";
hash = "sha256-spWnaf7xXK2xzgdUagsgN5doVrpJk7EA6fzYd9FlFm0=";
hash = "sha256-Tbsu4dYOBGwsPW94W0xN2+t4vqb1cWI7J1C2l6WU3qI=";
};
outputs = [ "out" "tools" ];
@@ -2,30 +2,30 @@
let
versions =
if stdenv.isLinux then {
stable = "0.0.37";
ptb = "0.0.59";
canary = "0.0.213";
stable = "0.0.38";
ptb = "0.0.61";
canary = "0.0.224";
development = "0.0.1";
} else {
stable = "0.0.287";
ptb = "0.0.90";
canary = "0.0.365";
development = "0.0.10";
stable = "0.0.289";
ptb = "0.0.91";
canary = "0.0.374";
development = "0.0.15";
};
version = versions.${branch};
srcs = rec {
x86_64-linux = {
stable = fetchurl {
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
hash = "sha256-uyflZ1Zks7M1Re6DxuNUAkIuPY4wFSydf2AGMtIube8=";
hash = "sha256-0i3xtArA/5LDyGiNQ/FjV3tU7Jzs8E6ZRuSUFNEJyDo=";
};
ptb = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
hash = "sha256-WhDEyRMjuy2e1N51tUj3v97Y0qWabCFPThaehadXFWs=";
hash = "sha256-wyP1a1bMpMx3m61EA6vtak1K4HOtCl6eMjh1DlHz5J8=";
};
canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
hash = "sha256-DGRq58Xj5p/7BunY/vFds9LVmxYOl9LcF8ESHrCLly4=";
hash = "sha256-SDF4woekFmy6VUqYTfSZi4aqtZ5ARgaex6+8qOMSHMQ=";
};
development = fetchurl {
url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
@@ -35,19 +35,19 @@ let
x86_64-darwin = {
stable = fetchurl {
url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg";
hash = "sha256-DTkWrUgSYP98IVFTWcm4muRR91Kfvs5pBxc1tvPmj/s=";
hash = "sha256-3XaiaWdP7GSnMeR6yU5lfeumrVm6WpUmitVuSs+xAvE=";
};
ptb = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
hash = "sha256-wOTgcHRUu/CjdnvQVNL+rkazhVbZjwI+UbfmsF6aveg=";
hash = "sha256-8pAoi8rAaHC17GxlDGEJxGX726qRe1LVMTQK6SngniM=";
};
canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
hash = "sha256-a4MyO2Wst+ZYNSpUaF0TXJKtDQcPRLehapwRzp10R2k=";
hash = "sha256-CiE33dAcX/aAjOncpX62KX+XfrRd5FgH8qQ2picwe6Q=";
};
development = fetchurl {
url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
hash = "sha256-FoYRW5SaR/53yKs/T2XKVKQevA3MxMWAJFjixtwsEF4=";
hash = "sha256-Fxxrjkj3W1MagT4rCxVEtip1W9MImsdQOuHXKPKsEtM=";
};
};
aarch64-darwin = x86_64-darwin;
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "hut";
version = "0.3.0";
version = "0.4.0";
src = fetchFromSourcehut {
owner = "~emersion";
repo = "hut";
rev = "v${version}";
sha256 = "sha256-kr5EWQ3zHUp/oNPZV2d3j9AyoEmHEX8/rETiMKTBi3s=";
sha256 = "sha256-9RSJ+SRXYBjdiuHScgFm5i0/Xi81pJfURPKAGCk+l04=";
};
vendorHash = "sha256-aoqGb7g8UEC/ydmL3GbWGy3HDD1kfDJOMeUP4nO9waA=";
vendorHash = "sha256-OxnplvBx2sFctdNSVd0S0tgiRt5Yah3ga4mORT2Kz6U=";
nativeBuildInputs = [
scdoc
@@ -3,11 +3,11 @@
buildKodiAddon rec {
pname = "urllib3";
namespace = "script.module.urllib3";
version = "1.26.16+matrix.1";
version = "2.1.0";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-HI99Cle/SpwulbDCVoDNy/0EfHVt4q7+LR60YRMaSFY=";
sha256 = "sha256-UCvkeguxytPoP1gIIt8N79TVs98ATzsfrRSabtbgnGc=";
};
passthru = {
@@ -3,11 +3,11 @@
buildKodiAddon rec {
pname = "websocket";
namespace = "script.module.websocket";
version = "1.6.2";
version = "1.6.4";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
sha256 = "sha256-vJGijCjIgLJAdJvl+hCAPtvq7fy2ksgjY90vjVyqDkI=";
sha256 = "sha256-1Wy+hxB059UoZnQlncytVT3sQ07dYAhNRnW3/QVD4ZE=";
};
propagatedBuildInputs = [
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch2
, pkg-config
, glib
, glibc
@@ -20,6 +21,14 @@ stdenv.mkDerivation rec {
hash = "sha256-GDbCjR3UWDo/AEKO3TZq29fxO9EUfymxWtvLBikJJ04=";
};
patches = [
(fetchpatch2 {
# Fix regression with several upstream bug reports; also caused podman NixOS tests to fail
url = "https://github.com/containers/conmon/commit/53531ac78d35aa9e18a20cfff9f30b910e25ecaa.patch";
hash = "sha256-rbLoXDmRK8P94rrhx2r22/EHZVpCsGTWItd/GW1VqZA=";
})
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib libseccomp systemd ]
++ lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];
@@ -11,13 +11,13 @@
buildGoModule rec {
pname = "containerd";
version = "1.7.9";
version = "1.7.11";
src = fetchFromGitHub {
owner = "containerd";
repo = "containerd";
rev = "v${version}";
hash = "sha256-/kCnzOL8CJuJJglHzmev3alt8cMwTUbIiZhNft9zwps=";
hash = "sha256-kvBD9Qh10kRowr32zDzjpHYh2IZC6+w+nOO4joShgEE=";
};
vendorHash = null;
+37
View File
@@ -0,0 +1,37 @@
{ lib
, buildGoModule
, fetchFromGitHub
, installShellFiles
}:
buildGoModule rec {
pname = "crawley";
version = "1.7.1";
src = fetchFromGitHub {
owner = "s0rg";
repo = "crawley";
rev = "v${version}";
hash = "sha256-IRhi6z2TQZOOw8EZkJ3/VEOBzAlg0DQjq9wSt+/c3ck=";
};
nativeBuildInputs = [ installShellFiles ];
vendorHash = "sha256-0BUbALCBR9CGwkqz1cUnzF3xjQkkzfdS7JDDTXkGmN4=";
ldflags = [ "-w" "-s" ];
postInstall = ''
installShellCompletion --cmd crawley \
--bash <(echo "complete -C $out/bin/crawley crawley") \
--zsh <(echo "complete -o nospace -C $out/bin/crawley crawley")
'';
meta = with lib; {
description = "The unix-way web crawler";
homepage = "https://github.com/s0rg/crawley";
license = licenses.mit;
maintainers = with maintainers; [ ltstf1re ];
mainProgram = "crawley";
};
}
+2 -2
View File
@@ -10,13 +10,13 @@
stdenvNoCC.mkDerivation rec {
pname = "kora-icon-theme";
version = "1.5.8";
version = "1.5.9";
src = fetchFromGitHub {
owner = "bikass";
repo = "kora";
rev = "v${version}";
sha256 = "sha256-ZPjtY6s3Sgl0aU2pAxagTMFIOcwDAZQRYtvOC0FBJaI=";
sha256 = "sha256-ZXAS22Oe6C34DR1BfGmCGr1qh9mu1PCY5IQWxrm1EfY=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -17,14 +17,14 @@ in
stdenv.mkDerivation rec {
pname = "fcft";
version = "3.1.6";
version = "3.1.7";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "dnkl";
repo = "fcft";
rev = version;
sha256 = "0cfyxf3xcj552bhd5awv5j0lb8xk3xhz87iixp3wnbvsgvl6dpwq";
sha256 = "sha256-QS39vbf2JowovTBtT4DKDRbLXieOrzbO4cQObOdE788=";
};
depsBuildBuild = [ pkg-config ];
+2 -2
View File
@@ -5,6 +5,6 @@
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
import ./generic.nix {
version = "3.95";
hash = "sha256-qgSbzlRbU+gElC2ae3FEGRUFSM1JHd/lNGNXC0x4xt4=";
version = "3.96";
hash = "sha256-OdvJ7OLL3CDvJkgtnMsuE1CVaaKpmgRmzEzW0WmD8Jo=";
}
+1
View File
@@ -41,4 +41,5 @@ in
mapAliases {
lpty = throw "lpy was removed because broken and unmaintained "; # added 2023-10-14
cyrussasl = throw "cyrussasl was removed because broken and unmaintained "; # added 2023-10-18
nlua-nvim = throw "nlua-nvim was removed, use neodev-nvim instead"; # added 2023-12-16
}
@@ -1,7 +1,7 @@
{ buildPecl, lib, fetchFromGitHub }:
let
version = "3.3.0";
version = "3.3.1";
in buildPecl {
inherit version;
@@ -11,7 +11,7 @@ in buildPecl {
owner = "xdebug";
repo = "xdebug";
rev = version;
hash = "sha256-i14po+0i25gRR87H6kUdyXF4rXZM70CqXi2EdFBn808=";
hash = "sha256-Zt1BIqNKsTHtIXy0Dar52sZxLi5k12LQAbxOLKQPMN8=";
};
doCheck = true;
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "aioairzone";
version = "0.6.9";
version = "0.7.2";
format = "pyproject";
disabled = pythonOlder "3.11";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Noltari";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-0nbH0pnTYRuSOkzG5Yn/fJmRKtXBMd6ti6Z+AW72j3Q=";
hash = "sha256-ppzusDyGTh2HnDFjqXClyHzjK/TFKvGOWg5Nb2fDGnc=";
};
nativeBuildInputs = [
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "bleak-esphome";
version = "0.2.0";
version = "0.3.0";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "bluetooth-devices";
repo = "bleak-esphome";
rev = "refs/tags/v${version}";
hash = "sha256-QtSkrX7xGaV/13FonQhYR4MpZxVwR8dAFCRvID0zSGo=";
hash = "sha256-XJxx9m8ZJtCmH9R1A4J+EFSTP4z9acDgRbaASKR/tZY=";
};
postPatch = ''
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "bthome-ble";
version = "3.2.0";
version = "3.3.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = "bthome-ble";
rev = "refs/tags/v${version}";
hash = "sha256-UYW7yEAg4RJR1ERFDDS6s8OBr0XRTHTJLSuOF7FO6u4=";
hash = "sha256-dFnEgUmmB9P8bKownMp0NsTWPAeMmdKiaxII3O1gT6A=";
};
nativeBuildInputs = [
@@ -11,6 +11,7 @@
, setuptools
, tzlocal
, vobject
, xandikos
}:
buildPythonPackage rec {
@@ -43,15 +44,9 @@ buildPythonPackage rec {
nativeCheckInputs = [
pytestCheckHook
xandikos
];
# xandikos and radicale are only optional test dependencies, not available for python3
postPatch = ''
substituteInPlace setup.py \
--replace xandikos "" \
--replace radicale ""
'';
pythonImportsCheck = [ "caldav" ];
meta = with lib; {
@@ -30,7 +30,6 @@
, pytest-xdist
, pytestCheckHook
, requests-mock
, ruff
, scipy
, sentencepiece
, torchsde
@@ -99,7 +98,6 @@ buildPythonPackage rec {
pytest-xdist
pytestCheckHook
requests-mock
ruff
scipy
sentencepiece
torchsde
@@ -141,6 +139,8 @@ buildPythonPackage rec {
"test_deprecate_stacklevel"
# fails due to precision of floating point numbers
"test_model_cpu_offload_forward_pass"
# tries to run ruff which we have intentionally removed from nativeCheckInputs
"test_is_copy_consistent"
];
meta = with lib; {
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "opower";
version = "0.0.40";
version = "0.0.41";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "tronikos";
repo = "opower";
rev = "refs/tags/v${version}";
hash = "sha256-0vk8LGqU3rOgjC8zXkijmIZG8inxwTw2IDneFfy5eQw=";
hash = "sha256-dqSMZ/4R4TbPEg/wRCTYKRbwj3mU+YUeYOsWQWIp5OM=";
};
pythonRemoveDeps = [
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pymc";
version = "5.10.1";
version = "5.10.2";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "pymc-devs";
repo = "pymc";
rev = "refs/tags/v${version}";
hash = "sha256-+hRj39teuxlHOEQ40E2ZteU+tN73j+cHWbxzWsl1+mE=";
hash = "sha256-Yrhd9pTHxdpGkea6BO/dM1O3nnGIV2CRsg40dpotf0U=";
};
propagatedBuildInputs = [
@@ -24,7 +24,7 @@
buildPythonPackage rec {
pname = "pytensor";
version = "2.18.2";
version = "2.18.4";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -33,7 +33,7 @@ buildPythonPackage rec {
owner = "pymc-devs";
repo = "pytensor";
rev = "refs/tags/rel-${version}";
hash = "sha256-uB5VT4wP08pOkHlxdPJTXK4j5ubmf+hk5oHYPM6diHM=";
hash = "sha256-j7SNXFiQUofP5NtggSOwLxXkg267yneqoWH2uoDZogs=";
};
postPatch = ''
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "pytrafikverket";
version = "0.3.9.1";
version = "0.3.9.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-F0BMpZVzSK0i+tdvN//KZQqgxFrfLf0SCNztKCs6BYQ=";
hash = "sha256-NxxuyLnzJ8T2jaQ761O943rpBbNwp/F4PygyQULkXzw=";
};
nativeBuildInputs = [
@@ -32,7 +32,7 @@
buildPythonPackage rec {
pname = "pyunifiprotect";
version = "4.22.0";
version = "4.22.3";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -41,7 +41,7 @@ buildPythonPackage rec {
owner = "briis";
repo = "pyunifiprotect";
rev = "refs/tags/v${version}";
hash = "sha256-qzom1mLTfP683GCYlUav/MlOkYj+AiEe13b74ceW7gI=";
hash = "sha256-KpijjKy5poiWghupXq8rNCtzuPXsPgu+ePAowhzOSYI=";
};
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
+2 -2
View File
@@ -50,13 +50,13 @@ in
stdenv.mkDerivation rec {
pname = "quickemu";
version = "4.9.1";
version = "4.9.2";
src = fetchFromGitHub {
owner = "quickemu-project";
repo = "quickemu";
rev = version;
hash = "sha256-tWl16dd0a6pDz+cUZx9Ku2ov+LJZabR2cDso5tPbML4=";
hash = "sha256-StYgnFBnEJUkJDyFluMm01xhgejXc99AEldGGxIvZU0=";
};
postPatch = ''
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "hcloud";
version = "1.40.0";
version = "1.41.0";
src = fetchFromGitHub {
owner = "hetznercloud";
repo = "cli";
rev = "refs/tags/v${version}";
hash = "sha256-usHBlfEym39p8S6w2eNeXVKpqxlJxLCn9DwK2J1AqdI=";
hash = "sha256-NcEJgC3FtGgv0m7qisCB8vaHvD5Yw/UIHsOFBYiID4c=";
};
vendorHash = "sha256-vytfRa4eiF53VTR50l/J2Df587u8xx3lj1QhMYSqglk=";
vendorHash = "sha256-qAgKotc+ypm0pHcbKCgpFmTY5W1b8Oq3XrrP6RVulig=";
ldflags = [
"-s"
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "ruff-lsp";
version = "0.0.45";
version = "0.0.47";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "astral-sh";
repo = "ruff-lsp";
rev = "refs/tags/v${version}";
hash = "sha256-jTLkex2K/IQTKZp2duM26/EaYhG5E2bGs/QKt5PA7lc=";
hash = "sha256-ZbSqqjvYzee79nSeyfU4FPoOzsQwOjPHjltS9QrWcqw=";
};
postPatch = ''
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "license-scanner";
version = "0.10.0";
version = "0.11.0";
src = fetchFromGitHub {
owner = "CycloneDX";
repo = "license-scanner";
rev = "refs/tags/v${version}";
hash = "sha256-X7omSecbb85dtxPJtgdjLLgJQRJ7dh12DGwzIG0tYcE=";
hash = "sha256-2KUaVDAZxMwZ3AAMEUmRiuvenPSFliUp6rZCZrVTDps=";
};
vendorHash = "sha256-7xa2tdCDCXkOZCLL8YPtO7i1VqD61Mow7un0690I8mM=";
+3 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "ruff";
version = "0.1.7";
version = "0.1.8";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "ruff";
rev = "refs/tags/v${version}";
hash = "sha256-Al256/8A/efLrf97xCwEocwgs3ngPnEAmkfcLWdlkTw=";
hash = "sha256-zf2280aSmGstcgxoU/IWtdtdWExvdKLBNh4Cn5tC1vU=";
};
cargoHash = "sha256-4iC9pRmhxC29zIrRxQfNG3KCWtHqw8ml6MJoT/XZjSI=";
cargoHash = "sha256-UC47RXgvjHInJuHVYmnAAb7SACRqt4d59k9/Cl9+x4Q=";
nativeBuildInputs = [
installShellFiles
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-mutants";
version = "23.11.2";
version = "23.12.0";
src = fetchFromGitHub {
owner = "sourcefrog";
repo = "cargo-mutants";
rev = "v${version}";
hash = "sha256-Rx/3U/wSV4OivUzVyjS+sHiPqCHdaoornngvfn59Bbc=";
hash = "sha256-6p+ri6An0rQTPSFUSE4MBNP5dFiVFsS0UDXUoWJoY20=";
};
cargoHash = "sha256-8PnxjZIOZ8DPso4Qd29mfiIPpfe3Erjnu5xXHf1eoGk=";
cargoHash = "sha256-4ej0Pl8n1Z001IdiM1u+/Z7ZTi9hwuoJLA4gHheQOsA=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.SystemConfiguration
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
description = "Tools related to the kexec Linux feature";
platforms = platforms.linux;
badPlatforms = [
"microblaze-linux" "microblazeel-linux"
"riscv64-linux" "riscv32-linux"
"sparc-linux" "sparc64-linux"
];
+5 -5
View File
@@ -1,13 +1,13 @@
{ lib, buildGoModule, fetchFromGitHub, symlinkJoin, nixosTests }:
let
version = "3.5.10";
version = "3.5.11";
src = fetchFromGitHub {
owner = "etcd-io";
repo = "etcd";
rev = "v${version}";
hash = "sha256-X/de8YA55SZ6p8r/pV8CGxfDKN8voJlyA0r4ckan6ZE=";
hash = "sha256-OjAWi5EXy1d1O6HLBzHcSfeCNmZZLNtrQXpTJ075B0I=";
};
CGO_ENABLED = 0;
@@ -25,7 +25,7 @@ let
inherit CGO_ENABLED meta src version;
vendorHash = "sha256-kFR6RvHoNM4SZOgJd7inUuw5GfRLM+3WsKU73We8UzU=";
vendorHash = "sha256-1/ma737hGdek+263w5OuO5iN5DTA8fpb6m0Fefyww20=";
modRoot = "./server";
@@ -45,7 +45,7 @@ let
inherit CGO_ENABLED meta src version;
vendorHash = "sha256-oVabZ2JZlLKHFCuAeeWRTrcSCxzz05HlvDu/YSMKuCs=";
vendorHash = "sha256-AMN8iWTIFeT0HLqxYrp7sieT0nEKBNwFXV9mZG3xG5I=";
modRoot = "./etcdutl";
};
@@ -55,7 +55,7 @@ let
inherit CGO_ENABLED meta src version;
vendorHash = "sha256-0j35caQfLh7kwDKgmTe1novqKfz/3JlQLbUk3+GFPhk=";
vendorHash = "sha256-zwafVpNBvrRUbL0qkDK9TOyo8KCiGjpZhvdUrgklG5Y=";
modRoot = "./etcdctl";
};
@@ -6,20 +6,20 @@
mkYarnPackage rec {
pname = "zigbee2mqtt-networkmap";
version = "unstable-2023-12-06";
version = "unstable-2023-12-16";
src = fetchFromGitHub {
owner = "azuwis";
repo = "zigbee2mqtt-networkmap";
rev = "d5f1002118ba5881c6bdc27cb0f67642575c414f";
hash = "sha256-ITqzMjom2XN7+ICDH0Z5YJWY5GNUXzaqSuEzXekhw9I=";
rev = "7851357d78ebc0d1cc3cb5c661267a1e8b4c09e3";
hash = "sha256-x7RVy0stWT6+8f0/0VORVBgGpBbsbyJBC38xIxXhzos=";
};
packageJSON = ./package.json;
offlineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-uPhD6UQ1KI7y6bqqQF7InT9eKU9VWGf2D60Lo5Mwcf8=";
hash = "sha256-s+vnyUeJKkkA5G0AmsfIG0Zh4bYdDc2B5MSNvdwhjgs=";
};
configurePhase = ''
@@ -8,7 +8,7 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"vue": "^3.3.4"
"vue": "^2.7.15"
},
"devDependencies": {
"@material/mwc-button": "^0.27.0",
+2 -2
View File
@@ -6,12 +6,12 @@
python3.pkgs.buildPythonApplication rec {
pname = "synadm";
version = "0.44";
version = "0.45";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-BNmdyEITSZJb+wwyLU+zZi70kmfuYOqVDhKi8xFCf2E=";
hash = "sha256-KstWVSU0IE1ncfIkIH1QsaQc/Yfs2lF+6+5x9zw9cA8=";
};
propagatedBuildInputs = with python3.pkgs; [
@@ -16,6 +16,16 @@ buildGoModule rec {
vendorHash = "sha256-uIilESEmAxANxFOy7qvYxlF/bId/Kqh4jUspNknlhlc=";
ldflags = [
"-s"
"-w"
"-X github.com/prometheus/common/version.Version=${version}"
"-X github.com/prometheus/common/version.Revision=unknown"
"-X github.com/prometheus/common/version.Branch=unknown"
"-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs"
"-X github.com/prometheus/common/version.BuildDate=unknown"
];
postInstall = ''
install -Dm444 -t $out/share/doc/${pname} *.md
'';
+8 -5
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "notify_push";
version = "0.6.5";
version = "0.6.6";
src = fetchFromGitHub {
owner = "nextcloud";
repo = pname;
rev = "v${version}";
hash = "sha256-go41ZIUBj1nj8rDI/c4Pk5cnDbM8Y2+bCZIab4XdhUY=";
hash = "sha256-9wVH+msUh0t0PKz+5044PhT9lGsbfp4u44gX0O70Pbo=";
};
cargoHash = "sha256-EuYwPQo2TucAaQw63pESkJGAtyuMhk3JT6mBg6E84Xs=";
cargoHash = "sha256-Q4KA+mc48OfmxYY7vDJ2ZU/Wd+101kbimwAw6ag3d+w=";
passthru = rec {
test_client = rustPlatform.buildRustPackage {
@@ -24,10 +24,13 @@ rustPlatform.buildRustPackage rec {
buildAndTestSubdir = "test_client";
cargoHash = "sha256-m4FHCrVGAmGIrgnMMleiTRgYGYh+b7EIH1ORE0tiBkY=";
cargoHash = "sha256-XiaeCVgVjre7NmH/B+dNw0u2HV0vJwlgDjhLXXgJS+Y=";
};
tests = {
inherit (nixosTests.nextcloud) with-postgresql-and-redis26;
inherit (nixosTests.nextcloud)
with-postgresql-and-redis26
with-postgresql-and-redis27
with-postgresql-and-redis28;
inherit test_client;
};
};
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "plpgsql_check";
version = "2.6.2";
version = "2.7.0";
src = fetchFromGitHub {
owner = "okbob";
repo = pname;
rev = "v${version}";
hash = "sha256-JYlcd4VveSoQM/PIRRCeCLfJTDRGRl3zrc6iAd1V3aE=";
hash = "sha256-DSBr2pmJD/kW1b4nqCTS4KwAAH6eojDmE/RVwvSIAa0=";
};
buildInputs = [ postgresql ];
+1 -1
View File
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
inherit (nushell) version src;
cargoHash = "sha256-eGRaYbYB+zHT8rXm6aCrnPVgyDA8ltsg0GOYgghmov0=";
env = lib.optionalAttrs stdenv.isDarwin {
env = lib.optionalAttrs stdenv.cc.isClang {
LIBCLANG_PATH = "${libclang.lib}/lib";
};
nativeBuildInputs = [ pkg-config ];
+1 -1
View File
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
inherit (nushell) version src;
cargoHash = "sha256-Ar5rFPHf+ugZuugVKVRFACYhh3F0JvQtfp6KibPIByw=";
env = lib.optionalAttrs stdenv.isDarwin {
env = lib.optionalAttrs stdenv.cc.isClang {
LIBCLANG_PATH = "${libclang.lib}/lib";
};
nativeBuildInputs = [ pkg-config ];
+1 -1
View File
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage {
inherit (nushell) version src;
cargoHash = "sha256-NVdXbpmGBAcv47jbel2cccoe0m2FInSSOnMWofqtpiM=";
env = lib.optionalAttrs stdenv.isDarwin {
env = lib.optionalAttrs stdenv.cc.isClang {
LIBCLANG_PATH = "${libclang.lib}/lib";
};
buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ];
+4 -4
View File
@@ -12,20 +12,20 @@
rustPlatform.buildRustPackage rec {
pname = "atuin";
version = "17.0.1";
version = "17.1.0";
src = fetchFromGitHub {
owner = "atuinsh";
repo = "atuin";
rev = "v${version}";
hash = "sha256-HJRlZwvBra2D7TzVKvMWJ0Hf17QgIEcBDQEHhxdVLIM=";
hash = "sha256-srFHVUZerxPmOQXVMoSgeLsylvILcOP7m62s4NCFDJE=";
};
# TODO: unify this to one hash because updater do not support this
cargoHash =
if stdenv.isLinux
then "sha256-AhoXmEjXsi/OgFX3htOA6A/lWegUFlsywdotX3PDwcs="
else "sha256-/nCnZ64pM8oWVX9a4JCeCZRyuo7aVc8YaBVEMbiRsqE=";
then "sha256-FyKcR6H3/2cra9VYJbW37cSCvOpAiC8UJYXnseNQlt4="
else "sha256-NfoAjTshmb1L4bIkBctk90bZL93hsyAyIE9AEFUGcGQ=";
nativeBuildInputs = [ installShellFiles ];
+3 -3
View File
@@ -7,13 +7,13 @@
rustPlatform.buildRustPackage rec {
pname = "dua";
version = "2.21.0";
version = "2.23.0";
src = fetchFromGitHub {
owner = "Byron";
repo = "dua-cli";
rev = "v${version}";
hash = "sha256-szpM3PxIMcKJaCinzZltneCSJCDkPGvXOaGqa9hx9IQ=";
hash = "sha256-dHtPz5TxNQyBHOuCYH1XRIeR63ghMP/moaULI++tg8Y=";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
postFetch = ''
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
'';
};
cargoHash = "sha256-/10trywiFX0UvePxlWek1uXTBRVk4saE+n1RJipinaw=";
cargoHash = "sha256-10etmf0eQw9nD74dJMpQGAV4cK9FnTWKSrhBT3ZJblc=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Foundation
+2 -2
View File
@@ -5,14 +5,14 @@
buildGoModule rec {
pname = "mdhtml";
version = "0.3.1";
version = "1.0";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "Tomkoid";
repo = pname;
rev = version;
hash = "sha256-ISZUadJZOWwUygLnGYvuMUNCmTNGZLYq+q/FeK++kWE=";
hash = "sha256-Fv5XpWA2ebqXdA+46gZQouuZ3XxH4WDj/W6xJ0ETg8E=";
};
vendorHash = null;
+3 -3
View File
@@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "slurp";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "emersion";
repo = "slurp";
rev = "v${finalAttrs.version}";
hash = "sha256-jUuY2wuN00libHDaJEmrvQAb1o989Ly3nLyKHV0jz8Q=";
hash = "sha256-2M8f3kN6tihwKlUCp2Qowv5xD6Ufb71AURXqwQShlXI=";
};
depsBuildBuild = [
@@ -53,6 +53,6 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/emersion/slurp";
license = licenses.mit;
mainProgram = "slurp";
maintainers = with maintainers; [ buffet ];
maintainers = with maintainers; [ buffet nickcao ];
};
})