Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2024-11-04 18:04:50 +00:00 committed by GitHub
commit 7bea7cacca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
100 changed files with 3029 additions and 1462 deletions

View File

@ -6,6 +6,8 @@ Christina Sørensen <christina@cafkafk.com> <christinaafk@gmail.com>
Christina Sørensen <christina@cafkafk.com> <89321978+cafkafk@users.noreply.github.com>
Daniel Løvbrøtte Olsen <me@dandellion.xyz> <daniel.olsen99@gmail.com>
Fabian Affolter <mail@fabian-affolter.ch> <fabian@affolter-engineering.ch>
Fiona Behrens <me@kloenk.dev>
Fiona Behrens <me@kloenk.dev> <me@kloenk.de>
goatastronaut0212 <goatastronaut0212@outlook.com> <goatastronaut0212@proton.me>
Janne Heß <janne@hess.ooo> <dasJ@users.noreply.github.com>
Jörg Thalheim <joerg@thalheim.io> <Mic92@users.noreply.github.com>

View File

@ -1217,6 +1217,11 @@ lib.mapAttrs mkLicense ({
fullName = "TCL/TK License";
};
tost = {
fullName = "Tomorrow Open Source Technology License 1.0";
url = "https://github.com/PixarAnimationStudios/OpenUSD/blob/release/LICENSE.txt";
};
ucd = {
fullName = "Unicode Character Database License";
url = "https://fedoraproject.org/wiki/Licensing:UCD";

View File

@ -9746,6 +9746,13 @@
githubId = 2179419;
name = "Arseniy Seroka";
};
jakecleary = {
email = "shout@jakecleary.net";
github = "jakecleary";
githubId = 4572429;
name = "Jake Cleary";
keys = [ { fingerprint = "6192 E5CC 28B8 FA7E F5F3 775F 3726 5B1E 496C 92A2"; } ];
};
jakedevs = {
email = "work@jakedevs.net";
github = "jakedevs";
@ -11567,11 +11574,11 @@
};
kloenk = {
email = "me@kloenk.dev";
matrix = "@kloenk:petabyte.dev";
name = "Finn Behrens";
github = "Kloenk";
matrix = "@kloenk:kloenk.eu";
name = "Fiona Behrens";
github = "kloenk";
githubId = 12898828;
keys = [ { fingerprint = "6881 5A95 D715 D429 659B 48A4 B924 45CF C954 6F9D"; } ];
keys = [ { fingerprint = "B44A DFDF F869 A66A 3FDF DD8B 8609 A7B5 19E5 E342"; } ];
};
kmcopper = {
email = "kmcopper@danwin1210.me";
@ -13744,12 +13751,6 @@
githubId = 2971615;
name = "Marius Bergmann";
};
mcaju = {
email = "cajum.bugs@yandex.com";
github = "CajuM";
githubId = 10420834;
name = "Mihai-Drosi Caju";
};
mccartykim = {
email = "mccartykim@zoho.com";
github = "mccartykim";

View File

@ -1,8 +1,8 @@
{
x86_64-linux = "/nix/store/2nhrwv91g6ycpyxvhmvc0xs8p92wp4bk-nix-2.24.9";
i686-linux = "/nix/store/idaxj9ji6ggpn1h47a35mf0c8ns4ma39-nix-2.24.9";
aarch64-linux = "/nix/store/7b5q44l2p70bf6m6dprr8f0587ypwq1z-nix-2.24.9";
riscv64-linux = "/nix/store/mgw3il1qk59750g5hbf02km79rgyx00y-nix-riscv64-unknown-linux-gnu-2.24.9";
x86_64-darwin = "/nix/store/rp8rc0pfgham7d7spj5s9syzb138dmmd-nix-2.24.9";
aarch64-darwin = "/nix/store/1n95r340s7p3vdwqh7m94q0a42crahqq-nix-2.24.9";
x86_64-linux = "/nix/store/hdy82qidsybc3fg561pqfwagv44vschb-nix-2.24.10";
i686-linux = "/nix/store/dyx4p79q6blva585bf90wbjjb7iyq8ra-nix-2.24.10";
aarch64-linux = "/nix/store/30gnc15nig1awa11vii9yz3z8518rnr3-nix-2.24.10";
riscv64-linux = "/nix/store/bxc2pyp1vj8kr77khyx5nglw73jqb98w-nix-riscv64-unknown-linux-gnu-2.24.10";
x86_64-darwin = "/nix/store/6mrkghigrci6dz2lnncqpgf80yi8gl7h-nix-2.24.10";
aarch64-darwin = "/nix/store/3f81gjiv836rjmsb29zab0pbjwf9did8-nix-2.24.10";
}

View File

@ -93,13 +93,13 @@ in {
};
extraConfig = lib.mkOption {
type = lib.types.str;
type = lib.types.lines;
description = "Extra configuration to append to master.cfg";
default = "c['buildbotNetUsageData'] = None";
};
extraImports = lib.mkOption {
type = lib.types.str;
type = lib.types.lines;
description = "Extra python imports to prepend to master.cfg";
default = "";
example = "from buildbot.process.project import Project";

View File

@ -1,8 +1,13 @@
{ config, lib, pkgs, ... }:
let cfg = config.hardware.spacenavd;
in {
{
config,
lib,
pkgs,
...
}:
let
cfg = config.hardware.spacenavd;
in
{
options = {
hardware.spacenavd = {
enable = lib.mkEnableOption "spacenavd to support 3DConnexion devices";
@ -10,12 +15,9 @@ in {
};
config = lib.mkIf cfg.enable {
systemd.user.services.spacenavd = {
description = "Daemon for the Spacenavigator 6DOF mice by 3Dconnexion";
wantedBy = [ "graphical.target" ];
serviceConfig = {
ExecStart = "${pkgs.spacenavd}/bin/spacenavd -d -l syslog";
};
systemd = {
packages = [ pkgs.spacenavd ];
services.spacenavd.enable = true;
};
};
}

View File

@ -188,7 +188,7 @@ let
assert "hello world" == client.succeed("cat /tmp/repo-clone/testfile").strip()
with subtest("Testing git protocol version=2 over ssh"):
git_protocol = client.succeed("GIT_TRACE2_EVENT=true git -C /tmp/repo-clone fetch |& grep negotiated-version")
git_protocol = client.succeed("GIT_TRACE2_EVENT=true GIT_TRACE2_EVENT_NESTING=3 git -C /tmp/repo-clone fetch |& grep negotiated-version")
version = json.loads(git_protocol).get("value")
assert version == "2", f"git did not negotiate protocol version 2, but version {version} instead."

View File

@ -117,9 +117,10 @@ in stdenv.mkDerivation rec {
# TODO: Update cmake hook to make it simpler to selectively disable cmake tests: #113829
checkPhase = let
disabledTests =
# PortChecker test fails when lashSupport is enabled because
# zynaddsubfx takes to long to start trying to connect to lash
lib.optionals lashSupport [ "PortChecker" ]
# PortChecker is non-deterministic. It's fixed in the master
# branch, but backporting would require an update to rtosc, so
# we'll just disable it until the next release.
[ "PortChecker" ]
# Tests fail on aarch64
++ lib.optionals stdenv.hostPlatform.isAarch64 [ "MessageTest" "UnisonTest" ];

View File

@ -2386,6 +2386,17 @@
};
meta.homepage = "https://github.com/rescript-lang/tree-sitter-rescript";
};
river = buildGrammar {
language = "river";
version = "0.0.0+rev=eafcdc5";
src = fetchFromGitHub {
owner = "grafana";
repo = "tree-sitter-river";
rev = "eafcdc5147f985fea120feb670f1df7babb2f79e";
hash = "sha256-fhuIO++hLr5DqqwgFXgg8QGmcheTpYaYLMo7117rjyk=";
};
meta.homepage = "https://github.com/grafana/tree-sitter-river";
};
rnoweb = buildGrammar {
language = "rnoweb";
version = "0.0.0+rev=1a74dc0";

View File

@ -298,8 +298,8 @@ let
mktplcRef = {
name = "openscad";
publisher = "Antyos";
version = "1.1.1";
sha256 = "1adcw9jj3npk3l6lnlfgji2l529c4s5xp9jl748r9naiy3w3dpjv";
version = "1.3.1";
hash = "sha256-J4lJgZT0HXRC2B1eFUl4MoP0YT5EZjLPl3yIY+VLBiI=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/Antyos.openscad/changelog";

View File

@ -15,14 +15,14 @@
python3Packages.buildPythonPackage rec {
pname = "hydrus";
version = "591";
version = "595";
format = "other";
src = fetchFromGitHub {
owner = "hydrusnetwork";
repo = "hydrus";
rev = "refs/tags/v${version}";
hash = "sha256-JhCnSNmCOEJdM5aEPpYWLpKy/EQ9BoN1A/aUAaILWtQ=";
hash = "sha256-bIUtFpAMCIeLAyGXi4Rgn8FmijN5NwbkC31JoVyjNdg=";
};
nativeBuildInputs = [

View File

@ -1,33 +1,44 @@
{ stdenv, lib, fetchFromGitHub, pkg-config, gtk2 }:
{
stdenv,
lib,
fetchFromGitHub,
fetchpatch,
pkg-config,
libspnav,
libX11,
stdenv.mkDerivation rec {
# Qt6 support is close: https://github.com/FreeSpacenav/spnavcfg/issues/43
libsForQt5,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "spnavcfg";
version = "0.3.1";
version = "1.1";
src = fetchFromGitHub {
owner = "FreeSpacenav";
repo = pname;
rev = "v${version}";
sha256 = "180mkdis15gxs79rr3f7hpwa1p6v81bybw37pzzdjnmqwqrc08a0";
repo = "spnavcfg";
rev = "refs/tags/v${finalAttrs.version}";
fetchLFS = true;
hash = "sha256-P3JYhZnaCxzJETwC4g5m4xAGBk28/Va7Z/ybqwacIaA=";
};
patches = [
# Changes the pidfile path from /run/spnavd.pid to $XDG_RUNTIME_DIR/spnavd.pid
# to allow for a user service
./configure-pidfile-path.patch
# Changes the config file path from /etc/spnavrc to $XDG_CONFIG_HOME/spnavrc or $HOME/.config/spnavrc
# to allow for a user service
./configure-cfgfile-path.patch
(fetchpatch {
url = "https://github.com/FreeSpacenav/spnavcfg/commit/fd9aa10fb8e19a257398757943b3d8e79906e583.patch";
hash = "sha256-XKEyLAFrA4qRU3zkBozblb/fKtLKsaItze0xv1uLnq0=";
})
];
postPatch = ''
sed -i s/4775/775/ Makefile.in
'';
nativeBuildInputs = [
pkg-config
libsForQt5.wrapQtAppsHook
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2 ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
buildInputs = [
libsForQt5.qtbase
libspnav
libX11
];
meta = with lib; {
homepage = "https://spacenav.sourceforge.net/";
@ -37,4 +48,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ gebner ];
mainProgram = "spnavcfg";
};
}
})

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "roxctl";
version = "4.5.3";
version = "4.5.4";
src = fetchFromGitHub {
owner = "stackrox";
repo = "stackrox";
rev = version;
sha256 = "sha256-TWmbpU27ZGG8L66TW3yWoxUO8M4N6mMOmLv2VVXM+Q4=";
sha256 = "sha256-Da3KFGdhDSvdcMBbYmhgft7Sj+PPgUMsEoXAtx9Mhm8=";
};
vendorHash = "sha256-qDSi1Jk6erSCwPiLubdVlqOT6PQygMQghS8leieJ78s=";

View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "timoni";
version = "0.22.0";
version = "0.22.1";
src = fetchFromGitHub {
owner = "stefanprodan";
repo = "timoni";
rev = "v${version}";
hash = "sha256-g0B5UbveQ6KYqfXGF5bsGJfUuZ3q1TNEaC1GwtNAig8=";
hash = "sha256-bztaG+agcByiIFR4vp0QCDzL9AvLJoZRyMjwSggtwio=";
};
vendorHash = "sha256-XeqHETKWw74edsWCOKC+bhIt0NZz5mgrTShoQk1hb5Y=";
vendorHash = "sha256-VHR5eQWC5e45ZcpCunrUPdvFKMETRZxHLZnl7FbyFcI=";
subPackages = [ "cmd/timoni" ];
nativeBuildInputs = [ installShellFiles ];

View File

@ -10,11 +10,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "tart";
version = "2.18.5";
version = "2.19.3";
src = fetchurl {
url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz";
hash = "sha256-3mbO6HlJxEl9NZzJ8IaZWESqPzS7OTw+I+t0XH25D/Q=";
hash = "sha256-WigjqOu36bkNsTk6WpLwpyaauk4RtwShw1wWBHdxTFI=";
};
sourceRoot = ".";

View File

@ -4,6 +4,7 @@ lib.makeOverridable (
{ owner, repo, rev, name ? "source"
, fetchSubmodules ? false, leaveDotGit ? null
, deepClone ? false, private ? false, forceFetchGit ? false
, fetchLFS ? false
, sparseCheckout ? []
, githubBase ? "github.com", varPrefix ? null
, meta ? { }
@ -25,7 +26,7 @@ let
};
passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" "forceFetchGit" "private" "githubBase" "varPrefix" ];
varBase = "NIX${lib.optionalString (varPrefix != null) "_${varPrefix}"}_GITHUB_PRIVATE_";
useFetchGit = fetchSubmodules || (leaveDotGit == true) || deepClone || forceFetchGit || (sparseCheckout != []);
useFetchGit = fetchSubmodules || (leaveDotGit == true) || deepClone || forceFetchGit || fetchLFS || (sparseCheckout != []);
# We prefer fetchzip in cases we don't need submodules as the hash
# is more stable in that case.
fetcher =
@ -52,7 +53,7 @@ let
fetcherArgs = (if useFetchGit
then {
inherit rev deepClone fetchSubmodules sparseCheckout; url = gitRepoUrl;
inherit rev deepClone fetchSubmodules sparseCheckout fetchLFS; url = gitRepoUrl;
} // lib.optionalAttrs (leaveDotGit != null) { inherit leaveDotGit; }
else {
url = "${baseUrl}/archive/${rev}.tar.gz";

View File

@ -62,14 +62,14 @@ let
in
py.pkgs.buildPythonApplication rec {
pname = "awscli2";
version = "2.18.15"; # N.B: if you change this, check if overrides are still up-to-date
version = "2.19.0"; # N.B: if you change this, check if overrides are still up-to-date
pyproject = true;
src = fetchFromGitHub {
owner = "aws";
repo = "aws-cli";
rev = "refs/tags/${version}";
hash = "sha256-dm4Z3WsFq5GQN6gvi5OS9J96PqhGx8Qz2OsHwUBrsAs=";
hash = "sha256-kHJXdqGRVA4C3EB1T9gQYoM6M8E/UYTTma1RqLZqH58=";
};
postPatch = ''

View File

@ -8,6 +8,12 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "adler2"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
[[package]]
name = "ahash"
version = "0.7.8"
@ -79,15 +85,15 @@ dependencies = [
[[package]]
name = "anyhow"
version = "1.0.86"
version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
[[package]]
name = "arrayvec"
version = "0.7.4"
version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
[[package]]
name = "associative-cache"
@ -121,9 +127,9 @@ dependencies = [
[[package]]
name = "async-executor"
version = "1.13.0"
version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7"
checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
dependencies = [
"async-task",
"concurrent-queue",
@ -175,9 +181,9 @@ dependencies = [
[[package]]
name = "async-process"
version = "2.2.4"
version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374"
checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb"
dependencies = [
"async-channel",
"async-io",
@ -190,7 +196,6 @@ dependencies = [
"futures-lite",
"rustix",
"tracing",
"windows-sys 0.59.0",
]
[[package]]
@ -201,7 +206,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.74",
"syn 2.0.77",
]
[[package]]
@ -230,13 +235,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
[[package]]
name = "async-trait"
version = "0.1.81"
version = "0.1.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.74",
"syn 2.0.77",
]
[[package]]
@ -317,7 +322,7 @@ dependencies = [
[[package]]
name = "browsers"
version = "0.5.8"
version = "0.6.0"
dependencies = [
"clap",
"cocoa-foundation 0.2.0",
@ -371,9 +376,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
[[package]]
name = "bytemuck"
version = "1.16.3"
version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83"
checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
[[package]]
name = "byteorder"
@ -408,9 +413,9 @@ dependencies = [
[[package]]
name = "cc"
version = "1.1.12"
version = "1.1.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68064e60dbf1f17005c2fde4d07c16d8baa506fd7ffed8ccab702d93617975c7"
checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0"
dependencies = [
"shlex",
]
@ -439,18 +444,18 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
[[package]]
name = "clap"
version = "4.5.15"
version = "4.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc"
checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3"
dependencies = [
"clap_builder",
]
[[package]]
name = "clap_builder"
version = "4.5.15"
version = "4.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b"
dependencies = [
"anstream",
"anstyle",
@ -640,9 +645,9 @@ dependencies = [
[[package]]
name = "cpufeatures"
version = "0.2.13"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
dependencies = [
"libc",
]
@ -804,7 +809,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.74",
"syn 2.0.77",
]
[[package]]
@ -899,9 +904,9 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
[[package]]
name = "dwrote"
version = "0.11.0"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b"
checksum = "2da3498378ed373237bdef1eddcc64e7be2d3ba4841f4c22a998e81cadeea83c"
dependencies = [
"lazy_static",
"libc",
@ -933,7 +938,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.74",
"syn 2.0.77",
]
[[package]]
@ -975,9 +980,9 @@ dependencies = [
[[package]]
name = "fastrand"
version = "2.1.0"
version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
[[package]]
name = "fdeflate"
@ -1000,12 +1005,12 @@ dependencies = [
[[package]]
name = "flate2"
version = "1.0.31"
version = "1.0.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920"
checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
dependencies = [
"crc32fast",
"miniz_oxide",
"miniz_oxide 0.8.0",
]
[[package]]
@ -1074,9 +1079,9 @@ dependencies = [
[[package]]
name = "freedesktop-desktop-entry"
version = "0.7.0"
version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "714dc75515835140c365a1f199143577afe4650ef1277f2fba50032c8c20bbc2"
checksum = "d83c9c25bc7e0ff18c6fee324db310497622be235fd45c0f7347ab81981a941e"
dependencies = [
"dirs 5.0.1",
"gettext-rs",
@ -1154,7 +1159,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.74",
"syn 2.0.77",
]
[[package]]
@ -1268,9 +1273,9 @@ dependencies = [
[[package]]
name = "gettext-rs"
version = "0.7.0"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364"
checksum = "4a6716b8a0db461a2720b850ba1623e5b69e4b1aa0224cf5e1fb23a0fe49e65c"
dependencies = [
"gettext-sys",
"locale_config",
@ -1278,9 +1283,9 @@ dependencies = [
[[package]]
name = "gettext-sys"
version = "0.21.3"
version = "0.21.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d"
checksum = "f7b8797f28f2dabfbe2caadb6db4f7fd739e251b5ede0a2ba49e506071edcf67"
dependencies = [
"cc",
"temp-dir",
@ -1374,9 +1379,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "globset"
version = "0.4.14"
version = "0.4.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19"
dependencies = [
"aho-corasick",
"bstr",
@ -1516,9 +1521,9 @@ dependencies = [
[[package]]
name = "indexmap"
version = "2.4.0"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
dependencies = [
"equivalent",
"hashbrown 0.14.5",
@ -1621,9 +1626,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "libc"
version = "0.2.156"
version = "0.2.159"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a"
checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
[[package]]
name = "libredox"
@ -1721,6 +1726,15 @@ dependencies = [
"simd-adler32",
]
[[package]]
name = "miniz_oxide"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
dependencies = [
"adler2",
]
[[package]]
name = "naive-cityhash"
version = "0.2.0"
@ -1929,9 +1943,9 @@ dependencies = [
[[package]]
name = "parking"
version = "2.2.0"
version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
[[package]]
name = "percent-encoding"
@ -2051,9 +2065,9 @@ dependencies = [
[[package]]
name = "pkg-config"
version = "0.3.30"
version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
[[package]]
name = "png"
@ -2065,7 +2079,7 @@ dependencies = [
"crc32fast",
"fdeflate",
"flate2",
"miniz_oxide",
"miniz_oxide 0.7.4",
]
[[package]]
@ -2110,11 +2124,11 @@ dependencies = [
[[package]]
name = "proc-macro-crate"
version = "3.1.0"
version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
dependencies = [
"toml_edit 0.21.1",
"toml_edit 0.22.21",
]
[[package]]
@ -2152,9 +2166,9 @@ dependencies = [
[[package]]
name = "quote"
version = "1.0.36"
version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
dependencies = [
"proc-macro2",
]
@ -2197,9 +2211,9 @@ checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175"
[[package]]
name = "redox_users"
version = "0.4.5"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
dependencies = [
"getrandom",
"libredox",
@ -2268,18 +2282,18 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]]
name = "rustc_version"
version = "0.4.0"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
dependencies = [
"semver",
]
[[package]]
name = "rustix"
version = "0.38.34"
version = "0.38.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
dependencies = [
"bitflags 2.6.0",
"errno",
@ -2323,29 +2337,29 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
[[package]]
name = "serde"
version = "1.0.208"
version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.208"
version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.74",
"syn 2.0.77",
]
[[package]]
name = "serde_json"
version = "1.0.125"
version = "1.0.128"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed"
checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
dependencies = [
"itoa",
"memchr",
@ -2361,7 +2375,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.74",
"syn 2.0.77",
]
[[package]]
@ -2479,9 +2493,9 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.74"
version = "2.0.77"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7"
checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
dependencies = [
"proc-macro2",
"quote",
@ -2528,28 +2542,28 @@ dependencies = [
[[package]]
name = "textdistance"
version = "1.0.2"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d321c8576c2b47e43953e9cce236550d4cd6af0a6ce518fe084340082ca6037b"
checksum = "7f1835c76a9d443834c04539860f3ce46b9d93ef8c260057f939e967ca81180a"
[[package]]
name = "thiserror"
version = "1.0.63"
version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.63"
version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.74",
"syn 2.0.77",
]
[[package]]
@ -2646,7 +2660,7 @@ dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
"toml_edit 0.22.20",
"toml_edit 0.22.21",
]
[[package]]
@ -2671,20 +2685,9 @@ dependencies = [
[[package]]
name = "toml_edit"
version = "0.21.1"
version = "0.22.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
dependencies = [
"indexmap",
"toml_datetime",
"winnow 0.5.40",
]
[[package]]
name = "toml_edit"
version = "0.22.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf"
dependencies = [
"indexmap",
"serde",
@ -2724,7 +2727,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.74",
"syn 2.0.77",
]
[[package]]
@ -2886,24 +2889,24 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
[[package]]
name = "unicode-ident"
version = "1.0.12"
version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
[[package]]
name = "unicode-normalization"
version = "0.1.23"
version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
dependencies = [
"tinyvec",
]
[[package]]
name = "unicode-segmentation"
version = "1.11.0"
version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
[[package]]
name = "url"
@ -2974,7 +2977,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
"syn 2.0.74",
"syn 2.0.77",
"wasm-bindgen-shared",
]
@ -2996,7 +2999,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.74",
"syn 2.0.77",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@ -3339,10 +3342,10 @@ version = "4.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e"
dependencies = [
"proc-macro-crate 3.1.0",
"proc-macro-crate 3.2.0",
"proc-macro2",
"quote",
"syn 2.0.74",
"syn 2.0.77",
"zvariant_utils",
]
@ -3375,7 +3378,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.74",
"syn 2.0.77",
]
[[package]]
@ -3397,10 +3400,10 @@ version = "4.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449"
dependencies = [
"proc-macro-crate 3.1.0",
"proc-macro-crate 3.2.0",
"proc-macro2",
"quote",
"syn 2.0.74",
"syn 2.0.77",
"zvariant_utils",
]
@ -3412,5 +3415,5 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.74",
"syn 2.0.77",
]

View File

@ -10,17 +10,19 @@
glib,
gtk3,
pango,
stdenv,
darwin,
}:
rustPlatform.buildRustPackage rec {
pname = "browsers";
version = "0.5.8";
version = "0.6.0";
src = fetchFromGitHub {
owner = "Browsers-software";
repo = "browsers";
rev = "refs/tags/${version}";
hash = "sha256-o9vyrHQsZQ3qywA4bviM+W4xx64IZL24VHErMFAEMFE=";
hash = "sha256-qLqyv5XXG7cpW+/eNCWguqemT3G2BhnolntHi2zZJ0o=";
};
cargoLock = {
@ -36,14 +38,21 @@ rustPlatform.buildRustPackage rec {
wrapGAppsHook3
];
buildInputs = [
atk
cairo
gdk-pixbuf
glib
gtk3
pango
];
buildInputs =
[
atk
cairo
gdk-pixbuf
glib
gtk3
pango
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.AppKit
darwin.apple_sdk.frameworks.CoreGraphics
darwin.apple_sdk.frameworks.CoreText
darwin.apple_sdk.frameworks.Foundation
];
postInstall = ''
install -m 444 \
@ -67,7 +76,6 @@ rustPlatform.buildRustPackage rec {
changelog = "https://github.com/Browsers-software/browsers/blob/${src.rev}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ravenz46 ];
platforms = lib.platforms.linux;
mainProgram = "browsers";
};
}

View File

@ -9,13 +9,13 @@
}:
stdenvNoCC.mkDerivation {
pname = "cosmic-icons";
version = "1.0.0-alpha.2";
version = "1.0.0-alpha.3";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-icons";
rev = "341c84467fd863f0319cadf49b3d4bac1bf3029a";
hash = "sha256-VA2QKuzTQBgubfjPXdpejFtZxqOZUXds/fZrfN6/8Nk=";
rev = "epoch-1.0.0-alpha.3";
hash = "sha256-7gWCRBiE+XJX1JSjopyPN4bIIgZih6ZKGVSA7wBq3i0=";
};
nativeBuildInputs = [ just ];

View File

@ -6,19 +6,20 @@
python3.pkgs.buildPythonApplication rec {
pname = "dnsdiag";
version = "2.5.0";
version = "2.6.0";
pyproject = true;
src = fetchFromGitHub {
owner = "farrokhi";
repo = "dnsdiag";
rev = "refs/tags/v${version}";
hash = "sha256-qUbHwbLPDyy24GNu3dDJQKV3B71q1ODNMyRFIWwyRuo=";
hash = "sha256-6TDs+ncbVa7LWtGLlqEXJb9zzXZ+nAhbi4QGyCSu3ho=";
};
build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
aioquic
cryptography
cymruwhois
dnspython

View File

@ -21,13 +21,13 @@
buildGoModule rec {
pname = "ecapture";
version = "0.8.8";
version = "0.8.9";
src = fetchFromGitHub {
owner = "gojue";
repo = "ecapture";
rev = "refs/tags/v${version}";
hash = "sha256-pw/qlYVw1ofYDrTWTQVdx/N9U2JjkB05c7IUXURd4B8=";
hash = "sha256-snq6ypEEyIVxD19pdc2qw/j6FPgmRS9l6lmdDcUljKw=";
fetchSubmodules = true;
};

View File

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "flawz";
version = "0.2.2";
version = "0.3.0";
src = fetchFromGitHub {
owner = "orhun";
repo = "flawz";
rev = "v${version}";
hash = "sha256-/gNHi7ZENy0cgnEgDBW82ACUUsuMLYD9eUrSxwO9k1U=";
hash = "sha256-7p/BUXrElJutUcRMu+LxdsMxA6lCDnaci0fDaKGsawI=";
};
cargoHash = "sha256-kMiKlZj+G1vfjaEiB3rtPoJl0K3W9xRVwgVz8q2pn1s=";
cargoHash = "sha256-jVAMnU2NnL/2Hri6NxSUkIfQ/bJ5wMZ+oFOTMPrFE0M=";
nativeBuildInputs = [
pkg-config

View File

@ -0,0 +1,84 @@
{
lib,
stdenv,
fetchFromGitHub,
installShellFiles,
python3Packages,
}:
let
inherit (python3Packages)
buildPythonApplication
gitpython
manim
opencv4
typer
pydantic
fonttools
git-dummy
pytestCheckHook
;
version = "0.3.5";
in
buildPythonApplication {
pname = "git-sim";
inherit version;
pyproject = true;
src = fetchFromGitHub {
owner = "initialcommit-com";
repo = "git-sim";
rev = "v${version}";
hash = "sha256-4jHkAlF2SAzHjBi8pmAJ0TKkcLxw+6EdGsXnHZUMILw=";
};
patches = [ ./tests.patch ];
build-system = [ ];
pythonRemoveDeps = [ "opencv-python-headless" ];
dependencies = [
gitpython
manim
opencv4
typer
pydantic
fonttools
git-dummy
];
# https://github.com/NixOS/nixpkgs/commit/8033561015355dd3c3cf419d81ead31e534d2138
makeWrapperArgs = [ "--prefix PYTHONWARNINGS , ignore:::pydub.utils:" ];
nativeBuildInputs = [ installShellFiles ];
postInstall =
# https://github.com/NixOS/nixpkgs/issues/308283
lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd git-sim \
--bash <($out/bin/git-sim --show-completion bash) \
--fish <($out/bin/git-sim --show-completion fish) \
--zsh <($out/bin/git-sim --show-completion zsh)
''
+ "ln -s ${git-dummy}/bin/git-dummy $out/bin/";
preCheck = ''
PATH=$PATH:$out/bin
'';
nativeCheckInputs = [
pytestCheckHook
git-dummy
];
doCheck = false;
meta = {
description = "Visually simulate Git operations in your own repos with a single terminal command";
homepage = "https://initialcommit.com/tools/git-sim";
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ mathiassven ];
};
}

View File

@ -0,0 +1,33 @@
diff --git a/tests/e2e_tests/conftest.py b/tests/e2e_tests/conftest.py
index 310197a..9e82a1e 100644
--- a/tests/e2e_tests/conftest.py
+++ b/tests/e2e_tests/conftest.py
@@ -22,9 +22,7 @@ def tmp_repo(tmp_path_factory):
# Create the sample repo for testing.
os.chdir(tmp_repo_dir)
- # When defining cmd, as_posix() is required for Windows compatibility.
- git_dummy_path = utils.get_venv_path() / "git-dummy"
- cmd = f"{git_dummy_path.as_posix()} --commits=10 --branches=4 --merge=1 --constant-sha --name=sample_repo --diverge-at=2"
+ cmd = "git-dummy --commits=10 --branches=4 --merge=1 --constant-sha --name=sample_repo --diverge-at=2"
cmd_parts = split(cmd)
subprocess.run(cmd_parts)
diff --git a/tests/e2e_tests/utils.py b/tests/e2e_tests/utils.py
index 8dfc623..41a4cf6 100644
--- a/tests/e2e_tests/utils.py
+++ b/tests/e2e_tests/utils.py
@@ -69,13 +69,6 @@ def get_cmd_parts(raw_command):
f"git-sim -d --output-only-path --img-format=png --font='{font_path}'",
)
- # Replace `git-sim` with the full path to the binary.
- # as_posix() is needed for Windows compatibility.
- # The space is included in "git-sim " to avoid replacing any occurrences
- # of git-sim in a font path.
- git_sim_path = get_venv_path() / "git-sim"
- cmd = cmd.replace("git-sim ", f"{git_sim_path.as_posix()} ")
-
# Show full test command when run in diagnostic mode.
print(f" Test command: {cmd}")

View File

@ -9,13 +9,13 @@
buildGoModule rec {
pname = "go-blueprint";
version = "0.8.1";
version = "0.8.2";
src = fetchFromGitHub {
owner = "Melkeydev";
repo = "go-blueprint";
rev = "v${version}";
hash = "sha256-lIx95DY8UpxTW5Zra0APseuXdknsdZAohiGFdwkHE4s=";
hash = "sha256-4KEshM6y27CD+PiyYoz4IWKkfLWRXOTA7bMFfxVYfaI=";
};
ldflags = [

View File

@ -0,0 +1,34 @@
--- old/bridge/bridge.go 2024-11-03 02:07:33.553972040 +0800
+++ new/bridge/bridge.go 2024-11-03 02:10:09.239584378 +0800
@@ -38,11 +38,6 @@
func InitBridge(fs embed.FS) {
// step1: Set Env
- exePath, err := os.Executable()
- if err != nil {
- panic(err)
- }
-
for _, v := range os.Args {
if v == "tasksch" {
Env.FromTaskSch = true
@@ -50,8 +45,8 @@
}
}
- Env.BasePath = filepath.Dir(exePath)
- Env.AppName = filepath.Base(exePath)
+ Env.AppName = "GUI.for.SingBox"
+ Env.BasePath = filepath.Join(os.Getenv("HOME"), ".config", Env.AppName)
// step2: Create a persistent data symlink
if Env.OS == "darwin" {
@@ -128,7 +123,7 @@
}
func (a *App) RestartApp() FlagResult {
- exePath := Env.BasePath + "/" + Env.AppName
+ exePath := Env.AppName
cmd := exec.Command(exePath)
HideExecWindow(cmd)

View File

@ -0,0 +1,133 @@
{
stdenv,
nodejs,
pnpm,
fetchFromGitHub,
buildGoModule,
lib,
wails,
webkitgtk_4_0,
pkg-config,
libsoup_3,
wrapGAppsHook3,
autoPatchelfHook,
makeDesktopItem,
copyDesktopItems,
}:
let
pname = "gui-for-singbox";
version = "1.8.9";
src = fetchFromGitHub {
owner = "GUI-for-Cores";
repo = "GUI.for.SingBox";
rev = "v${version}";
hash = "sha256-mN+j2O/pM+kblmxZjVWvHXLHJSxydxLRh/Fol2+WALE=";
};
frontend = stdenv.mkDerivation (finalAttrs: {
inherit pname version src;
nativeBuildInputs = [
nodejs
pnpm.configHook
];
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
sourceRoot = "${finalAttrs.src.name}/frontend";
hash = "sha256-bAgyGZLmEr8tMunoeQHl+B2IDGr4Gw3by1lC811lqio=";
};
sourceRoot = "${finalAttrs.src.name}/frontend";
buildPhase = ''
runHook preBuild
pnpm run build
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir $out/
cp -r ./dist/* $out/
runHook postInstall
'';
meta = {
description = "GUI program developed by vue3";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
platforms = lib.platforms.linux;
};
});
in
buildGoModule {
inherit pname version src;
vendorHash = "sha256-rDbJOj8t/qu04Rd8J0LnXiBoIDmdzBQ9avAhImK7dFg=";
nativeBuildInputs = [
wails
pkg-config
wrapGAppsHook3
autoPatchelfHook
copyDesktopItems
];
buildInputs = [
webkitgtk_4_0
libsoup_3
];
desktopItems = [
(makeDesktopItem {
name = "GUI.for.SingBox";
exec = "GUI.for.SingBox";
icon = "GUI.for.SingBox";
genericName = "GUI.for.SingBox";
desktopName = "GUI.for.SingBox";
categories = [
"Network"
];
keywords = [
"Proxy"
];
})
];
postUnpack = ''
cp -r ${frontend} $sourceRoot/frontend/dist
'';
patches = [ ./bridge.patch ];
buildPhase = ''
runHook preBuild
wails build -m -s -trimpath -skipbindings -devtools -tags webkit2_40 -o GUI.for.SingBox
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/share/pixmaps
cp -r ./build/bin $out/bin
cp build/appicon.png $out/share/pixmaps/GUI.for.SingBox.png
runHook postInstall
'';
meta = {
description = "SingBox GUI program developed by vue3 + wails";
homepage = "https://github.com/GUI-for-Cores/GUI.for.SingBox";
mainProgram = "GUI.for.SingBox";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
platforms = lib.platforms.linux;
};
}

View File

@ -1,42 +0,0 @@
diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc
index c5383bc..50d1abc 100644
--- a/nix/libstore/build.cc
+++ b/nix/libstore/build.cc
@@ -2312,15 +2312,6 @@ void DerivationGoal::registerOutputs()
Path actualPath = path;
if (useChroot) {
actualPath = chrootRootDir + path;
- if (pathExists(actualPath)) {
- /* Move output paths from the chroot to the store. */
- if (buildMode == bmRepair)
- replaceValidPath(path, actualPath);
- else
- if (buildMode != bmCheck && rename(actualPath.c_str(), path.c_str()) == -1)
- throw SysError(format("moving build output `%1%' from the chroot to the store") % path);
- }
- if (buildMode != bmCheck) actualPath = path;
} else {
Path redirected = redirectedOutputs[path];
if (buildMode == bmRepair
@@ -2360,6 +2351,21 @@ void DerivationGoal::registerOutputs()
something like that. */
canonicalisePathMetaData(actualPath, buildUser.enabled() ? buildUser.getUID() : -1, inodesSeen);
+ if (useChroot) {
+ if (pathExists(actualPath)) {
+ /* Now that output paths have been canonicalized (in particular
+ there are no setuid files left), move them outside of the
+ chroot and to the store. */
+ if (buildMode == bmRepair)
+ replaceValidPath(path, actualPath);
+ else
+ if (buildMode != bmCheck && rename(actualPath.c_str(), path.c_str()) == -1)
+ throw SysError(format("moving build output `%1%' from the chroot to the store") % path);
+ }
+ if (buildMode != bmCheck) actualPath = path;
+ }
+
+
/* FIXME: this is in-memory. */
StringSink sink;
dumpPath(actualPath, sink);

View File

@ -3,6 +3,7 @@
stdenv,
fetchurl,
fetchpatch,
fetchDebianPatch,
autoreconfHook,
disarchive,
git,
@ -57,9 +58,19 @@ stdenv.mkDerivation rec {
url = "https://git.savannah.gnu.org/cgit/guix.git/patch/?id=ff1251de0bc327ec478fc66a562430fbf35aef42";
hash = "sha256-f4KWDVrvO/oI+4SCUHU5GandkGtHrlaM1BWygM/Qlao=";
})
# manual port of build user takeover remediation commit
# see https://guix.gnu.org/en/blog/2024/build-user-takeover-vulnerability
./guix-build-user-takeover-fix.patch
(fetchDebianPatch {
inherit pname version;
debianRevision = "8";
patch = "security/0101-daemon-Sanitize-failed-build-outputs-prior-to-exposi.patch";
hash = "sha256-cbra/+K8+xHUJrCKRgzJCuhMBpzCSjgjosKAkJx7QIo=";
})
(fetchDebianPatch {
inherit pname version;
debianRevision = "8";
patch = "security/0102-daemon-Sanitize-successful-build-outputs-prior-to-ex.patch";
hash = "sha256-mOnlYtpIuYL+kDvSNuXuoDLJP03AA9aI2ALhap+0NOM=";
})
];
postPatch = ''

View File

@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Icarus Verilog compiler";
homepage = "http://iverilog.icarus.com/"; # https does not work
homepage = "https://steveicarus.github.io/iverilog";
license = with licenses; [ gpl2Plus lgpl21Plus ];
maintainers = with maintainers; [ thoughtpolice ];
platforms = platforms.all;

View File

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "kamp";
version = "0.2.1";
version = "0.2.2";
src = fetchFromGitHub {
owner = "vbauerster";
repo = pname;
rev = "v${version}";
hash = "sha256-9cakFhA9niMZ0jD0ilgCUztk4uL6wDp6zfHUJY/yLYw=";
hash = "sha256-JZe8z6OYJ+I0+dcq+sCoQPzlz6eB4z98jWj8MDXdODY=";
};
cargoHash = "sha256-BnVV0UnXEebq1kbQvv8PkmntLK0BwrOcMxxIODpZrxc=";
cargoHash = "sha256-+NiDSg7FJrtcNm/V0kn2kNQMJqOamE7Yl0sK/FSUYgA=";
postInstall = ''
install scripts/* -Dt $out/bin

View File

@ -0,0 +1,109 @@
{
lib,
fetchFromGitHub,
flutter,
stdenv,
webkitgtk_4_1,
alsa-lib,
libayatana-appindicator,
libepoxy,
autoPatchelfHook,
wrapGAppsHook3,
gst_all_1,
at-spi2-atk,
fetchurl,
}:
let
version = "1.4.1";
src = fetchFromGitHub {
owner = "Predidit";
repo = "Kazumi";
rev = version;
hash = "sha256-LRlJo2zuE3Y3i4vBcjxIYQEDVJ2x85Fn77K4LVtTlg8=";
};
mdk-sdk = fetchurl {
url = "https://github.com/wang-bin/mdk-sdk/releases/download/v0.29.1/mdk-sdk-linux-x64.tar.xz";
hash = "sha256-7dkvm5kP3gcQwXOE9DrjoOTzKRiwk/PVeRr7poLdCU0=";
};
in
flutter.buildFlutterApplication {
pname = "kazumi";
inherit version src;
pubspecLock = lib.importJSON ./pubspec.lock.json;
nativeBuildInputs = [
wrapGAppsHook3
autoPatchelfHook
];
buildInputs = [
webkitgtk_4_1
alsa-lib
at-spi2-atk
libayatana-appindicator
libepoxy
gst_all_1.gstreamer
gst_all_1.gst-vaapi
gst_all_1.gst-libav
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-base
];
customSourceBuilders = {
flutter_volume_controller =
{ version, src, ... }:
stdenv.mkDerivation rec {
pname = "flutter_volume_controller";
inherit version src;
inherit (src) passthru;
postPatch = ''
substituteInPlace linux/CMakeLists.txt \
--replace-fail '# Include ALSA' 'find_package(PkgConfig REQUIRED)' \
--replace-fail 'find_package(ALSA REQUIRED)' 'pkg_check_modules(ALSA REQUIRED alsa)'
'';
installPhase = ''
runHook preInstall
mkdir $out
cp -r ./* $out/
runHook postInstall
'';
};
fvp =
{ version, src, ... }:
stdenv.mkDerivation rec {
pname = "fvp";
inherit version src;
inherit (src) passthru;
installPhase = ''
runHook preInstall
tar -xf ${mdk-sdk} -C ./linux
mkdir $out
cp -r ./* $out/
runHook postInstall
'';
};
};
gitHashes = {
desktop_webview_window = "sha256-Z9ehzDKe1W3wGa2AcZoP73hlSwydggO6DaXd9mop+cM=";
webview_windows = "sha256-9oWTvEoFeF7djEVA3PSM72rOmOMUhV8ZYuV6+RreNzE=";
};
postInstall = ''
mkdir -p $out/share/applications/ $out/share/icons/hicolor/512x512/apps/
cp ./assets/linux/io.github.Predidit.Kazumi.desktop $out/share/applications
cp ./assets/images/logo/logo_linux.png $out/share/icons/hicolor/512x512/apps/io.github.Predidit.Kazumi.png
'';
meta = {
description = "Watch Animes online with danmaku support";
homepage = "https://github.com/Predidit/Kazumi";
mainProgram = "kazumi";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
platforms = lib.platforms.linux;
};
}

File diff suppressed because it is too large Load Diff

View File

@ -23,7 +23,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "komikku";
version = "1.58.0";
version = "1.60.0";
format = "other";
@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "valos";
repo = "Komikku";
rev = "v${version}";
hash = "sha256-21ZtzWjyUC+/iPv+R1DUzCHITR8GVhN+6iepcTIRy0Y=";
hash = "sha256-USm/Fo1whu9KItfiwwmfVlDXri0xqhmEyMcryyP9F30=";
};
nativeBuildInputs = [

View File

@ -1,8 +1,6 @@
{
lib,
fetchurl,
fetchpatch,
autoreconfHook,
ncurses,
pcre2,
stdenv,
@ -24,23 +22,6 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-KBn1VWTYbVQqu+yv2C/2HoGaPuyWf6o2zT5o8VlqRLg=";
};
patches = [
(fetchpatch {
# Fix configure parameters --with-secure=no and --without-secure.
url = "https://github.com/gwsw/less/commit/8fff6c56bfc833528b31ebdaee871f65fbe342b1.patch";
hash = "sha256-XV5XufivNWWLGeIpaP04YQPWcxIUKYYEINdT+eEx+WA=";
includes = [
"configure.ac"
];
})
];
# Need `autoreconfHook` since we patch `configure.ac`.
# TODO: Remove the `configure.ac` patch and `autoreconfHook` next release
nativeBuildInputs = [
autoreconfHook
];
buildInputs = [
ncurses
pcre2

View File

@ -6,11 +6,11 @@
appimageTools.wrapType2 rec {
pname = "lunarclient";
version = "3.2.24";
version = "3.2.26";
src = fetchurl {
url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage";
hash = "sha512-0rTADFgOOBDuv4nk2lgP4YUFxfsasZDQkp/r26iVwSa5f1swQXALGFwLl1VdJTRQ5AlZvRm6WBbt/ML2jODTZw==";
hash = "sha512-g8VJCIRriUMUq+I+YjvWV9erki7jtQvIQzGWTUbdp2JNY4ix6gHesl232pk0Ypu1rQKHp3wKBhF98k2w6p7d4A==";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "mihomo";
version = "1.18.9";
version = "1.18.10";
src = fetchFromGitHub {
owner = "MetaCubeX";
repo = "mihomo";
rev = "v${version}";
hash = "sha256-WVzJymXmtPV5AGYYuFDlrhy5Hh9eUBOFG8UhAnFZ22g=";
hash = "sha256-VbqIlaocee+IxL3DDXr17ZmvDsRqJEuST/1HcU0bJds=";
};
vendorHash = "sha256-A10XICoieWc0FJAn2G2aolefLjguwL72qrr4KjMFYZE=";
vendorHash = "sha256-6pbrBcDTE46YTWn0CTv9Nip7iUqS8xDbHGZ7VzqDnTc=";
excludedPackages = [ "./test" ];

View File

@ -2,12 +2,6 @@
# It is not intended for manual editing.
version = 3
[[package]]
name = "Inflector"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
[[package]]
name = "addr2line"
version = "0.24.2"
@ -37,9 +31,9 @@ dependencies = [
[[package]]
name = "anyhow"
version = "1.0.90"
version = "1.0.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95"
checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13"
[[package]]
name = "autocfg"
@ -99,9 +93,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "cc"
version = "1.1.31"
version = "1.1.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
checksum = "67b9470d453346108f93a59222a9a1a5724db32d0a4727b7ab7ace4b4d822dc9"
dependencies = [
"shlex",
]
@ -134,7 +128,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustc_version",
"syn 2.0.81",
"syn 2.0.87",
]
[[package]]
@ -145,9 +139,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
[[package]]
name = "els"
version = "0.1.59-nightly.4"
version = "0.1.60-nightly.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b4e110537afd761192ab9cbea35f98d2e1421c1d98520a7c7114d30805ebe8d"
checksum = "91526cd54184ae2ddea4124e87a00dca78fff3780de423dcc0b089d8ed0f31e1"
dependencies = [
"erg_common",
"erg_compiler",
@ -161,9 +155,9 @@ dependencies = [
[[package]]
name = "erg_common"
version = "0.6.47-nightly.4"
version = "0.6.48-nightly.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c17933aa843a988726e412295f030a501e1bf4c5c8ed1fa4bb5013a37bce9d8a"
checksum = "dc5e16917f93caa5866a8f628d8d4c82c72c7bde70bb1cae1969f1f5d0521f9a"
dependencies = [
"backtrace-on-stack-overflow",
"erg_proc_macros",
@ -174,9 +168,9 @@ dependencies = [
[[package]]
name = "erg_compiler"
version = "0.6.47-nightly.4"
version = "0.6.48-nightly.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3a10f7dd0644d0378bf1ba45cd923d774552757ac6f19d5f9dee090f0ac668b"
checksum = "446393772e60305fbbce5d331aad109037e4ee7c098f8431c6431c2fab200548"
dependencies = [
"erg_common",
"erg_parser",
@ -184,9 +178,9 @@ dependencies = [
[[package]]
name = "erg_parser"
version = "0.6.47-nightly.4"
version = "0.6.48-nightly.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ca055f88af21585c301b93874cff818477c26e0343cb1dfe3b4c69c928bfe31"
checksum = "5e00edb38b9576bace8b914c65d5c4511055feb2de41527449bae6471bd05017"
dependencies = [
"erg_common",
"erg_proc_macros",
@ -195,9 +189,9 @@ dependencies = [
[[package]]
name = "erg_proc_macros"
version = "0.6.47-nightly.4"
version = "0.6.48-nightly.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8560abd2df3c3db6183e7495384f0c1d04d42e779bc0e1402589ab488ab0aaec"
checksum = "3f51df19e941a11864b34dc9cbf7c94b36a8641def3bdb041de873dad566b9f7"
dependencies = [
"quote",
"syn 1.0.109",
@ -247,6 +241,12 @@ dependencies = [
"ahash",
]
[[package]]
name = "heck"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
[[package]]
name = "idna"
version = "0.5.0"
@ -259,14 +259,14 @@ dependencies = [
[[package]]
name = "is-macro"
version = "0.3.6"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2069faacbe981460232f880d26bf3c7634e322d49053aa48c27e3ae642f728f1"
checksum = "1d57a3e447e24c22647738e4607f1df1e0ec6f72e16182c4cd199f647cdfb0e4"
dependencies = [
"Inflector",
"heck",
"proc-macro2",
"quote",
"syn 2.0.81",
"syn 2.0.87",
]
[[package]]
@ -298,9 +298,9 @@ checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
[[package]]
name = "libm"
version = "0.2.8"
version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
[[package]]
name = "lock_api"
@ -554,16 +554,16 @@ dependencies = [
[[package]]
name = "proc-macro2"
version = "1.0.88"
version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
dependencies = [
"unicode-ident",
]
[[package]]
name = "py2erg"
version = "0.0.68"
version = "0.0.69"
dependencies = [
"erg_common",
"erg_compiler",
@ -573,7 +573,7 @@ dependencies = [
[[package]]
name = "pylyzer"
version = "0.0.68"
version = "0.0.69"
dependencies = [
"els",
"erg_common",
@ -583,7 +583,7 @@ dependencies = [
[[package]]
name = "pylyzer_core"
version = "0.0.68"
version = "0.0.69"
dependencies = [
"erg_common",
"erg_compiler",
@ -594,7 +594,7 @@ dependencies = [
[[package]]
name = "pylyzer_wasm"
version = "0.0.68"
version = "0.0.69"
dependencies = [
"erg_common",
"erg_compiler",
@ -674,7 +674,7 @@ dependencies = [
[[package]]
name = "rustpython-ast"
version = "0.4.0"
source = "git+https://github.com/RustPython/Parser#a5b08096a0b77e8f39cd6abdc998bb770dd0c79b"
source = "git+https://github.com/RustPython/Parser#5e9d9853e751240b28138efd165e793a7ee5dad4"
dependencies = [
"is-macro",
"malachite-bigint",
@ -685,7 +685,7 @@ dependencies = [
[[package]]
name = "rustpython-parser"
version = "0.4.0"
source = "git+https://github.com/RustPython/Parser#a5b08096a0b77e8f39cd6abdc998bb770dd0c79b"
source = "git+https://github.com/RustPython/Parser#5e9d9853e751240b28138efd165e793a7ee5dad4"
dependencies = [
"anyhow",
"is-macro",
@ -708,7 +708,7 @@ dependencies = [
[[package]]
name = "rustpython-parser-core"
version = "0.4.0"
source = "git+https://github.com/RustPython/Parser#a5b08096a0b77e8f39cd6abdc998bb770dd0c79b"
source = "git+https://github.com/RustPython/Parser#5e9d9853e751240b28138efd165e793a7ee5dad4"
dependencies = [
"is-macro",
"memchr",
@ -718,7 +718,7 @@ dependencies = [
[[package]]
name = "rustpython-parser-vendored"
version = "0.4.0"
source = "git+https://github.com/RustPython/Parser#a5b08096a0b77e8f39cd6abdc998bb770dd0c79b"
source = "git+https://github.com/RustPython/Parser#5e9d9853e751240b28138efd165e793a7ee5dad4"
dependencies = [
"memchr",
"once_cell",
@ -744,22 +744,22 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
[[package]]
name = "serde"
version = "1.0.210"
version = "1.0.214"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.210"
version = "1.0.214"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.81",
"syn 2.0.87",
]
[[package]]
@ -782,7 +782,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.81",
"syn 2.0.87",
]
[[package]]
@ -822,9 +822,9 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.81"
version = "2.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "198514704ca887dd5a1e408c6c6cdcba43672f9b4062e1b24aa34e74e6d7faae"
checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
dependencies = [
"proc-macro2",
"quote",
@ -1027,7 +1027,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
"syn 2.0.81",
"syn 2.0.87",
"wasm-bindgen-shared",
]
@ -1049,7 +1049,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.81",
"syn 2.0.87",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@ -1091,7 +1091,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.81",
"syn 2.0.87",
]
[[package]]
@ -1102,7 +1102,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.81",
"syn 2.0.87",
]
[[package]]
@ -1206,5 +1206,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.81",
"syn 2.0.87",
]

View File

@ -15,19 +15,19 @@
rustPlatform.buildRustPackage rec {
pname = "pylyzer";
version = "0.0.68";
version = "0.0.69";
src = fetchFromGitHub {
owner = "mtshiba";
repo = "pylyzer";
rev = "refs/tags/v${version}";
hash = "sha256-xeQDyj18L9jCftne9S79kWjrW0K7Nkx86Cy2aFqePfA=";
hash = "sha256-3Ufige1OQWriJ6qQXjpfzL1tlA/9Sa8BEmhMDdpYlAQ=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"rustpython-ast-0.4.0" = "sha256-kMUuqOVFSvvSHOeiYMjWdsLnDu12RyQld3qtTyd5tAM=";
"rustpython-ast-0.4.0" = "sha256-RChZlXzdzyLp0Lb/LTLbWfbUzPDhmWkf0uVobflCKRk=";
};
};

View File

@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "quick-lookup";
version = "2.1.1";
version = "2.1.2";
src = fetchFromGitHub {
owner = "johnfactotum";
repo = "quick-lookup";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-I6a8J/Z1yJhdqWES+1mIlvJq6FBOX0GiW0muNP/iSjE=";
hash = "sha256-KENHYdhB1OHIB1RKyv78QFdsq3fYRqKgBDCFPLxHZ+k=";
};
postPatch = ''

View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "rage";
version = "0.10.0";
version = "0.11.0";
src = fetchFromGitHub {
owner = "str4d";
repo = pname;
rev = "v${version}";
hash = "sha256-7PfNDFDuvQ9T3BeA15FuY1jAprGLsyglWXcNrZvtPAE=";
hash = "sha256-4ongCmO88IJjUPz35jOOpG4XpfVGYdA3GR2w3E/h+M4=";
};
cargoHash = "sha256-5aLT0JfeFj0fZP/1sHXulCQtoquHYriapMdPtN+fxko=";
cargoHash = "sha256-Nhm6xn7Upc9m+sTU9Pw3NGdpvwHvb4JGN6CQuMykILo=";
nativeBuildInputs = [
installShellFiles

View File

@ -11,12 +11,12 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "raycast";
version = "1.84.8";
version = "1.84.10";
src = fetchurl {
name = "Raycast.dmg";
url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal";
hash = "sha256-MSxscz2c5eNfdlWxn8sEVtqg2iXlPnIfJHnaiMvwtgY=";
hash = "sha256-9y66rex0A7pWkdqS1R0mo5IAA6SkA2e6alGu9Rs6j6U=";
};
dontPatch = true;
@ -47,7 +47,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
text = ''
url=$(curl --silent "https://releases.raycast.com/releases/latest?build=universal")
version=$(echo "$url" | jq -r '.version')
update-source-version raycast "$version" --file=./pkgs/os-specific/darwin/raycast/default.nix
update-source-version raycast "$version" --file=./pkgs/by-name/ra/raycast/package.nix
'';
});
@ -59,6 +59,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
lovesegfault
stepbrobd
donteatoreo
jakecleary
];
platforms = [
"aarch64-darwin"

View File

@ -1,21 +1,28 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
python3Packages,
}:
buildPythonPackage rec {
python3Packages.buildPythonApplication rec {
pname = "repocheck";
version = "2015-08-05";
format = "setuptools";
version = "1.0.0";
pyproject = true;
src = fetchFromGitHub {
sha256 = "1jc4v5zy7z7xlfmbfzvyzkyz893f5x2k6kvb3ni3rn2df7jqhc81";
rev = "ee48d0e88d3f5814d24a8d1f22d5d83732824688";
repo = "repocheck";
owner = "kynikos";
repo = "repocheck";
rev = "refs/tags/v${version}";
hash = "sha256-pCz+oAfDFyDeuXumfNzLTXnftM9+IG+lZzWSKtbZ9dg=";
};
build-system = [ python3Packages.setuptools ];
pythonImportsCheck = [ "repocheck" ];
# no tests
doCheck = false;
meta = with lib; {
inherit (src.meta) homepage;
description = "Check the status of code repositories under a root directory";

View File

@ -0,0 +1,28 @@
diff --git a/src/core/libraries/videodec/videodec2_impl.cpp b/src/core/libraries/videodec/videodec2_impl.cpp
index 021965e..31eb537 100644
--- a/src/core/libraries/videodec/videodec2_impl.cpp
+++ b/src/core/libraries/videodec/videodec2_impl.cpp
@@ -8,6 +8,16 @@
#include "common/logging/log.h"
#include "core/libraries/error_codes.h"
+#ifdef av_err2str
+#undef av_err2str
+#include <string>
+av_always_inline std::string av_err2string(int errnum) {
+ char errbuf[AV_ERROR_MAX_STRING_SIZE];
+ return av_make_error_string(errbuf, AV_ERROR_MAX_STRING_SIZE, errnum);
+}
+#define av_err2str(err) av_err2string(err).c_str()
+#endif // av_err2str
+
namespace Libraries::Vdec2 {
std::vector<OrbisVideodec2AvcPictureInfo> gPictureInfos;
@@ -225,4 +235,4 @@ AVFrame* VdecDecoder::ConvertNV12Frame(AVFrame& frame) {
return nv12_frame;
}
-} // namespace Libraries::Vdec2
\ No newline at end of file
+} // namespace Libraries::Vdec2

View File

@ -33,15 +33,15 @@
unstableGitUpdater,
}:
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "shadps4";
version = "0.3.0-unstable-2024-10-14";
version = "0.4.0";
src = fetchFromGitHub {
owner = "shadps4-emu";
repo = "shadPS4";
rev = "09725bd921088b73746605e672abf6ff40171880";
hash = "sha256-NtIiqmiZ1iCciMjT1cL7ONWxNHRO/0bci/thLrcORjo=";
rev = "refs/tags/v.${finalAttrs.version}";
hash = "sha256-dAhm9XMFnpNmbgi/TGktNHMdFDYPOWj31pZkBoUfQhA=";
fetchSubmodules = true;
};
@ -55,6 +55,9 @@ stdenv.mkDerivation {
# downloading an AppImage and trying to run it just won't work.
# https://github.com/shadps4-emu/shadPS4/issues/1368
./0001-Disable-update-checking.patch
# https://github.com/shadps4-emu/shadPS4/issues/1457
./av_err2str_macro.patch
];
buildInputs = [
@ -132,9 +135,10 @@ stdenv.mkDerivation {
meta = {
description = "Early in development PS4 emulator";
homepage = "https://github.com/shadps4-emu/shadPS4";
changelog = "https://github.com/shadps4-emu/shadPS4/releases/tag/v.${finalAttrs.version}";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ ryand56 ];
mainProgram = "shadps4";
platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86_64;
};
}
})

View File

@ -5,16 +5,16 @@
}:
buildGoModule rec {
pname = "tdl";
version = "0.17.5";
version = "0.17.7";
src = fetchFromGitHub {
owner = "iyear";
repo = "tdl";
rev = "v${version}";
hash = "sha256-K8eq3cuPRgVSqd9VVjlE9DQJQKlyUGZKAhPRwpUTrTc=";
hash = "sha256-1dRZdLHSZo4d6kE8qdyyk8Va4VUVxw3LiiWaz4lGpPQ=";
};
vendorHash = "sha256-X9gQ0mtuIgeo7s/IOAC5k6q3C8rBOKjTdQgeV7d3L60=";
vendorHash = "sha256-4lTbDMJkABZC1Slf9YhNZHXECbRhMbck2mqeIfog/aU=";
ldflags = [
"-s"

View File

@ -101,6 +101,6 @@ python3Packages.buildPythonApplication rec {
homepage = "https://github.com/waydroid/waydroid";
license = lib.licenses.gpl3Only;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ mcaju ];
maintainers = with lib.maintainers; [ ];
};
}

View File

@ -1,11 +1,11 @@
# Generated by ./update.sh - do not update manually!
# Last updated: 2024-05-06
# Last updated: 2024-11-04
{
version = "1.0.0.241";
amd64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_1.0.0.241_amd64.deb";
arm64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_1.0.0.241_arm64.deb";
loongarch64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_1.0.0.241_loongarch64.deb";
amd64_hash = "sha256-J2ipc3byBzvVFe+B1k+nsgZo+mwRpBd6LtF/ybAzmKM=";
arm64_hash = "sha256-5KA4ekhVdXoin/7VhuMbG8XIlx0w7vHAedZ1fnBOBYo=";
loongarch64_hash = "sha256-kMMnb9jjOOtQFivLDu+aQctVMYeFHQ1fNg49AQE4yLk=";
version = "4.0.0.21";
amd64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.0.21_amd64.deb";
arm64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.0.21_arm64.deb";
loongarch64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.0.21_loongarch64.deb";
amd64_hash = "sha256-1tO8ARt2LuCwPz7rO25/9dTOIf9Rwqc9TdqiZTTojRk=";
arm64_hash = "sha256-Xl+bT/WXZ58rchvUBAMfcdqMxOIRxp5qyMRE/FvEC9I=";
loongarch64_hash = "sha256-b6j3y10HOdRvKoTTY9j2jGoM/W9XAjdIrQNZA9ddmUw=";
}

View File

@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/mer-hybris/libgbinder";
license = lib.licenses.bsd3;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ mcaju ];
maintainers = with lib.maintainers; [ ];
};
}

View File

@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
homepage = "https://git.sailfishos.org/mer-core/libglibutil";
license = lib.licenses.bsd3;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ mcaju ];
maintainers = with lib.maintainers; [ ];
};
}

View File

@ -1,47 +0,0 @@
diff --git a/spnav.c b/spnav.c
index f9e10f8..27149f7 100644
--- a/spnav.c
+++ b/spnav.c
@@ -36,7 +36,7 @@ OF SUCH DAMAGE.
#include <sys/select.h>
#include "spnav.h"
-#define SPNAV_SOCK_PATH "/var/run/spnav.sock"
+#define DEFAULT_SPNAV_SOCK_PATH "/run/spnav.sock"
#ifdef USE_X11
#include <X11/Xlib.h>
@@ -70,6 +70,24 @@ static struct event_node *ev_queue, *ev_queue_tail;
/* AF_UNIX socket used for alternative communication with daemon */
static int sock = -1;
+static char *spath = NULL;
+
+static char *socket_path()
+{
+ char *xdg_runtime_dir;
+ if((xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"))) {
+ if ( spath == NULL ) {
+ spath = malloc(strlen(xdg_runtime_dir) + strlen("/spnav.sock") + 1);
+ if ( spath != NULL ) {
+ sprintf(spath, "%s/spnav.sock", xdg_runtime_dir);
+ }
+ }
+ if(access(spath, F_OK) != -1){
+ return spath;
+ }
+ }
+ return DEFAULT_SPNAV_SOCK_PATH;
+}
int spnav_open(void)
{
@@ -92,7 +110,7 @@ int spnav_open(void)
memset(&addr, 0, sizeof addr);
addr.sun_family = AF_UNIX;
- strncpy(addr.sun_path, SPNAV_SOCK_PATH, sizeof(addr.sun_path));
+ strncpy(addr.sun_path, socket_path(), sizeof(addr.sun_path));
if(connect(s, (struct sockaddr*)&addr, sizeof addr) == -1) {

View File

@ -1,26 +1,26 @@
{ stdenv, lib, fetchFromGitHub, libX11, fixDarwinDylibNames }:
{
stdenv,
lib,
fetchFromGitHub,
libX11,
fixDarwinDylibNames,
}:
stdenv.mkDerivation rec {
version = "0.2.3";
pname = "libspnav";
version = "1.1";
src = fetchFromGitHub {
owner = "FreeSpacenav";
repo = "libspnav";
rev = "${pname}-${version}";
sha256 = "098h1jhlj87axpza5zgy58prp0zn94wyrbch6x0s7q4mzh7dc8ba";
rev = "refs/tags/v${version}";
hash = "sha256-qBewSOiwf5iaGKLGRWOQUoHkUADuH8Q1mJCLiWCXmuQ=";
};
nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ libX11 ];
patches = [
# Changes the socket path from /run/spnav.sock to $XDG_RUNTIME_DIR/spnav.sock
# to allow for a user service
./configure-socket-path.patch
];
configureFlags = [ "--disable-debug"];
configureFlags = [ "--disable-debug" ];
makeFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
"AR=${stdenv.cc.targetPrefix}ar"

View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "nvidia-vaapi-driver";
version = "0.0.12";
version = "0.0.13";
src = fetchFromGitHub {
owner = "elFarto";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ETdHbPI3rZR4026rOT5K9/pjKTZxD5+RioKzUVGMwsA=";
sha256 = "sha256-KeOg9VvPTqIo0qB+dcU915yTztvFxo1jJcHHpsmMmfk=";
};
patches = [

View File

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "utf8cpp";
version = "4.0.5";
version = "4.0.6";
src = fetchFromGitHub {
owner = "nemtrif";
repo = "utfcpp";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-Z27/31obVErsmW1b1SVcr45nKlFu01RqqpTMwS0LqJ8=";
hash = "sha256-e8qH4eygLnQw7B8x+HN+vH8cr8fkxnTFz+PKtFJ8dGE=";
};
nativeBuildInputs = [ cmake ];

View File

@ -2515,14 +2515,14 @@ buildLuarocksPackage {
lze = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
buildLuarocksPackage {
pname = "lze";
version = "0.1.4-1";
version = "0.4.4-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/lze-0.1.4-1.rockspec";
sha256 = "0j2ll2kcqmk7m78x4bwwm47hr0n8kgz027c4l2yhyfw747s70z1h";
url = "mirror://luarocks/lze-0.4.4-1.rockspec";
sha256 = "1qky68bg003d0n57pfb04l4q5sxbwp54kpbwdrwln6qnwbb93fcy";
}).outPath;
src = fetchzip {
url = "https://github.com/BirdeeHub/lze/archive/v0.1.4.zip";
sha256 = "1rr8bsxvv53mhkvmc8vb1l6jvbrfzngr3kq8wj3gvpima3jdk1za";
url = "https://github.com/BirdeeHub/lze/archive/v0.4.4.zip";
sha256 = "18g865sii3k09dk7ynhy37m27br3lwy003zl1x0fgqpnqd47114j";
};
disabled = luaOlder "5.1";

View File

@ -21,14 +21,14 @@
buildPythonPackage rec {
pname = "cohere";
version = "5.11.2";
version = "5.11.3";
pyproject = true;
src = fetchFromGitHub {
owner = "cohere-ai";
repo = "cohere-python";
rev = "refs/tags/${version}";
hash = "sha256-QwloUY22Zy+gu8ggpLReXHXw11sZ/P0/Ao75a85MKN4=";
hash = "sha256-0Y/zSw2pdrwsYpBctiV/tVf2xPhf3jG7c18frSjBass=";
};
build-system = [ poetry-core ];

View File

@ -38,6 +38,6 @@ buildPythonPackage rec {
homepage = "https://github.com/erfanoabdi/gbinder-python";
license = lib.licenses.gpl3;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ mcaju ];
maintainers = with lib.maintainers; [ ];
};
}

View File

@ -0,0 +1,50 @@
{
lib,
stdenv,
buildPythonPackage,
fetchFromGitHub,
installShellFiles,
setuptools,
gitpython,
typer,
pydantic-settings,
}:
buildPythonPackage rec {
pname = "git-dummy";
version = "0.1.2";
pyproject = true;
src = fetchFromGitHub {
owner = "initialcommit-com";
repo = "git-dummy";
rev = "v${version}";
hash = "sha256-viybxn2J7SO7NgSvjwlP+tgtm+H6QrACafIy82d9XEk=";
};
build-system = [ setuptools ];
dependencies = [
gitpython
typer
pydantic-settings
];
nativeBuildInputs = [ installShellFiles ];
postInstall =
# https://github.com/NixOS/nixpkgs/issues/308283
lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd git-dummy \
--bash <($out/bin/git-dummy --show-completion bash) \
--fish <($out/bin/git-dummy --show-completion fish) \
--zsh <($out/bin/git-dummy --show-completion zsh)
'';
meta = {
homepage = "https://github.com/initialcommit-com/git-dummy";
description = "Generate dummy Git repositories populated with the desired number of commits, branches, and structure";
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ mathiassven ];
};
}

View File

@ -13,24 +13,27 @@
pytest-timeout,
pytestCheckHook,
pythonOlder,
setuptools,
zeroconf,
}:
buildPythonPackage rec {
pname = "hap-python";
version = "4.9.1";
format = "setuptools";
version = "4.9.2";
pyproject = true;
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "ikalchev";
repo = "HAP-python";
rev = "refs/tags/${version}";
hash = "sha256-nnh8PSEcuPN1qGuInJ7uYe83zdne8axbTrHd4g1xoJs=";
hash = "sha256-mBjVUfNHuGSeLRisqu9ALpTDwpxHir+6X0scq+HrzxA=";
};
propagatedBuildInputs = [
build-system = [ setuptools ];
dependencies = [
async-timeout
chacha20poly1305-reuseable
cryptography

View File

@ -48,6 +48,7 @@ buildPythonPackage rec {
nix-update --commit --version-regex '(.*)' python3Packages.langgraph
nix-update --commit --version-regex 'sdk==(.*)' python3Packages.langgraph-sdk
nix-update --commit --version-regex 'checkpoint==(.*)' python3Packages.langgraph-checkpoint
nix-update --commit --version-regex 'checkpointduckdb==(.*)' python3Packages.langgraph-checkpoint-duckdb
nix-update --commit --version-regex 'checkpointpostgres==(.*)' python3Packages.langgraph-checkpoint-postgres
nix-update --commit --version-regex 'checkpointsqlite==(.*)' python3Packages.langgraph-checkpoint-sqlite
'';

View File

@ -203,6 +203,9 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace "--no-cov-on-fail --cov=manim --cov-report xml --cov-report term" ""
substituteInPlace manim/_config/default.cfg \
--replace "ffmpeg_executable = ffmpeg" "ffmpeg_executable = ${lib.getExe ffmpeg}"
'';
buildInputs = [ cairo ];

View File

@ -17,13 +17,13 @@
buildPythonPackage rec {
pname = "materialx";
version = "1.39.1";
version = "1.38.10";
src = fetchFromGitHub {
owner = "AcademySoftwareFoundation";
repo = "MaterialX";
rev = "refs/tags/v${version}";
hash = "sha256-WzzsY1hOWwJEqT/ZRLIoZDfKNvx1Yf6aFhA3ZcSPx+s=";
rev = "v${version}";
hash = "sha256-/kMHmW2dptZNtjuhE5s+jvPRIdtY+FRiVtMU+tiBgQo=";
};
format = "other";

View File

@ -2,29 +2,35 @@
lib,
stdenv,
buildPythonPackage,
fetchpatch,
fetchPypi,
python,
pythonOlder,
# build-system
setuptools,
setuptools-scm,
cython,
numpy,
msgpack,
py-cpuinfo,
# dependencies
numpy,
# tests
msgpack,
pytestCheckHook,
python,
pythonOlder,
importlib-metadata,
}:
buildPythonPackage rec {
pname = "numcodecs";
version = "0.13.0";
version = "0.13.1";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-uk+scDbqWgeMev4dTf/rloUIDULxnJwWsS2thmcDqi4=";
hash = "sha256-o883iB3wiY86nA1Ed9+IEz/oUYW//le6MbzC+iB3Cbw=";
};
build-system = [
@ -41,37 +47,23 @@ buildPythonPackage rec {
# zfpy = [ zfpy ];
};
preBuild =
if (stdenv.hostPlatform.isx86 && !stdenv.hostPlatform.avx2Support) then
''
export DISABLE_NUMCODECS_AVX2=
''
else
null;
preBuild = lib.optionalString (stdenv.hostPlatform.isx86 && !stdenv.hostPlatform.avx2Support) ''
export DISABLE_NUMCODECS_AVX2=1
'';
nativeCheckInputs = [
pytestCheckHook
msgpack
importlib-metadata
];
# https://github.com/NixOS/nixpkgs/issues/255262
pytestFlagsArray = [ "$out/${python.sitePackages}/numcodecs" ];
disabledTests = [
"test_backwards_compatibility"
"test_encode_decode"
"test_legacy_codec_broken"
"test_bytes"
# ValueError: setting an array element with a sequence. The requested array has an inhomogeneous shape after 1 dimensions. The detected shape was (3,) + inhomogeneous part.
# with numpy 1.24
"test_non_numpy_inputs"
];
meta = with lib; {
meta = {
homepage = "https://github.com/zarr-developers/numcodecs";
license = licenses.mit;
license = lib.licenses.mit;
description = "Buffer compression and transformation codecs for use in data storage and communication applications";
maintainers = [ ];
maintainers = with lib.maintainers; [ doronbehar ];
};
}

View File

@ -1,13 +1,13 @@
{ lib, fetchFromGitHub }:
rec {
version = "3.8.0";
version = "3.9.0";
pyproject = true;
src = fetchFromGitHub {
owner = "openrazer";
repo = "openrazer";
rev = "v${version}";
hash = "sha256-eV5xDFRQi0m95pL6e2phvblUbh5GEJ1ru1a62TnbGNk=";
hash = "sha256-MLwhqLPWdjg1ZUZP5Sig37RgZEeHlU+DyELpyMif6iY=";
};
meta = with lib; {

View File

@ -52,6 +52,7 @@ in
buildPythonPackage rec {
pname = "openusd";
version = "24.08";
pyproject = false;
src = fetchFromGitHub {
owner = "PixarAnimationStudios";
@ -65,13 +66,12 @@ buildPythonPackage rec {
outputs = [ "out" ] ++ lib.optional withDocs "doc";
format = "other";
patches = [
(fetchpatch {
name = "port-to-embree-4.patch";
url = "https://github.com/PixarAnimationStudios/OpenUSD/pull/2266/commits/4b6c23d459c602fdac5e0ebc9b7722cbd5475e86.patch";
hash = "sha256-yjqdGAVqfEsOX1W/tG6c+GgQLYya5U9xgUe/sNIuDbw=";
# https://github.com/PixarAnimationStudios/OpenUSD/pull/2266
url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/c8fec1342e05dca98a1afd4ea93c7a5f0b41e25b.patch?full_index=1";
hash = "sha256-pK1TUwmVv9zsZkOypq25pl+FJDxJJvozUtVP9ystGtI=";
})
];
@ -175,7 +175,10 @@ buildPythonPackage rec {
for interchange between graphics applications.
'';
homepage = "https://openusd.org/";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ shaddydc ];
license = lib.licenses.tost;
maintainers = with lib.maintainers; [
shaddydc
gador
];
};
}

View File

@ -47,6 +47,6 @@ buildPythonPackage rec {
mainProgram = "pyclip";
homepage = "https://github.com/spyoungtech/pyclip";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ mcaju ];
maintainers = with lib.maintainers; [ ];
};
}

View File

@ -2,33 +2,35 @@
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
setuptools,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "pydsdl";
version = "1.18.0";
format = "setuptools";
disabled = pythonOlder "3.7";
version = "1.22.0";
pyproject = true;
src = fetchFromGitHub {
owner = "OpenCyphal";
repo = pname;
repo = "pydsdl";
rev = "refs/tags/${version}";
hash = "sha256-sn7KoJmJbr7Y+N9PAXyhJnts/hW+Gi06nrHj5VIDZMU=";
hash = "sha256-Q6Zt7qiFZvTK2pF4nWfHbjwQHZffzKOad6X/HQ94EUo=";
};
build-system = [ setuptools ];
# allow for writable directory for darwin
preBuild = ''
export HOME=$TMPDIR
'';
# Module doesn't contain tests
doCheck = false;
pythonImportsCheck = [ "pydsdl" ];
nativeCheckInputs = [ pytestCheckHook ];
pytestFlagsArray = [ "pydsdl/_test.py" ];
meta = with lib; {
description = "Library to process Cyphal DSDL";
longDescription = ''

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pyexploitdb";
version = "0.2.53";
version = "0.2.54";
pyproject = true;
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyExploitDb";
inherit version;
hash = "sha256-NebM8nhIo4Hgf7iwSV2utcrqR1kLh+cpmqV1Gc9r8cw=";
hash = "sha256-TJ2cjYadXqaX31UXY99/pCeH0T2nFj83AiLdX0SMC3U=";
};
build-system = [ setuptools ];
@ -35,8 +35,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library to fetch the most recent exploit-database";
homepage = "https://github.com/Hackman238/pyExploitDb/pyExploitDb";
changelog = "https://github.com/Hackman238/pyExploitDb/pyExploitDb/blob/master/ChangeLog.md";
homepage = "https://github.com/Hackman238/pyExploitDb";
changelog = "https://github.com/Hackman238/pyExploitDb/blob/master/ChangeLog.md";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ fab ];
};

View File

@ -1,6 +1,5 @@
{
lib,
stdenv,
pythonOlder,
buildPythonPackage,
fetchFromGitHub,
@ -33,7 +32,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace pygmt/clib/loading.py \
--replace "env.get(\"GMT_LIBRARY_PATH\", \"\")" "env.get(\"GMT_LIBRARY_PATH\", \"${gmt}/lib\")"
--replace-fail "env.get(\"GMT_LIBRARY_PATH\")" "env.get(\"GMT_LIBRARY_PATH\", \"${gmt}/lib\")"
'';
nativeBuildInputs = [ setuptools-scm ];

View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pysigma-backend-elasticsearch";
version = "1.1.2";
version = "1.1.3";
pyproject = true;
disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma-backend-elasticsearch";
rev = "refs/tags/v${version}";
hash = "sha256-7XecgpZ2DQr2f/Ge7skbielK7qwuGoy/KAoxzNvk9w4=";
hash = "sha256-6T3OnT6Row2dUmQ3xOu/00vcjD75+rfBSP7WyM4sQqA=";
};
postPatch = ''

View File

@ -38,7 +38,10 @@ buildPythonPackage rec {
typing-extensions
];
pythonRelaxDeps = [ "ipywidgets" ];
pythonRelaxDeps = [
"ipywidgets"
"lark"
];
nativeCheckInputs = [ pytestCheckHook ];
disabledTestPaths = [

View File

@ -2,31 +2,33 @@
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
setuptools,
pytestCheckHook,
numpy,
}:
buildPythonPackage rec {
pname = "sipyco";
version = "1.4";
format = "setuptools";
disabled = pythonOlder "3.7";
version = "1.8";
pyproject = true;
src = fetchFromGitHub {
owner = "m-labs";
repo = "sipyco";
rev = "refs/tags/v${version}";
hash = "sha256-sEYWtp11piUIa8YyuTOdFIIJ2GfcrUb+HEzPVKr4hW8=";
hash = "sha256-PPnAyDedUQ7Og/Cby9x5OT9wMkNGTP8GS53V6N/dk4w=";
};
propagatedBuildInputs = [ numpy ];
build-system = [ setuptools ];
dependencies = [ numpy ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "sipyco" ];
__darwinAllowLocalNetworking = true;
meta = with lib; {
description = "Simple Python Communications - used by the ARTIQ experimental control package";
mainProgram = "sipyco_rpctool";

View File

@ -1,7 +1,6 @@
{
lib,
buildPythonPackage,
fetchpatch,
fetchPypi,
pythonOlder,
altair,
@ -27,15 +26,6 @@ buildPythonPackage rec {
hash = "sha256-8lrmhCvwczqBpiQRCkPjmiYsJPHEFnZab/Azkh+i7ls=";
};
patches = [
# https://github.com/vega/ipyvega/pull/507
(fetchpatch {
name = "replace-poetry-with-poetry-core.patch";
url = "https://github.com/vega/ipyvega/commit/1a5028ee5d54e24b9650b66685f54c42b72c7899.patch";
hash = "sha256-W8UmMit7DJGKCM9+/OSRLTuRvC0ZR42AP/b/frVEvsk=";
})
];
nativeBuildInputs = [
poetry-core
];

View File

@ -1,8 +1,8 @@
{
lib,
buildPythonPackage,
setuptools,
colorama,
configobj,
fetchPypi,
packaging,
pykwalify,
@ -12,19 +12,20 @@
buildPythonPackage rec {
pname = "west";
version = "1.2.0";
format = "setuptools";
version = "1.3.0";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
hash = "sha256-tB5RrJA5OUT5wB974nAA1LMpYVt+0HT7DvaTtGRoEpc=";
hash = "sha256-iTIANL6HCZ0W519HYKwNHtZ+iXiSjkaKuZPj+6DP6S8=";
};
propagatedBuildInputs = [
build-system = [ setuptools ];
dependencies = [
colorama
configobj
packaging
pyyaml
pykwalify

View File

@ -1,15 +1,20 @@
{
lib,
asciitree,
buildPythonPackage,
fasteners,
fetchPypi,
numcodecs,
msgpack,
numpy,
pytestCheckHook,
pythonOlder,
# build-system
setuptools-scm,
# dependencies
asciitree,
numpy,
fasteners,
numcodecs,
# tests
pytestCheckHook,
}:
buildPythonPackage rec {
@ -24,24 +29,28 @@ buildPythonPackage rec {
hash = "sha256-JYDYy23YRiF3GhDTHE13fcqKJ3BqGomyn0LS034t9c4=";
};
nativeBuildInputs = [ setuptools-scm ];
build-system = [
setuptools-scm
];
propagatedBuildInputs = [
dependencies = [
asciitree
numpy
fasteners
numcodecs
] ++ numcodecs.optional-dependencies.msgpack;
nativeCheckInputs = [ pytestCheckHook ];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "zarr" ];
meta = with lib; {
meta = {
description = "Implementation of chunked, compressed, N-dimensional arrays for Python";
homepage = "https://github.com/zarr-developers/zarr";
changelog = "https://github.com/zarr-developers/zarr-python/releases/tag/v${version}";
license = licenses.mit;
maintainers = [ ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ doronbehar ];
};
}

View File

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
version = "3.2.276";
version = "3.2.277";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
rev = "refs/tags/${version}";
hash = "sha256-oN1KMe+a5iqC+VhIgKqm+JddIU+xjJ7LzBQ2wT2F1sA=";
hash = "sha256-Fd3PFoa7DFVnFmk1tJIlslqIrjch5xJtgYHaJC+2GHo=";
};
patches = [ ./flake8-compat-5.x.patch ];

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "go-jet";
version = "2.11.1";
version = "2.12.0";
src = fetchFromGitHub {
owner = pname;
repo = "jet";
rev = "v${version}";
sha256 = "sha256-1ntvvbSIqeANZhz/FKXP9cD8UVs9luMHa8pgvc6RsqE=";
sha256 = "sha256-lS/oo0jD/kYKVDJly96Y/iRupPXueoOOYJsEYu1+Jdk=";
};
vendorHash = "sha256-7jcUSzz/EI30PUK41u4FUUAzzl/PUKvE46A/nYwx134=";
vendorHash = "sha256-f2oeGERwnqMPPwV+ZUJ+Mss9ZmlQRg/xllofDR9aa4M=";
subPackages = [ "cmd/jet" ];

View File

@ -82,6 +82,7 @@
tree-sitter-r = lib.importJSON ./tree-sitter-r.json;
tree-sitter-regex = lib.importJSON ./tree-sitter-regex.json;
tree-sitter-rego = lib.importJSON ./tree-sitter-rego.json;
tree-sitter-river = lib.importJSON ./tree-sitter-river.json;
tree-sitter-rst = lib.importJSON ./tree-sitter-rst.json;
tree-sitter-ruby = lib.importJSON ./tree-sitter-ruby.json;
tree-sitter-rust = lib.importJSON ./tree-sitter-rust.json;

View File

@ -0,0 +1,12 @@
{
"url": "https://github.com/grafana/tree-sitter-river",
"rev": "eafcdc5147f985fea120feb670f1df7babb2f79e",
"date": "2023-11-22T14:48:13+01:00",
"path": "/nix/store/6wwv45dv3lgyzng2hryadamp061yzx4i-tree-sitter-river",
"sha256": "0acgxdgdffya5jc8d9ck2xrac0gi41w1a85cm91vwbm1xwxqh6vy",
"hash": "sha256-fhuIO++hLr5DqqwgFXgg8QGmcheTpYaYLMo7117rjyk=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
}

View File

@ -451,6 +451,10 @@ let
orga = "glehmann";
repo = "tree-sitter-earthfile";
};
"tree-sitter-river" = {
orga = "grafana";
repo = "tree-sitter-river";
};
};
allGrammars =

View File

@ -16,14 +16,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-update";
version = "15.0.0";
version = "16.0.0";
src = fetchCrate {
inherit pname version;
hash = "sha256-2Z/fRd80qZi61KO07gx3Jdnslxv1KUCubv9bIUmjGKU=";
hash = "sha256-jLv/9Fvg+1HNIhfm0D/vvMR9J+Enztj9rXQE1kZITGI=";
};
cargoHash = "sha256-v5rsFzox1x2pf/LilZy/YI985sL5Pigm2GGaCWWjB7s=";
cargoHash = "sha256-rwXpQkL6ysMBraLIMk2zQe0vmb9uuePWufBjRVzaBOA=";
nativeBuildInputs = [
cmake

View File

@ -35,13 +35,13 @@
stdenv.mkDerivation rec {
pname = "chiaki-ng";
version = "1.9.0";
version = "1.9.1";
src = fetchFromGitHub {
owner = "streetpea";
repo = "chiaki-ng";
rev = "v${version}";
hash = "sha256-7+AixZu74y1V+rUauVswPzuWX2x6n3MJoM2A2w4zyuI=";
hash = "sha256-1e53lqNns0CrpUfJ1AhclPO4nkMAfJT6xIXZlxXRir8=";
fetchSubmodules = true;
};

View File

@ -1,40 +1,37 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, libX11, IOKit }:
stdenv.mkDerivation rec {
version = "0.8";
{
stdenv,
lib,
fetchFromGitHub,
libXext,
libX11,
IOKit,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "spacenavd";
version = "1.3";
src = fetchFromGitHub {
owner = "FreeSpacenav";
repo = "spacenavd";
rev = "v${version}";
sha256 = "1zz0cm5cgvp9s5n4nzksl8rb11c7sw214bdafzra74smvqfjcjcf";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-26geQYOXjMZZ/FpPpav7zfql0davTBwB4Ir+X1oep9Q=";
};
patches = [
# Fixes Darwin: https://github.com/FreeSpacenav/spacenavd/pull/38
(fetchpatch {
url = "https://github.com/FreeSpacenav/spacenavd/commit/d6a25d5c3f49b9676d039775efc8bf854737c43c.patch";
sha256 = "02pdgcvaqc20qf9hi3r73nb9ds7yk2ps9nnxaj0x9p50xjnhfg5c";
})
# Changes the socket path from /run/spnav.sock to $XDG_RUNTIME_DIR/spnav.sock
# to allow for a user service
./configure-socket-path.patch
# Changes the pidfile path from /run/spnavd.pid to $XDG_RUNTIME_DIR/spnavd.pid
# to allow for a user service
./configure-pidfile-path.patch
# Changes the config file path from /etc/spnavrc to $XDG_CONFIG_HOME/spnavrc or $HOME/.config/spnavrc
# to allow for a user service
./configure-cfgfile-path.patch
];
buildInputs = [ libX11 ]
++ lib.optional stdenv.hostPlatform.isDarwin IOKit;
buildInputs = [
libX11
libXext
] ++ lib.optional stdenv.hostPlatform.isDarwin IOKit;
configureFlags = [ "--disable-debug" ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
postInstall = ''
install -Dm644 $src/contrib/systemd/spacenavd.service -t $out/lib/systemd/system
substituteInPlace $out/lib/systemd/system/spacenavd.service \
--replace-fail "/usr/local/bin/spacenavd" "$out/bin/spacenavd"
'';
meta = with lib; {
homepage = "https://spacenav.sourceforge.net/";
description = "Device driver and SDK for 3Dconnexion 3D input devices";
@ -43,4 +40,4 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
maintainers = with maintainers; [ sohalt ];
};
}
})

View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "bpfmon";
version = "2.52";
version = "2.53";
src = fetchFromGitHub {
owner = "bbonev";
repo = "bpfmon";
rev = "refs/tags/v${version}";
hash = "sha256-W7OnrC+FCxMd4YbYiybjIvO0LT7Hr1/0Y3BQwItaTBs=";
hash = "sha256-+W+3RLvgXXtUImzLkJr9mSWExvAUgjMp+lR9sg14VaY=";
};
buildInputs = [

View File

@ -1,13 +0,0 @@
source 'https://rubygems.org'
gem 'sensu'
# integration
gem 'sensu-plugins-influxdb'
# checks
gem 'sensu-plugins-http'
gem 'sensu-plugins-disk-checks'
gem 'sensu-plugins-logs'
gem 'sensu-plugins-systemd'
# gem 'sensu-plugins-process-checks'

View File

@ -1,162 +0,0 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
amq-protocol (2.0.1)
amqp (1.6.0)
amq-protocol (>= 2.0.1)
eventmachine
aws-eventstream (1.0.3)
aws-sdk (2.11.264)
aws-sdk-resources (= 2.11.264)
aws-sdk-core (2.11.264)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.11.264)
aws-sdk-core (= 2.11.264)
aws-sigv4 (1.1.0)
aws-eventstream (~> 1.0, >= 1.0.2)
cause (0.1)
childprocess (0.5.8)
ffi (~> 1.0, >= 1.0.11)
cookiejar (0.3.3)
dentaku (2.0.9)
domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
em-http-request (1.1.5)
addressable (>= 2.3.4)
cookiejar (!= 0.3.1)
em-socksify (>= 0.3)
eventmachine (>= 1.0.3)
http_parser.rb (>= 0.6.0)
em-http-server (0.1.8)
eventmachine
em-socksify (0.3.2)
eventmachine (>= 1.0.0.beta.4)
em-worker (0.0.2)
eventmachine
eventmachine (1.2.7)
ffi (1.9.21)
http-cookie (1.0.3)
domain_name (~> 0.5)
http_parser.rb (0.6.0)
influxdb (0.3.13)
cause
json
jmespath (1.4.0)
json (1.8.6)
jsonpath (0.5.8)
multi_json
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.0331)
mixlib-cli (1.7.0)
multi_json (1.13.1)
netrc (0.11.0)
oj (2.18.1)
parse-cron (0.1.4)
public_suffix (3.0.3)
rest-client (2.0.2)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
sensu (1.7.0)
em-http-request (= 1.1.5)
em-http-server (= 0.1.8)
eventmachine (= 1.2.7)
parse-cron (= 0.1.4)
sensu-extension (= 1.5.2)
sensu-extensions (= 1.11.0)
sensu-json (= 2.1.1)
sensu-logger (= 1.2.2)
sensu-redis (= 2.4.0)
sensu-settings (= 10.15.0)
sensu-spawn (= 2.5.0)
sensu-transport (= 8.2.0)
sensu-extension (1.5.2)
eventmachine
sensu-extensions (1.11.0)
sensu-extension
sensu-extensions-check-dependencies (= 1.1.0)
sensu-extensions-debug (= 1.0.0)
sensu-extensions-deregistration (= 1.0.0)
sensu-extensions-json (= 1.0.0)
sensu-extensions-occurrences (= 1.2.0)
sensu-extensions-only-check-output (= 1.0.0)
sensu-extensions-ruby-hash (= 1.0.0)
sensu-json (>= 1.1.0)
sensu-logger
sensu-settings
sensu-extensions-check-dependencies (1.1.0)
sensu-extension
sensu-extensions-debug (1.0.0)
sensu-extension
sensu-extensions-deregistration (1.0.0)
sensu-extension
sensu-extensions-json (1.0.0)
sensu-extension
sensu-extensions-occurrences (1.2.0)
sensu-extension
sensu-extensions-only-check-output (1.0.0)
sensu-extension
sensu-extensions-ruby-hash (1.0.0)
sensu-extension
sensu-json (2.1.1)
oj (= 2.18.1)
sensu-logger (1.2.2)
eventmachine
sensu-json
sensu-plugin (1.4.7)
json (< 2.0.0)
mixlib-cli (~> 1.5)
sensu-plugins-disk-checks (4.0.1)
sensu-plugin (~> 1.2)
sys-filesystem (= 1.1.7)
sensu-plugins-http (2.11.0)
aws-sdk (~> 2.3)
rest-client (~> 2.0.2)
sensu-plugin (~> 1.2)
sensu-plugins-influxdb (1.4.0)
dentaku (= 2.0.9)
influxdb (= 0.3.13)
jsonpath (= 0.5.8)
sensu-plugin (~> 1.3)
sensu-plugins-logs (1.3.2)
sensu-plugin (~> 1.2)
sensu-plugins-systemd (0.1.0)
sensu-plugin (~> 1.2)
sensu-redis (2.4.0)
eventmachine
sensu-settings (10.15.0)
parse-cron
sensu-json (>= 1.1.0)
sensu-spawn (2.5.0)
childprocess (= 0.5.8)
em-worker (= 0.0.2)
eventmachine
ffi (= 1.9.21)
sensu-transport (8.2.0)
amq-protocol (= 2.0.1)
amqp (= 1.6.0)
eventmachine
sensu-redis (>= 1.0.0)
sys-filesystem (1.1.7)
ffi
unf (0.1.4)
unf_ext
unf_ext (0.0.7.6)
PLATFORMS
ruby
DEPENDENCIES
sensu
sensu-plugins-disk-checks
sensu-plugins-http
sensu-plugins-influxdb
sensu-plugins-logs
sensu-plugins-systemd
BUNDLED WITH
2.1.4

View File

@ -1,54 +0,0 @@
{ lib, bundlerApp, bundlerUpdateScript }:
bundlerApp {
pname = "sensu";
gemdir = ./.;
exes = [
"sensu-api"
"sensu-client"
"sensu-install"
"sensu-server"
# indirect, but might be important
"check-disk-usage.rb"
"check-fstab-mounts.rb"
"check-smart.rb"
"check-smart-status.rb"
"check-smart-tests.rb"
"metrics-disk-capacity.rb"
"metrics-disk.rb"
"metrics-disk-usage.rb"
"check-head-redirect.rb"
"check-http-cors.rb"
"check-http-json.rb"
"check-http.rb"
"check-https-cert.rb"
"check-last-modified.rb"
"metrics-curl.rb"
"metrics-http-json-deep.rb"
"metrics-http-json.rb"
"check-influxdb-query.rb"
"check-influxdb.rb"
"metrics-influxdb.rb"
"mutator-influxdb-line-protocol.rb"
"check-journal.rb"
"check-log.rb"
"handler-logevent.rb"
"handler-show-event-config.rb"
"check-systemd.rb"
];
passthru.updateScript = bundlerUpdateScript "sensu";
meta = with lib; {
description = "Monitoring framework that aims to be simple, malleable, and scalable";
homepage = "https://sensuapp.org/";
license = licenses.mit;
maintainers = with maintainers; [ theuni peterhoeg manveru nicknovitski ];
platforms = platforms.unix;
};
}

View File

@ -1,633 +0,0 @@
{
addressable = {
dependencies = ["public_suffix"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
type = "gem";
};
version = "2.6.0";
};
amq-protocol = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rpn9vgh7y037aqhhp04smihzr73vp5i5g6xlqlha10wy3q0wp7x";
type = "gem";
};
version = "2.0.1";
};
amqp = {
dependencies = ["amq-protocol" "eventmachine"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kbrqnpjgj9v0722p3n5rw589l4g26ry8mcghwc5yr20ggkpdaz9";
type = "gem";
};
version = "1.6.0";
};
aws-eventstream = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "100g77a5ixg4p5zwq77f28n2pdkk0y481f7v83qrlmnj22318qq6";
type = "gem";
};
version = "1.0.3";
};
aws-sdk = {
dependencies = ["aws-sdk-resources"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mx4x4lxd584c9bsip68hfrw4lw5q04slx0w1a57yy2mlkcaz811";
type = "gem";
};
version = "2.11.264";
};
aws-sdk-core = {
dependencies = ["aws-sigv4" "jmespath"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kjmflddmq5y2y5677z7y2fin6pxa7my5cq39dzc7hmwl7favjxj";
type = "gem";
};
version = "2.11.264";
};
aws-sdk-resources = {
dependencies = ["aws-sdk-core"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1blw7kazv1a5kpkk6sy0mhhbfkb38f93sp2mpxbhbbr6n08hq4q3";
type = "gem";
};
version = "2.11.264";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1dfc8i5cxjwlvi4b665lbpbwvks8a6wfy3vfmwr3pjdmxwdmc2cs";
type = "gem";
};
version = "1.1.0";
};
cause = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0digirxqlwdg79mkbn70yc7i9i1qnclm2wjbrc47kqv6236bpj00";
type = "gem";
};
version = "0.1";
};
childprocess = {
dependencies = ["ffi"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1lv7axi1fhascm9njxh3lx1rbrnsm8wgvib0g7j26v4h1fcphqg0";
type = "gem";
};
version = "0.5.8";
};
cookiejar = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0q0kmbks9l3hl0wdq744hzy97ssq9dvlzywyqv9k9y1p3qc9va2a";
type = "gem";
};
version = "0.3.3";
};
dentaku = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11z4cw4lspx3rgmmd2hd4l1iikk6p17icxwn7xym92v1j825zpnr";
type = "gem";
};
version = "2.0.9";
};
domain_name = {
dependencies = ["unf"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v";
type = "gem";
};
version = "0.5.20180417";
};
em-http-request = {
dependencies = ["addressable" "cookiejar" "em-socksify" "eventmachine" "http_parser.rb"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13rxmbi0fv91n4sg300v3i9iiwd0jxv0i6xd0sp81dx3jlx7kasx";
type = "gem";
};
version = "1.1.5";
};
em-http-server = {
dependencies = ["eventmachine"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0y8l4gymy9dzjjchjav90ck6has2i2zdjihlhcyrg3jgq6kjzyq5";
type = "gem";
};
version = "0.1.8";
};
em-socksify = {
dependencies = ["eventmachine"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rk43ywaanfrd8180d98287xv2pxyl7llj291cwy87g1s735d5nk";
type = "gem";
};
version = "0.3.2";
};
em-worker = {
dependencies = ["eventmachine"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0z4jx9z2q5hxvdvik4yp0ahwfk69qsmdnyp72ln22p3qlkq2z5wk";
type = "gem";
};
version = "0.0.2";
};
eventmachine = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
type = "gem";
};
version = "1.2.7";
};
ffi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0c2dl10pi6a30kcvx2s6p2v1wb4kbm48iv38kmz2ff600nirhpb8";
type = "gem";
};
version = "1.9.21";
};
http-cookie = {
dependencies = ["domain_name"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
type = "gem";
};
version = "1.0.3";
};
"http_parser.rb" = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi";
type = "gem";
};
version = "0.6.0";
};
influxdb = {
dependencies = ["cause" "json"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jikl3iylbffsdmb4vr09ysqvpwxk133y6m9ylwcd0931ngsf0ks";
type = "gem";
};
version = "0.3.13";
};
jmespath = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf";
type = "gem";
};
version = "1.4.0";
};
json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5";
type = "gem";
};
version = "1.8.6";
};
jsonpath = {
dependencies = ["multi_json"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gwhrd7xlysq537yy8ma69jc83lblwiccajl5zvyqpnwyjjc93df";
type = "gem";
};
version = "0.5.8";
};
mime-types = {
dependencies = ["mime-types-data"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
type = "gem";
};
version = "3.2.2";
};
mime-types-data = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
type = "gem";
};
version = "3.2019.0331";
};
mixlib-cli = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp";
type = "gem";
};
version = "1.7.0";
};
multi_json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
type = "gem";
};
version = "1.13.1";
};
netrc = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y";
type = "gem";
};
version = "0.11.0";
};
oj = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "147whmq8h2n04chskl3v4a132xhz5i6kk6vhnz83jwng4vihin5f";
type = "gem";
};
version = "2.18.1";
};
parse-cron = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02fj9i21brm88nb91ikxwxbwv9y7mb7jsz6yydh82rifwq7357hg";
type = "gem";
};
version = "0.1.4";
};
public_suffix = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
type = "gem";
};
version = "3.0.3";
};
rest-client = {
dependencies = ["http-cookie" "mime-types" "netrc"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j";
type = "gem";
};
version = "2.0.2";
};
sensu = {
dependencies = ["em-http-request" "em-http-server" "eventmachine" "parse-cron" "sensu-extension" "sensu-extensions" "sensu-json" "sensu-logger" "sensu-redis" "sensu-settings" "sensu-spawn" "sensu-transport"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wmwck53i207axhqm2r6dz8d7arww3mzd8pjx7m79svyj998hzjc";
type = "gem";
};
version = "1.7.0";
};
sensu-extension = {
dependencies = ["eventmachine"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bpizp4n01rv72cryjjlrbfxxj3csish3mkxjzdy4inpi5j5h1dw";
type = "gem";
};
version = "1.5.2";
};
sensu-extensions = {
dependencies = ["sensu-extension" "sensu-extensions-check-dependencies" "sensu-extensions-debug" "sensu-extensions-deregistration" "sensu-extensions-json" "sensu-extensions-occurrences" "sensu-extensions-only-check-output" "sensu-extensions-ruby-hash" "sensu-json" "sensu-logger" "sensu-settings"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1313g6x3qwldk44p3v46sm3w1hz0pc89nslcwdw3v2j78a99a62y";
type = "gem";
};
version = "1.11.0";
};
sensu-extensions-check-dependencies = {
dependencies = ["sensu-extension"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hc4kz7k983f6fk27ikg5drvxm4a85qf1k07hqssfyk3k75jyj1r";
type = "gem";
};
version = "1.1.0";
};
sensu-extensions-debug = {
dependencies = ["sensu-extension"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11abdgn2kkkbvxq4692yg6a27qnxz4349gfiq7d35biy7vrw34lp";
type = "gem";
};
version = "1.0.0";
};
sensu-extensions-deregistration = {
dependencies = ["sensu-extension"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rarsd7vjflvzgs3hm6z3ypfp3rbzq2723wc0rqxnkpahzdrwr6c";
type = "gem";
};
version = "1.0.0";
};
sensu-extensions-json = {
dependencies = ["sensu-extension"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wnbn9sycdqdh9m0fhszaqkv0jijs3fkdbvcv8kdspx6irbv3m6g";
type = "gem";
};
version = "1.0.0";
};
sensu-extensions-occurrences = {
dependencies = ["sensu-extension"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lx5wsbblfs0rvkxfg09bsz0g2mwmckrhga7idnarsnm8m565v1v";
type = "gem";
};
version = "1.2.0";
};
sensu-extensions-only-check-output = {
dependencies = ["sensu-extension"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ds2i8wd4ji9ifig2zzr4jpxinvk5dm7j10pvaqy4snykxa3rqh3";
type = "gem";
};
version = "1.0.0";
};
sensu-extensions-ruby-hash = {
dependencies = ["sensu-extension"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xyrj3gbmslbivcd5qcmyclgapn7qf7f5jwfvfpw53bxzib0h7s3";
type = "gem";
};
version = "1.0.0";
};
sensu-json = {
dependencies = ["oj"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08zlxg5j3bhs72cc7wcllp026jbif0xiw6ib1cgawndlpsfl9fgx";
type = "gem";
};
version = "2.1.1";
};
sensu-logger = {
dependencies = ["eventmachine" "sensu-json"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jpw4kz36ilaknrzb3rbkhpbgv93w2d668z2cv395dq30d4d3iwm";
type = "gem";
};
version = "1.2.2";
};
sensu-plugin = {
dependencies = ["json" "mixlib-cli"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x4zka4zia2wk3gp0sr4m4lzsf0m7s4a3gcgs936n2mgzsbcaa86";
type = "gem";
};
version = "1.4.7";
};
sensu-plugins-disk-checks = {
dependencies = ["sensu-plugin" "sys-filesystem"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0q4f23ccvl6d0k26xph2fskk5pv2mmdrclr00m358m880sgkhyg1";
type = "gem";
};
version = "4.0.1";
};
sensu-plugins-http = {
dependencies = ["aws-sdk" "rest-client" "sensu-plugin"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bjvg6vr0fy106bp50n6dfwbqf7k0z7ynrm17am7ggfbhzy7wi06";
type = "gem";
};
version = "2.11.0";
};
sensu-plugins-influxdb = {
dependencies = ["dentaku" "influxdb" "jsonpath" "sensu-plugin"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rx0zfvv7c60vaqdwbpl5c3csg5zrrjy1jdl8saigpla133vbgxd";
type = "gem";
};
version = "1.4.0";
};
sensu-plugins-logs = {
dependencies = ["sensu-plugin"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17shj4msc8bzqgqi5waw649hzzgl8q87z6flmpg0msnmv4r2h1cf";
type = "gem";
};
version = "1.3.2";
};
sensu-plugins-systemd = {
dependencies = ["sensu-plugin"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0f0hdp2cvzs5wby2fkjg48siyjgdi83hf11ld1by2l0cn4s9ir24";
type = "gem";
};
version = "0.1.0";
};
sensu-redis = {
dependencies = ["eventmachine"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0widfmmj1h9ca2kk14wy1sqmlkq40linp89a73s3ghngnzri0xyk";
type = "gem";
};
version = "2.4.0";
};
sensu-settings = {
dependencies = ["parse-cron" "sensu-json"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cdlyhga9fj5hmchpb40fw9nh24qhax9djnqcxlj1fywyccycj69";
type = "gem";
};
version = "10.15.0";
};
sensu-spawn = {
dependencies = ["childprocess" "em-worker" "eventmachine" "ffi"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17yc8ivjpjbvig9r7yl6991d6ma0kcq75fbpz6i856ljvcr3lmd5";
type = "gem";
};
version = "2.5.0";
};
sensu-transport = {
dependencies = ["amq-protocol" "amqp" "eventmachine" "sensu-redis"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0x6vyfmg1jm1srf7xa5aka73by7qwcmry2rx8kq8phwa4g0v4mzr";
type = "gem";
};
version = "8.2.0";
};
sys-filesystem = {
dependencies = ["ffi"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10didky52nfapmybj6ipda18i8fcwf8bs9bbfbk5i7v1shzd36rf";
type = "gem";
};
version = "1.1.7";
};
unf = {
dependencies = ["unf_ext"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
type = "gem";
};
version = "0.1.4";
};
unf_ext = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ll6w64ibh81qwvjx19h8nj7mngxgffg7aigjx11klvf5k2g4nxf";
type = "gem";
};
version = "0.0.7.6";
};
}

View File

@ -7,13 +7,13 @@
rustPlatform.buildRustPackage rec {
pname = "dua";
version = "2.29.2";
version = "2.29.3";
src = fetchFromGitHub {
owner = "Byron";
repo = "dua-cli";
rev = "v${version}";
hash = "sha256-tmlf5heOZ3UyFh8ZfwXXZhQO3vlSWwyvxL9/euQ2Fn4=";
hash = "sha256-cxMims1b4zOmpRZSn9rovUCnUT66omgNYjDJWuIDnSk=";
# 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-bqWYXcry+mCUNgYS+7+MWfiV+u+3oZZg1o3Q6Mac+vE=";
cargoHash = "sha256-/7A1XW6EbOQpXeAlsOe1YoY6MdBQ3kC98TTBMs3Zfy8=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Foundation

View File

@ -1,20 +1,19 @@
{ lib
, fetchFromGitHub
, makeWrapper
, perl
, perlPackages
, stdenv
{
lib,
fetchurl,
makeWrapper,
perl,
perlPackages,
stdenv,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "imapsync";
version = "2.229";
version = "2.290";
src = fetchFromGitHub {
owner = "imapsync";
repo = "imapsync";
rev = "imapsync-${version}";
sha256 = "sha256-nlNePOV3Y0atEPSRByRo3dHj/WjIaefEDeWdMKTo4gc=";
src = fetchurl {
url = "https://imapsync.lamiral.info/dist/old_releases/${finalAttrs.version}/imapsync-${finalAttrs.version}.tgz";
hash = "sha256-uFhTxnaUDP793isfpF/7T8d4AnXDL4uN6zU8igY+EFE=";
};
postPatch = ''
@ -44,6 +43,7 @@ stdenv.mkDerivation rec {
MailIMAPClient
ModuleImplementation
ModuleScanDeps
NetServer
NTLM
PackageStash
PackageStashXS
@ -67,7 +67,10 @@ stdenv.mkDerivation rec {
mainProgram = "imapsync";
homepage = "https://imapsync.lamiral.info/";
license = licenses.nlpl;
maintainers = with maintainers; [ pSub ];
maintainers = with maintainers; [
pSub
motiejus
];
platforms = platforms.unix;
};
}
})

View File

@ -33,3 +33,9 @@ curl https://releases.nixos.org/nix/nix-$version/fallback-paths.nix > nixos/modu
If you're updating `nixVersions.stable`, follow all the steps mentioned above, but use the **staging** branch for your pull request (or **staging-next** after coordinating with the people in matrix `#staging:nixos.org`)
This is necessary because, at the end of the staging-next cycle, the NixOS tests are built through the [staging-next-small](https://hydra.nixos.org/jobset/nixos/staging-next-small) jobset.
Especially nixos installer test are important to look at here.
There is a script to update minor versions:
```
./pkgs/tools/package-management/nix/update-all.sh
```

View File

@ -16,6 +16,7 @@ let
atLeast210 = lib.versionAtLeast version "2.10pre";
atLeast213 = lib.versionAtLeast version "2.13pre";
atLeast214 = lib.versionAtLeast version "2.14pre";
atLeast218 = lib.versionAtLeast version "2.18pre";
atLeast219 = lib.versionAtLeast version "2.19pre";
atLeast220 = lib.versionAtLeast version "2.20pre";
atLeast221 = lib.versionAtLeast version "2.21pre";
@ -42,6 +43,7 @@ in
, callPackage
, coreutils
, curl
, darwin
, docbook_xsl_ns
, docbook5
, editline
@ -158,6 +160,8 @@ self = stdenv.mkDerivation {
libseccomp
] ++ lib.optionals withAWS [
aws-sdk-cpp
] ++ lib.optional (atLeast218 && stdenv.hostPlatform.isDarwin) [
darwin.apple_sdk.libs.sandbox
];

View File

@ -8,11 +8,22 @@ NIXPKGS_DIR=$(readlink -f "$SCRIPT_DIR/../../../..")
cd "$NIXPKGS_DIR"
nix_versions=$(nix eval --impure --json --expr "with import ./. { config.allowAliases = false; }; builtins.filter (name: builtins.match \"nix_.*\" name != null) (builtins.attrNames nixVersions)" | jq -r '.[]')
stable_version_full=$(nix eval --impure --json --expr "with import ./. { config.allowAliases = false; }; nixVersions.stable.version" | jq -r)
# strip patch version
stable_version_trimmed=${stable_version_full%.*}
for name in $nix_versions; do
minor_version=${name#nix_*_}
if [[ "$name" = "nix_2_3" ]]; then # not maintained by the nix team
continue
fi
if [[ "$name" = "nix_${stable_version_trimmed//./_}" ]]; then
curl https://releases.nixos.org/nix/nix-$stable_version_full/fallback-paths.nix > "$NIXPKGS_DIR/nixos/modules/installer/tools/nix-fallback-paths.nix"
# nix-update will commit the file if it has changed
git add "$NIXPKGS_DIR/nixos/modules/installer/tools/nix-fallback-paths.nix"
fi
nix-update --override-filename "$SCRIPT_DIR/default.nix" --version-regex "(2\\.${minor_version}\..+)" --build --commit "nixVersions.$name"
done

View File

@ -1,6 +1,7 @@
{ lib
, python3
, fetchFromGitHub
{
lib,
fetchFromGitHub,
python3,
}:
python3.pkgs.buildPythonApplication rec {
@ -21,27 +22,31 @@ python3.pkgs.buildPythonApplication rec {
sed -i '/apachetomcatscanner=apachetomcatscanner\.__main__:main/d' setup.py
'';
pythonRelaxDeps = [
"requests"
"urllib3"
];
build-system = with python3.pkgs; [ setuptools ];
propagatedBuildInputs = with python3.pkgs; [
requests
sectools
urllib3
xlsxwriter
];
# Project has no test
doCheck = false;
pythonImportsCheck = [
"apachetomcatscanner"
];
pythonImportsCheck = [ "apachetomcatscanner" ];
meta = with lib; {
description = "Tool to scan for Apache Tomcat server vulnerabilities";
mainProgram = "ApacheTomcatScanner";
homepage = "https://github.com/p0dalirius/ApacheTomcatScanner";
changelog = "https://github.com/p0dalirius/ApacheTomcatScanner/releases/tag/${version}";
license = licenses.gpl2Only;
maintainers = with maintainers; [ fab ];
mainProgram = "ApacheTomcatScanner";
};
}

View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "stress-ng";
version = "0.18.05";
version = "0.18.06";
src = fetchFromGitHub {
owner = "ColinIanKing";
repo = pname;
rev = "V${version}";
hash = "sha256-/mg+uCUWJJBymr1trnjBdi3mRD4Q7Ril+brokysnZXI=";
hash = "sha256-zQKyVzfqDzarEhb2tlndQ60GuIkL5a2fXh86wIdWLDk=";
};
postPatch = ''

View File

@ -1084,6 +1084,7 @@ mapAliases {
scitoken-cpp = scitokens-cpp; # Added 2024-02-12
semeru-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01
semeru-jre-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01
sensu = throw "sensu has been removed as the upstream project is deprecated. Consider using `sensu-go`"; # Added 2024-10-28
session-desktop-appimage = session-desktop;
sequoia = sequoia-sq; # Added 2023-06-26
sexp = sexpp; # Added 2023-07-03

View File

@ -24977,8 +24977,6 @@ with pkgs;
ruby-zoom = callPackage ../tools/text/ruby-zoom { };
sensu = callPackage ../servers/monitoring/sensu { };
inherit (callPackages ../servers/monitoring/sensu-go { })
sensu-go-agent
sensu-go-backend

View File

@ -574,6 +574,7 @@ mapAliases ({
recursivePthLoader = recursive-pth-loader; # added 2024-01-07
rednose = throw "rednose is no longer maintained (since February 2018)"; # added 2023-08-06
repeated_test = repeated-test; # added 2022-11-15
repocheck = throw "repocheck has been promoted to a top-level attribute name: `pkgs.repocheck`"; # Added 2024-11-03
reportengine = throw "reportengine has been removed, since it is unmaintained and broken"; # added 2024-08-21
repoze_lru = repoze-lru; # added 2023-11-11
repoze_sphinx_autointerface = repoze-sphinx-autointerface; # added 2023-11-11

View File

@ -5119,6 +5119,8 @@ self: super: with self; {
git-url-parse = callPackage ../development/python-modules/git-url-parse { };
git-dummy = callPackage ../development/python-modules/git-dummy { };
gitdb = callPackage ../development/python-modules/gitdb { };
githubkit = callPackage ../development/python-modules/githubkit { };
@ -13664,8 +13666,6 @@ self: super: with self; {
replicate = callPackage ../development/python-modules/replicate { };
repocheck = callPackage ../development/python-modules/repocheck { };
reportlab = callPackage ../development/python-modules/reportlab { };
reportlab-qrcode = callPackage ../development/python-modules/reportlab-qrcode { };