Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2024-09-07 18:04:28 +00:00 committed by GitHub
commit 5310eaa51e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
94 changed files with 1981 additions and 565 deletions

View File

@ -95,6 +95,11 @@
github = "0x120581f";
githubId = 130835755;
};
_0x3f = {
name = "0x3f";
github = "0x3fiona";
githubId = 178507884;
};
_0x4A6F = {
email = "mail-maintainer@0x4A6F.dev";
matrix = "@0x4a6f:matrix.org";
@ -3229,6 +3234,13 @@
githubId = 24193;
name = "Dan Callahan";
};
callumio = {
email = "git@cleslie.uk";
github = "callumio";
githubId = 16057677;
name = "Callum Leslie";
keys = [ { fingerprint = "BC82 4BB5 1656 D144 285E A0EC D382 C4AF EECE AA90"; } ];
};
calvertvl = {
email = "calvertvl@gmail.com";
github = "calvertvl";
@ -13150,6 +13162,12 @@
githubId = 10420834;
name = "Mihai-Drosi Caju";
};
mccartykim = {
email = "mccartykim@zoho.com";
github = "mccartykim";
githubId = 9851221;
name = "Kimberly McCarty";
};
mccurdyc = {
email = "mccurdyc22@gmail.com";
github = "mccurdyc";

View File

@ -50,6 +50,10 @@ in {
};
};
hardware = {
bluetooth.enable = lib.mkDefault true;
};
networking.networkmanager.enable = lib.mkDefault true;
systemd.packages = with pkgs.lomiri; [
@ -87,6 +91,8 @@ in {
ayatana-indicator-messages
ayatana-indicator-power
ayatana-indicator-session
] ++ lib.optionals config.hardware.bluetooth.enable [
ayatana-indicator-bluetooth
] ++ lib.optionals (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) [
ayatana-indicator-sound
]) ++ (with pkgs.lomiri; [

View File

@ -1,16 +1,69 @@
# neard service.
{ config, lib, pkgs, ... }:
{
###### interface
options = {
services.neard = {
enable = lib.mkEnableOption "neard, an NFC daemon";
config,
lib,
pkgs,
...
}:
let
inherit (lib)
mkEnableOption
mkIf
mkOption
types
;
cfg = config.services.neard;
format = pkgs.formats.ini { };
configFile = format.generate "neard.conf" cfg.settings;
in
{
options.services.neard = {
enable = mkEnableOption "neard, an NFC daemon";
settings = mkOption {
type = types.submodule {
freeformType = format.type;
options = {
General = {
ConstantPoll = mkOption {
type = types.bool;
default = false;
description = ''
Enable constant polling. Constant polling will automatically trigger a new
polling loop whenever a tag or a device is no longer in the RF field.
'';
};
DefaultPowered = mkOption {
type = types.bool;
default = true;
description = ''
Automatically turn an adapter on when being discovered.
'';
};
ResetOnError = mkOption {
type = types.bool;
default = true;
description = ''
Power cycle the adapter when getting a driver error from the kernel.
'';
};
};
};
};
default = {};
description = ''
Neard INI-style configuration file as a Nix attribute set.
See the upstream [configuration file](https://github.com/linux-nfc/neard/blob/master/src/main.conf).
'';
};
};
config = mkIf cfg.enable {
environment.etc."neard/main.conf".source = configFile;
###### implementation
config = lib.mkIf config.services.neard.enable {
environment.systemPackages = [ pkgs.neard ];
services.dbus.packages = [ pkgs.neard ];

View File

@ -183,7 +183,7 @@ in
networking.firewall.allowedUDPPorts = mkIf cfg.openFirewall [ 137 138 ];
})
(lib.mkIf cfg.nmbd.enable {
(lib.mkIf (cfg.enable && cfg.nmbd.enable) {
systemd.services.samba-nmbd = {
description = "Samba NMB Daemon";
documentation = [ "man:nmbd(8)" "man:samba(7)" "man:smb.conf(5)" ];
@ -214,7 +214,7 @@ in
};
})
(lib.mkIf cfg.smbd.enable {
(lib.mkIf (cfg.enable && cfg.smbd.enable) {
systemd.services.samba-smbd = {
description = "Samba SMB Daemon";
documentation = [ "man:smbd(8)" "man:samba(7)" "man:smb.conf(5)" ];
@ -250,7 +250,7 @@ in
};
})
(lib.mkIf cfg.winbindd.enable {
(lib.mkIf (cfg.enable && cfg.winbindd.enable) {
systemd.services.samba-winbindd = {
description = "Samba Winbind Daemon";
documentation = [ "man:winbindd(8)" "man:samba(7)" "man:smb.conf(5)" ];

View File

@ -356,6 +356,7 @@ in
startLimitIntervalSec = 14400;
startLimitBurst = 10;
reloadTriggers = optional cfg.enableReload cfg.configFile;
restartTriggers = optional (! cfg.enableReload) cfg.configFile;
serviceConfig = let
runOptions = ''--config ${configPath} ${optionalString (cfg.adapter != null) "--adapter ${cfg.adapter}"}'';

View File

@ -33,6 +33,7 @@ in
packages =
with pkgs;
[
ayatana-indicator-bluetooth
ayatana-indicator-datetime
ayatana-indicator-display
ayatana-indicator-messages

View File

@ -654,6 +654,7 @@ in
machine.send_key("left")
machine.send_key("left")
machine.send_key("left")
machine.send_key("left")
# Notifications are usually empty, nothing to check there
with subtest("ayatana indicator display works"):
@ -661,6 +662,11 @@ in
wait_for_text("Lock")
machine.screenshot("indicators_display")
with subtest("ayatana indicator bluetooth works"):
machine.send_key("right")
wait_for_text("Bluetooth settings")
machine.screenshot("indicators_bluetooth")
with subtest("lomiri indicator network works"):
machine.send_key("right")
wait_for_text(r"(Flight|Wi-Fi)")

View File

@ -1,17 +1,17 @@
{ lib, stdenv, fetchFromGitHub, ffmpeg, libkeyfinder }:
{ lib, stdenv, fetchFromGitHub, ffmpeg_7, libkeyfinder, fftw }:
stdenv.mkDerivation rec {
pname = "keyfinder-cli";
version = "1.1.1";
version = "1.1.2";
src = fetchFromGitHub {
repo = "keyfinder-cli";
owner = "EvanPurkhiser";
rev = "v${version}";
sha256 = "1mlcygbj3gqii3cz8jd6ks1lz612i4jp0343qjg293xm39fg47ns";
hash = "sha256-9/+wzPTaQ5PfPiqTZ5EuHdswXJgfgnvAul/FeeDbbJA=";
};
buildInputs = [ ffmpeg libkeyfinder ];
buildInputs = [ ffmpeg_7 libkeyfinder fftw ];
makeFlags = [ "PREFIX=$(out)" ];

View File

@ -6,12 +6,12 @@
python3.pkgs.buildPythonPackage rec {
pname = "ledfx";
version = "2.0.99";
version = "2.0.100";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-pwrAVcIwZ3RDYFMDk80q5aVSqLTQ5weZqgB3GRRu2ig=";
hash = "sha256-IRwzm0ODeT+umLvIjNURdTE9igpJ03r+ArjNN3y//z0=";
};
pythonRelaxDeps = true;

View File

@ -1,32 +0,0 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, python3, xorg, cmake, libgit2, darwin
, curl }:
rustPlatform.buildRustPackage rec {
pname = "amp";
version = "0.7.0";
src = fetchFromGitHub {
owner = "jmacdonald";
repo = pname;
rev = version;
sha256 = "sha256-xNadwz2agPbxvgUqrUf1+KsWTmeNh8hJIWcNwTzzM/M=";
};
cargoHash = "sha256-4c72l3R9OyxvslKC4RrIu/Ka3grGxIUCY6iF/NHS5X8=";
nativeBuildInputs = [ cmake pkg-config python3 ];
buildInputs = [ openssl xorg.libxcb libgit2 ] ++ lib.optionals stdenv.isDarwin
(with darwin.apple_sdk.frameworks; [ curl Security AppKit ]);
# Tests need to write to the theme directory in HOME.
preCheck = "export HOME=`mktemp -d`";
meta = with lib; {
description = "Modern text editor inspired by Vim";
homepage = "https://amp.rs";
license = [ licenses.gpl3 ];
maintainers = [ maintainers.sb0 ];
platforms = platforms.unix;
mainProgram = "amp";
};
}

View File

@ -29,13 +29,13 @@ let
in
melpaBuild {
pname = "lsp-bridge";
version = "0-unstable-2024-08-17";
version = "0-unstable-2024-09-05";
src = fetchFromGitHub {
owner = "manateelazycat";
repo = "lsp-bridge";
rev = "fe7a0729f9f46a0713b7049d20b25bb78d93f68f";
hash = "sha256-lbtg1n72xNePs1DNpjy6Hvg4OhACk9vSfVwFffkeb0I=";
rev = "bd0cea9639bb902d22ec05189681eef1f1df7e17";
hash = "sha256-QBtYSZAmdRhZqaR0/y0A1Q8fx62+owfdRiIVZOgWxkQ=";
};
patches = [

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "pastel";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-uK4HWC+uGiey+K0p8+Wi+Pi+U7b4k09b8iKF9BmTPcc=";
sha256 = "sha256-kr2aLRd143ksVx42ZDO/NILydObinn3AwPCniXVVmY0=";
};
cargoHash = "sha256-5paHSrqU8tItD/CAbauj6KcW/mKsveOAfXjD/NUuFAc=";
cargoHash = "sha256-+Cw/aAXkSbYLqc7TGWsMUJNo88v0s1Cq1m4V84j3gXE=";
buildInputs = lib.optional stdenv.isDarwin Security;

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "vhs";
version = "0.7.2";
version = "0.8.0";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = pname;
rev = "v${version}";
hash = "sha256-CWurSAxEXAquWXEOyBWBF6JN9Pesm5hBS3jVNv56dvE=";
hash = "sha256-kUsh+jy4dXYW1uAUfFv/HKBqIIyVogLKUYNjBhIKlls=";
};
vendorHash = "sha256-Kh5Sy7URmhsyBF35I0TaDdpSLD96MnkwIS+96+tSyO0=";
vendorHash = "sha256-1UBhiRemJ+dQNm20+8pbOJus5abvTwVcuzxNMzrniN8=";
nativeBuildInputs = [ installShellFiles makeWrapper ];

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "clusterctl";
version = "1.8.1";
version = "1.8.2";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = "cluster-api";
rev = "v${version}";
hash = "sha256-Z7cFwR8IUThEd4Te3KHPC8K8v56ymAG7nIM/7pxWq4U=";
hash = "sha256-7MTl1PzkcvnLZgpGQ+SA29Zb3h0iLMWQcN/FvQflM7s=";
};
vendorHash = "sha256-0VVaD1vGIGezgkVCvIhNHmZqVFxFu4UcUUh0wuX2viw=";

View File

@ -15,8 +15,8 @@
stdenv.mkDerivation rec {
pname = "termius";
version = "9.3.2";
revision = "200";
version = "9.5.0";
revision = "203";
src = fetchurl {
# find the latest version with
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
# and the sha512 with
# curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r
url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_${revision}.snap";
hash = "sha512-LPNwyDqVRFVAmhtZGpxoYEQK5B8BIdaV/ylTD0JfvAJAHWpGrbBJT1jMpT7LetNH5XQyXW81nY26JlcmXHaAwg==";
hash = "sha512-BouIQvJZbi350l30gl9fnXKYRHhi5q1oOvyEIVEmd4DjXvJLQisV4cK4OZIJ/bPOCI5DTxNOY7PwEduVQd3SYA==";
};
desktopItem = makeDesktopItem {

View File

@ -19,17 +19,18 @@
, speex
, speexdsp
, cppzmq
, uhd
}:
gnuradio3_8.pkgs.mkDerivation rec {
pname = "qradiolink";
version = "0.8.11-1";
version = "0.9.0-1";
src = fetchFromGitHub {
owner = "qradiolink";
repo = "qradiolink";
rev = version;
sha256 = "sha256-62+eKaLt9DlTebbnLPVJFx68bfWb7BrdQHocyJTfK28=";
sha256 = "sha256-Js6DzmUG8O9c9VvjE6hc7JGuFmgc1Wq41zVJb8Us/yI=";
};
preBuild = ''
@ -67,6 +68,7 @@ gnuradio3_8.pkgs.mkDerivation rec {
libsndfile
cppzmq
gnuradio3_8.qwt
uhd
] ++ lib.optionals (gnuradio3_8.hasFeature "gr-ctrlport") [
thrift
gnuradio3_8.unwrapped.python.pkgs.thrift

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "git-town";
version = "15.1.0";
version = "16.0.0";
src = fetchFromGitHub {
owner = "git-town";
repo = "git-town";
rev = "v${version}";
hash = "sha256-e4lOyYQHsVOmOYKQ+3B2EdneWL8NEzboTlRKtO8Wdjg=";
hash = "sha256-aSnUJLoHq5byILuiNRrguawfBzL5as7u7ekAbuAmUgM=";
};
vendorHash = null;

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "nixpacks";
version = "1.27.0";
version = "1.28.1";
src = fetchFromGitHub {
owner = "railwayapp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-aIg+CuWa97FlSs8kOFe6BxV2lB4M6R8QosoSomFPqFA=";
sha256 = "sha256-0gy9fm18Tc1ALZEV+XZN8kwK725PpIK2OTKKMatvtVQ=";
};
cargoHash = "sha256-4Q6nduLEK2ym+3o3OD8jJwpl+sLbryk/TzoOSd/d4yE=";
cargoHash = "sha256-r7jVcDja3BZyZoN2JxDymyv+rOv3wWaGo+yC4GwnZ50=";
# skip test due FHS dependency
doCheck = false;

View File

@ -27,7 +27,7 @@
# since rustc 1.42 the "proc_macro" crate is part of the default crate prelude
# https://github.com/rust-lang/cargo/commit/4d64eb99a4#diff-7f98585dbf9d30aa100c8318e2c77e79R1021-R1022
++ lib.optional (lib.elem "proc-macro" crateType) "--extern proc_macro"
++ lib.optional (stdenv.hostPlatform.linker == "lld") # Needed when building for targets that use lld. e.g. 'wasm32-unknown-unknown'
++ lib.optional (stdenv.hostPlatform.linker == "lld" && rustc ? llvmPackages.lld) # Needed when building for targets that use lld. e.g. 'wasm32-unknown-unknown'
"-C linker=${rustc.llvmPackages.lld}/bin/lld"
++ lib.optional (stdenv.hasCC && stdenv.hostPlatform.linker != "lld")
"-C linker=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"

View File

@ -16,16 +16,6 @@
}:
let
# Returns a true if the builder's rustc was built with support for the target.
targetAlreadyIncluded = lib.elem stdenv.hostPlatform.rust.rustcTarget
(lib.splitString "," (lib.removePrefix "--target=" (
lib.elemAt (lib.filter (f: lib.hasPrefix "--target=" f) pkgsBuildBuild.rustc.unwrapped.configureFlags) 0)
));
# If the build's rustc was built with support for the target then reuse it. (Avoids uneeded compilation for targets like `wasm32-unknown-unknown`)
rustc' = if targetAlreadyIncluded then pkgsBuildBuild.rustc else rustc;
cargo' = if targetAlreadyIncluded then pkgsBuildBuild.cargo else cargo;
# Create rustc arguments to link against the given list of dependencies
# and renames.
#
@ -85,11 +75,6 @@ let
inherit lib stdenv echo_colored noisily mkRustcDepArgs mkRustcFeatureArgs;
};
buildCrate = import ./build-crate.nix {
inherit lib stdenv mkRustcDepArgs mkRustcFeatureArgs needUnstableCLI;
rustc = rustc';
};
installCrate = import ./install-crate.nix { inherit stdenv; };
in
@ -103,7 +88,11 @@ crate_: lib.makeOverridable
# The rust compiler to use.
#
# Default: pkgs.rustc
{ rust
{ rust ? rustc
# The cargo package to use for getting some metadata.
#
# Default: pkgs.cargo
, cargo ? cargo
# Whether to build a release version (`true`) or a debug
# version (`false`). Debug versions are faster to build
# but might be much slower at runtime.
@ -262,6 +251,11 @@ crate_: lib.makeOverridable
# https://github.com/kolloch/crate2nix/blame/5b19c1b14e1b0e5522c3e44e300d0b332dc939e7/crate2nix/templates/build.nix.tera#L89
crateBin = lib.filter (bin: !(bin ? name && bin.name == ",")) (crate.crateBin or [ ]);
hasCrateBin = crate ? crateBin;
buildCrate = import ./build-crate.nix {
inherit lib stdenv mkRustcDepArgs mkRustcFeatureArgs needUnstableCLI;
rustc = rust;
};
in
stdenv.mkDerivation (rec {
@ -285,7 +279,7 @@ crate_: lib.makeOverridable
name = "rust_${crate.crateName}-${crate.version}${lib.optionalString buildTests_ "-test"}";
version = crate.version;
depsBuildBuild = [ pkgsBuildBuild.stdenv.cc ];
nativeBuildInputs = [ rustc' cargo' jq ]
nativeBuildInputs = [ rust cargo jq ]
++ lib.optionals stdenv.hasCC [ stdenv.cc ]
++ lib.optionals stdenv.buildPlatform.isDarwin [ libiconv ]
++ (crate.nativeBuildInputs or [ ]) ++ nativeBuildInputs_;
@ -392,7 +386,8 @@ crate_: lib.makeOverridable
)
)
{
rust = rustc';
rust = crate_.rust or rustc;
cargo = crate_.cargo or cargo;
release = crate_.release or true;
verbose = crate_.verbose or true;
extraRustcOpts = [ ];

View File

@ -79,18 +79,21 @@ and override its value in [`pkgs/top-level/all-packages.nix`](../top-level/all-p
## Manual migration guidelines
Most packages are still defined in `all-packages.nix` and the [category hierarchy](../README.md#category-hierarchy).
Please hold off migrating your maintained packages to this directory.
Since it would take a lot of contributor and reviewer time to migrate all packages manually,
an [automated migration is planned](https://github.com/NixOS/nixpkgs/pull/211832),
though it is expected to still take some time to get done.
If you're interested in helping out with this effort,
please see [this ticket](https://github.com/NixOS/nixpkgs-vet/issues/56).
1. An automated migration for the majority of packages [is being worked on](https://github.com/NixOS/nixpkgs/pull/211832).
In order to save on contributor and reviewer time, packages should only be migrated manually afterwards if they couldn't be migrated automatically.
Since [only PRs to packages in `pkgs/by-name` can be automatically merged](../../CONTRIBUTING.md#how-to-merge-pull-requests),
if package maintainers would like to use this feature, they are welcome to migrate their packages to `pkgs/by-name`.
To lessen PR traffic, they're encouraged to also perform some more general maintenance on the package in the same PR,
though this is not required and must not be expected.
1. Manual migrations should only be lightly encouraged if the relevant code is being worked on anyways.
For example with a package update or refactoring.
1. Manual migrations should not remove definitions from `all-packages.nix` with custom arguments.
That is a backwards-incompatible change because it changes the `.override` interface.
Such packages may still be moved to `pkgs/by-name` however, while keeping the definition in `all-packages.nix`.
See also [changing implicit attribute defaults](#changing-implicit-attribute-defaults).
Note that definitions in `all-packages.nix` with custom arguments should not be removed.
That is a backwards-incompatible change because it changes the `.override` interface.
Such packages may still be moved to `pkgs/by-name` however, while keeping the definition in `all-packages.nix`.
See also [changing implicit attribute defaults](#changing-implicit-attribute-defaults).
## Limitations

View File

@ -0,0 +1,64 @@
{
lib,
stdenv,
fetchFromGitHub,
rustPlatform,
openssl,
pkg-config,
python3,
xorg,
cmake,
libgit2,
darwin,
curl,
}:
rustPlatform.buildRustPackage rec {
pname = "amp";
version = "0.7.0";
src = fetchFromGitHub {
owner = "jmacdonald";
repo = "amp";
rev = version;
hash = "sha256-xNadwz2agPbxvgUqrUf1+KsWTmeNh8hJIWcNwTzzM/M=";
};
cargoPatches = [ ./update_time_crate.patch ];
cargoHash = "sha256-EYD1gQgkHemT/3VewdsU5kOGQKY3OjIHRiTSqSRNwtU=";
nativeBuildInputs = [
cmake
pkg-config
python3
];
buildInputs =
[
openssl
xorg.libxcb
libgit2
]
++ lib.optionals stdenv.isDarwin (
with darwin.apple_sdk.frameworks;
[
curl
Security
AppKit
]
);
# Tests need to write to the theme directory in HOME.
preCheck = "export HOME=`mktemp -d`";
meta = {
description = "Modern text editor inspired by Vim";
homepage = "https://amp.rs";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [
sb0
aleksana
];
mainProgram = "amp";
};
}

View File

@ -0,0 +1,56 @@
From 4ce866de7a2e1613951002ff61563a80e19a5c0c Mon Sep 17 00:00:00 2001
From: Drewry Pope <drewrypope@gmail.com>
Date: Wed, 28 Aug 2024 18:45:41 -0500
Subject: [PATCH] update time
---
Cargo.lock | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 0e1b8ff6..bd8b5814 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -864,6 +864,12 @@ dependencies = [
"minimal-lexical",
]
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
[[package]]
name = "num-traits"
version = "0.2.16"
@@ -1372,12 +1378,13 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.31"
+version = "0.3.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
dependencies = [
"deranged",
"itoa",
+ "num-conv",
"powerfmt",
"serde",
"time-core",
@@ -1392,10 +1399,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
[[package]]
name = "time-macros"
-version = "0.2.16"
+version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
dependencies = [
+ "num-conv",
"time-core",
]

View File

@ -0,0 +1,84 @@
{
stdenv,
lib,
fetchFromGitHub,
gitUpdater,
nixosTests,
cmake,
gettext,
glib,
gobject-introspection,
intltool,
libayatana-common,
lomiri,
pkg-config,
systemd,
vala,
wrapGAppsHook3,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "ayatana-indicator-bluetooth";
version = "24.5.0";
src = fetchFromGitHub {
owner = "AyatanaIndicators";
repo = "ayatana-indicator-bluetooth";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-EreOhrlWbSZtwazsvwWsPji2iLfQxr2LbjCI13Hrb28=";
};
postPatch = ''
substituteInPlace data/CMakeLists.txt \
--replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' \
--replace-fail '/etc' "\''${CMAKE_INSTALL_SYSCONFDIR}"
'';
strictDeps = true;
nativeBuildInputs = [
cmake
gettext
gobject-introspection
intltool
pkg-config
vala
wrapGAppsHook3
];
buildInputs = [
lomiri.cmake-extras
glib
libayatana-common
systemd
];
cmakeFlags = [
(lib.cmakeBool "GSETTINGS_LOCALINSTALL" true)
(lib.cmakeBool "GSETTINGS_COMPILE" true)
];
passthru = {
ayatana-indicators = {
ayatana-indicator-bluetooth = [
"ayatana"
"lomiri"
];
};
updateScript = gitUpdater { };
tests.vm = nixosTests.ayatana-indicators;
};
meta = {
description = "Ayatana System Indicator for Bluetooth Management";
longDescription = ''
This Ayatana Indicator exposes bluetooth functionality via the system
indicator API and provides fast user controls for Bluetooth devices.
'';
homepage = "https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth";
changelog = "https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth/blob/${finalAttrs.version}/ChangeLog";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ OPNA2608 ];
platforms = lib.platforms.linux;
};
})

View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "boxbuddy";
version = "2.2.10";
version = "2.2.11";
src = fetchFromGitHub {
owner = "Dvlv";
repo = "BoxBuddyRS";
rev = version;
hash = "sha256-q09yrFO/qBXr/O3tK7seqWyBEraQ7VJB39RukS6v+ys=";
hash = "sha256-MPeGaAoKbLit/d0UCZjAEso4i2vZ8H4D8Ia8Mutqnvg=";
};
cargoHash = "sha256-Ow16RxhauuisQ+GiJ5TdFa0D9FcgmAjwnk7WenXoQYo=";
cargoHash = "sha256-5tSM5sqrePpP7YOLuKi4i78F48oSexLVHQSyx6g7fio=";
# The software assumes it is installed either in flatpak or in the home directory
# so the xdg data path needs to be patched here

View File

@ -8,14 +8,14 @@
}:
rustPlatform.buildRustPackage rec {
pname = "clippy-sarif";
version = "0.6.5";
version = "0.6.6";
src = fetchCrate {
inherit pname version;
hash = "sha256-vwHb622JIJr+iRx/MhWdXoRULnKqtxx6HB4rv9zpYA8=";
hash = "sha256-GoVUOtxgLKEG+G1vgmFqtm0b2NRl4bhIe7DVo1tOqaw=";
};
cargoHash = "sha256-bRB6DedlvFsHcjTJQiGn///M9YOp1rl9FxXQlzuI0vo=";
cargoHash = "sha256-DZdU1QyIvzHm9UekqA2nZUKSRcgn7pKQFhPkPcAVFPY=";
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;

View File

@ -0,0 +1,27 @@
{
buildGoModule,
fetchFromGitHub,
lib,
}:
buildGoModule rec {
pname = "cuetsy";
version = "0.1.11";
src = fetchFromGitHub {
owner = "grafana";
repo = "cuetsy";
rev = "v${version}";
hash = "sha256-dirzVR4j5K1+EHbeRi4rHwRxkyveySoM7qJzvOlGp+0=";
};
vendorHash = "sha256-CDa7ZfbVQOIt24VZTy4j0Dn24nolmYa0h9zgrJ3QTeY=";
meta = {
description = "Experimental CUE->TypeScript exporter";
homepage = "https://github.com/grafana/cuetsy";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ bryanhonof ];
mainProgram = "cuetsy";
};
}

View File

@ -5,7 +5,7 @@
}:
buildNpmPackage rec {
pname = "eask";
pname = "eask-cli";
version = "0.10.0";
src = fetchFromGitHub {

File diff suppressed because it is too large Load Diff

View File

@ -1,42 +1,43 @@
{
lib,
stdenv,
fetchFromGitLab,
writeScript,
appstream-glib,
cargo,
meson,
ninja,
pkg-config,
rustPlatform,
rustc,
wrapGAppsHook4,
cairo,
cargo,
desktop-file-utils,
fetchFromGitLab,
gdb,
gdk-pixbuf,
git,
glib,
gtk4,
gtksourceview5,
lib,
libadwaita,
libgit2,
libusb1,
meson,
ninja,
nix-update-script,
openssl,
openxr-loader,
pango,
pkg-config,
rustPlatform,
rustc,
stdenv,
vte-gtk4,
wrapGAppsHook4,
zlib,
unstableGitUpdater,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "envision-unwrapped";
version = "0-unstable-2024-07-03";
version = "0-unstable-2024-09-06";
src = fetchFromGitLab {
owner = "gabmus";
repo = "envision";
rev = "6cf5e40b96d1cbd99a3cfcef1f03899356e79448";
hash = "sha256-a/IUNGoq9OKEC3uCg6PUp2TRHkfm4mTT3QQ8SfA29RU=";
rev = "849f47a8533bc3fc673afbdd9b32acac3ff26f7d";
hash = "sha256-t1+4MXD1s4NW38r3Ht+1OmCAY44MqEPijXdUVKy0rY4=";
};
strictDeps = true;
@ -44,7 +45,8 @@ stdenv.mkDerivation (finalAttrs: {
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"libmonado-rs-0.1.0" = "sha256-PsNgfpgso3HhIMXKky/u6Xw8phk1isRpNXKLhvN1wIE=";
"libmonado-rs-0.1.0" = "sha256-xztevBUaYBm5G3A0ZTb+3GV3g1IAU3SzfSS5BBqfp1Y=";
"openxr-0.18.0" = "sha256-ktkbhmExstkNJDYM/HYOwAwv3acex7P9SP0KMAOKhQk=";
};
};
@ -52,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
appstream-glib
desktop-file-utils
cargo
git
meson
ninja
pkg-config
@ -70,6 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
libgit2
libusb1
openssl
openxr-loader
pango
vte-gtk4
zlib
@ -80,11 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
--prefix PATH : "${lib.makeBinPath [ gdb ]}"
'';
passthru.updateScript = writeScript "envision-update" ''
source ${builtins.head (unstableGitUpdater { })}
cp $tmpdir/Cargo.lock ./pkgs/by-name/en/envision-unwrapped/Cargo.lock
'';
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; };
meta = {
description = "UI for building, configuring and running Monado, the open source OpenXR runtime";

View File

@ -5,7 +5,7 @@
}:
let
version = "1.8.0";
version = "1.9.0";
# nixpkgs-update: no auto update
suffix =
@ -32,8 +32,8 @@ stdenv.mkDerivation {
sourceRoot = ".";
src = dlbin {
x86_64-linux = "sha256-vImb2u+NCqew+vv0miv2R+AphVj0+u5Elw2HocbRri0=";
aarch64-linux = "sha256-ZLSc61MWfXYWv0/Sxz3vaWoyAlnqbgfPFEfJCRxfknE=";
x86_64-linux = "sha256-lcE3QMfKGm37QOD1HNCp7v7h8iPNLDU4dV0Dw6m6Ujc=";
aarch64-linux = "sha256-xVZOdt7CuOgJLFLw+KTF9FzzF5HpWpMC9DYKdx33j2k=";
};
dontConfigure = true;

View File

@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://flashprog.org";
description = "Utility for reading, writing, erasing and verifying flash ROM chips";
license = with licenses; [ gpl2Plus ];
maintainers = with maintainers; [ felixsinger ];
maintainers = with maintainers; [ felixsinger funkeleinhorn ];
platforms = platforms.all;
mainProgram = "flashprog";
};

View File

@ -7,14 +7,14 @@
}:
rustPlatform.buildRustPackage rec {
pname = "hadolint-sarif";
version = "0.6.5";
version = "0.6.6";
src = fetchCrate {
inherit pname version;
hash = "sha256-wMb/taAAR0W8YVowNik0S8nFSmsD6LAQ5Egn0k52U74=";
hash = "sha256-v1rbM1HEZpSIS07x4GyICu6OR7PfH89wNywlXXPh1to=";
};
cargoHash = "sha256-OpUUmte/NfMNbyO3H4ikJF5ALnvfNkUBwFhIN9vefd0=";
cargoHash = "sha256-lojb6tESIl2kbVDUyoDf1CntvzJOtoZZJEyDs9PR7Gw=";
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;

View File

@ -0,0 +1,29 @@
From 0c37b7e3ec65b4d0e166e2127d9f1835320165b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
Date: Fri, 6 Sep 2024 17:07:11 -0400
Subject: [PATCH] incusd/instance/qemu: Make O_DIRECT conditional on
directCache
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
---
internal/server/instance/drivers/driver_qemu.go | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/internal/server/instance/drivers/driver_qemu.go b/internal/server/instance/drivers/driver_qemu.go
index 5a94c9db43..9609b73c1b 100644
--- a/internal/server/instance/drivers/driver_qemu.go
+++ b/internal/server/instance/drivers/driver_qemu.go
@@ -4276,7 +4276,9 @@ func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string]
permissions = unix.O_RDONLY
}
- permissions |= unix.O_DIRECT
+ if directCache {
+ permissions |= unix.O_DIRECT
+ }
f, err := os.OpenFile(driveConf.DevPath, permissions, 0)
if err != nil {

View File

@ -0,0 +1,28 @@
From 572afb06f66f83ca95efa1b9386fceeaa1c9e11b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
Date: Fri, 6 Sep 2024 15:51:35 -0400
Subject: [PATCH] incusd/instance/qemu: Set O_DIRECT when passing in FDs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This is required in most cases with QEMU 9.1.0.
Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
---
internal/server/instance/drivers/driver_qemu.go | 2 ++
1 file changed, 2 insertions(+)
diff --git a/internal/server/instance/drivers/driver_qemu.go b/internal/server/instance/drivers/driver_qemu.go
index 37da21f42f..e25aab0667 100644
--- a/internal/server/instance/drivers/driver_qemu.go
+++ b/internal/server/instance/drivers/driver_qemu.go
@@ -4277,6 +4277,8 @@ func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string]
permissions = unix.O_RDONLY
}
+ permissions |= unix.O_DIRECT
+
f, err := os.OpenFile(driveConf.DevPath, permissions, 0)
if err != nil {
return fmt.Errorf("Failed opening file descriptor for disk device %q: %w", driveConf.DevName, err)

View File

@ -0,0 +1,33 @@
From 58eeb4eeee8a9e7f9fa9c62443d00f0ec6797078 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
Date: Fri, 6 Sep 2024 17:10:01 -0400
Subject: [PATCH] incusd/instance/qemu: Force threads I/O mode for
unsafe/writeback
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The default "native" aioMode requires direct I/O which is incompatible
with unsafe/writeback.
Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
---
internal/server/instance/drivers/driver_qemu.go | 2 ++
1 file changed, 2 insertions(+)
diff --git a/internal/server/instance/drivers/driver_qemu.go b/internal/server/instance/drivers/driver_qemu.go
index 9609b73c1b..a5a4944d40 100644
--- a/internal/server/instance/drivers/driver_qemu.go
+++ b/internal/server/instance/drivers/driver_qemu.go
@@ -4088,9 +4088,11 @@ func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string]
noFlushCache := false // Don't ignore any flush requests for the device.
if cacheMode == "unsafe" {
+ aioMode = "threads"
directCache = false
noFlushCache = true
} else if cacheMode == "writeback" {
+ aioMode = "threads"
directCache = false
}

View File

@ -1,6 +1,11 @@
import ./generic.nix {
hash = "sha256-fWc+qUAFlqMuiDhZzEY99rXHjKq40GPzplSN8ggId9g=";
version = "6.4.0";
vendorHash = "sha256-j+ywLnN+/6HvMKOEr1FuXTLxUMX7VtU4eG3GGx3yAOo=";
patches = [ ];
hash = "sha256-FdoJI0SUH8KS3Epyw/HejgyhISWGLePsIjYUS2YTBvc=";
version = "6.5.0";
vendorHash = "sha256-8e2X7HIy1IEx6p41SHJyq5dNUJ3rRC2maXC4uNaSlnk=";
patches = [
# qemu 9.1 compat, remove in 6.6
./572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch
./58eeb4eeee8a9e7f9fa9c62443d00f0ec6797078.patch
./0c37b7e3ec65b4d0e166e2127d9f1835320165b8.patch
];
}

View File

@ -1,4 +1,8 @@
{ stdenv, lib, fetchFromGitHub }:
{
stdenv,
lib,
fetchFromGitHub,
}:
stdenv.mkDerivation rec {
pname = "iotools";
@ -11,7 +15,10 @@ stdenv.mkDerivation rec {
sha256 = "0vymnah44d5bzsjhfmxkcrlrikkp0db22k7a1s8bknz7glk9fldn";
};
makeFlags = [ "DEBUG=0" "STATIC=0" ];
makeFlags = [
"DEBUG=0"
"STATIC=0"
];
installPhase = ''
install -Dm755 iotools -t $out/bin
@ -30,7 +37,10 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/adurbin/iotools";
license = licenses.gpl2Only;
maintainers = with maintainers; [ felixsinger ];
platforms = [ "x86_64-linux" "i686-linux" ];
platforms = [
"x86_64-linux"
"i686-linux"
];
mainProgram = "iotools";
};
}

View File

@ -7,13 +7,13 @@
}:
buildGoModule rec {
pname = "lazygit";
version = "0.43.1";
version = "0.44.0";
src = fetchFromGitHub {
owner = "jesseduffield";
repo = pname;
rev = "v${version}";
hash = "sha256-iFx/ffaijhOqEDRW1QVzhQMvSgnS4lKFOzq1YdlkUzc=";
hash = "sha256-bJ2wdS0BCAGjfbnMoQSUhw/xAkC5HPRklefXx2ux078=";
};
vendorHash = null;

View File

@ -1,6 +1,10 @@
{ fetchFromGitLab, lib, stdenv
, autoreconfHook, pkg-config
, libusb1
{
fetchFromGitLab,
lib,
stdenv,
autoreconfHook,
pkg-config,
libusb1,
}:
stdenv.mkDerivation rec {
@ -12,10 +16,13 @@ stdenv.mkDerivation rec {
owner = "libjaylink";
repo = "libjaylink";
rev = version;
sha256 = "sha256-odJDE1A0WZ9vBXPxaUdthjTgmbmbdHjbyY1PkaM4+vI=";
hash = "sha256-odJDE1A0WZ9vBXPxaUdthjTgmbmbdHjbyY1PkaM4+vI=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs = [ libusb1 ];
postPatch = ''

View File

@ -0,0 +1,31 @@
{
stdenvNoCC,
fetchurl,
lib,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "lxgw-wenkai-screen";
version = "1.330";
src = fetchurl {
url = "https://github.com/lxgw/LxgwWenKai-Screen/releases/download/v${finalAttrs.version}/LXGWWenKaiScreen.ttf";
hash = "sha256-3C6gZmL5Bn6+26TfI2UdCCnGI8Vw4UTFJRc8n6qlP5o=";
};
dontUnpack = true;
installPhase = ''
runHook preInstall
install -Dm644 "$src" "$out/share/fonts/truetype/LXGWWenKaiScreen.ttf"
runHook postInstall
'';
meta = {
description = "LXGW WenKai font optimized for screen reading";
homepage = "https://github.com/lxgw/LxgwWenKai-Screen";
license = lib.licenses.ofl;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ lebensterben ];
};
})

View File

@ -0,0 +1,52 @@
--- a/CMakeLists.txt 2022-10-20 17:03:52.000000000 +0200
+++ b/CMakeLists.txt 2024-09-05 21:39:27.172090291 +0200
@@ -98,7 +98,9 @@
src/magencd.c
src/rp2mag.c
src/utils.c
- src/rp2mag_encode.c)
+ src/rp2mag_encode.c
+ src/commandmb1.c
+ src/command_helper.c)
target_compile_options(rastertoultra PRIVATE ${CUPS_CFLAGS})
target_link_libraries(rastertoultra ${CUPS_LIBS})
@@ -164,38 +166,3 @@
)
set(CPACK_VERBATIM_VARIABLES YES)
include(CPack)
-
-## TESTS
-
-add_subdirectory(test/unity EXCLUDE_FROM_ALL)
-add_executable(test_rp2_mag EXCLUDE_FROM_ALL test/test_rp2_mag.c
- src/rp2mag.c
- src/rp2mag_encode.c
- src/utils.c)
-target_compile_definitions(test_rp2_mag PRIVATE TEST)
-target_include_directories(test_rp2_mag PRIVATE src)
-target_link_libraries(test_rp2_mag unity)
-
-add_executable(test_dpi EXCLUDE_FROM_ALL test/test_dpi.c
- src/rastertoultra.c
- src/utils.c
- src/crc32.c
- src/rp2mag.c
- src/colrmtch.c
- src/rp2mag_encode.c
- src/magencd.c
- src/colour-profiles/magir2x.c
- src/colour-profiles/magiox.c
- src/colour-profiles/magiry.c)
-target_include_directories(test_dpi PRIVATE src)
-target_compile_definitions(test_dpi PRIVATE TEST)
-target_compile_options(test_dpi PRIVATE -Wno-unused-function)
-target_link_libraries(test_dpi unity m ${CUPS_LIBS})
-
-enable_testing()
-add_test(test_rp2_mag test_rp2_mag)
-add_test(test_dpi test_dpi)
-
-# Autotools-style "make check" command
-add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
-add_dependencies(check test_rp2_mag test_dpi)

View File

@ -0,0 +1,78 @@
{
stdenv,
lib,
fetchzip,
cmake,
cups,
}:
stdenv.mkDerivation rec {
pname = "magicard-cups-driver";
version = "1.4.0";
src = fetchzip {
# https://support.magicard.com/solution/linux-driver/
url = "https://f08ddbe93aa02eaf9a6c-f08cd513e3a8c914f4f8f62af1786149.ssl.cf3.rackcdn.com/magicard_ltd-linux_driver-${version}.tar.gz";
hash = "sha256-1k2Twn1JBizw/tzQ0xF1uJIecblRd6VurB7FAUop5F0=";
};
src_v1_3_4 = fetchzip {
url = "https://techs.magicard.com/linux/v1.3.4/magicard_ltd-linux_driver-1.3.4.tar.gz";
hash = "sha256-6UIL2wyFOjOJeyGjYScfjbpURycN469raye6DnP19jg=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ cups ];
# Replace the supplied cmake generated makefile (which is useless on a different machine)
# with the CMakeLists.txt taken from v1.3.4 of the driver and patch it to make it compatible with v1.4.0
prePatch = ''
cp ${src_v1_3_4}/CMakeLists.txt CMakeLists.txt
rm makefile
'';
patches = [ ./CMakeLists.patch ];
cmakeFlags = [
"-DCUPS_SERVER_BIN=lib/cups"
"-DCUPS_DATA_DIR=share/cups"
];
meta = {
description = "CUPS driver for Magicard Printers";
longDescription = ''
This driver supports Magicard printers and rebrands sold at least under the following brands:
- Aisino
- AlphaCard
- BOOD
- Brady
- Cardmaker
- Centena
- DTP
- Digital ID
- DoH
- Elliaden
- Fagoo
- Goodcard
- Gudecard
- IDentilam
- IDville
- ilinkcard
- Intersider
- Magicard
- Orphicard
- PPC ID
- Polaroid
- PriceCardPro
- Pridento
- ScreenCheck
- Titan
- Ying
'';
homepage = "https://support.magicard.com/solution/linux-driver/";
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ _0x3f ];
};
}

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "notation";
version = "1.1.1";
version = "1.2.0";
src = fetchFromGitHub {
owner = "notaryproject";
repo = pname;
rev = "v${version}";
hash = "sha256-Pi4Ddlx8G4dRDz79yTiPBf6gf0wsvoE9CuyeVGrHst0=";
hash = "sha256-TliXrI5G+1Zw5vhrpEtcjDv2EjRjUsGEfwKOOf8vtZg=";
};
vendorHash = "sha256-REJPSBLXzIPAmxwzckufTqJvZCWUUkJLBmHTx2nv9QM=";
vendorHash = "sha256-kK4iwpzSz0JFnY1DbA7rjIzrqZO3imTCOfgtQKd0oV8=";
nativeBuildInputs = [
installShellFiles

View File

@ -7,7 +7,7 @@
let
pname = "openfga-cli";
version = "0.5.3";
version = "0.6.0";
in
buildGoModule {
@ -17,10 +17,10 @@ buildGoModule {
owner = "openfga";
repo = "cli";
rev = "v${version}";
hash = "sha256-74wHhVGhLiuszRZBjxGGk9jfN+D6T1eZg8OFEkE3gPE=";
hash = "sha256-6bzVT+SnYAFDYdy5nyXPpmUuLsmjvUuaIlPkICjw30U=";
};
vendorHash = "sha256-TDjXy5zR5LJWVmIfAolHgzM7JElgyksHbv0NAS97QnU=";
vendorHash = "sha256-jIcuyt4tzfz+WkyQnMZs6viLnmwtGbVawgnz9M/xAS8=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -7,7 +7,7 @@
let
pname = "openfga";
version = "1.5.9";
version = "1.6.0";
in
buildGoModule {
@ -17,10 +17,10 @@ buildGoModule {
owner = "openfga";
repo = "openfga";
rev = "v${version}";
hash = "sha256-btk7I1jHWJfV1KgWpPXbKbn1f/2MnLrqA0HuHD3fSQc=";
hash = "sha256-Y0ffBbNQFPGoLq2B9HtImU1tH0JqhvPYgftNCUQtcJo=";
};
vendorHash = "sha256-rU45E9yEh7a1MrbnzFFuNeMpfbODO2O7tqEaiv7CA9Y=";
vendorHash = "sha256-+awhoYHstxLarPRDIzETAx0wR8TqoyDz3iFSQxH2vG4=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "orchard";
version = "0.22.1";
version = "0.23.0";
src = fetchFromGitHub {
owner = "cirruslabs";
repo = pname;
rev = version;
hash = "sha256-GdcDouGL6wshCdzKZ7TAm/Ty3c8dAsWQSNRlGIUIq2Y=";
hash = "sha256-cBl3dvLZGO8a3rc4bqw7eDcSn0mcUBo3AlkjmSPKp9E=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -19,7 +19,7 @@ buildGoModule rec {
'';
};
vendorHash = "sha256-Xf/d0Zv+aSzJhE2+XtKFqhNnPZrtaNhM3IKnNb8JOTQ=";
vendorHash = "sha256-HphNpli6hYvmeIJlkkSzOZDbdqFL4XI+koUK9RvWfw8=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "picocrypt-cli";
version = "2.06";
version = "2.07";
src = fetchFromGitHub {
owner = "Picocrypt";
repo = "CLI";
rev = version;
hash = "sha256-vxHYTgNVhTTN1yQkqjvlzqq7pV0XiQqTHI9HqIUVyR4=";
hash = "sha256-z6xtqo0VBLneXNaP6NdyuHTX905cqrzxvECIHVBGNlY=";
};
sourceRoot = "${src.name}/picocrypt";

View File

@ -0,0 +1,51 @@
{
lib,
stdenv,
fetchFromGitHub,
meson,
ninja,
pkg-config,
vala,
blueprint-compiler,
wrapGAppsHook4,
libadwaita,
libgee,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "pinit";
version = "2.1.1";
src = fetchFromGitHub {
owner = "ryonakano";
repo = "pinit";
rev = finalAttrs.version;
hash = "sha256-unvlMytZdjVbrWlwkpw90NZoFw9A6Ga0bB2XqFEPuVE=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
vala
blueprint-compiler
wrapGAppsHook4
];
buildInputs = [
libadwaita
libgee
];
meta = {
description = "Pin portable apps to the launcher";
homepage = "https://github.com/ryonakano/pinit";
license = with lib.licenses; [
gpl3Plus
cc0
];
mainProgram = "com.github.ryonakano.pinit";
maintainers = with lib.maintainers; [ aleksana ];
platforms = lib.platforms.linux;
};
})

View File

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "poethepoet";
version = "0.27.0";
version = "0.28.0";
pyproject = true;
src = fetchFromGitHub {
owner = "nat-n";
repo = "poethepoet";
rev = "refs/tags/v${version}";
hash = "sha256-2AxNu4/tTTH5aW02ec83jxhLJoDKSogY/fm8PUm1cSg=";
hash = "sha256-um17UHFLX7zLQXLWbYnEnaLUwMgFSxdGt85fjMBEhjQ=";
};
nativeBuildInputs = [

View File

@ -12,13 +12,13 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "raspberrypi-eeprom";
version = "2024.06.05-2712";
version = "2024.07.30-2712";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "rpi-eeprom";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-VcMDDnM0VNr+Y+16ZChZdlEcmlHx6mYNCK0mrPMJHes=";
hash = "sha256-4rTq8O6TqE7vRr4o+/149FraYLmKFUQRUFffzC0aeIQ=";
};
buildInputs = [ python3 ];

View File

@ -17,7 +17,7 @@
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.7"; hash = "sha256-zMBpSXV8dlGI/3ZB9Lx4qQnAHFNCwsjuEAuQzxHWDJU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-arm64/8.0.7/microsoft.aspnetcore.app.runtime.osx-arm64.8.0.7.nupkg"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.32"; hash = "sha256-vh/e46xM/HbhbBvL5eP5/DCHwCP2Bg7WoMS28nBXWV0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-x64/6.0.32/microsoft.aspnetcore.app.runtime.osx-x64.6.0.32.nupkg"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.7"; hash = "sha256-TWXhiLxVkTem4aoBfWpVEhbWvfECfqJQqFP4X8BMhCY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-x64/8.0.7/microsoft.aspnetcore.app.runtime.osx-x64.8.0.7.nupkg"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace"; version = "9.0.0-preview.24327.6"; hash = "sha256-lK1mJ36CZKI+a6RKjAfmM0TD3zYYnasTzVnq3nFmI7M="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.aspnetcore.razor.externalaccess.roslynworkspace/9.0.0-preview.24327.6/microsoft.aspnetcore.razor.externalaccess.roslynworkspace.9.0.0-preview.24327.6.nupkg"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace"; version = "9.0.0-preview.24366.2"; hash = "sha256-SUZfSiONzmTwDQsaTd7VTkE6IrzSu80giAPwrjvuY7M="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.aspnetcore.razor.externalaccess.roslynworkspace/9.0.0-preview.24366.2/microsoft.aspnetcore.razor.externalaccess.roslynworkspace.9.0.0-preview.24366.2.nupkg"; })
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "8.0.0"; hash = "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.bcl.asyncinterfaces/8.0.0/microsoft.bcl.asyncinterfaces.8.0.0.nupkg"; })
(fetchNuGet { pname = "Microsoft.Build"; version = "17.10.4"; hash = "sha256-yaElGdmgcELCXR5fIe5/ingMx2qS/PM3tZGTPNHHjXo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/17.10.4/microsoft.build.17.10.4.nupkg"; })
(fetchNuGet { pname = "Microsoft.Build"; version = "17.3.4"; hash = "sha256-LHtjk4vxeVSLzAKAcG8BN+S20d2sUR2DAOsSXLNIy5U="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build/17.3.4/microsoft.build.17.3.4.nupkg"; })
@ -42,7 +42,7 @@
(fetchNuGet { pname = "Microsoft.CodeAnalysis.PublicApiAnalyzers"; version = "3.11.0-beta1.24081.1"; hash = "sha256-nXx0MSYXVzdr0jcNo9aZLocZU1ywN+n/vdD2kYBh5TI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/3.11.0-beta1.24081.1/microsoft.codeanalysis.publicapianalyzers.3.11.0-beta1.24081.1.nupkg"; })
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; hash = "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.csharp/4.7.0/microsoft.csharp.4.7.0.nupkg"; })
(fetchNuGet { pname = "Microsoft.DiaSymReader"; version = "2.0.0"; hash = "sha256-8hotZmh8Rb6Q6oD9Meb74SvAdbDo39Y/1m8h43HHjjw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diasymreader/2.0.0/microsoft.diasymreader.2.0.0.nupkg"; })
(fetchNuGet { pname = "Microsoft.DotNet.Arcade.Sdk"; version = "9.0.0-beta.24352.2"; hash = "sha256-ABdgrKht2runHUtSNpTsv7BTDQaRA3AenjSwaof+3nA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.24352.2/microsoft.dotnet.arcade.sdk.9.0.0-beta.24352.2.nupkg"; })
(fetchNuGet { pname = "Microsoft.DotNet.Arcade.Sdk"; version = "9.0.0-beta.24416.2"; hash = "sha256-MMfwLKBLTEtaNt896ueqH50zb/XyeXqpGJAC0O8yifw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.24416.2/microsoft.dotnet.arcade.sdk.9.0.0-beta.24416.2.nupkg"; })
(fetchNuGet { pname = "Microsoft.DotNet.XliffTasks"; version = "9.0.0-beta.24076.5"; hash = "sha256-5cREL85PwcDwo4yyc2Eh908HQ/Cm36w9uZSIvVELZH0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.24076.5/microsoft.dotnet.xlifftasks.9.0.0-beta.24076.5.nupkg"; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; hash = "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration/8.0.0/microsoft.extensions.configuration.8.0.0.nupkg"; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; hash = "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration.abstractions/8.0.0/microsoft.extensions.configuration.abstractions.8.0.0.nupkg"; })
@ -57,7 +57,7 @@
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; hash = "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.options/8.0.0/microsoft.extensions.options.8.0.0.nupkg"; })
(fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; hash = "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.options.configurationextensions/8.0.0/microsoft.extensions.options.configurationextensions.8.0.0.nupkg"; })
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.primitives/8.0.0/microsoft.extensions.primitives.8.0.0.nupkg"; })
(fetchNuGet { pname = "Microsoft.IO.Redist"; version = "6.0.0"; hash = "sha256-pa3MT+QWrWeehQwUWtTS/Rwto8IIDgAt+zLqaUAQoJ0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.io.redist/6.0.0/microsoft.io.redist.6.0.0.nupkg"; })
(fetchNuGet { pname = "Microsoft.IO.Redist"; version = "6.0.1"; hash = "sha256-IaATAy1M/MEBTid0mQiTrHj4aTwo2POCtckxSbLc3lU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.io.redist/6.0.1/microsoft.io.redist.6.0.1.nupkg"; })
(fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.10.4"; hash = "sha256-nXY7YaIx6sXn7aMqpF4bW4d2J5U1KNb9sXqRSd8MpOc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.10.4/microsoft.net.stringtools.17.10.4.nupkg"; })
(fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.3.4"; hash = "sha256-xLPrrL8iS3gNMIa/C/Wv0fBfHIehUHeQ4Y+F+gbqkhk="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.net.stringtools/17.3.4/microsoft.net.stringtools.17.3.4.nupkg"; })
(fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; hash = "sha256-+9uBaUDZ3roUJwyYJUL30Mz+3C6LE16FzfQKgS0Yveo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.4.0/microsoft.net.stringtools.17.4.0.nupkg"; })
@ -96,8 +96,8 @@
(fetchNuGet { pname = "Microsoft.VisualStudio.RemoteControl"; version = "16.3.52"; hash = "sha256-J/egIc9ovDi1MUrnyKnpadECQqAB1WUUyrbxINv4zRE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.remotecontrol/16.3.52/microsoft.visualstudio.remotecontrol.16.3.52.nupkg"; })
(fetchNuGet { pname = "Microsoft.VisualStudio.Setup.Configuration.Interop"; version = "3.2.2146"; hash = "sha256-ic5h0cmHIaowJfItTLXLnmFhIg4NhaoMoWVAFMHKdzQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.setup.configuration.interop/3.2.2146/microsoft.visualstudio.setup.configuration.interop.3.2.2146.nupkg"; })
(fetchNuGet { pname = "Microsoft.VisualStudio.Telemetry"; version = "17.11.8"; hash = "sha256-w6VeYf5feF1HGpz8g7u7ytEXH3Ve8LLkG+SM4uNpDj4="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.telemetry/17.11.8/microsoft.visualstudio.telemetry.17.11.8.nupkg"; })
(fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.10.41"; hash = "sha256-amoJoKroXLRzlpMGH6HwBLnOge4LqgnOmEitQvz/XHQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading/17.10.41/microsoft.visualstudio.threading.17.10.41.nupkg"; })
(fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.10.41"; hash = "sha256-3hn7R+RHr6AInqPv3OrpsYiI7JdM2+qqIJlyG3kWptU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading.analyzers/17.10.41/microsoft.visualstudio.threading.analyzers.17.10.41.nupkg"; })
(fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.11.20"; hash = "sha256-yuNMLu4qKQpHcYHP2JN45u/dY8wvGHGaFFuHKizupcE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading/17.11.20/microsoft.visualstudio.threading.17.11.20.nupkg"; })
(fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.11.20"; hash = "sha256-mHYVKapahjHlrzeJ6JpQAtugg+Ub3IzesYSJ+UTybAU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading.analyzers/17.11.20/microsoft.visualstudio.threading.analyzers.17.11.20.nupkg"; })
(fetchNuGet { pname = "Microsoft.VisualStudio.Utilities.Internal"; version = "16.3.73"; hash = "sha256-zwk4jWuCw2ANhG00TnwT9JE7n/h2EQkYKeq6o966ilo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.utilities.internal/16.3.73/microsoft.visualstudio.utilities.internal.16.3.73.nupkg"; })
(fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.6.11"; hash = "sha256-Lkjp9Ove4+CFP06x/toYpJEiAinuTfn/o+oh0fW3pGM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.validation/17.6.11/microsoft.visualstudio.validation.17.6.11.nupkg"; })
(fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.8.8"; hash = "sha256-sB8GLRiJHX3Py7qeBUnUANiDWhyPtISon6HQs+8wKms="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.validation/17.8.8/microsoft.visualstudio.validation.17.8.8.nupkg"; })
@ -210,7 +210,6 @@
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg"; })
(fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg"; })
(fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg"; })
(fetchNuGet { pname = "System.Runtime.Loader"; version = "4.3.0"; hash = "sha256-syG1GTFjYbwX146BD/L7t55j+DZqpHDc6z28kdSNzx0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.loader/4.3.0/system.runtime.loader.4.3.0.nupkg"; })
(fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/5.0.0/system.security.accesscontrol.5.0.0.nupkg"; })
(fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "7.0.2"; hash = "sha256-qS5Z/Yo8J+f3ExVX5Qkcpj1Z57oUZqz5rWa1h5bVpl8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.pkcs/7.0.2/system.security.cryptography.pkcs.7.0.2.nupkg"; })
(fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; hash = "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.protecteddata/8.0.0/system.security.cryptography.protecteddata.8.0.0.nupkg"; })
@ -222,7 +221,7 @@
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; hash = "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/7.0.0/system.text.encoding.codepages.7.0.0.nupkg"; })
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.extensions/4.3.0/system.text.encoding.extensions.4.3.0.nupkg"; })
(fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; hash = "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encodings.web/8.0.0/system.text.encodings.web.8.0.0.nupkg"; })
(fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; hash = "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/8.0.0/system.text.json.8.0.0.nupkg"; })
(fetchNuGet { pname = "System.Text.Json"; version = "8.0.4"; hash = "sha256-g5oT7fbXxQ9Iah1nMCr4UUX/a2l+EVjJyTrw3FTbIaI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/8.0.4/system.text.json.8.0.4.nupkg"; })
(fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.3.0/system.threading.4.3.0.nupkg"; })
(fetchNuGet { pname = "System.Threading.Channels"; version = "7.0.0"; hash = "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.channels/7.0.0/system.threading.channels.7.0.0.nupkg"; })
(fetchNuGet { pname = "System.Threading.Overlapped"; version = "4.3.0"; hash = "sha256-tUX099CChkqWiHyP/1e4jGYzZAjgIthMOdMmiOGMUNk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.overlapped/4.3.0/system.threading.overlapped.4.3.0.nupkg"; })

View File

@ -10,18 +10,18 @@ in
buildDotnetModule rec {
inherit pname dotnet-sdk dotnet-runtime;
vsVersion = "2.39.29";
vsVersion = "2.45.17";
src = fetchFromGitHub {
owner = "dotnet";
repo = "roslyn";
rev = "VSCode-CSharp-${vsVersion}";
hash = "sha256-E0gha6jZnXyRVH5XUuXxa7H9+2lfD9XTlQcNSiQycHA=";
hash = "sha256-5u+5UkcWn5XKxhbAbZeUBWBAI4B1nuZFP4qDF4cHerU=";
};
# versioned independently from vscode-csharp
# "roslyn" in here:
# https://github.com/dotnet/vscode-csharp/blob/main/package.json
version = "4.12.0-1.24359.11";
version = "4.12.0-2.24422.6";
projectFile = "src/LanguageServer/${project}/${project}.csproj";
useDotnetFromEnv = true;
nugetDeps = ./deps.nix;

View File

@ -8,14 +8,14 @@
}:
rustPlatform.buildRustPackage rec {
pname = "sarif-fmt";
version = "0.6.5";
version = "0.6.6";
src = fetchCrate {
inherit pname version;
hash = "sha256-Zflwjj5ArNmE/7Im/O09kG07ZekCyz5jU2S3vpnlXT8=";
hash = "sha256-0LyTXyycdIq0FuBTxE9D7FRFfn4iZnDKOt+Rk4P1HwU=";
};
cargoHash = "sha256-hCtVfGutgvncb05zt+lSNdlrDO+UruSUahzrxaERjFE=";
cargoHash = "sha256-UpVZtZ3d0N/uL9+yc1gIO3SQsoqvUBMEDjdl9SDSKd8=";
# `test_clippy` (the only test we enable) is broken on Darwin
# because `--enable-profiler` is not enabled in rustc on Darwin

View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "serie";
version = "0.2.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "lusingander";
repo = "serie";
rev = "v${version}";
hash = "sha256-0NQ/csgAoD15fyuXCDgABF6eDEITwJk98qPL81IptJA=";
hash = "sha256-LjWpWgOInnPL4Ke8Ntk+bEJBljPSEe14RCKzN50JUGA=";
};
cargoHash = "sha256-4Mic+hFBmId01k4AmOBA2matf28Py3mVOsVNWgqaMA0=";
cargoHash = "sha256-Ynnp7jSnkNHbL98JOXjV6v97IXWwi2HiZC5SkChCRv0=";
buildInputs = lib.optionals stdenv.isDarwin (
with darwin.apple_sdk.frameworks;

View File

@ -5,13 +5,13 @@
}:
buildGoModule rec {
pname = "sesh";
version = "2.0.2";
version = "2.1.0";
src = fetchFromGitHub {
owner = "joshmedeski";
repo = "sesh";
rev = "v${version}";
hash = "sha256-oOr2jJAJuddyIPp9z7ottHFUDSpSyc5+PiNYyVD6Alg=";
hash = "sha256-IbXd+lk257nw+Kh9ziQ3f6vn387A7jkJB7MUAGfgDmU=";
};
vendorHash = "sha256-a45P6yt93l0CnL5mrOotQmE/1r0unjoToXqSJ+spimg=";

View File

@ -7,14 +7,14 @@
}:
rustPlatform.buildRustPackage rec {
pname = "shellcheck-sarif";
version = "0.6.5";
version = "0.6.6";
src = fetchCrate {
inherit pname version;
hash = "sha256-fvOxZd6xLyOm1OjK24Xx6uHz2e8eyIklX1kUAuRGcyY=";
hash = "sha256-NPf8BkrpqM/MaVha9/AIuUXPQpslslLFv0l9a0lzYyc=";
};
cargoHash = "sha256-jHOCjZ6NAU8YmAc2T1aCSaa2Yx9wkP361LZ2MKAWVLA=";
cargoHash = "sha256-YUyZZcSaBqnc216Hu+BAv1raNFRzSnikedr+/n8wTbE=";
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;

View File

@ -8,7 +8,7 @@
testers,
}:
let
version = "0.5.1";
version = "0.5.2";
in
rustPlatform.buildRustPackage {
pname = "stu";
@ -18,10 +18,10 @@ rustPlatform.buildRustPackage {
owner = "lusingander";
repo = "stu";
rev = "v${version}";
hash = "sha256-JLsUMZDXK89QmHLlGG9i5L+1e/redjk5ff6NiZdNsYo=";
hash = "sha256-R+ebDW6qkYK92seQHCWGKby544UrNGg+CfdK1NLIwas=";
};
cargoHash = "sha256-1sAK+F0Wghz2X78OzYJ3QN+5sdpNQw/pxHof0IoJPQo=";
cargoHash = "sha256-6uporgZTii97xLdEt7KXuSxoRMmFOGEGU3bPXP7Z14g=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.AppKit

View File

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "subtitleedit";
version = "4.0.7";
version = "4.0.8";
src = fetchzip {
url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${
lib.replaceStrings [ "." ] [ "" ] version
}.zip";
hash = "sha256-7BTW0wqlxyxtXu4aBVQXMQ1mUdSINn+S6W7XPL5pcSI=";
hash = "sha256-pUCuAxCljRu1fXPQIBDWtkC17RBD+Bv6Nx5Tw/ACuXw=";
stripRoot = false;
};

396
pkgs/by-name/vr/vrcadvert/deps.nix generated Normal file
View File

@ -0,0 +1,396 @@
# This file was automatically generated by passthru.fetch-deps.
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }:
[
(fetchNuGet {
pname = "MeaMod.DNS";
version = "1.0.70";
hash = "sha256-Hl6ZmKBbS6YZX7cc1Jp4/Hz6ksZqlFR7ZllbZgHzeYw=";
})
(fetchNuGet {
pname = "Microsoft.Extensions.Logging.Abstractions";
version = "6.0.2";
hash = "sha256-VRyyMGCMBh25vIIzbLapMAqY8UffqJRvkF/kcYcjZfM=";
})
(fetchNuGet {
pname = "Microsoft.NETCore.Platforms";
version = "1.1.1";
hash = "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg=";
})
(fetchNuGet {
pname = "Microsoft.NETCore.Targets";
version = "1.1.0";
hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=";
})
(fetchNuGet {
pname = "Microsoft.Win32.Primitives";
version = "4.3.0";
hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=";
})
(fetchNuGet {
pname = "Newtonsoft.Json";
version = "13.0.1";
hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=";
})
(fetchNuGet {
pname = "runtime.any.System.Collections";
version = "4.3.0";
hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=";
})
(fetchNuGet {
pname = "runtime.any.System.Diagnostics.Tracing";
version = "4.3.0";
hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=";
})
(fetchNuGet {
pname = "runtime.any.System.Globalization";
version = "4.3.0";
hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=";
})
(fetchNuGet {
pname = "runtime.any.System.Globalization.Calendars";
version = "4.3.0";
hash = "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=";
})
(fetchNuGet {
pname = "runtime.any.System.IO";
version = "4.3.0";
hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=";
})
(fetchNuGet {
pname = "runtime.any.System.Reflection";
version = "4.3.0";
hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=";
})
(fetchNuGet {
pname = "runtime.any.System.Reflection.Primitives";
version = "4.3.0";
hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=";
})
(fetchNuGet {
pname = "runtime.any.System.Resources.ResourceManager";
version = "4.3.0";
hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=";
})
(fetchNuGet {
pname = "runtime.any.System.Runtime";
version = "4.3.0";
hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=";
})
(fetchNuGet {
pname = "runtime.any.System.Runtime.Handles";
version = "4.3.0";
hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=";
})
(fetchNuGet {
pname = "runtime.any.System.Runtime.InteropServices";
version = "4.3.0";
hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=";
})
(fetchNuGet {
pname = "runtime.any.System.Text.Encoding";
version = "4.3.0";
hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=";
})
(fetchNuGet {
pname = "runtime.any.System.Text.Encoding.Extensions";
version = "4.3.0";
hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=";
})
(fetchNuGet {
pname = "runtime.any.System.Threading.Tasks";
version = "4.3.0";
hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=";
})
(fetchNuGet {
pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.2";
hash = "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c=";
})
(fetchNuGet {
pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.2";
hash = "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg=";
})
(fetchNuGet {
pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.2";
hash = "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA=";
})
(fetchNuGet {
pname = "runtime.native.System";
version = "4.3.0";
hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=";
})
(fetchNuGet {
pname = "runtime.native.System.Net.Http";
version = "4.3.0";
hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=";
})
(fetchNuGet {
pname = "runtime.native.System.Security.Cryptography.Apple";
version = "4.3.0";
hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=";
})
(fetchNuGet {
pname = "runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.2";
hash = "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8=";
})
(fetchNuGet {
pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.2";
hash = "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ=";
})
(fetchNuGet {
pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.2";
hash = "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY=";
})
(fetchNuGet {
pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple";
version = "4.3.0";
hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=";
})
(fetchNuGet {
pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.2";
hash = "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U=";
})
(fetchNuGet {
pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.2";
hash = "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI=";
})
(fetchNuGet {
pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.2";
hash = "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU=";
})
(fetchNuGet {
pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.2";
hash = "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA=";
})
(fetchNuGet {
pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.2";
hash = "sha256-LFkh7ua7R4rI5w2KGjcHlGXLecsncCy6kDXLuy4qD/Q=";
})
(fetchNuGet {
pname = "runtime.unix.Microsoft.Win32.Primitives";
version = "4.3.0";
hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=";
})
(fetchNuGet {
pname = "runtime.unix.System.Diagnostics.Debug";
version = "4.3.0";
hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=";
})
(fetchNuGet {
pname = "runtime.unix.System.IO.FileSystem";
version = "4.3.0";
hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=";
})
(fetchNuGet {
pname = "runtime.unix.System.Net.Primitives";
version = "4.3.0";
hash = "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=";
})
(fetchNuGet {
pname = "runtime.unix.System.Private.Uri";
version = "4.3.0";
hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=";
})
(fetchNuGet {
pname = "runtime.unix.System.Runtime.Extensions";
version = "4.3.0";
hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=";
})
(fetchNuGet {
pname = "System.Buffers";
version = "4.3.0";
hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=";
})
(fetchNuGet {
pname = "System.Collections";
version = "4.3.0";
hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=";
})
(fetchNuGet {
pname = "System.Collections.Concurrent";
version = "4.3.0";
hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=";
})
(fetchNuGet {
pname = "System.CommandLine";
version = "2.0.0-beta4.22272.1";
hash = "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc=";
})
(fetchNuGet {
pname = "System.Diagnostics.Debug";
version = "4.3.0";
hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=";
})
(fetchNuGet {
pname = "System.Diagnostics.DiagnosticSource";
version = "4.3.0";
hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=";
})
(fetchNuGet {
pname = "System.Diagnostics.Tracing";
version = "4.3.0";
hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=";
})
(fetchNuGet {
pname = "System.Globalization";
version = "4.3.0";
hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=";
})
(fetchNuGet {
pname = "System.Globalization.Calendars";
version = "4.3.0";
hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=";
})
(fetchNuGet {
pname = "System.Globalization.Extensions";
version = "4.3.0";
hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=";
})
(fetchNuGet {
pname = "System.IO";
version = "4.3.0";
hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=";
})
(fetchNuGet {
pname = "System.IO.FileSystem";
version = "4.3.0";
hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=";
})
(fetchNuGet {
pname = "System.IO.FileSystem.Primitives";
version = "4.3.0";
hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=";
})
(fetchNuGet {
pname = "System.Linq";
version = "4.3.0";
hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=";
})
(fetchNuGet {
pname = "System.Net.Http";
version = "4.3.4";
hash = "sha256-FMoU0K7nlPLxoDju0NL21Wjlga9GpnAoQjsFhFYYt00=";
})
(fetchNuGet {
pname = "System.Net.Primitives";
version = "4.3.0";
hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=";
})
(fetchNuGet {
pname = "System.Private.Uri";
version = "4.3.0";
hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=";
})
(fetchNuGet {
pname = "System.Reflection";
version = "4.3.0";
hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=";
})
(fetchNuGet {
pname = "System.Reflection.Primitives";
version = "4.3.0";
hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=";
})
(fetchNuGet {
pname = "System.Resources.ResourceManager";
version = "4.3.0";
hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=";
})
(fetchNuGet {
pname = "System.Runtime";
version = "4.3.0";
hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=";
})
(fetchNuGet {
pname = "System.Runtime.Extensions";
version = "4.3.0";
hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=";
})
(fetchNuGet {
pname = "System.Runtime.Handles";
version = "4.3.0";
hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=";
})
(fetchNuGet {
pname = "System.Runtime.InteropServices";
version = "4.3.0";
hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=";
})
(fetchNuGet {
pname = "System.Runtime.Numerics";
version = "4.3.0";
hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=";
})
(fetchNuGet {
pname = "System.Security.Cryptography.Algorithms";
version = "4.3.0";
hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=";
})
(fetchNuGet {
pname = "System.Security.Cryptography.Cng";
version = "4.3.0";
hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=";
})
(fetchNuGet {
pname = "System.Security.Cryptography.Csp";
version = "4.3.0";
hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=";
})
(fetchNuGet {
pname = "System.Security.Cryptography.Encoding";
version = "4.3.0";
hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=";
})
(fetchNuGet {
pname = "System.Security.Cryptography.OpenSsl";
version = "4.3.0";
hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=";
})
(fetchNuGet {
pname = "System.Security.Cryptography.Primitives";
version = "4.3.0";
hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=";
})
(fetchNuGet {
pname = "System.Security.Cryptography.X509Certificates";
version = "4.3.0";
hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=";
})
(fetchNuGet {
pname = "System.Text.Encoding";
version = "4.3.0";
hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=";
})
(fetchNuGet {
pname = "System.Text.Encoding.Extensions";
version = "4.3.0";
hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=";
})
(fetchNuGet {
pname = "System.Threading";
version = "4.3.0";
hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=";
})
(fetchNuGet {
pname = "System.Threading.Tasks";
version = "4.3.0";
hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=";
})
(fetchNuGet {
pname = "VRChat.OSCQuery";
version = "0.0.7";
hash = "sha256-qivB0feWMAGYa6qE2pNK1Mhxt5xiFCICj9bEgUu2W+w=";
})
]

View File

@ -0,0 +1,30 @@
{
buildDotnetModule,
fetchFromGitHub,
lib,
}:
buildDotnetModule rec {
pname = "VrcAdvert";
version = "1.0.0";
src = fetchFromGitHub {
owner = "galister";
repo = "VrcAdvert";
rev = "v${version}";
hash = "sha256-noIu5LV0yva94Kmdr39zb0kKXDaIrQ8DIplCj3aTIbQ=";
};
nugetDeps = ./deps.nix;
executables = [ "VrcAdvert" ];
meta = {
description = "Advertise your OSC app through OSCQuery";
homepage = "https://github.com/galister/VrcAdvert";
license = lib.licenses.unlicense;
maintainers = with lib.maintainers; [ Scrumplex ];
mainProgram = "VrcAdvert";
platforms = lib.platforms.all;
};
}

View File

@ -2,11 +2,11 @@
buildGraalvmNativeImage rec {
pname = "yamlscript";
version = "0.1.73";
version = "0.1.74";
src = fetchurl {
url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar";
hash = "sha256-FXw476RXIFnjnK8cz/Kxni4dZ58LJvevcxiotDO7+bQ=";
hash = "sha256-kAuUXOc3QQ9gxBO+HKZDGm5Y4H/lKeFzyiDlz+GMjv8=";
};
executable = "ys";

View File

@ -27,13 +27,13 @@ lib.checkListOfEnum "${pname}: theme variants" [
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "2024-05-28";
version = "2024-09-07";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
hash = "sha256-60pz/ET3jorEui31Aq6I3LMTz0djwWUv7poEI0USzJw=";
hash = "sha256-/cW/ymT9MjB07Sw7ifpr6x8oaaeI4PSyaOdLci7AncY=";
};
nativeBuildInputs = [ gtk3 jdupes ];

View File

@ -39,6 +39,7 @@ let
haveLibcxx = stdenv.cc.libcxx != null;
isDarwinStatic = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic && lib.versionAtLeast release_version "16";
inherit (stdenv.hostPlatform) isMusl isAarch64;
noSanitizers = !haveLibc || bareMetal || isMusl || isDarwinStatic;
baseName = "compiler-rt";
pname = baseName + lib.optionalString (haveLibc) "-libc";
@ -94,7 +95,7 @@ stdenv.mkDerivation ({
"-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
] ++ lib.optionals (useLLVM && haveLibc) [
"-DCOMPILER_RT_BUILD_SANITIZERS=ON"
] ++ lib.optionals (!haveLibc || bareMetal || isMusl || isDarwinStatic) [
] ++ lib.optionals (noSanitizers) [
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
] ++ lib.optionals ((useLLVM && !haveLibcxx) || !haveLibc || bareMetal || isMusl || isDarwinStatic) [
"-DCOMPILER_RT_BUILD_XRAY=OFF"
@ -131,6 +132,8 @@ stdenv.mkDerivation ({
"-DCOMPILER_RT_ENABLE_IOS=OFF"
]) ++ lib.optionals (lib.versionAtLeast version "19" && stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [
"-DSANITIZER_MIN_OSX_VERSION=10.10"
] ++ lib.optionals (noSanitizers && lib.versionAtLeast release_version "19") [
"-DCOMPILER_RT_BUILD_CTX_PROFILE=OFF"
];
outputs = [ "out" "dev" ];

View File

@ -1,30 +1,21 @@
{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, fftw, catch2 }:
{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, fftw, catch2_3 }:
stdenv.mkDerivation rec {
pname = "libkeyfinder";
version = "2.2.6";
version = "2.2.8";
src = fetchFromGitHub {
owner = "mixxxdj";
repo = "libkeyfinder";
rev = "v${version}";
sha256 = "sha256-7w/Wc9ncLinbnM2q3yv5DBtFoJFAM2e9xAUTsqvE9mg=";
rev = version;
hash = "sha256-Et8u5j/ke9u2bwHFriPCCBiXkPel37gwx+kwuViAr4o=";
};
# in main post 2.2.6, see https://github.com/mixxxdj/libkeyfinder/issues/21
patches = [
(fetchpatch {
name = "fix-pkg-config";
url = "https://github.com/mixxxdj/libkeyfinder/commit/4e1a5022d4c91e3ecfe9be5c3ac7cc488093bd2e.patch";
sha256 = "08llmgp6r11bq5s820j3fs9bgriaibkhq8r3v2av064w66mwp48x";
})
];
nativeBuildInputs = [ cmake ];
buildInputs = [ fftw ];
nativeCheckInputs = [ catch2 ];
nativeCheckInputs = [ catch2_3 ];
doCheck = true;

View File

@ -1,6 +1,23 @@
{ lib, stdenv, fetchurl
, cmake, docbook_xml_dtd_45, docbook_xsl, doxygen, graphviz-nox, pkg-config, qttools, wrapQtAppsHook
, alsa-lib, fluidsynth, libpulseaudio, qtbase, qtsvg, sonivox, qt5compat ? null
{
lib,
stdenv,
fetchurl,
cmake,
docbook_xml_dtd_45,
docbook_xsl,
doxygen,
graphviz-nox,
pkg-config,
qttools,
wrapQtAppsHook,
alsa-lib,
fluidsynth,
libpulseaudio,
qtbase,
qtsvg,
qtwayland,
sonivox,
qt5compat ? null,
}:
let
@ -8,29 +25,45 @@ let
in
stdenv.mkDerivation rec {
pname = "drumstick";
version = "2.9.0";
version = "2.9.1";
src = fetchurl {
url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2";
hash = "sha256-p0N8EeCtVEPCGzPwiRxPdI1XT5XQ5pcKYEDJXbYYTrM=";
hash = "sha256-U5Cm9pTDxC8NzyQfjaC/eBBDUWELV4jq4ov4QGefM9g=";
};
patches = [
./drumstick-plugins.patch
];
patches = [ ./drumstick-plugins.patch ];
postPatch = ''
substituteInPlace library/rt/backendmanager.cpp --subst-var out
'';
outputs = [ "out" "dev" "man" ];
outputs = [
"out"
"dev"
"man"
];
nativeBuildInputs = [
cmake docbook_xml_dtd_45 docbook_xml_dtd_45 docbook_xsl doxygen graphviz-nox pkg-config qttools wrapQtAppsHook
cmake
docbook_xml_dtd_45
docbook_xml_dtd_45
docbook_xsl
doxygen
graphviz-nox
pkg-config
qttools
wrapQtAppsHook
];
buildInputs = [
alsa-lib fluidsynth libpulseaudio qtbase qtsvg sonivox
alsa-lib
fluidsynth
libpulseaudio
qtbase
qtsvg
qtwayland
sonivox
] ++ lib.optionals isQt6 [ qt5compat ];
cmakeFlags = [

View File

@ -46,13 +46,13 @@ let
in
stdenv.mkDerivation (finalAttrs: rec {
pname = "libpulsar";
version = "3.5.1";
version = "3.6.0";
src = fetchFromGitHub {
owner = "apache";
repo = "pulsar-client-cpp";
rev = "v${version}";
hash = "sha256-BSDkF0MAc54N59t7ozMLof0of4sURL3qiksLZhb+6I8=";
hash = "sha256-P1LhUH7V3EtWBXwPHQdN11mCjuyUyVdrtZsUItvC8xU=";
};
nativeBuildInputs = [ cmake pkg-config ]

View File

@ -13,8 +13,8 @@
buildPythonPackage rec {
pname = "galois";
version = "0.4.1";
format = "pyproject";
version = "0.4.2";
pyproject = true;
disabled = pythonOlder "3.7";
@ -22,14 +22,17 @@ buildPythonPackage rec {
owner = "mhostetter";
repo = "galois";
rev = "refs/tags/v${version}";
hash = "sha256-ZNVBP/c1Q7635PbySk5Yxz7riYNLnBnJLG6AMxy/ZeA=";
hash = "sha256-DbmrrNw7XwTL4i6pJIfkBOUs+KGEmdV2FmQa1xfOHYU=";
};
nativeBuildInputs = [
setuptools-scm
pythonRelaxDeps = [
"numpy"
"numba"
];
propagatedBuildInputs = [
build-system = [ setuptools-scm ];
dependencies = [
numpy
numba
typing-extensions
@ -40,11 +43,6 @@ buildPythonPackage rec {
pytest-xdist
];
pythonRelaxDeps = [
"numpy"
"numba"
];
pythonImportsCheck = [ "galois" ];
meta = with lib; {

View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "githubkit";
version = "0.11.8";
version = "0.11.9";
pyproject = true;
disabled = pythonOlder "3.8";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "yanyongyu";
repo = "githubkit";
rev = "refs/tags/v${version}";
hash = "sha256-FTNLyCcwDU6EssQDJlwtmA7cQj57fsOaecvbpwswirU=";
hash = "sha256-aN8LTWDtzj04w0dQvUVMJ2QhHWaFK4ml1ZoLO2LmKTY=";
};
pythonRelaxDeps = [ "hishel" ];

View File

@ -81,7 +81,10 @@ let
changelog = "https://github.com/simonw/llm/releases/tag/${version}";
license = licenses.asl20;
mainProgram = "llm";
maintainers = with maintainers; [ aldoborrero ];
maintainers = with maintainers; [
aldoborrero
mccartykim
];
};
};

View File

@ -6,12 +6,14 @@
isPyPy,
pythonAtLeast,
# build-system
llvm,
setuptools,
# tests
pytestCheckHook,
llvm,
libxml2,
withStaticLLVM ? true,
}:
buildPythonPackage rec {
@ -28,24 +30,19 @@ buildPythonPackage rec {
hash = "sha256-5QBSRDb28Bui9IOhGofj+c7Rk7J5fNv5nPksEPY/O5o=";
};
nativeBuildInputs = [
llvm
setuptools
];
build-system = [ setuptools ];
postPatch = ''
substituteInPlace llvmlite/tests/test_binding.py \
--replace-fail "test_linux" "nope"
buildInputs = [ llvm ] ++ lib.optionals withStaticLLVM [ libxml2.dev ];
postPatch = lib.optionalString withStaticLLVM ''
substituteInPlace ffi/build.py --replace-fail "--system-libs --libs all" "--system-libs --libs --link-static all"
'';
# Set directory containing llvm-config binary
preConfigure = ''
export LLVM_CONFIG=${llvm.dev}/bin/llvm-config
'';
env.LLVM_CONFIG = "${llvm.dev}/bin/llvm-config";
nativeCheckInputs = [ pytestCheckHook ];
nativeCheckInputs = [
pytestCheckHook
];
# https://github.com/NixOS/nixpkgs/issues/255262
preCheck = ''
cd $out
@ -53,7 +50,7 @@ buildPythonPackage rec {
__impureHostDeps = lib.optionals stdenv.isDarwin [ "/usr/lib/libm.dylib" ];
passthru.llvm = llvm;
passthru = lib.optionalAttrs (!withStaticLLVM) { inherit llvm; };
meta = {
changelog = "https://github.com/numba/llvmlite/blob/v${version}/CHANGE_LOG";

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pulsectl-asyncio";
version = "1.2.0";
version = "1.2.1";
pyproject = true;
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "mhthies";
repo = "pulsectl-asyncio";
rev = "refs/tags/v${version}";
hash = "sha256-WqUO4eERJkRg6O+gCmjqfdVbBT/3TVVBUUduoIxcPNQ=";
hash = "sha256-VmogNphVZNJSUKUqp7xADRl78Ooofhl1YYrtYz5MBYc=";
};
build-system = [ setuptools ];

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pyinstrument";
version = "4.7.2";
version = "4.7.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "joerick";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-X28GRYlGrlDUcY+7teaCiJkG+kQ7p367TK0zOjfHi5o=";
hash = "sha256-Dvpx6Bf4obHL3inzIHhOrM3u/7X+0NRfEAyynDjtEwE=";
};
nativeBuildInputs = [

View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pytest-twisted";
version = "1.14.2";
version = "1.14.2-unstable-2024-08-22";
pyproject = true;
src = fetchFromGitHub {
owner = "pytest-dev";
repo = "pytest-twisted";
rev = "refs/tags/v${version}";
hash = "sha256-1NkKTdk5D36VngJtBEdT42o1MmMT6stBne9KyC17518=";
rev = "0f10b1500aa6c46a2b206abc690a4e00e3c7556b";
hash = "sha256-1dAfCa6hON0Vh9StI1Xw69IAwBzUkR6DdjQ0HNyoyME=";
};
build-system = [ setuptools ];

View File

@ -3,6 +3,9 @@
buildPythonPackage,
fetchFromGitHub,
# build-system
versioneer,
# dependencies
lightning-utilities,
numpy,
@ -15,8 +18,6 @@
pytestCheckHook,
stdenv,
pythonAtLeast,
}:
buildPythonPackage rec {
@ -33,6 +34,13 @@ buildPythonPackage rec {
pythonRelaxDeps = [ "lightning-utilities" ];
# Remove vendorized versioneer (incompatible with python 3.12)
postPatch = ''
rm versioneer.py
'';
build-system = [ versioneer ];
dependencies = [
lightning-utilities
numpy
@ -66,7 +74,5 @@ buildPythonPackage rec {
homepage = "https://rising.rtfd.io";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ bcdarwin ];
# AttributeError: module 'configparser' has no attribute 'SafeConfigParser'. Did you mean: 'RawConfigParser'?
broken = pythonAtLeast "3.12";
};
}

View File

@ -6,14 +6,15 @@
pythonAtLeast,
argcomplete,
requests,
setuptools,
looseversion,
gnupg,
}:
buildPythonPackage rec {
pname = "sdkmanager";
version = "0.6.7";
format = "setuptools";
version = "0.6.8";
pyproject = true;
disabled = pythonOlder "3.5";
@ -21,10 +22,14 @@ buildPythonPackage rec {
owner = "fdroid";
repo = pname;
rev = version;
hash = "sha256-8Iq3sVp9/dZi4zNZIgNm38ntoA2koS/Ism+pIVATr4Q=";
hash = "sha256-Ev90WS/T+Rb8h/21XHQdy/GePhGiYWwyfP88OUyBojQ=";
};
propagatedBuildInputs = [
pythonRelaxDeps = [ "urllib3" ];
build-system = [ setuptools ];
dependencies = [
argcomplete
requests
] ++ requests.optional-dependencies.socks ++ lib.optionals (pythonAtLeast "3.12") [ looseversion ];

View File

@ -19,6 +19,8 @@ buildPythonPackage rec {
sha256 = "12nypzb1m14yip4zrbzin5jc5awyp1d5md5y40g5anj4phb4hx1i";
};
patches = [ ./python312-fix.patch ];
buildInputs = [ alsa-lib ];
meta = with lib; {

View File

@ -0,0 +1,98 @@
From 6a7cb95c5af4537bad72bad9b190e09cb6d7883c Mon Sep 17 00:00:00 2001
From: cexen <cexenial@gmail.com>
Date: Sun, 21 Jan 2024 21:01:29 +0900
Subject: [PATCH] replace PyMem_* to PyMem_Raw*
Fixes #72.
---
c_src/posix_mutex.c | 4 ++--
c_src/simpleaudio.c | 8 ++++----
c_src/simpleaudio_win.c | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/c_src/posix_mutex.c b/c_src/posix_mutex.c
index 533a3f1..04619f1 100644
--- a/c_src/posix_mutex.c
+++ b/c_src/posix_mutex.c
@@ -10,14 +10,14 @@ MIT License (see LICENSE.txt)
void* create_mutex() {
void* mutex;
- mutex = PyMem_Malloc(sizeof(pthread_mutex_t));
+ mutex = PyMem_RawMalloc(sizeof(pthread_mutex_t));
pthread_mutex_init((pthread_mutex_t*)mutex, NULL);
return mutex;
}
void destroy_mutex(void* mutex) {
pthread_mutex_destroy((pthread_mutex_t*)mutex);
- PyMem_Free(mutex);
+ PyMem_RawFree(mutex);
}
void grab_mutex(void* mutex) {
diff --git a/c_src/simpleaudio.c b/c_src/simpleaudio.c
index edacba3..b0b24b8 100644
--- a/c_src/simpleaudio.c
+++ b/c_src/simpleaudio.c
@@ -219,7 +219,7 @@ void delete_list_item(play_item_t* play_item) {
play_item->prev_item->next_item = play_item->next_item;
}
destroy_mutex(play_item->mutex);
- PyMem_Free(play_item);
+ PyMem_RawFree(play_item);
}
/*********************************************/
@@ -228,7 +228,7 @@ play_item_t* new_list_item(play_item_t* list_head) {
play_item_t* new_item;
play_item_t* old_tail;
- new_item = PyMem_Malloc(sizeof(play_item_t));
+ new_item = PyMem_RawMalloc(sizeof(play_item_t));
new_item->next_item = NULL;
old_tail = list_head;
@@ -269,13 +269,13 @@ void destroy_audio_blob(audio_blob_t* audio_blob) {
grab_mutex(audio_blob->list_mutex);
delete_list_item(audio_blob->play_list_item);
release_mutex(audio_blob->list_mutex);
- PyMem_Free(audio_blob);
+ PyMem_RawFree(audio_blob);
}
/********************************************/
audio_blob_t* create_audio_blob() {
- audio_blob_t* audio_blob = PyMem_Malloc(sizeof(audio_blob_t));
+ audio_blob_t* audio_blob = PyMem_RawMalloc(sizeof(audio_blob_t));
dbg1("created audio blob at %p\n", audio_blob);
diff --git a/c_src/simpleaudio_win.c b/c_src/simpleaudio_win.c
index 5aed022..ba79d23 100644
--- a/c_src/simpleaudio_win.c
+++ b/c_src/simpleaudio_win.c
@@ -57,8 +57,8 @@ MMRESULT fill_buffer(WAVEHDR* wave_header, audio_blob_t* audio_blob) {
if (audio_blob->num_buffers > 0) {
dbg2("done buffering - dellocating a buffer\n");
- PyMem_Free(wave_header->lpData);
- PyMem_Free(wave_header);
+ PyMem_RawFree(wave_header->lpData);
+ PyMem_RawFree(wave_header);
audio_blob->num_buffers--;
}
if (audio_blob->num_buffers == 0) {
@@ -182,9 +182,9 @@ PyObject* play_os(Py_buffer buffer_obj, int len_samples, int num_channels, int b
dbg1("allocating %d buffers of %d bytes\n", NUM_BUFS, buffer_size);
for (i = 0; i < NUM_BUFS; i++) {
- temp_wave_hdr = PyMem_Malloc(sizeof(WAVEHDR));
+ temp_wave_hdr = PyMem_RawMalloc(sizeof(WAVEHDR));
memset(temp_wave_hdr, 0, sizeof(WAVEHDR));
- temp_wave_hdr->lpData = PyMem_Malloc(buffer_size);
+ temp_wave_hdr->lpData = PyMem_RawMalloc(buffer_size);
temp_wave_hdr->dwBufferLength = buffer_size;
result = fill_buffer(temp_wave_hdr, audio_blob);

View File

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "slack-sdk";
version = "3.31.0";
version = "3.32.0";
pyproject = true;
disabled = pythonOlder "3.6";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "slackapi";
repo = "python-slack-sdk";
rev = "refs/tags/v${version}";
hash = "sha256-6fuC2yIGtjIxnEiI2/1sQ5RZB18WlteozyS8/XDTwkg=";
hash = "sha256-lAFisE1So1h7xWzqZHbv1iJrVckzxT4vEU7mA2Vc7oA=";
};
postPatch = ''

View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "xiaomi-ble";
version = "0.31.1";
version = "0.32.0";
pyproject = true;
disabled = pythonOlder "3.9";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = "xiaomi-ble";
rev = "refs/tags/v${version}";
hash = "sha256-ggI0beyE3gfgs5hyh7Rn9YDDkIvqqd0hA/XCy55/r2E=";
hash = "sha256-dZJsB40BMPo0tOFq0vLILrwfezf5dnspFK/aZWOV4uc=";
};
postPatch = ''

View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-binstall";
version = "1.10.3";
version = "1.10.4";
src = fetchFromGitHub {
owner = "cargo-bins";
repo = "cargo-binstall";
rev = "v${version}";
hash = "sha256-2Vo8zORVyWu0IA44K8BmXCjiFtdKJelZm/D6p5vqI2k=";
hash = "sha256-I6MyeKKqAxDb2BT6Uvmudw953kof1DIrZf1zmidwURo=";
};
cargoHash = "sha256-iKhP1P/8oz/0ulkLeZFiAdFGhhs3vZh6JGeQpmd1ZdQ=";
cargoHash = "sha256-tNYqUODqZSUb+p6JxZXWma5OE2v657yosObJ49Ei4+k=";
nativeBuildInputs = [
pkg-config

View File

@ -11,13 +11,13 @@
}:
rustPlatform.buildRustPackage rec {
pname = "sentry-cli";
version = "2.34.1";
version = "2.35.0";
src = fetchFromGitHub {
owner = "getsentry";
repo = "sentry-cli";
rev = version;
sha256 = "sha256-TaBhYZYIoY1W+O7lMRFKlMAhoaz2emqVE9h6AB+jMbE=";
sha256 = "sha256-o93re2owDozZt5GdnoofRS6erfJH+69rxoEUsDZ2zmM=";
};
doCheck = false;
@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ];
nativeBuildInputs = [ installShellFiles pkg-config ];
cargoHash = "sha256-uCNlOsgrQNoHZvuoQDdxuvD4JCqi82OdGeKlphayPC8=";
cargoHash = "sha256-7bgME43pdW9Oe8olOq2OdswyapBg5b7zKFrjmubWyMc=";
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd sentry-cli \

View File

@ -0,0 +1,47 @@
{
stdenv,
lib,
fetchFromGitHub,
kernel,
}:
stdenv.mkDerivation rec {
pname = "nullfs";
version = "0.17";
src = fetchFromGitHub {
owner = "abbbi";
repo = "nullfsvfs";
rev = "v${version}";
sha256 = "sha256-Hkplhem4Gb1xsYQtRSWub0m15Fiil3qJAO183ygP+WI=";
};
hardeningDisable = [ "pic" ];
enableParallelBuilding = true;
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [
"KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
prePatch = ''
substituteInPlace "Makefile" \
--replace-fail "/lib/modules/\$(shell uname -r)/build" "\$(KSRC)"
'';
installPhase = ''
runHook preInstall
mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/fs/nullfs/"
install -p -m 644 nullfs.ko $out/lib/modules/${kernel.modDirVersion}/kernel/fs/nullfs/
runHook postInstall
'';
meta = with lib; {
description = "A virtual black hole file system that behaves like /dev/null";
homepage = "https://github.com/abbbi/nullfsvfs";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ callumio ];
};
}

View File

@ -100,12 +100,6 @@ let
];
});
debugpy = super.debugpy.overridePythonAttrs (oldAttrs: {
# tests are deadlocking too often
# https://github.com/NixOS/nixpkgs/issues/262000
doCheck = false;
});
geojson = super.geojson.overridePythonAttrs (oldAttrs: rec {
version = "2.5.0";
src = fetchFromGitHub {
@ -569,10 +563,7 @@ in python.pkgs.buildPythonApplication rec {
] ++ lib.concatMap (component: getPackages component python.pkgs) [
# some components are needed even if tests in tests/components are disabled
"default_config"
"debugpy"
"hue"
"qwikswitch"
"sentry"
];
pytestFlagsArray = [
@ -605,6 +596,8 @@ in python.pkgs.buildPythonApplication rec {
"tests/hassfest"
# we don't care about code quality
"tests/pylint"
# redundant component import test, which would make debugpy & sentry expensive to review
"tests/test_circular_imports.py"
# don't bulk test all components
"tests/components"
];

View File

@ -13,19 +13,19 @@
let
pname = "matrix-appservice-irc";
version = "3.0.0";
version = "3.0.1";
src = fetchFromGitHub {
owner = "matrix-org";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-ZT8ugev+Tgu47KLuVVo5sFfiGtWLDc6JW5NZvsQ1mA8=";
hash = "sha256-LlcGcE3ik/xaiySyW5vfemGmukR7rlZrhfZOJwwfLDM=";
};
yarnOfflineCache = fetchYarnDeps {
name = "${pname}-${version}-offline-cache";
yarnLock = "${src}/yarn.lock";
hash = "sha256-13OUcxZOlW1pp4uB1aRmqlzKf6rTgyP/nMnLmksXV3w=";
hash = "sha256-VUqi1OBuUeLbjDH0yBZDSkJBkaMWdzYddcHB5rikJwQ=";
};
in

View File

@ -1,69 +1,74 @@
{ stdenv
, lib
, fetchurl
, fetchFromGitHub
, autoreconfHook
, autoconf-archive
, gobject-introspection
, pkg-config
, systemd
, wrapGAppsHook3
, glib
, dbus
, libnl
, python2Packages
, python3Packages
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "neard";
version = "0.18";
version = "0.19-unstable-2024-07-02";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://git.kernel.org/pub/scm/network/nfc/neard.git/snapshot/neard-${version}.tar.gz";
sha256 = "wBPjEVMV4uEdFrXw8cjOmvvNuiaACq2RJF/ZtKXck4s=";
src = fetchFromGitHub {
owner = "linux-nfc";
repo = "neard";
rev = "a0a7d4d677800a39346f0c89d93d0fe43a95efad";
hash = "sha256-6BgX7cJwxX+1RX3wU+HY/PIBgzomzOKemnl0SDLJNro=";
};
postPatch = ''
patchShebangs test/*
'';
nativeBuildInputs = [
autoreconfHook
autoconf-archive
gobject-introspection
pkg-config
python2Packages.wrapPython
python3Packages.wrapPython
wrapGAppsHook3
];
dontWrapGApps = true;
configureFlags = [
"--enable-pie"
"--enable-test"
"--enable-tools"
"--with-sysconfdir=/etc"
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
"--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user"
];
buildInputs = [
systemd
glib
dbus
glib
libnl
] ++ (with python2Packages; [
python
]);
pythonPath = with python2Packages; [
pygobject2
dbus-python
pygtk
];
strictDeps = true;
enableParallelBuilding = true;
configureFlags = [
"--disable-debug"
"--enable-tools"
"--enable-ese"
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
pythonPath = with python3Packages; [
pygobject3
dbus-python
];
postInstall = ''
install -m 0755 tools/snep-send $out/bin/
doCheck = true;
install -D -m644 src/main.conf $out/etc/neard/main.conf
# INFO: the config option "--enable-test" would copy the apps to $out/lib/neard/test/ instead
install -d $out/lib/neard
install -m 0755 test/* $out/lib/neard/
wrapPythonProgramsIn $out/lib/neard "$out $pythonPath"
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
wrapPythonProgramsIn "$out/lib/neard" "$pythonPath"
'';
meta = with lib; {
@ -72,7 +77,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Only;
maintainers = [ ];
platforms = platforms.unix;
# error: wcwidth-0.2.13 not supported for interpreter python2.7
broken = true; # Added 2024-03-17
};
}

View File

@ -1,13 +1,22 @@
# Autogenerated by maintainers/scripts/bootstrap-files/refresh-tarballs.bash as:
# $ ./refresh-tarballs.bash --targets=x86_64-unknown-freebsd
#
# Metadata:
# - nixpkgs revision: 6414ef7ca3bf18ec4f9628d09ccc1eb030276ee2
# - hydra build: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.x86_64-unknown-freebsd.build/latest
# - resolved hydra build: https://hydra.nixos.org/build/271214352
# - instantiated derivation: /nix/store/aahbgs95ani3bd70vxb8kwrvbms0d6ii-build.drv
# - output directory: /nix/store/ikzxl9ws9yxrl8g8z2kcjwqlq5gfjbhx-build
# - build time: Sat, 31 Aug 2024 17:18:35 +0000
{
bootstrapTools = import <nix/fetchurl.nix> {
url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-freebsd/6414ef7ca3bf18ec4f9628d09ccc1eb030276ee2/bootstrap-tools.tar.xz";
hash = "sha256-f7Fqxtpj7/0Sbs+kUgMs7oJ0JmPuh3bqD2YzOBTw2fc=";
};
unpack = import <nix/fetchurl.nix> {
url = "http://192.168.122.1:8000/result/on-server/unpack.nar.xz";
hash = "sha256-y6quCU9JKnKBdHDcUkdkM0ypWDT2cdSiqR1WqA+8ozE=";
name = "boostrapUnpacked";
url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-freebsd/6414ef7ca3bf18ec4f9628d09ccc1eb030276ee2/unpack.nar.xz";
hash = "sha256-3NTRtonoc3ZqnEF3hr1mUPH/aw+04OlwVxGhZmjXlMM=";
name = "unpack";
unpack = true;
};
bootstrapTools = import <nix/fetchurl.nix> {
url = "http://192.168.122.1:8000/result/on-server/bootstrap-tools.tar.xz";
hash = "sha256-ypIOxsB8a/RPupki0ZTjb+vuE+ibtmS8e3DazeolHj8=";
name = "bootstrapTools.tar.xz";
};
}

View File

@ -9,19 +9,19 @@
buildGoModule rec {
pname = "remote-touchpad";
version = "1.4.6";
version = "1.4.8";
src = fetchFromGitHub {
owner = "unrud";
repo = pname;
rev = "v${version}";
sha256 = "sha256-LytZBVubsGajx4hFYwP3MwHkAW7LlIr77aVLpeHwWxU=";
sha256 = "sha256-C/qaLEYvIbl0XINsumAFLnsQgy+EDjoX446BJnuE6eQ=";
};
buildInputs = [ libXi libXrandr libXt libXtst ];
tags = [ "portal,x11" ];
vendorHash = "sha256-vL6kSm0yPEn5TNpB6E+2+Xjm/ANNUxgA8XEWz9n7kHI=";
vendorHash = "sha256-bt5KUgNDgWX7CVHvX5c0uYqoxGRDbGbae52+mpnBEZU=";
meta = with lib; {
description = "Control mouse and keyboard from the web browser of a smartphone";

View File

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "nix-update-source";
version = "0.6.3";
version = "0.7.0";
src = fetchFromGitHub {
hash = "sha256-+49Yb+rZ3CzFnwEpwj5xrcMUVBiYOJtCk9YeZ15IM/U=";
owner = "timbertson";
repo = "nix-update-source";
rev = "version-${version}";
sha256 = "157wvv9vnaszzwbj68jpdc0imcm1hdab3z760bx2axbsgfpqqilz";
};
propagatedBuildInputs = [ nix-prefetch-scripts ];
@ -34,20 +34,25 @@ python3Packages.buildPythonApplication rec {
overrideSrc = drv: lib.overrideDerivation drv (orig: { inherit src; });
};
updateScript = ''
#!${runtimeShell}
set -e
echo
cd ${toString ./.}
${pkgs.nix-update-source}/bin/nix-update-source \
--prompt version \
--replace-attr version \
--set owner timbertson \
--set repo nix-update-source \
--set type fetchFromGitHub \
--set rev 'version-{version}' \
--modify-nix default.nix
'';
updateScript = [
runtimeShell
"-c"
''
set -e
echo
cd ${toString ./.}
${pkgs.nix-update-source}/bin/nix-update-source \
--prompt version \
--replace-attr version \
--set owner timbertson \
--set repo nix-update-source \
--set type fetchFromGitHub \
--set rev 'version-{version}' \
--nix-literal rev 'version-''${version}'\
--modify-nix default.nix
''
];
};
meta = {

View File

@ -10,13 +10,13 @@
buildGoModule rec {
pname = "kubescape";
version = "3.0.16";
version = "3.0.17";
src = fetchFromGitHub {
owner = "kubescape";
repo = "kubescape";
rev = "refs/tags/v${version}";
hash = "sha256-bCL9M4bqdmK7CHF/GDAaVuIaAekkiLAMy1xxwq/nGUE=";
hash = "sha256-xErgJPtf89Zmjn2lyRSuVmHT692xzupxWuBsu547+E0=";
fetchSubmodules = true;
};

View File

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "vault";
version = "1.17.4";
version = "1.17.5";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "vault";
rev = "v${version}";
hash = "sha256-4/oUL4VF7zN77/0BXVcj3foNXiK/IqN33p5/XEEk5ZM=";
hash = "sha256-OMA4c+Ot5xioRdI4z7zY4Eux8KxxIZ4opnT/xSc5oUk=";
};
vendorHash = "sha256-MJPKICuaxyUA8DQsdeToJK7HQk1VINNjv7JGjb1mrCs=";

View File

@ -361,6 +361,7 @@ mapAliases ({
### E ###
EBTKS = ebtks; # Added 2024-01-21
eask = eask-cli; # Added 2024-09-05
ec2_ami_tools = ec2-ami-tools; # Added 2021-10-08
ec2_api_tools = ec2-api-tools; # Added 2021-10-08
ec2-utils = amazon-ec2-utils; # Added 2022-02-01

View File

@ -3040,8 +3040,6 @@ with pkgs;
ammonite_2_13;
ammonite = ammonite_2_13;
amp = callPackage ../applications/editors/amp { };
ams = callPackage ../applications/audio/ams { };
amtterm = callPackage ../tools/system/amtterm { };
@ -5388,8 +5386,6 @@ with pkgs;
iotas = callPackage ../applications/office/iotas { };
iotools = callPackage ../tools/misc/iotools { };
jellycli = callPackage ../applications/audio/jellycli { };
jellyfin-ffmpeg = callPackage ../development/libraries/jellyfin-ffmpeg { };
@ -10745,7 +10741,9 @@ with pkgs;
noisetorch = callPackage ../applications/audio/noisetorch { };
notation = callPackage ../tools/security/notation { };
notation = callPackage ../by-name/no/notation/package.nix {
buildGoModule = buildGo123Module;
};
notify-osd = callPackage ../applications/misc/notify-osd { };
@ -15895,9 +15893,18 @@ with pkgs;
makeRustPlatform = callPackage ../development/compilers/rust/make-rust-platform.nix { };
buildRustCrate = callPackage ../build-support/rust/build-rust-crate ({ } // lib.optionalAttrs (stdenv.hostPlatform.libc == null) {
stdenv = stdenvNoCC; # Some build targets without libc will fail to evaluate with a normal stdenv.
});
buildRustCrate =
let
# Returns a true if the builder's rustc was built with support for the target.
targetAlreadyIncluded = lib.elem stdenv.hostPlatform.rust.rustcTarget
(lib.splitString "," (lib.removePrefix "--target=" (
lib.elemAt (lib.filter (f: lib.hasPrefix "--target=" f) pkgsBuildBuild.rustc.unwrapped.configureFlags) 0
)));
in
callPackage ../build-support/rust/build-rust-crate ({ } // lib.optionalAttrs (stdenv.hostPlatform.libc == null) {
stdenv = stdenvNoCC; # Some build targets without libc will fail to evaluate with a normal stdenv.
} // lib.optionalAttrs targetAlreadyIncluded { inherit (pkgsBuildBuild) rustc cargo; } # Optimization.
);
buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { };
cargo2junit = callPackage ../development/tools/rust/cargo2junit { };
@ -22171,8 +22178,6 @@ with pkgs;
liburcu = callPackage ../development/libraries/liburcu { };
libjaylink = callPackage ../development/libraries/libjaylink { };
libusb-compat-0_1 = callPackage ../development/libraries/libusb-compat/0.1.nix { };
libusb1 = callPackage ../development/libraries/libusb1 {

View File

@ -603,6 +603,8 @@ in {
drbd = callPackage ../os-specific/linux/drbd/driver.nix { };
nullfs = callPackage ../os-specific/linux/nullfs { };
} // lib.optionalAttrs config.allowAliases {
ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18;
hid-nintendo = throw "hid-nintendo was added in mainline kernel version 5.16"; # Added 2023-07-30