Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -151,6 +151,8 @@
|
||||
|
||||
- [GLPI-Agent](https://github.com/glpi-project/glpi-agent), GLPI Agent. Available as [services.glpiAgent](options.html#opt-services.glpiAgent.enable).
|
||||
|
||||
- [Recyclarr](https://github.com/recyclarr/recyclarr) a TRaSH Guides synchronizer for Sonarr and Radarr. Available as [services.recyclarr](#opt-services.recyclarr.enable).
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
## Backward Incompatibilities {#sec-release-25.05-incompatibilities}
|
||||
@@ -275,6 +277,8 @@
|
||||
|
||||
- `tldr` now uses [`tldr-python-client`](https://github.com/tldr-pages/tldr-python-client) instead of [`tldr-c-client`](https://github.com/tldr-pages/tldr-c-client) which is unmaintained.
|
||||
|
||||
- `services.bird2` has been renamed to `services.bird` and the default bird package has been switched to `bird3`. `bird2` can still be choosen via the `services.bird.package` option.
|
||||
|
||||
- `renovate` was updated to v39. See the [upstream release notes](https://docs.renovatebot.com/release-notes-for-major-versions/#version-39) for breaking changes.
|
||||
Like upstream's docker images, renovate now runs on NodeJS 22.
|
||||
|
||||
|
||||
@@ -862,6 +862,7 @@
|
||||
./services/misc/radicle.nix
|
||||
./services/misc/readarr.nix
|
||||
./services/misc/realmd.nix
|
||||
./services/misc/recyclarr.nix
|
||||
./services/misc/redlib.nix
|
||||
./services/misc/redmine.nix
|
||||
./services/misc/renovate.nix
|
||||
|
||||
@@ -41,7 +41,7 @@ in
|
||||
}
|
||||
];
|
||||
};
|
||||
description = lib.mdDoc ''
|
||||
description = ''
|
||||
Recyclarr YAML configuration as a Nix attribute set.
|
||||
|
||||
For detailed configuration options and examples, see the
|
||||
@@ -55,6 +55,7 @@ in
|
||||
systemd.services.recyclarr.serviceConfig.LoadCredential = [
|
||||
"radarr-api_key:''${config.sops.secrets.radarr-api_key.path}"
|
||||
];
|
||||
```
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@ in
|
||||
};
|
||||
serviceOpts = {
|
||||
serviceConfig = {
|
||||
SupplementaryGroups = singleton (if cfg.birdVersion == 1 then "bird" else "bird2");
|
||||
SupplementaryGroups = "bird";
|
||||
ExecStart = ''
|
||||
${pkgs.prometheus-bird-exporter}/bin/bird_exporter \
|
||||
-web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
|
||||
|
||||
@@ -320,7 +320,7 @@ in
|
||||
groups."bird-lg" = lib.mkIf (cfg.group == "bird-lg") { };
|
||||
users."bird-lg" = lib.mkIf (cfg.user == "bird-lg") {
|
||||
description = "Bird Looking Glass user";
|
||||
extraGroups = lib.optionals (config.services.bird2.enable) [ "bird2" ];
|
||||
extraGroups = lib.optionals (config.services.bird.enable) [ "bird" ];
|
||||
group = cfg.group;
|
||||
isSystemUser = true;
|
||||
};
|
||||
|
||||
@@ -14,7 +14,7 @@ let
|
||||
types
|
||||
;
|
||||
|
||||
cfg = config.services.bird2;
|
||||
cfg = config.services.bird;
|
||||
caps = [
|
||||
"CAP_NET_ADMIN"
|
||||
"CAP_NET_BIND_SERVICE"
|
||||
@@ -24,8 +24,9 @@ in
|
||||
{
|
||||
###### interface
|
||||
options = {
|
||||
services.bird2 = {
|
||||
services.bird = {
|
||||
enable = mkEnableOption "BIRD Internet Routing Daemon";
|
||||
package = lib.mkPackageOption pkgs "bird3" { };
|
||||
config = mkOption {
|
||||
type = types.lines;
|
||||
description = ''
|
||||
@@ -37,7 +38,7 @@ in
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether bird2 should be automatically reloaded when the configuration changes.
|
||||
Whether bird should be automatically reloaded when the configuration changes.
|
||||
'';
|
||||
};
|
||||
checkConfig = mkOption {
|
||||
@@ -58,7 +59,7 @@ in
|
||||
'';
|
||||
description = ''
|
||||
Commands to execute before the config file check. The file to be checked will be
|
||||
available as `bird2.conf` in the current directory.
|
||||
available as `bird.conf` in the current directory.
|
||||
|
||||
Files created with this option will not be available at service runtime, only during
|
||||
build time checking.
|
||||
@@ -68,36 +69,39 @@ in
|
||||
};
|
||||
|
||||
imports = [
|
||||
(lib.mkRemovedOptionModule [ "services" "bird" ] "Use services.bird2 instead")
|
||||
(lib.mkRemovedOptionModule [ "services" "bird6" ] "Use services.bird2 instead")
|
||||
(lib.mkRemovedOptionModule [ "services" "bird2" ]
|
||||
"Use services.bird instead. bird3 is the new default bird package. You can choose to remain with bird2 by setting the service.bird.package option."
|
||||
)
|
||||
(lib.mkRemovedOptionModule [ "services" "bird6" ] "Use services.bird instead")
|
||||
];
|
||||
|
||||
###### implementation
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ pkgs.bird ];
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
environment.etc."bird/bird2.conf".source = pkgs.writeTextFile {
|
||||
name = "bird2";
|
||||
environment.etc."bird/bird.conf".source = pkgs.writeTextFile {
|
||||
name = "bird";
|
||||
text = cfg.config;
|
||||
derivationArgs.nativeBuildInputs = lib.optional cfg.checkConfig cfg.package;
|
||||
checkPhase = optionalString cfg.checkConfig ''
|
||||
ln -s $out bird2.conf
|
||||
ln -s $out bird.conf
|
||||
${cfg.preCheckConfig}
|
||||
${pkgs.buildPackages.bird}/bin/bird -d -p -c bird2.conf
|
||||
bird -d -p -c bird.conf
|
||||
'';
|
||||
};
|
||||
|
||||
systemd.services.bird2 = {
|
||||
systemd.services.bird = {
|
||||
description = "BIRD Internet Routing Daemon";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
reloadTriggers = lib.optional cfg.autoReload config.environment.etc."bird/bird2.conf".source;
|
||||
reloadTriggers = lib.optional cfg.autoReload config.environment.etc."bird/bird.conf".source;
|
||||
serviceConfig = {
|
||||
Type = "forking";
|
||||
Restart = "on-failure";
|
||||
User = "bird2";
|
||||
Group = "bird2";
|
||||
ExecStart = "${pkgs.bird}/bin/bird -c /etc/bird/bird2.conf";
|
||||
ExecReload = "${pkgs.bird}/bin/birdc configure";
|
||||
ExecStop = "${pkgs.bird}/bin/birdc down";
|
||||
User = "bird";
|
||||
Group = "bird";
|
||||
ExecStart = "${lib.getExe' cfg.package "bird"} -c /etc/bird/bird.conf";
|
||||
ExecReload = "${lib.getExe' cfg.package "birdc"} configure";
|
||||
ExecStop = "${lib.getExe' cfg.package "birdc"} down";
|
||||
RuntimeDirectory = "bird";
|
||||
CapabilityBoundingSet = caps;
|
||||
AmbientCapabilities = caps;
|
||||
@@ -112,12 +116,16 @@ in
|
||||
};
|
||||
};
|
||||
users = {
|
||||
users.bird2 = {
|
||||
users.bird = {
|
||||
description = "BIRD Internet Routing Daemon user";
|
||||
group = "bird2";
|
||||
group = "bird";
|
||||
isSystemUser = true;
|
||||
};
|
||||
groups.bird2 = { };
|
||||
groups.bird = { };
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ herbetom ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ in
|
||||
|
||||
[bird]
|
||||
listen = "0.0.0.0:29184"
|
||||
config = "/etc/bird/bird2.conf"
|
||||
config = "/etc/bird/bird.conf"
|
||||
birdc = "''${pkgs.bird}/bin/birdc"
|
||||
ttl = 5 # time to live (in minutes) for caching of cli output
|
||||
|
||||
|
||||
@@ -305,6 +305,15 @@ in {
|
||||
example = "php82";
|
||||
};
|
||||
|
||||
finalPackage = mkOption {
|
||||
type = types.package;
|
||||
readOnly = true;
|
||||
description = ''
|
||||
Package to the finalized Nextcloud package, including all installed apps.
|
||||
This is automatically set by the module.
|
||||
'';
|
||||
};
|
||||
|
||||
maxUploadSize = mkOption {
|
||||
default = "512M";
|
||||
type = types.str;
|
||||
@@ -925,6 +934,8 @@ in {
|
||||
"L+ ${datadir}/config/override.config.php - - - - ${overrideConfig}"
|
||||
];
|
||||
|
||||
services.nextcloud.finalPackage = webroot;
|
||||
|
||||
systemd.services = {
|
||||
# When upgrading the Nextcloud package, Nextcloud can report errors such as
|
||||
# "The files of the app [all apps in /var/lib/nextcloud/apps] were not replaced correctly"
|
||||
|
||||
@@ -13,7 +13,7 @@ let
|
||||
inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
|
||||
inherit (pkgs.lib) optionalString;
|
||||
|
||||
makeBird2Host =
|
||||
makeBirdHost =
|
||||
hostId:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
@@ -32,7 +32,7 @@ let
|
||||
networkConfig.Address = "10.0.0.${hostId}/24";
|
||||
};
|
||||
|
||||
services.bird2 = {
|
||||
services.bird = {
|
||||
enable = true;
|
||||
|
||||
config = ''
|
||||
@@ -107,17 +107,17 @@ let
|
||||
};
|
||||
in
|
||||
makeTest {
|
||||
name = "bird2";
|
||||
name = "bird";
|
||||
|
||||
nodes.host1 = makeBird2Host "1";
|
||||
nodes.host2 = makeBird2Host "2";
|
||||
nodes.host1 = makeBirdHost "1";
|
||||
nodes.host2 = makeBirdHost "2";
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
|
||||
host1.wait_for_unit("bird2.service")
|
||||
host2.wait_for_unit("bird2.service")
|
||||
host1.succeed("systemctl reload bird2.service")
|
||||
host1.wait_for_unit("bird.service")
|
||||
host2.wait_for_unit("bird.service")
|
||||
host1.succeed("systemctl reload bird.service")
|
||||
|
||||
with subtest("Waiting for advertised IPv4 routes"):
|
||||
host1.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.2\")) | any'")
|
||||
|
||||
@@ -17,7 +17,7 @@ makeTest {
|
||||
nodes = {
|
||||
host1 = {
|
||||
environment.systemPackages = with pkgs; [ jq ];
|
||||
services.bird2 = {
|
||||
services.bird = {
|
||||
enable = true;
|
||||
config = ''
|
||||
log syslog all;
|
||||
@@ -71,7 +71,7 @@ makeTest {
|
||||
filter_fields = []
|
||||
[bird]
|
||||
listen = "0.0.0.0:29184"
|
||||
config = "/etc/bird/bird2.conf"
|
||||
config = "/etc/bird/bird.conf"
|
||||
birdc = "${pkgs.bird}/bin/birdc"
|
||||
ttl = 5 # time to live (in minutes) for caching of cli output
|
||||
[parser]
|
||||
@@ -89,7 +89,7 @@ makeTest {
|
||||
testScript = ''
|
||||
start_all()
|
||||
|
||||
host1.wait_for_unit("bird2.service")
|
||||
host1.wait_for_unit("bird.service")
|
||||
host1.wait_for_unit("birdwatcher.service")
|
||||
host1.wait_for_open_port(29184)
|
||||
host1.succeed("curl http://[::]:29184/status | jq -r .status.message | grep 'Daemon is up and running'")
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
{ ... }:
|
||||
{
|
||||
networking.firewall.allowedTCPPorts = [ 179 ];
|
||||
services.bird2 = {
|
||||
services.bird = {
|
||||
enable = true;
|
||||
config = ''
|
||||
router id 192.168.1.1;
|
||||
@@ -59,7 +59,7 @@
|
||||
''
|
||||
start_all()
|
||||
fnm.wait_for_unit("fastnetmon.service")
|
||||
bird.wait_for_unit("bird2.service")
|
||||
bird.wait_for_unit("bird.service")
|
||||
|
||||
fnm.wait_until_succeeds('journalctl -eu fastnetmon.service | grep "BGP daemon restarted correctly"')
|
||||
fnm.wait_until_succeeds("journalctl -eu gobgp.service | grep BGP_FSM_OPENCONFIRM")
|
||||
|
||||
@@ -116,8 +116,8 @@ let
|
||||
enable = true;
|
||||
};
|
||||
metricProvider = {
|
||||
services.bird2.enable = true;
|
||||
services.bird2.config = ''
|
||||
services.bird.enable = true;
|
||||
services.bird.config = ''
|
||||
router id 127.0.0.1;
|
||||
|
||||
protocol kernel MyObviousTestString {
|
||||
|
||||
@@ -18,13 +18,13 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "polkadot";
|
||||
version = "2412";
|
||||
version = "2412-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paritytech";
|
||||
repo = "polkadot-sdk";
|
||||
rev = "polkadot-stable${version}";
|
||||
hash = "sha256-0oqSABuCcyNhvCJyZuesnPvsUgHdNXdc36HeNMmToYM=";
|
||||
hash = "sha256-wvtK+xbq8MLx77ad+x8gzPyL5ScFxHFt6rlZUAzc0CU=";
|
||||
|
||||
# the build process of polkadot requires a .git folder in order to determine
|
||||
# the git commit hash that is being built and add it to the version string.
|
||||
@@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-ueTEx6oqfMzM1ytXavRxLrWf4+8jYqVY9JJJbl8j2YY=";
|
||||
cargoHash = "sha256-c88vE2DxjngARu0NSZR4NVEYK4OiSxIETVRY6K5CbVs=";
|
||||
|
||||
buildType = "production";
|
||||
buildAndTestSubdir = "polkadot";
|
||||
|
||||
@@ -13652,6 +13652,18 @@ final: prev:
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
telescope-emoji-nvim = buildVimPlugin {
|
||||
pname = "telescope-emoji.nvim";
|
||||
version = "2022-12-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "xiyaowong";
|
||||
repo = "telescope-emoji.nvim";
|
||||
rev = "86248d97be84a1ce83f0541500ef9edc99ea2aa1";
|
||||
sha256 = "18m46gj68xv6basaqzbschr60sc9xzi4dx21cvnx401bk97cqpgi";
|
||||
};
|
||||
meta.homepage = "https://github.com/xiyaowong/telescope-emoji.nvim/";
|
||||
};
|
||||
|
||||
telescope-file-browser-nvim = buildVimPlugin {
|
||||
pname = "telescope-file-browser.nvim";
|
||||
version = "2024-10-24";
|
||||
@@ -13744,6 +13756,18 @@ final: prev:
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
telescope-glyph-nvim = buildVimPlugin {
|
||||
pname = "telescope-glyph.nvim";
|
||||
version = "2022-08-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ghassan0";
|
||||
repo = "telescope-glyph.nvim";
|
||||
rev = "f63f01e129e71cc25b79637610674bbf0be5ce9d";
|
||||
sha256 = "0n1mdiwkkciqpxjad1nngrc7px5yziyan0daxgs9jsgdqmy1lzp8";
|
||||
};
|
||||
meta.homepage = "https://github.com/ghassan0/telescope-glyph.nvim/";
|
||||
};
|
||||
|
||||
telescope-live-grep-args-nvim = buildVimPlugin {
|
||||
pname = "telescope-live-grep-args.nvim";
|
||||
version = "2024-07-28";
|
||||
|
||||
@@ -3146,6 +3146,10 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
telescope-emoji-nvim = super.telescope-emoji-nvim.overrideAttrs {
|
||||
dependencies = [ self.telescope-nvim ];
|
||||
};
|
||||
|
||||
telescope-frecency-nvim = super.telescope-frecency-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
sqlite-lua
|
||||
@@ -3207,6 +3211,10 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
telescope-glyph-nvim = super.telescope-github-nvim.overrideAttrs {
|
||||
dependencies = [ self.telescope-nvim ];
|
||||
};
|
||||
|
||||
telescope-live-grep-args-nvim = super.telescope-live-grep-args-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
plenary-nvim
|
||||
|
||||
@@ -1044,6 +1044,7 @@ https://github.com/GustavoKatel/telescope-asynctasks.nvim/,,
|
||||
https://github.com/nvim-telescope/telescope-cheat.nvim/,,
|
||||
https://github.com/fannheyward/telescope-coc.nvim/,,
|
||||
https://github.com/nvim-telescope/telescope-dap.nvim/,,
|
||||
https://github.com/xiyaowong/telescope-emoji.nvim/,HEAD,
|
||||
https://github.com/nvim-telescope/telescope-file-browser.nvim/,,
|
||||
https://github.com/nvim-telescope/telescope-frecency.nvim/,,
|
||||
https://github.com/nvim-telescope/telescope-fzf-native.nvim/,,
|
||||
@@ -1051,6 +1052,7 @@ https://github.com/nvim-telescope/telescope-fzf-writer.nvim/,,
|
||||
https://github.com/nvim-telescope/telescope-fzy-native.nvim/,,
|
||||
https://github.com/Snikimonkd/telescope-git-conflicts.nvim/,HEAD,
|
||||
https://github.com/nvim-telescope/telescope-github.nvim/,,
|
||||
https://github.com/ghassan0/telescope-glyph.nvim/,HEAD,
|
||||
https://github.com/nvim-telescope/telescope-live-grep-args.nvim/,HEAD,
|
||||
https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/,,
|
||||
https://github.com/MrcJkb/telescope-manix/,HEAD,
|
||||
|
||||
+2
-2
@@ -46,14 +46,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "telegram-desktop-unwrapped";
|
||||
version = "5.10.5";
|
||||
version = "5.10.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "telegramdesktop";
|
||||
repo = "tdesktop";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-0BfKWwb+mnlaMD55KKvEMRIFvqBDQCs272lemvXBnjw=";
|
||||
hash = "sha256-lcU2EJQgT7vQa2z0SB8LKhWjhn22Wc+eHi92junY2PY=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
|
||||
@@ -78,8 +78,8 @@ let
|
||||
virtualboxSubVersion = "a";
|
||||
virtualboxSha256 = "5a7b13066ec71990af0cc00a5eea9c7ec3c71ca5ed99bb549c85494ce2ea395d";
|
||||
|
||||
kvmPatchVersion = "20241220";
|
||||
kvmPatchHash = "sha256-SYyD79iN6Sp/Mxat+ml3fee9X1vFUFyrwHPnQNboc1c=";
|
||||
kvmPatchVersion = "20250207";
|
||||
kvmPatchHash = "sha256-GzRLIXhzWL1NLvaGKcWVBCdvay1IxgJUE4koLX1ze7Y=";
|
||||
|
||||
# The KVM build is not compatible to VirtualBox's kernel modules. So don't export
|
||||
# modsrc at all.
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
dataDir ? "/var/lib/agorakit",
|
||||
}:
|
||||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "agorakit";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = finalAttrs.pname;
|
||||
repo = finalAttrs.pname;
|
||||
rev = finalAttrs.version;
|
||||
tag = finalAttrs.version;
|
||||
sha256 = "sha256-6T7AksvBxUpv8TkPicnlCE5KZS/ydPB5Bq1MJcWoZds=";
|
||||
};
|
||||
|
||||
@@ -26,7 +26,7 @@ php.buildComposerProject (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-5ypBA9Qb8jHzAtvNBHkJfsLIf3Pfw1LvYmHP/hED2ig=";
|
||||
vendorHash = "sha256-EepkEMqzRJUqw4PrPclY9BM4AGlQZJpYLWjIyaX15PA=";
|
||||
composerStrictValidation = false;
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -87,11 +87,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "appgate-sdp";
|
||||
version = "6.4.1";
|
||||
version = "6.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb";
|
||||
sha256 = "sha256-wnao0W03vpV9HMnUXEY3pf63jN3gB2jExfuA1hsG00I=";
|
||||
sha256 = "sha256-xFpBC6X95C01wUfzJ3a0kMz898k6BItkpJLcUmfd7oY=";
|
||||
};
|
||||
|
||||
# just patch interpreter
|
||||
|
||||
@@ -12,17 +12,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ast-grep";
|
||||
version = "0.34.3";
|
||||
version = "0.34.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ast-grep";
|
||||
repo = "ast-grep";
|
||||
tag = version;
|
||||
hash = "sha256-r82BDCncRUSmIBQFwsrKDwKEKmvGm/lKtz1rYC47Ems=";
|
||||
hash = "sha256-fS2zuL0j/4Z24wvRIu2M47CafC/f0Ta3rMmQomB3P1Q=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-hxIeRkKPuLftAYAsdk2Hq1+ittGeWDIl9Rryi7MLg90=";
|
||||
cargoHash = "sha256-b0t5t7qla4/xZiR3YqhLUDRCj+V2jEUjY4sGGA7L+hE=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
Generated
-6102
File diff suppressed because it is too large
Load Diff
@@ -13,54 +13,55 @@
|
||||
libgbm,
|
||||
seatd,
|
||||
wayland,
|
||||
glibc,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "asusctl";
|
||||
version = "6.0.12";
|
||||
version = "6.1.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "asus-linux";
|
||||
repo = "asusctl";
|
||||
rev = version;
|
||||
hash = "sha256-fod3ZkJktmJGHF8nSSp9lVMg/qYKQd4EiauFGTSvbsg=";
|
||||
hash = "sha256-EedOSStqZ2Q8PUJ+0mgIC2+MbiO19VUVDoVvWkkQscc=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"const-field-offset-0.1.5" = "sha256-QtlvLwe27tLLdWhqiKzXoUvBsBcZbfwY84jXUduzCKw=";
|
||||
"supergfxctl-5.2.4" = "sha256-MQJJaTajPQ45BU6zyMx0Wwf7tAPcT4EURWWbZxrbGzE=";
|
||||
};
|
||||
};
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-o+u4k6yGVThBO9Chv4EwVpkDZzZj64RN9iNZyAy0LHs=";
|
||||
|
||||
postPatch = ''
|
||||
files="
|
||||
asusd-user/src/config.rs
|
||||
asusd-user/src/daemon.rs
|
||||
asusd/src/ctrl_anime/config.rs
|
||||
asusd/src/aura_anime/config.rs
|
||||
rog-aura/src/aura_detection.rs
|
||||
rog-control-center/src/lib.rs
|
||||
rog-control-center/src/main.rs
|
||||
rog-control-center/src/tray.rs
|
||||
"
|
||||
for file in $files; do
|
||||
substituteInPlace $file --replace /usr/share $out/share
|
||||
substituteInPlace $file --replace-fail /usr/share $out/share
|
||||
done
|
||||
|
||||
substituteInPlace data/asusd.rules --replace systemctl ${systemd}/bin/systemctl
|
||||
substituteInPlace data/asusd.rules --replace-fail systemctl ${lib.getExe' systemd "systemctl"}
|
||||
substituteInPlace data/asusd.service \
|
||||
--replace /usr/bin/asusd $out/bin/asusd \
|
||||
--replace /bin/sleep ${coreutils}/bin/sleep
|
||||
--replace-fail /usr/bin/asusd $out/bin/asusd \
|
||||
--replace-fail /bin/sleep ${lib.getExe' coreutils "sleep"}
|
||||
substituteInPlace data/asusd-user.service \
|
||||
--replace /usr/bin/asusd-user $out/bin/asusd-user \
|
||||
--replace /usr/bin/sleep ${coreutils}/bin/sleep
|
||||
--replace-fail /usr/bin/asusd-user $out/bin/asusd-user \
|
||||
--replace-fail /usr/bin/sleep ${lib.getExe' coreutils "sleep"}
|
||||
|
||||
substituteInPlace Makefile \
|
||||
--replace /usr/bin/grep ${lib.getExe gnugrep}
|
||||
--replace-fail /usr/bin/grep ${lib.getExe gnugrep}
|
||||
|
||||
substituteInPlace /build/asusctl-${version}-vendor/sg-0.4.0/build.rs \
|
||||
--replace-fail /usr/include ${lib.getDev glibc}/include
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fontconfig
|
||||
|
||||
@@ -9,19 +9,19 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "atlas";
|
||||
version = "0.30.0";
|
||||
version = "0.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ariga";
|
||||
repo = "atlas";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Pq4h+/hFu5ujZLv0HUbyrDbuScfQuVEXs7m7mYYZ2yA=";
|
||||
hash = "sha256-P1TmPDtxl/78gNT+SoIzlWaTmkIKQH1Tyue9Ai1CVJs=";
|
||||
};
|
||||
|
||||
modRoot = "cmd/atlas";
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-Le5PVOnn4Ma9ZrL4311kedOZYU80kLzbh3VAbu0xXow=";
|
||||
vendorHash = "sha256-R0avfCFXZmUkonBoAUtYtyFKUgNLZRjpiv1PqmsbUYo=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
version = "2.16.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://bird.network.cz/pub/bird/${pname}-${version}.tar.gz";
|
||||
url = "https://bird.network.cz/download/bird-${version}.tar.gz";
|
||||
hash = "sha256-9uWcvMrKYmaK6gIGhyS9QnuexEnH4PD8VoFQOYjHNbQ=";
|
||||
};
|
||||
|
||||
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
changelog = "https://gitlab.nic.cz/labs/bird/-/blob/v${version}/NEWS";
|
||||
description = "BIRD Internet Routing Daemon";
|
||||
homepage = "http://bird.network.cz";
|
||||
homepage = "https://bird.network.cz";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ herbetom ];
|
||||
platforms = platforms.linux;
|
||||
@@ -0,0 +1,6 @@
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -165,2 +165,2 @@
|
||||
install: all
|
||||
- $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(runstatedir)
|
||||
+ $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir)
|
||||
@@ -0,0 +1,51 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
flex,
|
||||
bison,
|
||||
readline,
|
||||
libssh,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bird";
|
||||
version = "3.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bird.network.cz/download/bird-${version}.tar.gz";
|
||||
hash = "sha256-iGhAPKqE4lVLtuYK2+fGV+e7fErEGRDjmPNeI2upD6E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
flex
|
||||
bison
|
||||
];
|
||||
buildInputs = [
|
||||
readline
|
||||
libssh
|
||||
];
|
||||
|
||||
patches = [
|
||||
./dont-create-sysconfdir-2.patch
|
||||
];
|
||||
|
||||
CPP = "${stdenv.cc.targetPrefix}cpp -E";
|
||||
|
||||
configureFlags = [
|
||||
"--localstatedir=/var"
|
||||
"--runstatedir=/run/bird"
|
||||
];
|
||||
|
||||
passthru.tests = nixosTests.bird;
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://gitlab.nic.cz/labs/bird/-/blob/v${version}/NEWS";
|
||||
description = "BIRD Internet Routing Daemon";
|
||||
homepage = "https://bird.network.cz";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ herbetom ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -3,24 +3,24 @@
|
||||
|
||||
let
|
||||
pname = "brave";
|
||||
version = "1.74.51";
|
||||
version = "1.75.175";
|
||||
|
||||
allArchives = {
|
||||
aarch64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
|
||||
hash = "sha256-rsoZ5AKdYGyg6zt6k/HlBfK+FNvVZdL5VjNMNYqpKls=";
|
||||
hash = "sha256-/tzdBTkNF8KtSG36Xs1MC+d//SVcGaQu1ODs9YXBKzc=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-ZlpKfTvsJKDmzpTCnPBqzCCvBKGJJCvOKi65KdEFGlI=";
|
||||
hash = "sha256-IhWUUvms/UMps3KOcOqm5YBRlSfCX/TLYEx7iIp9Nvc=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
|
||||
hash = "sha256-VKpxOffAg5+IereL3fLfDa8MSxVDmTKvf6VNbDuibhw=";
|
||||
hash = "sha256-laiGVu0rNUMw9ybXGRdJKoUGJ9uo7FoFhekuL0UgtFY=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
|
||||
hash = "sha256-NrU/J7+7kS6w93bjbp56nviju33gR8tHBOwbNibG3vY=";
|
||||
hash = "sha256-wht/l79wLG1Fr4KcbhLbS7AbozWSgKBJconjy1hRBOI=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
+14
-10
@@ -8,8 +8,6 @@
|
||||
pkg-config,
|
||||
openssl,
|
||||
stdenv,
|
||||
CoreServices,
|
||||
Security,
|
||||
zig,
|
||||
nix-update-script,
|
||||
}:
|
||||
@@ -19,9 +17,9 @@ rustPlatform.buildRustPackage rec {
|
||||
version = "1.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
owner = "cargo-lambda";
|
||||
repo = "cargo-lambda";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-GiV5yjlzU4iU4BJ8Fq8I9uOchVCF2UGb+WLMMr7n8pc=";
|
||||
};
|
||||
|
||||
@@ -39,8 +37,6 @@ rustPlatform.buildRustPackage rec {
|
||||
[ openssl ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
curl
|
||||
CoreServices
|
||||
Security
|
||||
];
|
||||
|
||||
# Remove files that don't make builds reproducible:
|
||||
@@ -57,14 +53,22 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
CARGO_LAMBDA_BUILD_INFO = "(nixpkgs)";
|
||||
|
||||
checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Fails in darwin sandbox, first because of trying to listen to a port on
|
||||
# localhost. While this would be fixed by `__darwinAllowLocalNetworking = true;`,
|
||||
# they then fail with other I/O issues.
|
||||
"--skip=test::test_download_example"
|
||||
"--skip=test::test_download_example_with_cache"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Cargo subcommand to help you work with AWS Lambda";
|
||||
mainProgram = "cargo-lambda";
|
||||
homepage = "https://cargo-lambda.info";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
taylor1791
|
||||
calavera
|
||||
matthiasbeyer
|
||||
@@ -7,17 +7,17 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "codesnap";
|
||||
version = "0.8.3";
|
||||
version = "0.10.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mistricky";
|
||||
repo = "CodeSnap";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-i6aKtNXoGMT2FuzsPGGb/V1e4X5WW72DeiSNBrnJCbA=";
|
||||
hash = "sha256-g2Xu/PKRSYrHKDJ5/MZRUkDQeYuxvNWPTuymhI8Iu5Q=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-torktXGNPsz0hMppIgTYatudtPQ0OYW465En6LqTD3I=";
|
||||
cargoHash = "sha256-bQT+tpoSZ54yppyNJxbOEqQoIKqYZAnRo0j42Ti+EJo=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "codespell";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "codespell-project";
|
||||
repo = "codespell";
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-TZH3+ZzsThh0GDtiSU1ZEStmCHmEuNDrk/Vyc8E2ESI=";
|
||||
sha256 = "sha256-9hr/QZcBESLukujzNKNjWGG3nXx+wkvQvoUYmYgtXv0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
{
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
git,
|
||||
jujutsu,
|
||||
lib,
|
||||
makeWrapper,
|
||||
nix-update-script,
|
||||
universal-ctags,
|
||||
versionCheckHook,
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "ctags-lsp";
|
||||
version = "0.6.1";
|
||||
vendorHash = null;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netmute";
|
||||
repo = "ctags-lsp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-wSccfhVp1PDn/gj46r8BNskEuBuRIx1wydYAW1PV4cg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.version=${version}"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/ctags-lsp \
|
||||
--suffix PATH : ${
|
||||
lib.makeBinPath [
|
||||
universal-ctags
|
||||
git
|
||||
jujutsu
|
||||
]
|
||||
}
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/netmute/ctags-lsp/releases/tag/v${version}";
|
||||
description = "LSP implementation using universal-ctags as backend";
|
||||
homepage = "https://github.com/netmute/ctags-lsp";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "ctags-lsp";
|
||||
maintainers = with lib.maintainers; [ voronind ];
|
||||
};
|
||||
}
|
||||
@@ -37,6 +37,7 @@ let
|
||||
gnutar
|
||||
gzip
|
||||
perl
|
||||
util-linux
|
||||
wget
|
||||
xz
|
||||
];
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "flarectl";
|
||||
version = "0.114.0";
|
||||
version = "0.115.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "cloudflare-go";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-K0SnwLZUmu/qPTAMXPiQtomKyfLK+gJIIMo4sY6qjYc=";
|
||||
hash = "sha256-2LdsqCqRTruTHYPwuI9Gm07cpvQNOrZvIl6rjZU+0aU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vTByYXYj3r8pOi6oXYu9f7zO4MdXg0fWqWzhsNLCjjw=";
|
||||
vendorHash = "sha256-f+bNNwbTj348JJJLST2j7h8/A79qzvGlf8MjldVvtGU=";
|
||||
|
||||
subPackages = [ "cmd/flarectl" ];
|
||||
|
||||
|
||||
@@ -8,20 +8,20 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "flood";
|
||||
version = "4.9.0";
|
||||
version = "4.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jesec";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-R8OWr9jsD6KZ3P827plCTSLcVrrFEdutmlZNwqXJNfU=";
|
||||
hash = "sha256-sIwXx9DA+vRW4pf6jyqcsla0khh8fdpvVTZ5pLrUhhc=";
|
||||
};
|
||||
|
||||
npmConfigHook = pnpm_9.configHook;
|
||||
npmDeps = pnpmDeps;
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit pname version src;
|
||||
hash = "sha256-6YW2m7siLzHiAFEpidQS5okhjsY9qNm+Ro8mHex1/No=";
|
||||
hash = "sha256-E2VxRcOMLvvCQb9gCAGcBTsly571zh/HWM6Q1Zd2eVw=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gnome-graphs";
|
||||
version = "1.8.2";
|
||||
version = "1.8.4";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
@@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "World";
|
||||
repo = "Graphs";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-juKo4pFAjowGaykHkByfA9kEJ68z1ttGhA0OsfHt/XM=";
|
||||
hash = "sha256-up4Hv2gndekDQzEnf7kkskDyRGJ/mqEji7dsuLgnUVI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "grocy";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grocy";
|
||||
repo = "grocy";
|
||||
rev = "v${finalAttrs.version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-aX3DMy9Jv8rNp1/VIvUtNXYXGBrCgBMs5GsDf4XXSj0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-KaYvA0Rd4pd1s/L8QbVUgkE+SjH+jv4+6RvIaGOpews=";
|
||||
vendorHash = "sha256-W4pRJJYGaKYYO6BqhYZyP0VH7lcPXbByR0bBn+dfdIo=";
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/yarn.lock";
|
||||
@@ -52,13 +52,10 @@ php.buildComposerProject (finalAttrs: {
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
postInstall = ''
|
||||
chmod -R u+w $out/share
|
||||
mv $out/share/php/grocy/* $out
|
||||
rm -r $out/share
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = { inherit (nixosTests) grocy; };
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grpc-client-cli";
|
||||
version = "1.21.2";
|
||||
version = "1.21.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vadimi";
|
||||
repo = "grpc-client-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-v7LqYA/IW9SHWlXQHl0E7aNxSOWc7zmTMzTEKYjRUl8=";
|
||||
sha256 = "sha256-c+mwQJczF8BG3NnpZpBZNGzGQxs8/ptApvESQhiUpfA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-NQUoAwrLMexDs0iRzGnuQ8E0hWVJBwtBUA9NI6/+AFU=";
|
||||
vendorHash = "sha256-1SRp5NmE+NbRtUZ3s4yL6CJUMs+dlm6oN00gKV9QY0U=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "generic gRPC command line client";
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
guile,
|
||||
mosquitto,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "guile-mqtt";
|
||||
version = "0.2.1";
|
||||
|
||||
# building from git repo requires nyacc>=2.01.3
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mdjurfeldt/guile-mqtt/releases/download/v${finalAttrs.version}/guile-mqtt-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-+qfrUw8yIY8iObEVLbg6bOfiQNR5Lkw2n9oHMr3JQ5k=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
guile
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
guile
|
||||
mosquitto
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Guile bindings for the libmosquitto MQTT client library";
|
||||
homepage = "https://gitlab.com/mdjurfeldt/guile-mqtt";
|
||||
license = with lib.licenses; [
|
||||
lgpl3Plus
|
||||
gpl3Plus
|
||||
];
|
||||
maintainers = with lib.maintainers; [ sikmir ];
|
||||
platforms = guile.meta.platforms;
|
||||
};
|
||||
})
|
||||
@@ -27,16 +27,16 @@ let
|
||||
in
|
||||
phpPackage.buildComposerProject rec {
|
||||
pname = "librenms";
|
||||
version = "24.12.0";
|
||||
version = "25.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "librenms";
|
||||
repo = pname;
|
||||
rev = "${version}";
|
||||
sha256 = "sha256-/0mc4wTx9WDxgDxqq+Kut8uX/Yr+bxqZ1BeJvmFDxG8=";
|
||||
sha256 = "sha256-Uo+JOgb1KSZkludoupIIGnuK88ER3LthGnGmShpkrNU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-DNiTSXt/1Qr67BdlTu3ccP4Whw5pyybeFJ045c/e8Dc=";
|
||||
vendorHash = "sha256-QBZnsURxLf3vmeh9qxEOJtSVAi1Ipr0jEbC/EmhL4q8=";
|
||||
|
||||
php = phpPackage;
|
||||
|
||||
|
||||
@@ -11,18 +11,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mergiraf";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "mergiraf";
|
||||
repo = "mergiraf";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ft3lr+k/EOfYO9z8XPgONiUd8YLn6t7D6OsnMxVETrg=";
|
||||
hash = "sha256-BUZnchpwvBQ84xaw/p0IQO/QOBUs+8gN6dpvPjhszhc=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-PuHdAHDB2K65vJlAsdsxAyMEnj8dAOozDX99k26pI9A=";
|
||||
cargoHash = "sha256-90GNH526dqsu7GsRz857/SV7SWndwiSHIzS/UJgc8AA=";
|
||||
|
||||
nativeCheckInputs = [
|
||||
git
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
}:
|
||||
buildGo123Module rec {
|
||||
pname = "nak";
|
||||
version = "0.10.1";
|
||||
version = "0.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fiatjaf";
|
||||
repo = "nak";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-nIqmQVLGe6iqgnz0QuCgLTPT0TsL5QUMqxBQGXq13QE=";
|
||||
hash = "sha256-DFkF5wPRAxbM3MoaNMXp0JdjeegaVQ7XQUjkMjbhgA8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Gt/HG3iRoz9nDBX8C8XUZ0FTic1cl2c5cVkxUG9ngwY=";
|
||||
vendorHash = "sha256-80jO8u/BdR4JIAmTIoaT2C0ztOkJp/62TGHQtT2Jl3w=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
|
||||
index 647ed68..b08088e 100644
|
||||
--- a/src/app/layout.tsx
|
||||
+++ b/src/app/layout.tsx
|
||||
--- a/src/app/(chat)/layout.tsx
|
||||
+++ b/src/app/(chat)/layout.tsx
|
||||
@@ -1,10 +1,10 @@
|
||||
import type { Metadata } from "next";
|
||||
-import { Inter } from "next/font/google";
|
||||
+import localFont from "next/font/local";
|
||||
import "./globals.css";
|
||||
import "../globals.css";
|
||||
import { ThemeProvider } from "@/providers/theme-provider";
|
||||
import { Toaster } from "@/components/ui/sonner"
|
||||
|
||||
import { Toaster } from "@/components/ui/sonner";
|
||||
|
||||
-const inter = Inter({ subsets: ["latin"] });
|
||||
+const inter = localFont({ src: './Inter.ttf' });
|
||||
|
||||
+const inter = localFont({ src: '../Inter.ttf' });
|
||||
|
||||
export const metadata: Metadata = {
|
||||
title: "Ollama UI",
|
||||
--
|
||||
|
||||
@@ -14,7 +14,8 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
tag = "v.${version}";
|
||||
in
|
||||
buildNpmPackage {
|
||||
pname = "nextjs-ollama-llm-ui";
|
||||
@@ -23,10 +24,10 @@ buildNpmPackage {
|
||||
src = fetchFromGitHub {
|
||||
owner = "jakobhoeg";
|
||||
repo = "nextjs-ollama-llm-ui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IA7g96u5QY8cOuTbJEWw7+U+hSFBzIQVk4Kv3qHKAdM=";
|
||||
inherit tag;
|
||||
hash = "sha256-hgLeTWtnyxGMkMsAGBbaM2yeS/H8AStMPR2bjLdjwEc=";
|
||||
};
|
||||
npmDepsHash = "sha256-3M0BZ9KZZ0ONwvTLycfMR8skMQf8mzjeqYCwJY4l040=";
|
||||
npmDepsHash = "sha256-9+A+85IK4zmMGlBsVoLg7RnST72AhAM6xPGnBZLgLTk=";
|
||||
|
||||
patches = [
|
||||
# nextjs tries to download google fonts from the internet during buildPhase and fails in Nix sandbox.
|
||||
@@ -91,7 +92,7 @@ buildNpmPackage {
|
||||
|
||||
meta = {
|
||||
description = "Simple chat web interface for Ollama LLMs";
|
||||
changelog = "https://github.com/jakobhoeg/nextjs-ollama-llm-ui/releases/tag/v${version}";
|
||||
changelog = "https://github.com/jakobhoeg/nextjs-ollama-llm-ui/releases/tag/${tag}";
|
||||
mainProgram = "nextjs-ollama-llm-ui";
|
||||
homepage = "https://github.com/jakobhoeg/nextjs-ollama-llm-ui";
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@@ -15,18 +15,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "picocrypt";
|
||||
version = "1.45";
|
||||
version = "1.46";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Picocrypt";
|
||||
repo = "Picocrypt";
|
||||
tag = version;
|
||||
hash = "sha256-VJCLbMthxb2eWN20pXA6GOzR1FDN97KCU6ligKbKQkY=";
|
||||
hash = "sha256-2kY/EK/tICA5vVT79Qy3oHKMWuoEPwXUI7FYnFuiLVQ=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/src";
|
||||
|
||||
vendorHash = "sha256-ufMxDyK4EPTYLGc0AJ6EARIFCPwz+5OgZzQSGnP+WLA=";
|
||||
vendorHash = "sha256-fcDsPUDsZsgwI2MudvNaGKIIe55JsMCNgDs7Jz2HF9A=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
@@ -69,7 +69,7 @@ buildGoModule rec {
|
||||
meta = {
|
||||
description = "Very small, very simple, yet very secure encryption tool, written in Go";
|
||||
homepage = "https://github.com/Picocrypt/Picocrypt";
|
||||
changelog = "https://github.com/Picocrypt/Picocrypt/blob/main/Changelog.md";
|
||||
changelog = "https://github.com/Picocrypt/Picocrypt/blob/${version}/Changelog.md";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ ryand56 ];
|
||||
mainProgram = "picocrypt-gui";
|
||||
|
||||
@@ -7,20 +7,21 @@
|
||||
, runtimeDir ? "/run/pixelfed"
|
||||
}:
|
||||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "pixelfed";
|
||||
version = "0.12.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pixelfed";
|
||||
repo = "pixelfed";
|
||||
rev = "v${finalAttrs.version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HEo0BOC/AEWhCApibxo2TBQF4kbLrbPEXqDygVQlVic=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QkkSnQb9haH8SiXyLSS58VXSD4op7Hr4Z6vUAAYLIic=";
|
||||
vendorHash = "sha256-aMKuuBTavNTIfYkuAn2vBFeh5xJd3BY8C+IVfglnS+g=";
|
||||
|
||||
postInstall = ''
|
||||
chmod -R u+w $out/share
|
||||
mv "$out/share/php/${finalAttrs.pname}"/* $out
|
||||
rm -R $out/bootstrap/cache
|
||||
# Move static contents for the NixOS module to pick it up, if needed.
|
||||
|
||||
@@ -13,20 +13,20 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "radicle-httpd";
|
||||
version = "0.18.0";
|
||||
version = "0.18.1";
|
||||
env.RADICLE_VERSION = version;
|
||||
|
||||
# You must update the radicle-explorer source hash when changing this.
|
||||
src = fetchgit {
|
||||
url = "https://seed.radicle.xyz/z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git";
|
||||
rev = "refs/namespaces/z6MkkfM3tPXNPrPevKr3uSiQtHPuwnNhu2yUVjgd2jXVsVz5/refs/tags/v${version}";
|
||||
hash = "sha256-VHfiL0BSJsYS8QgMf+LEa6HvYoc+dxawTcwB4d6sTg8=";
|
||||
hash = "sha256-sXVeDlGY6jyi5/z7ilPwlU7b3pyLSKIqUfi0Usx6NT8=";
|
||||
sparseCheckout = [ "radicle-httpd" ];
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/radicle-httpd";
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-YE72rhJXPcsonpOQLs/gZn5RE3DkSAGhWtYvg4jQ2D8=";
|
||||
cargoHash = "sha256-ILsrDrpBMY8X3ZpfyUdf342agP6E8d32LEQTYtV869o=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
asciidoctor
|
||||
|
||||
@@ -3,16 +3,16 @@
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
undmg,
|
||||
gitUpdater,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "rectangle";
|
||||
version = "0.85";
|
||||
version = "0.86";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rxhanson/Rectangle/releases/download/v${version}/Rectangle${version}.dmg";
|
||||
hash = "sha256-TBUC5z2BZMt0eb9NAD3/y9y23iRzs7YRJSfyb3QN1Mc=";
|
||||
url = "https://github.com/rxhanson/Rectangle/releases/download/v${finalAttrs.version}/Rectangle${finalAttrs.version}.dmg";
|
||||
hash = "sha256-UUL5xaZn+NDQ5VvlVH9ROek5AFQ5fyZLGubLc/qQqcI=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
@@ -22,26 +22,23 @@ stdenvNoCC.mkDerivation rec {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/Applications
|
||||
mv Rectangle.app $out/Applications
|
||||
mkdir -p "$out/Applications"
|
||||
mv Rectangle.app "$out/Applications"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
url = "https://github.com/rxhanson/Rectangle";
|
||||
rev-prefix = "v";
|
||||
};
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Move and resize windows in macOS using keyboard shortcuts or snap areas";
|
||||
homepage = "https://rectangleapp.com/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
platforms = platforms.darwin;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
Intuinewin
|
||||
wegank
|
||||
];
|
||||
license = licenses.mit;
|
||||
platforms = lib.platforms.darwin;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
stdenv,
|
||||
}:
|
||||
let
|
||||
version = "2.0-1483";
|
||||
version = "2.0-1496";
|
||||
urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2";
|
||||
hash = "sha256-y8MYiWlc3HfF7a3n7yrs84H/9KbEoANd8+7t2ORIm6w=";
|
||||
hash = "sha256-QglwnTO7dZ/8X8pNj63D6XQdJmGTKPfOG91xgfqWho0=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -12,29 +12,29 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "ruff-lsp";
|
||||
version = "0.0.60";
|
||||
version = "0.0.61";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "ruff-lsp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Qo2pzDjdlhIpKfldPbL9VsO1AaSc1bW5t1i1Nqu7alA=";
|
||||
hash = "sha256-gyrmustYJAwjO7YbBl76f/IvcEy2ffb9Se7idcyxsYg=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [ hatchling ];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
lsprotocol
|
||||
packaging
|
||||
pygls
|
||||
lsprotocol
|
||||
ruff
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
python-lsp-jsonrpc
|
||||
ruff
|
||||
versionCheckHook
|
||||
|
||||
@@ -17,17 +17,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ruff";
|
||||
version = "0.9.4";
|
||||
version = "0.9.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "ruff";
|
||||
tag = version;
|
||||
hash = "sha256-HUCquxp8U6ZoHNSuUSu56EyiaSRRA8qUMYu6nNibt6w=";
|
||||
hash = "sha256-VoYV13GsTaAWoLcSfuadLR2l8Xbn0MEd/Uh9EP/DgjE=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-EiIN97I72Iam7STjZhHnvVktJXJocnVomjVp8a8t+fM=";
|
||||
cargoHash = "sha256-d6fLVmg7mbCQqDiNeXRwGHc/a0+RYlmqnkyiUJuM8xY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sigma-cli";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SigmaHQ";
|
||||
repo = "sigma-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-bBKNKgS3V/sZ8lZMk2ZwTzOVaVecSR9GhNP2FNkWbw0=";
|
||||
hash = "sha256-ywf7k2RsrAMUrDUv1nxTEixmP+NjtIyuBDhj4l9ZQCE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -38,7 +38,10 @@ python3.pkgs.buildPythonApplication rec {
|
||||
pysigma-pipeline-windows
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ];
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
pytest-cov-stub
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_plugin_list"
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.78.1";
|
||||
version = "1.80.0";
|
||||
in
|
||||
buildGo123Module {
|
||||
pname = "tailscale";
|
||||
@@ -31,7 +31,7 @@ buildGo123Module {
|
||||
owner = "tailscale";
|
||||
repo = "tailscale";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HHLGvxB3MMmmOUNLr2ivouLDO/Lo2FJYRYzoCE2fUDk=";
|
||||
hash = "sha256-wb52Ffoh56EEVToGGK1Rzfb5DHiR2dLxDJRLcUgYhFg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -43,7 +43,7 @@ buildGo123Module {
|
||||
})
|
||||
];
|
||||
|
||||
vendorHash = "sha256-0VB7q9HKd5/QKaWBMpCYycRRiNTWCEjUMc3g3z6agc8=";
|
||||
vendorHash = "sha256-a+d02h0AXqr2FuWRAOUACiYVSpm276onkwKxGSJTL5s=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ] ++ [
|
||||
installShellFiles
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "television";
|
||||
version = "0.10.2";
|
||||
version = "0.10.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexpasmantier";
|
||||
repo = "television";
|
||||
tag = version;
|
||||
hash = "sha256-VOoRl//Z0AiRv96SqopjUYePPUa9KRbEpLYzJ6k1b8Q=";
|
||||
hash = "sha256-ja3Xqp8nRTQnf0K1okHSBPcqQe/m8DqH7UWbdohxlvM=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-OFSbynO7FSDxMiXVmB+STWB45iIhIn2rq+8Mjz37MwE=";
|
||||
cargoHash = "sha256-eplkAaNgoAxMLK3BG0EvNLYT1T3vJpHpbuGvwooegeI=";
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
|
||||
@@ -10,14 +10,14 @@ let
|
||||
platform =
|
||||
if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system;
|
||||
hash = builtins.getAttr platform {
|
||||
"universal-macos" = "sha256-YQyC1AYL1pXvH6PwWUWpyRCC3yr4kYemhXFy1ag1zHE=";
|
||||
"x86_64-linux" = "sha256-61ZexEleFyrtgGOtBA1lFsPBtRZO3vpnLTMdJIU/BAk=";
|
||||
"aarch64-linux" = "sha256-x/xWe1ePttTGmbikNpGOysbEumEO3T+2+35yRb/mKR8=";
|
||||
"universal-macos" = "sha256-Rrm/vTOT8y9e7wFsM+J3SwHoyd2t9VMUVcUFfjBssjU=";
|
||||
"x86_64-linux" = "sha256-fgs4YiK7egvKmLev2e7dTu1zdz6O61+HzOmyt5ke8cE=";
|
||||
"aarch64-linux" = "sha256-J2JFV4TFGX1XDQ+7AAJ8dREmPoNcErzpcUFkhWk/YVs=";
|
||||
};
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "tigerbeetle";
|
||||
version = "0.16.23";
|
||||
version = "0.16.26";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip";
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "trivy";
|
||||
version = "0.59.0";
|
||||
version = "0.59.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = "trivy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-DIBpuSW8igkpZxhve77fzJ1u3sp3iWHmi7746F0cKEQ=";
|
||||
hash = "sha256-G3VLZTA/wYFWSP47l1aCnswTrr0YpX05ThMy90cZ+w4=";
|
||||
};
|
||||
|
||||
# Hash mismatch on across Linux and Darwin
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
{
|
||||
lib,
|
||||
darwin,
|
||||
fetchFromGitHub,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
@@ -12,17 +11,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "twm";
|
||||
version = "0.11.0";
|
||||
version = "0.12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinnymeller";
|
||||
repo = "twm";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-SiwLqUq/gC8Tr31jjblLc9YP4yBi9HL38W83kgh7eJI=";
|
||||
hash = "sha256-Hta9IvPViZFEiR+RXRmlPRwIu10D9B5dbXzhflxzBhY=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-iqFPerePQStx1QsFW+2nDNSZEMlDW2HNW05i38rMYgg=";
|
||||
cargoHash = "sha256-buiU+umHqyZ/3YoW2+5QpmF9AGEuNUihro5PFuWFSH4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@@ -30,7 +29,7 @@ rustPlatform.buildRustPackage rec {
|
||||
];
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd twm \
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
version = "0.8.1";
|
||||
version = "0.9.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "vault-tasks";
|
||||
@@ -14,10 +14,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "louis-thevenet";
|
||||
repo = "vault-tasks";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4sg1v541NknaOClZAkYC6tGlpItBT6RzUK9Itniu7OQ=";
|
||||
hash = "sha256-IjpmvoibxDwbdq4SyPXWxhsUTzaRKH1qUXwskCWOqm4=";
|
||||
};
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-ocRf+orNwp5+iDQR6Vyc85O9oguUFcVabwINRYDCXe0=";
|
||||
cargoHash = "sha256-VgLGpyjbRL2W1oCqTjl0+thi+HYdcB8g/mwkeYA/85E=";
|
||||
|
||||
postInstall = "install -Dm444 desktop/vault-tasks.desktop -t $out/share/applications";
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "walk";
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antonmedv";
|
||||
repo = "walk";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wGiRMNgp5NZVj8ILyQ2C/iqpjv4XgphRfWcF/CSMj48=";
|
||||
hash = "sha256-BglvfbJ0YTqErXt0UPJsX39gAFT5RF3oZV0yrJvcfaY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MTM7zR5OYHbzAm07FTLvXVnESARg50/BZrB2bl+LtXM=";
|
||||
|
||||
@@ -12,17 +12,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wastebin";
|
||||
version = "2.7.0";
|
||||
version = "2.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matze";
|
||||
repo = "wastebin";
|
||||
rev = version;
|
||||
hash = "sha256-OMczHUAhEIdstX4h5Luhx4Ud7oNNM579pP59hj0fnc0=";
|
||||
hash = "sha256-O0nWjRiQBDclfbeulGjCZANXwQypV8uHHR5syuki5xE=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-2D4j6dH+qmr4JmZDh25SJaNwZs7lEbYqY/RvTUe+S8Y=";
|
||||
cargoHash = "sha256-WMofTTkJCcx+6vicrYfxJWTo1YCzheeGOE7LC5JQ8mM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -11,21 +11,21 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "yazi";
|
||||
version = "0.4.2";
|
||||
version = "25.2.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sxyazi";
|
||||
repo = "yazi";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2fBajVFpmgNHb90NbK59yUeaYLWR7rhQxpce9Tq1uQU=";
|
||||
hash = "sha256-f8+C+L8eOugnyx4Zm2y3qAXH33BsI5F1JWecigPKuMg=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-WViLfoPOFQz2zod2ZSWgmX5VqYiXKvdBUUqPPt9ereE=";
|
||||
cargoHash = "sha256-7ARj5TNZm//CfkOczqaaoY1KjpXpr5dtSvdUNygpL6U=";
|
||||
|
||||
env.YAZI_GEN_COMPLETIONS = true;
|
||||
env.VERGEN_GIT_SHA = "Nixpkgs";
|
||||
env.VERGEN_BUILD_DATE = "2024-12-20";
|
||||
env.VERGEN_BUILD_DATE = "2025-02-07";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
buildInputs = [ rust-jemalloc-sys ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ];
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "zigpy-cli";
|
||||
version = "1.0.5";
|
||||
version = "1.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zigpy";
|
||||
repo = "zigpy-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-69E6PkrCE5S498pO33uEz7g2dV41H0vNfFinUHDATTQ=";
|
||||
hash = "sha256-X4sH2UOF0xHzjT1enohg7JKi+5lQ6wnJBIn09jK5Db8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -54,7 +54,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
description = "Command line interface for zigpy";
|
||||
mainProgram = "zigpy";
|
||||
homepage = "https://github.com/zigpy/zigpy-cli";
|
||||
changelog = "https://github.com/zigpy/zigpy-cli/releases/tag/v${version}";
|
||||
changelog = "https://github.com/zigpy/zigpy-cli/releases/tag/${src.tag}";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ispc";
|
||||
version = "1.25.3";
|
||||
version = "1.26.0";
|
||||
|
||||
dontFixCmake = true; # https://github.com/NixOS/nixpkgs/pull/232522#issuecomment-2133803566
|
||||
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-baTJNfhOSYfJJnrutkW06AIMXpVP3eBpEes0GSI1yGY=";
|
||||
sha256 = "sha256-T8tFJaHkb6XpKA2s9tlNfJE7n0YJx30KTBIng+dmQ2c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,11 +15,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jruby";
|
||||
version = "9.4.10.0";
|
||||
version = "9.4.11.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://s3.amazonaws.com/jruby.org/downloads/${finalAttrs.version}/jruby-bin-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-CzJbtuZIlt/PI1u8ZQbKm1r3jxyP7H8Ei8QYixeTteA=";
|
||||
hash = "sha256-z0BnvcOmq1GMeGWI4khq3AR7nOoLlqQyGLA6xlHSbhE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wireplumber";
|
||||
version = "0.5.7";
|
||||
version = "0.5.8";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "pipewire";
|
||||
repo = "wireplumber";
|
||||
rev = version;
|
||||
hash = "sha256-KZ4ECpDZhTBQKylJwP3OcsyjZ1ktqwWUZFg9j9KvNsM=";
|
||||
hash = "sha256-RILzGhFQEpwGlpLbTzw7qrXIX3uNQZfJJ4d5ftXZzzw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
buildOctavePackage rec {
|
||||
pname = "communications";
|
||||
version = "1.2.6";
|
||||
version = "1.2.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-psQuiBOI1mXXZaH4EesVO91r2ViCc0KrKxKM7Xw+gts=";
|
||||
sha256 = "sha256-UXaoV45mdmA7n2cB8J3S+/8Nt7uhokyv2MVBm+FK5lw=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
buildOctavePackage rec {
|
||||
pname = "windows";
|
||||
version = "1.6.4";
|
||||
version = "1.6.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-LH9+3MLme4UIcpm5o/apNmkbmJ6NsRsW5TkGpmiNHP0=";
|
||||
sha256 = "sha256-j/goQc57jcfxlCsbf31Mx8oNud1vNE0D/hNfXyvVmTc=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -48,7 +48,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
broken = lib.versionOlder "paho-mqtt" "2";
|
||||
broken = lib.versionOlder paho-mqtt.version "2";
|
||||
description = "Idiomatic asyncio MQTT client, wrapped around paho-mqtt";
|
||||
homepage = "https://github.com/sbtinstruments/aiomqtt";
|
||||
changelog = "https://github.com/sbtinstruments/aiomqtt/blob/${src.tag}/CHANGELOG.md";
|
||||
|
||||
@@ -25,6 +25,11 @@ buildPythonPackage rec {
|
||||
hash = "sha256-1HFbNswdKa/9cQX0Gf6lLW1V5Kt/N4X6/5kQDdzp1Wo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail 'asttokens>=2.0.0,<3.0.0' 'asttokens>=2.0.0' \
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ hatchling ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@@ -45,6 +50,7 @@ buildPythonPackage rec {
|
||||
"test_multiple_not_verbose"
|
||||
# Sensitive to interpreter output
|
||||
"test_simple"
|
||||
"test_expr_render"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
||||
@@ -2,11 +2,12 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
pythonOlder,
|
||||
numpy,
|
||||
poetry-core,
|
||||
pythonOlder,
|
||||
tqdm,
|
||||
pyyaml,
|
||||
sentencepiece,
|
||||
tqdm,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "gguf";
|
||||
@@ -23,10 +24,13 @@ buildPythonPackage rec {
|
||||
dependencies = [
|
||||
numpy
|
||||
poetry-core
|
||||
tqdm
|
||||
pyyaml
|
||||
sentencepiece
|
||||
tqdm
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "gguf" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module for writing binary files in the GGUF format";
|
||||
homepage = "https://ggml.ai/";
|
||||
|
||||
@@ -85,6 +85,9 @@ buildPythonPackage rec {
|
||||
|
||||
passthru = {
|
||||
updateScript = langgraph-sdk.updateScript;
|
||||
|
||||
# multiple tags confuse the bulk updater
|
||||
skipBulkUpdate = true;
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langgraph-checkpoint-sqlite";
|
||||
version = "2.0.13";
|
||||
version = "2.0.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -21,8 +21,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langgraph";
|
||||
tag = "checkpointpostgres==${version}";
|
||||
hash = "sha256-Vz2ZoikEZuMvt3j9tvBIcXCwWSrCV8MI7x9PIHodl8Y=";
|
||||
tag = "checkpointsqlite==${version}";
|
||||
hash = "sha256-dh+cjcOp6rGFntz82VNfVyetcrQBdBFdXk5xFb0aR5c=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/checkpoint-sqlite";
|
||||
@@ -46,10 +46,13 @@ buildPythonPackage rec {
|
||||
|
||||
passthru = {
|
||||
updateScript = langgraph-sdk.updateScript;
|
||||
|
||||
# multiple tags confuse the bulk updater
|
||||
skipBulkUpdate = true;
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/langchain-ai/langgraph/releases/tag/checkpointsqlite==${src.tag}";
|
||||
changelog = "https://github.com/langchain-ai/langgraph/releases/tag/checkpointsqlite==${version}";
|
||||
description = "Library with a SQLite implementation of LangGraph checkpoint saver";
|
||||
homepage = "https://github.com/langchain-ai/langgraph/tree/main/libs/checkpoint-sqlite";
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langgraph-checkpoint";
|
||||
version = "2.0.13";
|
||||
version = "2.0.8";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -23,8 +23,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langgraph";
|
||||
tag = "checkpointpostgres==${version}";
|
||||
hash = "sha256-Vz2ZoikEZuMvt3j9tvBIcXCwWSrCV8MI7x9PIHodl8Y=";
|
||||
tag = "checkpoint==${version}";
|
||||
hash = "sha256-obDK6wn+oo8zDQsidogwKTIgT5wuUH/l4y+12cttkd0=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/checkpoint";
|
||||
@@ -53,10 +53,13 @@ buildPythonPackage rec {
|
||||
|
||||
passthru = {
|
||||
updateScript = langgraph-sdk.updateScript;
|
||||
|
||||
# multiple tags confuse the bulk updater
|
||||
skipBulkUpdate = true;
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/langchain-ai/langgraph/releases/tag/checkpoint==${src.tag}";
|
||||
changelog = "https://github.com/langchain-ai/langgraph/releases/tag/checkpoint==${version}";
|
||||
description = "Library with base interfaces for LangGraph checkpoint savers";
|
||||
homepage = "https://github.com/langchain-ai/langgraph/tree/main/libs/checkpoint";
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langgraph-cli";
|
||||
version = "2.0.13";
|
||||
version = "0.1.52";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -20,8 +20,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langgraph";
|
||||
tag = "checkpointpostgres==${version}";
|
||||
hash = "sha256-Vz2ZoikEZuMvt3j9tvBIcXCwWSrCV8MI7x9PIHodl8Y=";
|
||||
tag = "cli==${version}";
|
||||
hash = "sha256-zTBeDJB1Xu/rWsvEC/L4BRzxyh04lPYV7HQNHoJcskk=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/cli";
|
||||
@@ -57,10 +57,13 @@ buildPythonPackage rec {
|
||||
];
|
||||
};
|
||||
|
||||
# multiple tags confuse the bulk updater
|
||||
passthru.skipBulkUpdate = true;
|
||||
|
||||
meta = {
|
||||
description = "Official CLI for LangGraph API";
|
||||
homepage = "https://github.com/langchain-ai/langgraph/libs/cli";
|
||||
changelog = "https://github.com/langchain-ai/langgraph/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/langchain-ai/langgraph/releases/tag/${version}";
|
||||
mainProgram = "langgraph";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sarahec ];
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langgraph-sdk";
|
||||
version = "2.0.13";
|
||||
version = "0.1.43";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langgraph";
|
||||
tag = "checkpointpostgres==${version}";
|
||||
hash = "sha256-Vz2ZoikEZuMvt3j9tvBIcXCwWSrCV8MI7x9PIHodl8Y=";
|
||||
tag = "sdk==${version}";
|
||||
hash = "sha256-mG04V36Aa5Df5pUgr+xWej8i2XYx+O/N61sSzxwN9Go=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/sdk-py";
|
||||
@@ -54,12 +54,15 @@ buildPythonPackage rec {
|
||||
nix-update --commit --version-regex 'checkpointpostgres==(.*)' python3Packages.langgraph-checkpoint-postgres
|
||||
nix-update --commit --version-regex 'checkpointsqlite==(.*)' python3Packages.langgraph-checkpoint-sqlite
|
||||
'';
|
||||
|
||||
# multiple tags confuse the bulk updater
|
||||
skipBulkUpdate = true;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "SDK for interacting with the LangGraph Cloud REST API";
|
||||
homepage = "https://github.com/langchain-ai/langgraphtree/main/libs/sdk-py";
|
||||
changelog = "https://github.com/langchain-ai/langgraph/releases/tag/sdk==${src.tag}";
|
||||
changelog = "https://github.com/langchain-ai/langgraph/releases/tag/sdk==${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sarahec ];
|
||||
};
|
||||
|
||||
@@ -35,14 +35,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langgraph";
|
||||
version = "2.0.13";
|
||||
version = "0.2.56";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langgraph";
|
||||
tag = "checkpointpostgres==${version}";
|
||||
hash = "sha256-Vz2ZoikEZuMvt3j9tvBIcXCwWSrCV8MI7x9PIHodl8Y=";
|
||||
tag = version;
|
||||
hash = "sha256-X/IMNEmggu9bSJFUaTohbFYxGZBguf+eFb3ObmQGplk=";
|
||||
};
|
||||
|
||||
postgresqlTestSetupPost = ''
|
||||
@@ -116,10 +116,13 @@ buildPythonPackage rec {
|
||||
|
||||
passthru.updateScript = langgraph-sdk.updateScript;
|
||||
|
||||
# multiple tags confuse the bulk updater
|
||||
passthru.skipBulkUpdate = true;
|
||||
|
||||
meta = {
|
||||
description = "Build resilient language agents as graphs";
|
||||
homepage = "https://github.com/langchain-ai/langgraph";
|
||||
changelog = "https://github.com/langchain-ai/langgraph/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/langchain-ai/langgraph/releases/tag/${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sarahec ];
|
||||
};
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mitmproxy";
|
||||
version = "11.1.0";
|
||||
version = "11.0.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -54,7 +54,7 @@ buildPythonPackage rec {
|
||||
owner = "mitmproxy";
|
||||
repo = "mitmproxy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8PqyxTwDk8pJjBh+NUB5BkuTeeA51gxmzqT450Y1d4Q=";
|
||||
hash = "sha256-qcsPOISQjHVHh4TrQ/UihZaxB/jWBfq7AVI4U1gQPVs=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
@@ -151,7 +151,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Man-in-the-middle proxy";
|
||||
homepage = "https://mitmproxy.org/";
|
||||
changelog = "https://github.com/mitmproxy/mitmproxy/blob/${src.tag}/CHANGELOG.md";
|
||||
changelog = "https://github.com/mitmproxy/mitmproxy/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
|
||||
@@ -28,14 +28,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "numpyro";
|
||||
version = "0.16.1";
|
||||
version = "0.17.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyro-ppl";
|
||||
repo = "numpyro";
|
||||
tag = version;
|
||||
hash = "sha256-6i7LPdmMakGeLujhA9d7Ep9oiVcND3ni/jzUkqgEqxw=";
|
||||
hash = "sha256-S5A5wBb2ZMxpLvP/EYahdg2BqgzKGvnzvZOII76O/+w=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -76,64 +76,25 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# jax.errors.UnexpectedTracerError: Encountered an unexpected tracer
|
||||
"test_haiku_state_dropout_smoke"
|
||||
"test_flax_state_dropout_smoke"
|
||||
|
||||
# AssertionError due to tolerance issues
|
||||
"test_beta_binomial_log_prob"
|
||||
"test_collapse_beta"
|
||||
"test_cpu"
|
||||
"test_gamma_poisson"
|
||||
"test_gof"
|
||||
"test_hpdi"
|
||||
"test_kl_dirichlet_dirichlet"
|
||||
"test_kl_univariate"
|
||||
"test_mean_var"
|
||||
# since jax update to 0.5.0
|
||||
"test_analytic_kl_2"
|
||||
"test_analytic_kl_3"
|
||||
"test_apply_kernel"
|
||||
"test_beta_bernoulli"
|
||||
"test_biject_to"
|
||||
"test_bijective_transforms"
|
||||
"test_change_point_x64"
|
||||
"test_cholesky_update"
|
||||
"test_dais_vae"
|
||||
"test_discrete_gibbs_multiple_sites_chain"
|
||||
"test_cpu"
|
||||
"test_entropy_categorical"
|
||||
"test_gaussian_model"
|
||||
"test_get_proposal_loc_and_scale"
|
||||
"test_guide_plate_contraction"
|
||||
"test_kernel_forward"
|
||||
|
||||
# > with pytest.warns(UserWarning, match="Hessian of log posterior"):
|
||||
# E Failed: DID NOT WARN. No warnings of type (<class 'UserWarning'>,) were emitted.
|
||||
# E Emitted warnings: [].
|
||||
"test_laplace_approximation_warning"
|
||||
"test_log_prob_gradient"
|
||||
"test_logistic_regression"
|
||||
"test_logistic_regression_x64"
|
||||
"test_scale"
|
||||
"test_scan_svi"
|
||||
"test_stein_particle_loss"
|
||||
"test_weight_convergence"
|
||||
|
||||
# Tests want to download data
|
||||
"data_load"
|
||||
"test_jsb_chorales"
|
||||
|
||||
# RuntimeWarning: overflow encountered in cast
|
||||
"test_zero_inflated_logits_probs_agree"
|
||||
|
||||
# NameError: unbound axis name: _provenance
|
||||
"test_model_transformation"
|
||||
|
||||
# ValueError: compiling computation that requires 2 logical devices, but only 1 XLA devices are available (num_replicas=2)
|
||||
"test_chain"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# require jaxns (unpackaged)
|
||||
"test/contrib/test_nested_sampling.py"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Library for probabilistic programming with NumPy";
|
||||
homepage = "https://num.pyro.ai/";
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
hatchling,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
jedi,
|
||||
packaging,
|
||||
pygments,
|
||||
@@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
hash = "sha256-Jk8jngU45S6D09AgFDEAsxccrhcidnS7G5+LB180hJw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [
|
||||
jedi
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
argcomplete,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pudb,
|
||||
@@ -10,7 +11,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "recline";
|
||||
version = "2024.7.1";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NetApp";
|
||||
@@ -19,7 +20,18 @@ buildPythonPackage rec {
|
||||
sha256 = "sha256-Qc4oofuhSZ2S5zuCY9Ce9ISldYI3MDUJXFc8VcXdLIU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
patches = [
|
||||
# based on https://github.com/NetApp/recline/pull/21
|
||||
./devendor.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
rm -r recline/vendor/argcomplete
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ argcomplete ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pudb
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
commit 6ea5c039671de2547249c36ca3e1fb51fc4a7e06
|
||||
Author: Sandro Jäckel <sandro.jaeckel@gmail.com>
|
||||
Date: Thu Feb 6 18:33:28 2025 +0100
|
||||
|
||||
Devendor argcomplete
|
||||
|
||||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index 5ac5cab..6b60188 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -21,6 +21,7 @@ packages = [
|
||||
]
|
||||
|
||||
[tool.poetry.dependencies]
|
||||
+argcomplete = "*"
|
||||
python = ">=3.9.0,<4"
|
||||
windows-curses = {version = "^2.3.3", markers = "sys_platform == 'win32'"}
|
||||
pyreadline3 = {version = "^3.4.1", markers = "sys_platform == 'win32'"}
|
||||
diff --git a/recline/repl/completer.py b/recline/repl/completer.py
|
||||
index ff35583..1a05ae3 100644
|
||||
--- a/recline/repl/completer.py
|
||||
+++ b/recline/repl/completer.py
|
||||
@@ -5,6 +5,7 @@
|
||||
as argument names and values.
|
||||
"""
|
||||
|
||||
+import argcomplete
|
||||
import argparse
|
||||
import re
|
||||
import readline
|
||||
@@ -12,7 +13,6 @@
|
||||
|
||||
import recline
|
||||
from recline.arg_types.recline_type import UniqueParam
|
||||
-from recline.vendor import argcomplete
|
||||
|
||||
|
||||
def match_command_hook(substitution, matches, *_):
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "spyder-kernels";
|
||||
version = "3.0.2";
|
||||
version = "3.0.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spyder-ide";
|
||||
repo = "spyder-kernels";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-lze398ZQqI6cEu/rldPqzNQ8jrqI/ixUps/aJat7920=";
|
||||
hash = "sha256-gsQVzDgEW+TQSitLiYAIEk4Ow1IyIKfp8BcHqNJ2Y+I=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
fetchPypi,
|
||||
|
||||
# nativeBuildInputs
|
||||
pyqtwebengine,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
@@ -32,7 +33,6 @@
|
||||
pylint-venv,
|
||||
pyls-spyder,
|
||||
pyopengl,
|
||||
pyqtwebengine,
|
||||
python-lsp-black,
|
||||
python-lsp-server,
|
||||
pyuca,
|
||||
@@ -55,12 +55,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "spyder";
|
||||
version = "6.0.3";
|
||||
version = "6.0.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-g4cyG5OQ180K9NzPRO/yH3CY5kQDS/g+fp5qCa/YDA8=";
|
||||
hash = "sha256-4AsaO75mAH0rRDnrHGiwwfuQS7A/0/nQ7YPot6y0y+Y=";
|
||||
};
|
||||
|
||||
patches = [ ./dont-clear-pythonpath.patch ];
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.0.1313";
|
||||
version = "3.0.1314";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
tag = version;
|
||||
hash = "sha256-2LuhzxD0d9hrjgi2jdjNk9Ndl7D6jxpap3taxY52IsE=";
|
||||
hash = "sha256-8fcKPSkE+yZa8wm7tuyXuWdCWgKBRsxzTpcTcCVVE1M=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -195,7 +195,7 @@ in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vllm";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
pyproject = true;
|
||||
|
||||
stdenv = if cudaSupport then cudaPackages.backendStdenv else args.stdenv;
|
||||
@@ -204,7 +204,7 @@ buildPythonPackage rec {
|
||||
owner = "vllm-project";
|
||||
repo = pname;
|
||||
tag = "v${version}";
|
||||
hash = "sha256-CImXKMEv+jHqngvcr8W6fQLiCo1mqmcZ0Ho0bfAgfbg=";
|
||||
hash = "sha256-j59DpNuO5TgGD6UVGzueSTumd7mDMB4l1QytV3rFIJE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"bookmarks": "agpl3Plus"
|
||||
"app_api" : "agpl3Plus"
|
||||
, "bookmarks": "agpl3Plus"
|
||||
, "calendar": "agpl3Plus"
|
||||
, "collectives": "agpl3Plus"
|
||||
, "contacts": "agpl3Plus"
|
||||
@@ -7,14 +8,17 @@
|
||||
, "cospend": "agpl3Plus"
|
||||
, "deck": "agpl3Plus"
|
||||
, "end_to_end_encryption": "agpl3Plus"
|
||||
, "files_texteditor": "agpl3Plus"
|
||||
, "files_automatedtagging" : "agpl3Plus"
|
||||
, "files_markdown": "agpl3Plus"
|
||||
, "files_mindmap": "agpl3Plus"
|
||||
, "files_retention": "agpl3Plus"
|
||||
, "files_texteditor": "agpl3Plus"
|
||||
, "forms": "agpl3Plus"
|
||||
, "gpoddersync": "agpl3Only"
|
||||
, "groupfolders": "agpl3Plus"
|
||||
, "impersonate": "agpl3Plus"
|
||||
, "integration_openai": "agpl3Only"
|
||||
, "integration_deepl": "agpl3Plus"
|
||||
, "integration_paperless": "agpl3Plus"
|
||||
, "mail": "agpl3Plus"
|
||||
, "maps": "agpl3Plus"
|
||||
@@ -26,9 +30,11 @@
|
||||
, "phonetrack": "agpl3Plus"
|
||||
, "polls": "agpl3Plus"
|
||||
, "previewgenerator": "agpl3Plus"
|
||||
, "quota_warning": "agpl3Plus"
|
||||
, "qownnotesapi": "agpl3Plus"
|
||||
, "registration": "agpl3Plus"
|
||||
, "richdocuments": "agpl3Only"
|
||||
, "sociallogin": "agpl3Only"
|
||||
, "spreed": "agpl3Plus"
|
||||
, "tasks": "agpl3Plus"
|
||||
, "twofactor_nextcloud_notification": "agpl3Only"
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildFishPlugin rec {
|
||||
pname = "hydro";
|
||||
version = "0-unstable-2024-03-24";
|
||||
version = "0-unstable-2024-11-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jorgebucaran";
|
||||
repo = "hydro";
|
||||
rev = "bc31a5ebc687afbfb13f599c9d1cc105040437e1";
|
||||
hash = "sha256-0MMiM0NRbjZPJLAMDXb+Frgm+du80XpAviPqkwoHjDA=";
|
||||
rev = "9c93b89573bd722f766f2190a862ae55e728f6ba";
|
||||
hash = "sha256-QYq4sU41/iKvDUczWLYRGqDQpVASF/+6brJJ8IxypjE=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "trufflehog";
|
||||
version = "3.88.3";
|
||||
version = "3.88.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trufflesecurity";
|
||||
repo = "trufflehog";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-OPXDDLlrX8lV1u6/o7xa7jhX4UmFwTJLSxMmmzcYRVk=";
|
||||
hash = "sha256-PydX3Aol+HrKG82g5ILbL69pBp0+Y6sCzqEtqAix0OQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YsUAu2gEXzpjM/jg4VJ7KTvf1/cLTO04hLOLmUDeYk0=";
|
||||
|
||||
@@ -152,7 +152,7 @@ mapAliases {
|
||||
bibata-extra-cursors = throw "bibata-cursors has been removed as it was broken"; # Added 2024-07-15
|
||||
bitcoin-unlimited = throw "bitcoin-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15
|
||||
bitcoind-unlimited = throw "bitcoind-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15
|
||||
bird2 = bird; # Added 2022-02-21
|
||||
bird = bird2; # Added 2025-01-11
|
||||
bisq-desktop = throw "bisq-desktop has been removed because OpenJFX 11 was removed"; # Added 2024-11-17
|
||||
bitwarden = bitwarden-desktop; # Added 2024-02-25
|
||||
blender-with-packages = args:
|
||||
|
||||
@@ -6666,9 +6666,6 @@ with pkgs;
|
||||
cargo-hf2 = callPackage ../development/tools/rust/cargo-hf2 {
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit;
|
||||
};
|
||||
cargo-lambda = callPackage ../development/tools/rust/cargo-lambda {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
|
||||
};
|
||||
cargo-ndk = callPackage ../development/tools/rust/cargo-ndk {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreGraphics Foundation;
|
||||
};
|
||||
|
||||
@@ -43,7 +43,6 @@
|
||||
uwimap,
|
||||
valgrind,
|
||||
zlib,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
lib.makeScope pkgs.newScope (
|
||||
@@ -544,6 +543,7 @@ lib.makeScope pkgs.newScope (
|
||||
zlib
|
||||
openssl
|
||||
];
|
||||
configureFlags = [ "--with-mysqlnd-ssl" ];
|
||||
# The configure script doesn't correctly add library link
|
||||
# flags, so we add them to the variable used by the Makefile
|
||||
# when linking.
|
||||
|
||||
@@ -158,6 +158,7 @@ let
|
||||
transformers = linux;
|
||||
ttstokenizer = linux;
|
||||
vidstab = linux;
|
||||
vllm = linux;
|
||||
};
|
||||
}
|
||||
// (lib.genAttrs packageSets evalPackageSet);
|
||||
|
||||
Reference in New Issue
Block a user