Merge master into staging-next
This commit is contained in:
@@ -10414,6 +10414,7 @@
|
||||
};
|
||||
isabelroses = {
|
||||
email = "isabel@isabelroses.com";
|
||||
matrix = "@isabel:isabelroses.com";
|
||||
github = "isabelroses";
|
||||
githubId = 71222764;
|
||||
name = "Isabel Roses";
|
||||
|
||||
@@ -26,20 +26,20 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "authenticator";
|
||||
version = "4.5.0";
|
||||
version = "4.6.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "Authenticator";
|
||||
rev = version;
|
||||
hash = "sha256-g4+ntBuAEH9sj61CiS5t95nMfCgaWJTgiwRXtwrUTs0=";
|
||||
hash = "sha256-Kq/J/1+ROibR6NjfH/g760/CT4DZg1hIcsXQ4MHzrDc=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-fG0xABK/qzoACFEYhMeDF6Qbucx0FCPpuTuInDFHnu8=";
|
||||
hash = "sha256-SQDr4jdCZzuizYWwJ5crrunqN8O2bCUv5gIslBduAZY=";
|
||||
};
|
||||
|
||||
preFixup = ''
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bpfilter";
|
||||
version = "0.2.1";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "bpfilter";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8oF4YuVlxWwl0JgAAe3JRz0Sy5xe77Ayhvour9K3zeY=";
|
||||
hash = "sha256-k8zl6WQ5htxu2nsubOoqMg69E/z+4TQTtywIfZG/G7U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
env = lib.optionalAttrs stdenv.cc.isGNU {
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
|
||||
};
|
||||
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dalfox";
|
||||
version = "2.9.3";
|
||||
version = "2.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hahwul";
|
||||
repo = "dalfox";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-tg8TXPeGINGDBR3HOWYRXrg7ioBFhX1V7N1wRzHI0/c=";
|
||||
hash = "sha256-F4CXVgHdEjSMK3YIF5X6zCVVI17GkIE3KGAE1OxfhyY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-SXNkMaUZ2jYoSmlmss4lFwpgxvqRF0D27KpANJveaq4=";
|
||||
vendorHash = "sha256-Nt0Rgwrjs2irKPnt5G/32VH3Wj19+xnh+gLspWDnKCY=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "eartag";
|
||||
version = "0.6.4";
|
||||
version = "0.6.5";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
@@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "World";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-K93sj84MdDCQgIMghkjpGIieSrlnlQiw85JSgggRlf4=";
|
||||
hash = "sha256-sxVivQppX8KdkvHaW6xQ64Wi8Nfv5Rmwf4NADBDpOOo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -17,17 +17,17 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "forgejo-runner";
|
||||
version = "6.3.0";
|
||||
version = "6.3.1";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "code.forgejo.org";
|
||||
owner = "forgejo";
|
||||
repo = "runner";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fBpNWxQtej75/oVaHat/H/4Ge9rbjf6FZ/Dw+LBZjcI=";
|
||||
hash = "sha256-eR7WsdnA9guEf/BXymWuJTy+4TTBUq9YxeFVKgvvAD8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mHvAkVdUAyS4KP6S61IRF2j37XgNMgCFbyZ+WpqqjjA=";
|
||||
vendorHash = "sha256-ZlXx0B2IdyeqPzQchmUI0peOZShUi0m9BMBQ1Xj2ftQ=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "immich-public-proxy";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "alangrainger";
|
||||
repo = "immich-public-proxy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-khOmZj/9/28bADeffAqnbpw9yTvyz+wgBkxZlY9sXPw=";
|
||||
hash = "sha256-2SqQZfmcGY4814dUeNbOJHwMcWniWaiBV9W4d5ndoaU=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/app";
|
||||
|
||||
npmDepsHash = "sha256-jLXO8in7gWBg24210lEVNpfKq0HFs4b+zXPAZGzXsIg=";
|
||||
npmDepsHash = "sha256-4T+hvvuH9HxdztASu6OVS2hFsSA/tlk8d8x9QhcEDFs=";
|
||||
|
||||
# patch in absolute nix store paths so the process doesn't need to cwd in $out
|
||||
postPatch = ''
|
||||
|
||||
@@ -18,20 +18,20 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lorem";
|
||||
version = "1.4";
|
||||
version = "1.5";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World/design";
|
||||
repo = "lorem";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-6+kDKKK1bkIOZlqzKWpzpjAS5o7bkbVFITMZVmJijuU=";
|
||||
hash = "sha256-q6gpxxNebf2G/lT5wWXT/lVp3zR8QLWB8/sdK+wLTJ8=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
src = finalAttrs.src;
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}";
|
||||
hash = "sha256-l6vd521DmV019Yu5O1Kf5RKan2ROCBHlPiEDhf34Grc=";
|
||||
hash = "sha256-4JYYcfsEoCGJWZCp0273gXrf8hfuHL/QSsLEHvNa4uA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pyradio";
|
||||
version = "0.9.3.11.5";
|
||||
version = "0.9.3.11.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coderholic";
|
||||
repo = "pyradio";
|
||||
tag = version;
|
||||
hash = "sha256-+guMfdYmXnWARyl5TQVUk2jCkIs11I5d0PMlCzs4ZFo=";
|
||||
hash = "sha256-A8H0Jo/iRSxmt+e8aLwZlXGNM+ozajFxFQVM8/zY/Yw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "telegraf";
|
||||
version = "1.34.0";
|
||||
version = "1.34.1";
|
||||
|
||||
subPackages = [ "cmd/telegraf" ];
|
||||
|
||||
@@ -18,10 +18,10 @@ buildGoModule rec {
|
||||
owner = "influxdata";
|
||||
repo = "telegraf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0l2x/ljKcEBkyxKbeYtRpBGMSKVbKe5UKNHaNJZt2fI=";
|
||||
hash = "sha256-q+v4cKqBLGxsvR5e8OS6Ix/0JZ+0I/cf0M6P27ym9Go=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-juuC2iM6/w1VA7afkA3qA9r39+z4tcqwVlV54jFOCuw=";
|
||||
vendorHash = "sha256-681a1K1wsjTgZXCx5fuz0/HZ52KucVGnqiv/EIz34Bg=";
|
||||
proxyVendor = true;
|
||||
|
||||
ldflags = [
|
||||
|
||||
@@ -7,23 +7,20 @@
|
||||
makeWrapper,
|
||||
installShellFiles,
|
||||
}:
|
||||
let
|
||||
version = "3.2.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wallust";
|
||||
inherit version;
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "explosion-mental";
|
||||
repo = "wallust";
|
||||
rev = version;
|
||||
hash = "sha256-71vLHuzLcNTvwE7j6iIQZJWD18IQnA0OwF/cOAZCLL8=";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-n3FXPlm8nructXh+Wc7BgJvxas6OFHEPbTe2QWjEpsg=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-TxlGzfupx9661T8nGvSxurz9cxc9C3udOnoU3PXVCdQ=";
|
||||
cargoHash = "sha256-LIHSnRPrx4gHZkpKEEZ1Um609i3vv0JGXLpbiSD08P4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
@@ -53,7 +50,7 @@ rustPlatform.buildRustPackage {
|
||||
onemoresuza
|
||||
iynaix
|
||||
];
|
||||
downloadPage = "https://codeberg.org/explosion-mental/wallust/releases/tag/${version}";
|
||||
downloadPage = "https://codeberg.org/explosion-mental/wallust/releases/tag/${finalAttrs.version}";
|
||||
mainProgram = "wallust";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
{
|
||||
lib,
|
||||
buildDunePackage,
|
||||
fetchFromGitLab,
|
||||
afl-persistent,
|
||||
pprint,
|
||||
version ? "20250314",
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "monolith";
|
||||
inherit version;
|
||||
|
||||
minimalOCamlVersion = "4.12";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.inria.fr";
|
||||
owner = "fpottier";
|
||||
repo = "monolith";
|
||||
tag = version;
|
||||
hash = "sha256-hIB3QSOLARumRgpUroTFUzSreHw7kMikGde+mB28sGM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
afl-persistent
|
||||
pprint
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Facilities for testing an OCaml library";
|
||||
homepage = "https://cambium.inria.fr/~fpottier/monolith/doc/monolith/Monolith/index.html";
|
||||
changelog = "https://gitlab.inria.fr/fpottier/monolith/-/raw/${version}/CHANGES.md";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
};
|
||||
}
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "androidtvremote2";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "tronikos";
|
||||
repo = "androidtvremote2";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-mvkOz57R2OLYUeSD2GSyslgbWFHPOzdO4DpSMemUT5U=";
|
||||
hash = "sha256-b1nzfLHUNXqR4aiNYCLopBpyAGvgumtUW4gNSDVn5kU=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -20,19 +20,18 @@
|
||||
pyarrow,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
pythonAtLeast,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "awkward";
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scikit-hep";
|
||||
repo = "awkward";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-dr8DUY6T6fvtMASdM9U+XQN0dVP8AKvwa1gwHfOz3Dw=";
|
||||
hash = "sha256-37yUZSD9c92ydjjt5Z7KnUzfSMAQM37Ah4WGp9HWiDs=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydeconz";
|
||||
version = "119";
|
||||
version = "120";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
@@ -23,12 +23,12 @@ buildPythonPackage rec {
|
||||
owner = "Kane610";
|
||||
repo = "deconz";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-5138YzxutjyFsYyLGLTzeyCISuY8kV4WA0FLML+VeZQ=";
|
||||
hash = "sha256-L9v6j8CFc19TlcFBTm3YCQG1nS78uIUfERB6mfwzMNM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "setuptools==75.6.0" "setuptools" \
|
||||
--replace-fail "setuptools==77.0.3" "setuptools" \
|
||||
--replace-fail "wheel==" "wheel>="
|
||||
'';
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-telegram-bot";
|
||||
version = "21.11.1";
|
||||
version = "22.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||
owner = "python-telegram-bot";
|
||||
repo = "python-telegram-bot";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ro3v7JXTxhxmxS0/TXTgV6ZixR5UaJ4zQ+UCt2oel9w=";
|
||||
hash = "sha256-/8sWlq2f71B3Y2fAsdluGqW5I07KNfFmqtXtk+7crE4=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -44,5 +44,8 @@ rustPlatform.buildRustPackage rec {
|
||||
changelog = "https://github.com/benfred/py-spy/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lnl7 ];
|
||||
platforms = lib.platforms.linux;
|
||||
# https://github.com/benfred/py-spy/pull/330
|
||||
broken = stdenv.hostPlatform.isAarch64;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1131,8 +1131,6 @@ with pkgs;
|
||||
|
||||
yarn-lock-converter = callPackage ../tools/package-management/yarn-lock-converter { };
|
||||
|
||||
archi = callPackage ../tools/misc/archi { };
|
||||
|
||||
breitbandmessung = callPackage ../applications/networking/breitbandmessung {
|
||||
electron = electron_34;
|
||||
};
|
||||
@@ -17267,8 +17265,6 @@ with pkgs;
|
||||
# this driver ships with pre-compiled 32-bit binary libraries
|
||||
cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { };
|
||||
|
||||
depotdownloader = callPackage ../tools/misc/depotdownloader { };
|
||||
|
||||
faust = res.faust2;
|
||||
|
||||
faust2 = callPackage ../applications/audio/faust/faust2.nix { };
|
||||
|
||||
@@ -1252,6 +1252,8 @@ let
|
||||
|
||||
mmap = callPackage ../development/ocaml-modules/mmap { };
|
||||
|
||||
monolith = callPackage ../development/ocaml-modules/monolith { };
|
||||
|
||||
mopsa = callPackage ../development/ocaml-modules/mopsa { };
|
||||
|
||||
morbig = callPackage ../development/ocaml-modules/morbig { };
|
||||
|
||||
Reference in New Issue
Block a user