Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2023-05-28 18:01:48 +00:00 committed by GitHub
commit a981e2e0f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 3639 additions and 278 deletions

7
.github/CODEOWNERS vendored
View File

@ -305,3 +305,10 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
/pkgs/build-support/ocaml @romildo @ulrikstrid
/pkgs/development/compilers/ocaml @romildo @ulrikstrid
/pkgs/development/ocaml-modules @romildo @ulrikstrid
# ZFS
pkgs/os-specific/linux/zfs @raitobezarius
nixos/lib/make-single-disk-zfs-image.nix @raitobezarius
nixos/lib/make-multi-disk-zfs-image.nix @raitobezarius
nixos/modules/tasks/filesystems/zfs.nix @raitobezarius
nixos/tests/zfs.nix @raitobezarius

View File

@ -931,6 +931,12 @@
githubId = 123550;
name = "André Silva";
};
andresnav = {
email = "nix@andresnav.com";
github = "andres-nav";
githubId = 118762770;
name = "Andres Navarro";
};
andrestylianos = {
email = "andre.stylianos@gmail.com";
github = "andrestylianos";
@ -7527,6 +7533,12 @@
githubId = 8900;
name = "Johan Magnus Jonsson";
};
jmbaur = {
email = "jaredbaur@fastmail.com";
github = "jmbaur";
githubId = 45740526;
name = "Jared Baur";
};
jmc-figueira = {
email = "business+nixos@jmc-figueira.dev";
github = "jmc-figueira";

View File

@ -857,16 +857,17 @@ class Machine:
def wait_for_console_text(self, regex: str, timeout: int | None = None) -> None:
"""
Wait for the provided regex to appear on console.
For each reads,
Wait for the provided regex to appear on console.
For each reads,
If timeout is None, timeout is infinite.
If timeout is None, timeout is infinite.
`timeout` is in seconds.
`timeout` is in seconds.
"""
# Buffer the console output, this is needed
# to match multiline regexes.
console = io.StringIO()
def console_matches() -> bool:
nonlocal console
try:
@ -877,7 +878,7 @@ class Machine:
pass
console.seek(0)
matches = re.search(regex, console.read())
return (matches is not None)
return matches is not None
with self.nested(f"waiting for {regex} to appear on console"):
if timeout is not None:

View File

@ -201,7 +201,7 @@ in
This is a testing mail.
''}")
machine.sleep(5)
machine.sleep(10)
machine.succeed("curl -L 'https://machine.${domain}/inbox/repo1/repo1@root-1/T/#u' | grep 'This is a testing mail.'")
# Read a mail through public-inbox-imapd

View File

@ -55,13 +55,13 @@
stdenv.mkDerivation rec {
pname = "dolphin-emu";
version = "5.0-18498";
version = "5.0-19368";
src = fetchFromGitHub {
owner = "dolphin-emu";
repo = "dolphin";
rev = "46b99671d9158e0ca840c1d8ef249db0f321ced7";
sha256 = "sha256-K+OF8o8I1XDLQQcsWC8p8jUuWeb+RoHlBG3cEZ1aWIU=";
rev = "dadbeb4bae7e7fa23af2b46e0add4143094dc107";
sha256 = "sha256-XLtFn2liONPizvrKyySZx0mY7qC2fpwhAWaRZLlEzh8=";
fetchSubmodules = true;
};
@ -101,7 +101,8 @@ stdenv.mkDerivation rec {
libevdev
libXext
libXrandr
mgba # Derivation doesn't support Darwin
# FIXME: Remove comment on next mgba version
#mgba # Derivation doesn't support Darwin
udev
vulkan-loader
] ++ lib.optionals stdenv.isDarwin [
@ -126,7 +127,7 @@ stdenv.mkDerivation rec {
# Bundles the application folder into a standalone executable, so we cannot devendor libraries
"-DSKIP_POSTPROCESS_BUNDLE=ON"
# Needs xcode so compilation fails with it enabled. We would want the version to be fixed anyways.
# Note: The updater isn't available on linux, so we dont need to disable it there.
# Note: The updater isn't available on linux, so we don't need to disable it there.
"-DENABLE_AUTOUPDATE=OFF"
];

View File

@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
''
runHook preInstall
mkdir -p $out/share/{applications,ppsspp}
mkdir -p $out/share/{applications,ppsspp,icons}
'' + (if enableQt then ''
install -Dm555 PPSSPPQt $out/bin/ppsspp
wrapProgram $out/bin/ppsspp \
@ -110,6 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
--prefix LD_LIBRARY_PATH : ${vulkanPath} \
'' + "\n" + ''
mv assets $out/share/ppsspp
mv ../icons/hicolor $out/share/icons
runHook postInstall
'';

3051
pkgs/applications/misc/done/Cargo.lock generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,67 @@
{ lib
, stdenv
, fetchFromGitHub
, cargo
, glib
, meson
, ninja
, pkg-config
, rustPlatform
, rustc
, wrapGAppsHook4
, gdk-pixbuf
, gtk4
, libadwaita
, openssl
, sqlite
, darwin
}:
stdenv.mkDerivation rec {
pname = "done";
version = "0.1.7";
src = fetchFromGitHub {
owner = "done-devs";
repo = "done";
rev = "v${version}";
hash = "sha256-MLCb96jr3YWODZ6xh4fcyFnL5RjFDcEjHKnDD8Gysy8=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"directories-4.0.1" = "sha256-4M8WstNq5I7UduIUZI9q1R9oazp7MDBRBRBHZv6iGWI=";
"libset-0.1.2" = "sha256-+eA6pqafIYomXdlvwSzT/b/T4Je5HgPPmGL2M11VpMU=";
};
};
nativeBuildInputs = [
cargo
glib
meson
ninja
pkg-config
rustPlatform.cargoSetupHook
rustc
wrapGAppsHook4
];
buildInputs = [
gdk-pixbuf
gtk4
libadwaita
openssl
sqlite
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Foundation
];
meta = with lib; {
description = "The ultimate task management solution for seamless organization and efficiency";
homepage = "https://done.edfloreshz.dev/";
changelog = "https://github.com/done-devs/done/blob/${src.rev}/CHANGES.md";
license = licenses.mpl20;
maintainers = with maintainers; [ figsoda ];
};
}

View File

@ -8,13 +8,13 @@
mkDerivation rec {
pname = "heimer";
version = "4.1.0";
version = "4.2.0";
src = fetchFromGitHub {
owner = "juzzlin";
repo = pname;
rev = version;
hash = "sha256-cq8rRz1mfDPzTRVG++vccI2YewSKQqd1RAJbgB3TS5E=";
hash = "sha256-Z94e+4WwabHncBr4Gsv0AkZHyrbFCCIpumGbANHX6dU=";
};
nativeBuildInputs = [

View File

@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace '/etc/udev/rules.d' "$out/etc/udev/rules.d"
--replace '/etc/udev/rules.d' "$out/etc/udev/rules.d" \
--replace "VERSION_INFO_PATCH_VERSION git" "VERSION_INFO_PATCH_VERSION ${lib.versions.patch version}"
substituteInPlace rtl-sdr.rules \
--replace 'MODE:="0666"' 'ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev"'

View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "seqtk";
version = "1.3";
version = "1.4";
src = fetchFromGitHub {
owner = "lh3";
repo = "seqtk";
rev = "v${version}";
hash = "sha256-1Hw/lnoFQumuEJg1n2C6vnWkBa+VLiEiDrosghSm360=";
hash = "sha256-W6IUn7R9tlnWrKe/qOHJL+43AL4EZB7zj7M5u9l83WE=";
};
buildInputs = [ zlib libdeflate isa-l ];

View File

@ -0,0 +1,22 @@
{ lib
, stdenv
, fetchurl
}:
stdenv.mkDerivation rec {
pname = "OpenBUGS";
version = "3.2.3";
src = fetchurl {
url = "https://www.mrc-bsu.cam.ac.uk/wp-content/uploads/2018/04/${pname}-${version}.tar.gz";
sha256 = "sha256-oonE2gxKw3H4ATImyF69Cp4d7F3puFiVDkhUy4FLTtg=";
};
meta = with lib; {
description = "Open source program for Bayesian modelling based on MCMC";
homepage = "https://www.mrc-bsu.cam.ac.uk/software/bugs/openbugs/";
maintainers = with maintainers; [ andresnav ];
license = licenses.gpl3Only;
platforms = [ "i686-linux" ];
};
}

View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "cvs-fast-export";
version = "1.59";
version = "1.60";
src = fetchurl {
url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-${version}.tar.gz";
sha256 = "sha256-JDnNg/VMmPJI6F07o77L4ChYDollLFB1YCL75WSp6No=";
sha256 = "sha256-QLMBYX2n27rcaa9Uisrr2VItgtTPv5ZWbOc5tK1VF8w=";
};
strictDeps = true;

View File

@ -2,6 +2,9 @@
{ crateName ? args.pname
, pname ? null
# The `dl` field of the registry's index configuration
# https://doc.rust-lang.org/cargo/reference/registry-index.html#index-configuration
, registryDl ? "https://crates.io/api/v1/crates"
, version
, unpack ? true
, ...
@ -11,7 +14,7 @@ assert pname == null || pname == crateName;
(if unpack then fetchzip else fetchurl) ({
name = "${crateName}-${version}.tar.gz";
url = "https://crates.io/api/v1/crates/${crateName}/${version}/download";
url = "${registryDl}/${crateName}/${version}/download";
} // lib.optionalAttrs unpack {
extension = "tar.gz";
} // removeAttrs args [ "crateName" "pname" "version" "unpack" ])

View File

@ -62,7 +62,6 @@
],
"volume-scroller": [
"volume_scroller@trflynn89.pm.me",
"volume_scroller@noskoski",
"volume_scroller@francislavoie.github.io"
]
},
@ -138,7 +137,6 @@
],
"volume-scroller": [
"volume_scroller@trflynn89.pm.me",
"volume_scroller@noskoski",
"volume_scroller@francislavoie.github.io"
],
"floating-panel": [
@ -197,7 +195,6 @@
],
"volume-scroller": [
"volume_scroller@trflynn89.pm.me",
"volume_scroller@noskoski",
"volume_scroller@francislavoie.github.io"
],
"floating-panel": [
@ -218,6 +215,10 @@
"lockkeys@vaina.lt",
"lockkeys@fawtytoo"
],
"persian-calendar": [
"PersianCalendar@oxygenws.com",
"persian-calendar@iamrezamousavi.gmail.com"
],
"clipboard-indicator": [
"clipboard-indicator@tudmotu.com",
"clipboard-indicator@Dieg0Js.github.io"
@ -244,7 +245,6 @@
],
"volume-scroller": [
"volume_scroller@trflynn89.pm.me",
"volume_scroller@noskoski",
"volume_scroller@francislavoie.github.io"
],
"auto-activities": [
@ -285,6 +285,10 @@
"vbox-applet@gs.eros2.info",
"vbox-applet@buba98"
],
"panel-date-format": [
"panel-date-format@keiii.github.com",
"panel-date-format@atareao.es"
],
"battery-time": [
"batime@martin.zurowietz.de",
"batterytime@typeof.pw"
@ -307,6 +311,10 @@
"workspace-indicator@gnome-shell-extensions.gcampax.github.com",
"horizontal-workspace-indicator@tty2.io"
],
"persian-calendar": [
"PersianCalendar@oxygenws.com",
"persian-calendar@iamrezamousavi.gmail.com"
],
"clipboard-indicator": [
"clipboard-indicator@tudmotu.com",
"clipboard-indicator@Dieg0Js.github.io"
@ -314,6 +322,10 @@
"virtualbox-applet": [
"vbox-applet@gs.eros2.info",
"vbox-applet@buba98"
],
"panel-date-format": [
"panel-date-format@keiii.github.com",
"panel-date-format@atareao.es"
]
}
}

View File

@ -16,16 +16,19 @@
"workspace-indicator@gnome-shell-extensions.gcampax.github.com" = "workspace-indicator";
"horizontal-workspace-indicator@tty2.io" = "workspace-indicator-2";
"PersianCalendar@oxygenws.com" = "persian-calendar";
"persian-calendar@iamrezamousavi.gmail.com" = "persian-calendar-2";
"clipboard-indicator@tudmotu.com" = "clipboard-indicator";
"clipboard-indicator@Dieg0Js.github.io" = "clipboard-indicator-2";
"vbox-applet@gs.eros2.info" = "virtualbox-applet";
"vbox-applet@buba98" = "virtualbox-applet-2";
# ####### GNOME 43 #######
"panel-date-format@keiii.github.com" = "panel-date-format";
"panel-date-format@atareao.es" = "panel-date-format-2";
"PersianCalendar@oxygenws.com" = "persian-calendar";
"persian-calendar@iamrezamousavi.gmail.com" = "persian-calendar-2";
# ####### GNOME 43 #######
# DEPRECATED: Use "Caffeine" instead
"KeepAwake@jepfa.de" = "keep-awake";
@ -49,11 +52,6 @@
"lockkeys@vaina.lt" = "lock-keys";
"lockkeys@fawtytoo" = "lock-keys-2";
"panel-date-format@keiii.github.com" = "panel-date-format";
"panel-date-format@atareao.es" = "panel-date-format-2";
"volume_scroller@noskoski" = "volume-scroller-3";
"wireguard-indicator@gregos.me" = "wireguard-indicator-2";
"wireguard-indicator@atareao.es" = "wireguard-indicator";

File diff suppressed because one or more lines are too long

View File

@ -36,7 +36,7 @@ buildType = if stdenv.isDarwin then
edk2 = buildStdenv.mkDerivation {
pname = "edk2";
version = "202211";
version = "202302";
patches = [
# pass targetPrefix as an env var
@ -52,7 +52,7 @@ edk2 = buildStdenv.mkDerivation {
repo = "edk2";
rev = "edk2-stable${edk2.version}";
fetchSubmodules = true;
sha256 = "sha256-0jE73xPyenAcgJ1mS35oTc5cYw7jJvVYxhPdhTWpKA0=";
sha256 = "sha256-KZ5bTdaStO2M1hLPx9LsUSMl9NEiZeYMmFiShxCJqJM=";
};
nativeBuildInputs = [ pythonEnv ];

View File

@ -0,0 +1,44 @@
{ alsa-lib
, cmake
, CoreAudio
, CoreFoundation
, CoreMIDI
, CoreServices
, fetchFromGitHub
, lib
, stdenv
}:
stdenv.mkDerivation {
pname = "libremidi";
version = "unstable-2023-05-05";
src = fetchFromGitHub {
owner = "jcelerier";
repo = "libremidi";
rev = "cd2e52d59c8ecc97d751619072c4f4271fa82455";
hash = "sha256-CydoCprxqDl5FXjtgT+AckaRTqQAlCDwwrnPDK17A6o=";
};
nativeBuildInputs = [ cmake ];
buildInputs = lib.optional stdenv.isLinux alsa-lib
++ lib.optionals stdenv.isDarwin [
CoreAudio
CoreFoundation
CoreMIDI
CoreServices
];
postInstall = ''
cp -r $src/include $out
'';
meta = {
description = "A modern C++ MIDI real-time & file I/O library";
homepage = "https://github.com/jcelerier/libremidi";
maintainers = [ lib.maintainers.paveloom ];
license = lib.licenses.bsd2;
platforms = lib.platforms.all;
};
}

View File

@ -4,9 +4,9 @@ version = 3
[[package]]
name = "aho-corasick"
version = "0.7.20"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
dependencies = [
"memchr",
]
@ -25,7 +25,7 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "breezy"
version = "3.3.2"
version = "3.3.3"
dependencies = [
"pyo3",
]
@ -38,35 +38,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "indoc"
version = "0.3.6"
version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8"
dependencies = [
"indoc-impl",
"proc-macro-hack",
]
[[package]]
name = "indoc-impl"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0"
dependencies = [
"proc-macro-hack",
"proc-macro2",
"quote",
"syn",
"unindent",
]
[[package]]
name = "instant"
version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
dependencies = [
"cfg-if",
]
checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306"
[[package]]
name = "lazy_static"
@ -76,9 +50,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
version = "0.2.139"
version = "0.2.144"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
[[package]]
name = "lock_api"
@ -96,6 +70,15 @@ version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "memoffset"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
dependencies = [
"autocfg",
]
[[package]]
name = "once_cell"
version = "1.17.1"
@ -104,94 +87,80 @@ checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
[[package]]
name = "parking_lot"
version = "0.11.2"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
dependencies = [
"instant",
"lock_api",
"parking_lot_core",
]
[[package]]
name = "parking_lot_core"
version = "0.8.6"
version = "0.9.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
dependencies = [
"cfg-if",
"instant",
"libc",
"redox_syscall",
"smallvec",
"winapi",
"windows-sys",
]
[[package]]
name = "paste"
version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880"
dependencies = [
"paste-impl",
"proc-macro-hack",
]
[[package]]
name = "paste-impl"
version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6"
dependencies = [
"proc-macro-hack",
]
[[package]]
name = "proc-macro-hack"
version = "0.5.20+deprecated"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]]
name = "proc-macro2"
version = "1.0.51"
version = "1.0.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"
checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
dependencies = [
"unicode-ident",
]
[[package]]
name = "pyo3"
version = "0.15.2"
version = "0.18.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d41d50a7271e08c7c8a54cd24af5d62f73ee3a6f6a314215281ebdec421d5752"
checksum = "e3b1ac5b3731ba34fdaa9785f8d74d17448cd18f30cf19e0c7e7b1fdb5272109"
dependencies = [
"cfg-if",
"indoc",
"libc",
"memoffset",
"parking_lot",
"paste",
"pyo3-build-config",
"pyo3-ffi",
"pyo3-macros",
"unindent",
]
[[package]]
name = "pyo3-build-config"
version = "0.15.2"
version = "0.18.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "779239fc40b8e18bc8416d3a37d280ca9b9fb04bda54b98037bb6748595c2410"
checksum = "9cb946f5ac61bb61a5014924910d936ebd2b23b705f7a4a3c40b05c720b079a3"
dependencies = [
"once_cell",
"target-lexicon",
]
[[package]]
name = "pyo3-ffi"
version = "0.18.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd4d7c5337821916ea2a1d21d1092e8443cf34879e53a0ac653fbb98f44ff65c"
dependencies = [
"libc",
"pyo3-build-config",
]
[[package]]
name = "pyo3-macros"
version = "0.15.2"
version = "0.18.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00b247e8c664be87998d8628e86f282c25066165f1f8dda66100c48202fdb93a"
checksum = "a9d39c55dab3fc5a4b25bbd1ac10a2da452c4aca13bb450f22818a002e29648d"
dependencies = [
"proc-macro2",
"pyo3-macros-backend",
"quote",
"syn",
@ -199,21 +168,20 @@ dependencies = [
[[package]]
name = "pyo3-macros-backend"
version = "0.15.2"
version = "0.18.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a8c2812c412e00e641d99eeb79dd478317d981d938aa60325dfa7157b607095"
checksum = "97daff08a4c48320587b5224cc98d609e3c27b6d437315bd40b605c98eeb5918"
dependencies = [
"proc-macro2",
"pyo3-build-config",
"quote",
"syn",
]
[[package]]
name = "quote"
version = "1.0.23"
version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
dependencies = [
"proc-macro2",
]
@ -229,9 +197,9 @@ dependencies = [
[[package]]
name = "regex"
version = "1.7.1"
version = "1.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
dependencies = [
"aho-corasick",
"memchr",
@ -240,13 +208,13 @@ dependencies = [
[[package]]
name = "regex-syntax"
version = "0.6.28"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
[[package]]
name = "rio-py"
version = "3.3.2"
version = "3.3.3"
dependencies = [
"lazy_static",
"pyo3",
@ -277,10 +245,16 @@ dependencies = [
]
[[package]]
name = "unicode-ident"
version = "1.0.6"
name = "target-lexicon"
version = "0.12.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5"
[[package]]
name = "unicode-ident"
version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
[[package]]
name = "unindent"
@ -289,23 +263,67 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c"
[[package]]
name = "winapi"
version = "0.3.9"
name = "windows-sys"
version = "0.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
dependencies = [
"winapi-i686-pc-windows-gnu",
"winapi-x86_64-pc-windows-gnu",
"windows-targets",
]
[[package]]
name = "winapi-i686-pc-windows-gnu"
version = "0.4.0"
name = "windows-targets"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
dependencies = [
"windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_gnullvm",
"windows_x86_64_msvc",
]
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
name = "windows_aarch64_gnullvm"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
[[package]]
name = "windows_aarch64_msvc"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
[[package]]
name = "windows_i686_gnu"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
[[package]]
name = "windows_i686_msvc"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
[[package]]
name = "windows_x86_64_gnu"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
[[package]]
name = "windows_x86_64_msvc"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"

View File

@ -27,14 +27,14 @@
buildPythonPackage rec {
pname = "breezy";
version = "3.3.2";
version = "3.3.3";
format = "pyproject";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
hash = "sha256-TqaUn8uwdrl4VFsJn6xoq6011voYmd7vT2uCo9uiV8E=";
hash = "sha256-WrXmxp63uja5lfPIPjPnvh1d/KwrkoOIjh4MYeRwMOc=";
};
cargoDeps = rustPlatform.importCargoLock {
@ -45,8 +45,6 @@ buildPythonPackage rec {
ln -s ${./Cargo.lock} Cargo.lock
'';
cargoHash = "sha256-xYZh/evNp036/wRlNWWUYeD2EkleM+OeY4qbYMCE00I=";
nativeBuildInputs = [
cython
installShellFiles
@ -117,6 +115,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Friendly distributed version control system";
homepage = "https://www.breezy-vcs.org/";
changelog = "https://github.com/breezy-team/breezy/blob/brz-${version}/doc/en/release-notes/brz-${versions.majorMinor version}.txt";
license = licenses.gpl2Only;
maintainers = [ maintainers.marsam ];
mainProgram = "brz";

View File

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "hidapi";
version = "0.13.1";
version = "0.14.0";
src = fetchPypi {
inherit pname version;
sha256 = "99b18b28ec414ef9b604ddaed08182e486a400486f31ca56f61d537eed1d17cf";
sha256 = "a7cb029286ced5426a381286526d9501846409701a29c2538615c3d1a612b8be";
};
nativeBuildInputs = lib.optionals stdenv.isDarwin [ xcbuild ];

View File

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonAtLeast
, isPy27
, futures ? null
, gevent
@ -15,6 +16,10 @@ buildPythonPackage rec {
version = "2.4.0";
format = "setuptools";
# incompatible with asyncio changes in 3.11 and deprecated
# https://github.com/opentracing/specification/issues/163
disabled = pythonAtLeast "3.11";
src = fetchPypi {
inherit pname version;
sha256 = "a173117e6ef580d55874734d1fa7ecb6f3655160b8b8974a2a1e98e5ec9c840d";

View File

@ -6,6 +6,7 @@
, sniffio
, pytest-trio
, pytestCheckHook
, pythonAtLeast
, pythonOlder
}:
@ -49,6 +50,10 @@ buildPythonPackage rec {
"tests/python" # tries to import internal API test.test_asyncio
];
disabledTests = lib.optionals (pythonAtLeast "3.11") [
"test_run_task"
];
pythonImportsCheck = [
"trio_asyncio"
];

View File

@ -6,20 +6,21 @@
, python3
, makeWrapper
, darwin
, which
}:
rustPlatform.buildRustPackage rec {
pname = "pylyzer";
version = "0.0.27";
version = "0.0.28";
src = fetchFromGitHub {
owner = "mtshiba";
repo = "pylyzer";
rev = "v${version}";
hash = "sha256-RtfRYycHSDaOE71tTtChdMJKyRyTqracHw4p94heFwU=";
hash = "sha256-+i35dkYtvGrjN3KWtCfr6W4TkNmV0T8CF+WcaodPbX4=";
};
cargoHash = "sha256-Ggvcg96j9LlhDy0BMJzNDXE1Qtf04svt2ezXmkq3aUA=";
cargoHash = "sha256-y/CZDh7TURi6VBko+/3U2HQ41asn1IWJF/1WPD0DyT4=";
nativeBuildInputs = [
git
@ -42,6 +43,10 @@ rustPlatform.buildRustPackage rec {
cp -r $HOME/.erg/ $out/lib/erg
'';
nativeCheckInputs = [
which
];
checkFlags = [
# this test causes stack overflow
# > thread 'exec_import' has overflowed its stack

View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitLab
, fetchpatch
# build time
, bison
@ -52,6 +53,15 @@ stdenv.mkDerivation rec {
hash = "sha256-7Z9Y7uUjtjdQbB+xV/fvO18xB18VV7fBZqw1fI7U0jQ=";
};
patches = [
# fixes pkgsMusl.intel-gpu-tools
# https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/138
(fetchpatch {
url = "https://raw.githubusercontent.com/void-linux/void-packages/111918317d06598fe1459dbe139923404f3f4b9d/srcpkgs/igt-gpu-tools/patches/musl.patch";
hash = "sha256-cvtwZg7js7O/Ww7puBTfVzLRji2bHTyV91+PvpH8qrg=";
})
];
nativeBuildInputs = [
bison
docbook_xsl

View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "rain";
version = "1.3.3";
version = "1.4.0";
src = fetchFromGitHub {
owner = "aws-cloudformation";
repo = pname;
rev = "v${version}";
sha256 = "sha256-34BHWvXwwdiFotVlV8U6HSkRy9TvJ6DLIC0Mpz//C3w=";
sha256 = "sha256-qSzsipGXBxLkdVC4mqq4KhTtyo4+Y/TlgKbGkm1HlK8=";
};
vendorHash = "sha256-h/9a+o/jiNH2b1XIkbnKXSpCsBtyIhdOGyTNHU+Q/bA=";
vendorHash = "sha256-n1Hxd2SE8JhLqII+neOzeB94KQ7b/Gm1kXCtP8AuWYk=";
subPackages = [ "cmd/rain" ];

View File

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-chef";
version = "0.1.59";
version = "0.1.61";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-96KfjxpFw1uNejN917KMX98zxzJmozMiS99Aex2w4tM=";
sha256 = "sha256-O3q0gfVnFMgcwWGfRgdGOwU6fauRN2qPkyTe72p3zS4=";
};
cargoHash = "sha256-t4MuazMC8VJLj2SwY/crkd2W/ioRkdjvL5ZWiCp+7tE=";
cargoHash = "sha256-A22x2s5tHf9M6UbFHwmVNgO2qe65io/GysF1+ZE8NXM=";
meta = with lib; {
description = "A cargo-subcommand to speed up Rust Docker builds using Docker layer caching";

View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "telegraf";
version = "1.26.2";
version = "1.26.3";
excludedPackages = "test";
@ -12,10 +12,10 @@ buildGoModule rec {
owner = "influxdata";
repo = "telegraf";
rev = "v${version}";
sha256 = "sha256-Y3WDhYJ4So0vcJPvd+1l8Fpuqa84vm7A1Teh5G+pOmI=";
sha256 = "sha256-B1jYtJFj9hQT2ub9KaeoiWJZN9CHyZzA7juk0JZ0ZAo=";
};
vendorHash = "sha256-uEqFst42z8tfTgnNF4l/8+6XakRPsT0qL0YJOQD/z60=";
vendorHash = "sha256-dwUVmUzQn66Pz4vY9JIHVImiM4FwbAPZctSach/jH4c=";
proxyVendor = true;
ldflags = [

View File

@ -0,0 +1,34 @@
{ lib, stdenv, fetchFromGitHub, cmake, installShellFiles, openssl }:
stdenv.mkDerivation rec {
pname = "flashmq";
version = "1.4.5";
src = fetchFromGitHub {
owner = "halfgaar";
repo = "FlashMQ";
rev = "v${version}";
hash = "sha256-DcxwwUNpnMeK8A3LuyfrWAMCng0yIcX9bKxNGY0uDSo=";
};
nativeBuildInputs = [ cmake installShellFiles ];
buildInputs = [ openssl ];
installPhase = ''
runHook preInstall
install -Dm755 flashmq -t $out/bin
installManPage $src/man/*.{1,5}
runHook postInstall
'';
meta = with lib; {
description = "Fast light-weight MQTT broker/server";
homepage = "https://www.flashmq.org/";
license = licenses.agpl3Only;
maintainers = with maintainers; [ sikmir ];
platforms = platforms.linux;
};
}

View File

@ -0,0 +1,40 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "fiano";
version = "1.2.0";
src = fetchFromGitHub {
owner = "linuxboot";
repo = "fiano";
rev = "v${version}";
hash = "sha256-QX0XMec99YbYWyfRThhwDaNjKstkUEz6wsisBynprmg=";
};
subPackages = [
"cmds/cbfs"
"cmds/create-ffs"
"cmds/fmap"
"cmds/fspinfo"
"cmds/glzma"
"cmds/guid2english"
"cmds/microcode"
"cmds/utk"
];
vendorHash = "sha256-00ZSAVEmk2pNjv6fo++gnpIheK8lo4AVWf+ghXappnI=";
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "Go-based tools for modifying UEFI firmware";
homepage = "https://github.com/linuxboot/fiano";
changelog = "https://github.com/linuxboot/fiano/blob/v${version}/RELEASES.md";
license = licenses.bsd3;
maintainers = [ maintainers.jmbaur ];
};
}

View File

@ -24,8 +24,8 @@
}:
let
pname = "qFlipper";
version = "1.3.0";
sha256 = "sha256-OkeufUPAQWfWCr/OG0h62E+Oo8KeqmVnC70SBEEaOfs=";
version = "1.3.1";
sha256 = "sha256-ObrK21EjtdwQAq7ucUx7oUjwak2DgvbrcfvaXdzcgQo=";
timestamp = "99999999999";
commit = "nix-${version}";

View File

@ -13,14 +13,14 @@
stdenv.mkDerivation rec {
pname = "iaito";
version = "5.8.4";
version = "5.8.6";
srcs = [
(fetchFromGitHub rec {
owner = "radareorg";
repo = "iaito";
rev = version;
hash = "sha256-pt2vq+JN+Ccv+9o8s2y87xTVeQp2WJ0UfKdoWGsBkUI=";
hash = "sha256-rl8bOIR0oS6YvZA5pr8oSj7HcKK4YeCjAEi7saVdvk8=";
name = repo;
})
(fetchFromGitHub rec {

View File

@ -17,14 +17,14 @@
stdenv.mkDerivation rec {
# Don't forget to update go.d.plugin.nix as well
version = "1.39.0";
version = "1.39.1";
pname = "netdata";
src = fetchFromGitHub {
owner = "netdata";
repo = "netdata";
rev = "v${version}";
sha256 = "sha256-YegHgyj9X8YDSsEV65v8oSnRDv57oz3PCkLA1vy+LYA=";
sha256 = "sha256-jioQAUBc9jKmLgu9117TCqI/v+VMSD0CIMzEzG8J0OA=";
fetchSubmodules = true;
};
@ -121,6 +121,7 @@ stdenv.mkDerivation rec {
broken = stdenv.isDarwin || stdenv.buildPlatform != stdenv.hostPlatform;
description = "Real-time performance monitoring tool";
homepage = "https://www.netdata.cloud/";
changelog = "https://github.com/netdata/netdata/releases/tag/v${version}";
license = licenses.gpl3Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ raitobezarius ];

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bibclean";
version = "3.06";
version = "3.07";
src = fetchurl {
url = "http://ftp.math.utah.edu/pub/bibclean/bibclean-${version}.tar.xz";
sha256 = "sha256-ZXT5uAQrqPoF6uVBazc4o1w40Sn0jnM+JYeOz7qq3kM=";
sha256 = "sha256-kZM2eC6ePCBOYPVkhf0fjdZ562IvyP0fSDNZXuEBkaY=";
};
postPatch = ''

View File

@ -741,6 +741,8 @@ with pkgs;
docui = callPackage ../tools/misc/docui { };
done = callPackage ../applications/misc/done { };
dotfiles = callPackage ../applications/misc/dotfiles { };
# Dotnet
@ -1667,6 +1669,8 @@ with pkgs;
ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { };
openbugs = pkgsi686Linux.callPackage ../applications/science/machine-learning/openbugs { };
paperview = callPackage ../tools/X11/paperview { };
pferd = callPackage ../tools/misc/pferd { };
@ -4873,6 +4877,8 @@ with pkgs;
fetch-scm = callPackage ../tools/misc/fetch-scm { };
fiano = callPackage ../tools/misc/fiano { };
filebench = callPackage ../tools/misc/filebench { };
filebot = callPackage ../applications/video/filebot { };
@ -17605,17 +17611,17 @@ with pkgs;
ansible = ansible_2_15;
ansible_2_15 = python3Packages.toPythonApplication python3Packages.ansible-core;
ansible_2_14 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
version = "2.14.5";
version = "2.14.6";
src = oldAttrs.src.override {
inherit version;
hash = "sha256-jE7tds5Fi0o3M0oIAt8pSI7Pn4rzjDERBpyWsXsgVTA=";
hash = "sha256-DN2w30VFYZgfHFQdt6xTmNXp3kUuofAYR6y9Ax/X0rI=";
};
}));
ansible_2_13 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
version = "2.13.9";
version = "2.13.10";
src = oldAttrs.src.override {
inherit version;
hash = "sha256-nDGeygqcU83m8XSBLd1xFO2x5dDrXh30e9DY/v7ax2w=";
hash = "sha256-1LQKSq+GDe9sLJ6K1SAfhoPj59fY4hRjxtWepPixLfc=";
};
}));
@ -22112,6 +22118,14 @@ with pkgs;
librem = callPackage ../development/libraries/librem { };
libremidi = callPackage ../development/libraries/libremidi {
inherit (darwin.apple_sdk.frameworks)
CoreAudio
CoreFoundation
CoreMIDI
CoreServices;
};
librelp = callPackage ../development/libraries/librelp { };
librepo = callPackage ../tools/package-management/librepo {
@ -25380,6 +25394,8 @@ with pkgs;
inherit (callPackages ../servers/firebird { }) firebird_4 firebird_3 firebird_2_5 firebird;
flashmq = callPackage ../servers/mqtt/flashmq { };
freeradius = callPackage ../servers/freeradius { };
freshrss = callPackage ../servers/web-apps/freshrss { };