Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2024-02-16 18:01:48 +00:00 committed by GitHub
commit 6d90f72388
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
75 changed files with 1484 additions and 1210 deletions

View File

@ -4116,6 +4116,12 @@
github = "D3vil0p3r"; github = "D3vil0p3r";
githubId = 83867734; githubId = 83867734;
}; };
d4ilyrun = {
name = "Léo Duboin";
email = "leo@duboin.com";
github = "d4ilyrun";
githubId = 34611103;
};
dadada = { dadada = {
name = "dadada"; name = "dadada";
email = "dadada@dadada.li"; email = "dadada@dadada.li";
@ -11191,6 +11197,12 @@
githubId = 35580196; githubId = 35580196;
name = "Luca Guerra"; name = "Luca Guerra";
}; };
lucasbergman = {
email = "lucas@bergmans.us";
github = "lucasbergman";
githubId = 3717454;
name = "Lucas Bergman";
};
lucasew = { lucasew = {
email = "lucas59356@gmail.com"; email = "lucas59356@gmail.com";
github = "lucasew"; github = "lucasew";

View File

@ -33,6 +33,7 @@ let
TRUSTED_PROXY_IP = cfg.trustedProxy; TRUSTED_PROXY_IP = cfg.trustedProxy;
} }
// lib.optionalAttrs (cfg.redis.createLocally && cfg.redis.enableUnixSocket) { REDIS_URL = "unix://${config.services.redis.servers.mastodon.unixSocket}"; }
// lib.optionalAttrs (cfg.database.host != "/run/postgresql" && cfg.database.port != null) { DB_PORT = toString cfg.database.port; } // lib.optionalAttrs (cfg.database.host != "/run/postgresql" && cfg.database.port != null) { DB_PORT = toString cfg.database.port; }
// lib.optionalAttrs cfg.smtp.authenticate { SMTP_LOGIN = cfg.smtp.user; } // lib.optionalAttrs cfg.smtp.authenticate { SMTP_LOGIN = cfg.smtp.user; }
// lib.optionalAttrs (cfg.elasticsearch.host != null) { ES_HOST = cfg.elasticsearch.host; } // lib.optionalAttrs (cfg.elasticsearch.host != null) { ES_HOST = cfg.elasticsearch.host; }
@ -116,9 +117,11 @@ let
threads = toString (if processCfg.threads == null then cfg.sidekiqThreads else processCfg.threads); threads = toString (if processCfg.threads == null then cfg.sidekiqThreads else processCfg.threads);
in { in {
after = [ "network.target" "mastodon-init-dirs.service" ] after = [ "network.target" "mastodon-init-dirs.service" ]
++ lib.optional cfg.redis.createLocally "redis-mastodon.service"
++ lib.optional databaseActuallyCreateLocally "postgresql.service" ++ lib.optional databaseActuallyCreateLocally "postgresql.service"
++ lib.optional cfg.automaticMigrations "mastodon-init-db.service"; ++ lib.optional cfg.automaticMigrations "mastodon-init-db.service";
requires = [ "mastodon-init-dirs.service" ] requires = [ "mastodon-init-dirs.service" ]
++ lib.optional cfg.redis.createLocally "redis-mastodon.service"
++ lib.optional databaseActuallyCreateLocally "postgresql.service" ++ lib.optional databaseActuallyCreateLocally "postgresql.service"
++ lib.optional cfg.automaticMigrations "mastodon-init-db.service"; ++ lib.optional cfg.automaticMigrations "mastodon-init-db.service";
description = "Mastodon sidekiq${jobClassLabel}"; description = "Mastodon sidekiq${jobClassLabel}";
@ -146,9 +149,11 @@ let
name = "mastodon-streaming-${toString i}"; name = "mastodon-streaming-${toString i}";
value = { value = {
after = [ "network.target" "mastodon-init-dirs.service" ] after = [ "network.target" "mastodon-init-dirs.service" ]
++ lib.optional cfg.redis.createLocally "redis-mastodon.service"
++ lib.optional databaseActuallyCreateLocally "postgresql.service" ++ lib.optional databaseActuallyCreateLocally "postgresql.service"
++ lib.optional cfg.automaticMigrations "mastodon-init-db.service"; ++ lib.optional cfg.automaticMigrations "mastodon-init-db.service";
requires = [ "mastodon-init-dirs.service" ] requires = [ "mastodon-init-dirs.service" ]
++ lib.optional cfg.redis.createLocally "redis-mastodon.service"
++ lib.optional databaseActuallyCreateLocally "postgresql.service" ++ lib.optional databaseActuallyCreateLocally "postgresql.service"
++ lib.optional cfg.automaticMigrations "mastodon-init-db.service"; ++ lib.optional cfg.automaticMigrations "mastodon-init-db.service";
wantedBy = [ "mastodon.target" "mastodon-streaming.target" ]; wantedBy = [ "mastodon.target" "mastodon-streaming.target" ];
@ -404,6 +409,12 @@ in {
type = lib.types.port; type = lib.types.port;
default = 31637; default = 31637;
}; };
enableUnixSocket = lib.mkOption {
description = lib.mdDoc "Use Unix socket";
type = lib.types.bool;
default = true;
};
}; };
database = { database = {
@ -751,9 +762,11 @@ in {
systemd.services.mastodon-web = { systemd.services.mastodon-web = {
after = [ "network.target" "mastodon-init-dirs.service" ] after = [ "network.target" "mastodon-init-dirs.service" ]
++ lib.optional cfg.redis.createLocally "redis-mastodon.service"
++ lib.optional databaseActuallyCreateLocally "postgresql.service" ++ lib.optional databaseActuallyCreateLocally "postgresql.service"
++ lib.optional cfg.automaticMigrations "mastodon-init-db.service"; ++ lib.optional cfg.automaticMigrations "mastodon-init-db.service";
requires = [ "mastodon-init-dirs.service" ] requires = [ "mastodon-init-dirs.service" ]
++ lib.optional cfg.redis.createLocally "redis-mastodon.service"
++ lib.optional databaseActuallyCreateLocally "postgresql.service" ++ lib.optional databaseActuallyCreateLocally "postgresql.service"
++ lib.optional cfg.automaticMigrations "mastodon-init-db.service"; ++ lib.optional cfg.automaticMigrations "mastodon-init-db.service";
wantedBy = [ "mastodon.target" ]; wantedBy = [ "mastodon.target" ];
@ -834,11 +847,14 @@ in {
enable = true; enable = true;
hostname = lib.mkDefault "${cfg.localDomain}"; hostname = lib.mkDefault "${cfg.localDomain}";
}; };
services.redis.servers.mastodon = lib.mkIf (cfg.redis.createLocally && cfg.redis.host == "127.0.0.1") { services.redis.servers.mastodon = lib.mkIf cfg.redis.createLocally (lib.mkMerge [
enable = true; {
port = cfg.redis.port; enable = true;
bind = "127.0.0.1"; }
}; (lib.mkIf (!cfg.redis.enableUnixSocket) {
port = cfg.redis.port;
})
]);
services.postgresql = lib.mkIf databaseActuallyCreateLocally { services.postgresql = lib.mkIf databaseActuallyCreateLocally {
enable = true; enable = true;
ensureUsers = [ ensureUsers = [
@ -859,6 +875,7 @@ in {
}; };
}) })
(lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package pkgs.imagemagick ]) (lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package pkgs.imagemagick ])
(lib.mkIf (cfg.redis.createLocally && cfg.redis.enableUnixSocket) {${config.services.mastodon.user}.extraGroups = [ "redis-mastodon" ];})
]; ];
users.groups.${cfg.group}.members = lib.optional cfg.configureNginx config.services.nginx.user; users.groups.${cfg.group}.members = lib.optional cfg.configureNginx config.services.nginx.user;

View File

@ -21,6 +21,7 @@ import ./make-test-python.nix ({ lib, pkgs, ...} :
enableOCR = true; enableOCR = true;
# https://nixos.org/manual/nixos/stable/#ssec-machine-objects
testScript = { nodes, ... }: let testScript = { nodes, ... }: let
aliceDo = cmd: ''machine.succeed("su - alice -c '${cmd}' >&2 &");''; aliceDo = cmd: ''machine.succeed("su - alice -c '${cmd}' >&2 &");'';
in '' in ''
@ -52,8 +53,13 @@ import ./make-test-python.nix ({ lib, pkgs, ...} :
machine.wait_for_text("App metric") machine.wait_for_text("App metric")
machine.send_key("ret") machine.send_key("ret")
# Doesn't work for non-root
#machine.wait_for_window("QOwnNotes - ${pkgs.qownnotes.version}")
# OCR doesn't seem to be able any more to handle the main window
#machine.wait_for_text("QOwnNotes - ${pkgs.qownnotes.version}")
# The main window should now show up # The main window should now show up
machine.wait_for_text("QOwnNotes - ${pkgs.qownnotes.version}")
machine.wait_for_open_port(22222) machine.wait_for_open_port(22222)
machine.wait_for_console_text("QOwnNotes server listening on port 22222") machine.wait_for_console_text("QOwnNotes server listening on port 22222")
@ -63,7 +69,13 @@ import ./make-test-python.nix ({ lib, pkgs, ...} :
machine.send_key("ctrl-n") machine.send_key("ctrl-n")
machine.sleep(1) machine.sleep(1)
machine.send_chars("This is a NixOS test!\n") machine.send_chars("This is a NixOS test!\n")
machine.wait_for_text("This is a NixOS test!") machine.wait_until_succeeds("find /home/alice/Notes -type f | grep -qi 'Note 2'")
# OCR doesn't seem to be able any more to handle the main window
#machine.wait_for_text("This is a NixOS test!")
# Doesn't work for non-root
#machine.wait_for_window("- QOwnNotes - ${pkgs.qownnotes.version}")
machine.screenshot("QOwnNotes-NewNote") machine.screenshot("QOwnNotes-NewNote")
''; '';

View File

@ -34,12 +34,6 @@ in
pki.certificateFiles = [ "${cert pkgs}/cert.pem" ]; pki.certificateFiles = [ "${cert pkgs}/cert.pem" ];
}; };
services.redis.servers.mastodon = {
enable = true;
bind = "127.0.0.1";
port = 31637;
};
# TODO remove once https://github.com/NixOS/nixpkgs/pull/266270 is resolved. # TODO remove once https://github.com/NixOS/nixpkgs/pull/266270 is resolved.
services.postgresql.package = pkgs.postgresql_14; services.postgresql.package = pkgs.postgresql_14;

View File

@ -23,6 +23,10 @@
"date": "2023-08-19", "date": "2023-08-19",
"new": "nvchad-ui" "new": "nvchad-ui"
}, },
"nvim-base16": {
"date": "2024-02-15",
"new": "base16-nvim"
},
"nvim-bufferline-lua": { "nvim-bufferline-lua": {
"date": "2021-08-22", "date": "2021-08-22",
"new": "bufferline-nvim" "new": "bufferline-nvim"

File diff suppressed because it is too large Load Diff

View File

@ -994,7 +994,7 @@
inherit (old) version src; inherit (old) version src;
sourceRoot = "source/spectre_oxi"; sourceRoot = "source/spectre_oxi";
cargoHash = "sha256-y2ZIgOApIShkIesXmItPKDO6XjFrG4GS5HCPncJUmN8="; cargoHash = "sha256-822+3s6FJVqBRYJAL/89bJfGv8fNhSN3nQelB29mXvQ=";
preCheck = '' preCheck = ''
@ -1130,7 +1130,7 @@
pname = "sg-nvim-rust"; pname = "sg-nvim-rust";
inherit (old) version src; inherit (old) version src;
cargoHash = "sha256-BDNFZ/7nnfvtBA7T6a7MDNJsq/cOI9tgW0kxUoIcbV8="; cargoHash = "sha256-nlPSsp/HbS1DxhOHh5+7x1re46oiQa9FQMLClc7TQLg=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

View File

@ -73,7 +73,6 @@ https://github.com/jiangmiao/auto-pairs/,,
https://github.com/pocco81/auto-save.nvim/,HEAD, https://github.com/pocco81/auto-save.nvim/,HEAD,
https://github.com/rmagatti/auto-session/,, https://github.com/rmagatti/auto-session/,,
https://github.com/m4xshen/autoclose.nvim/,HEAD, https://github.com/m4xshen/autoclose.nvim/,HEAD,
https://github.com/tamton-aquib/staline.nvim,main,
https://github.com/vim-scripts/autoload_cscope.vim/,, https://github.com/vim-scripts/autoload_cscope.vim/,,
https://github.com/nullishamy/autosave.nvim/,HEAD, https://github.com/nullishamy/autosave.nvim/,HEAD,
https://github.com/rafi/awesome-vim-colorschemes/,, https://github.com/rafi/awesome-vim-colorschemes/,,
@ -513,7 +512,7 @@ https://github.com/Shougo/neco-vim/,,
https://github.com/nvim-neo-tree/neo-tree.nvim/,HEAD, https://github.com/nvim-neo-tree/neo-tree.nvim/,HEAD,
https://github.com/Shougo/neocomplete.vim/,, https://github.com/Shougo/neocomplete.vim/,,
https://github.com/folke/neoconf.nvim/,HEAD, https://github.com/folke/neoconf.nvim/,HEAD,
https://github.com/IogaMaster/neocord.git/,main, https://github.com/IogaMaster/neocord/,main,
https://github.com/KeitaNakamura/neodark.vim/,, https://github.com/KeitaNakamura/neodark.vim/,,
https://github.com/folke/neodev.nvim/,HEAD, https://github.com/folke/neodev.nvim/,HEAD,
https://github.com/sbdchd/neoformat/,, https://github.com/sbdchd/neoformat/,,
@ -797,6 +796,7 @@ https://github.com/srcery-colors/srcery-vim/,,
https://github.com/chr4/sslsecure.vim/,, https://github.com/chr4/sslsecure.vim/,,
https://github.com/cshuaimin/ssr.nvim/,HEAD, https://github.com/cshuaimin/ssr.nvim/,HEAD,
https://github.com/luukvbaal/stabilize.nvim/,, https://github.com/luukvbaal/stabilize.nvim/,,
https://github.com/tamton-aquib/staline.nvim/,main,
https://github.com/eigenfoo/stan-vim/,, https://github.com/eigenfoo/stan-vim/,,
https://github.com/josegamez82/starrynight/,HEAD, https://github.com/josegamez82/starrynight/,HEAD,
https://github.com/darfink/starsearch.vim/,, https://github.com/darfink/starsearch.vim/,,
@ -892,7 +892,7 @@ https://github.com/leafgarland/typescript-vim/,,
https://github.com/jose-elias-alvarez/typescript.nvim/,, https://github.com/jose-elias-alvarez/typescript.nvim/,,
https://github.com/kaarmu/typst.vim/,HEAD, https://github.com/kaarmu/typst.vim/,HEAD,
https://github.com/nvchad/ui/,HEAD,nvchad-ui https://github.com/nvchad/ui/,HEAD,nvchad-ui
https://github.com/altermo/ultimate-autopair.nvim.git/,HEAD, https://github.com/altermo/ultimate-autopair.nvim/,HEAD,
https://github.com/SirVer/ultisnips/,, https://github.com/SirVer/ultisnips/,,
https://github.com/mbbill/undotree/,, https://github.com/mbbill/undotree/,,
https://github.com/chrisbra/unicode.vim/,, https://github.com/chrisbra/unicode.vim/,,

View File

@ -190,6 +190,23 @@ let
}; };
}; };
alexisvt.flutter-snippets = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "flutter-snippets";
publisher = "alexisvt";
version = "3.0.0";
sha256 = "44ac46f826625f0a4aec40f2542f32c161e672ff96f45a548d0bccd9feed04ef";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/alexisvt.flutter-snippets/changelog";
description = "A set of helpful widget snippets for day to day Flutter development";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=alexisvt.flutter-snippets";
homepage = "https://github.com/Alexisvt/flutter-snippets";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.DataHearth ];
};
};
alygin.vscode-tlaplus = buildVscodeMarketplaceExtension { alygin.vscode-tlaplus = buildVscodeMarketplaceExtension {
mktplcRef = { mktplcRef = {
name = "vscode-tlaplus"; name = "vscode-tlaplus";
@ -786,6 +803,23 @@ let
}; };
}; };
christian-kohler.npm-intellisense = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "npm-intellisense";
publisher = "christian-kohler";
version = "1.4.5";
sha256 = "962b851a7cafbd51f34afeb4a0b91e985caff3947e46218a12b448533d8f60ab";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/christian-kohler.npm-intellisense/changelog";
description = "Visual Studio Code plugin that autocompletes npm modules in import statements";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=christian-kohler.npm-intellisense";
homepage = "https://github.com/ChristianKohler/NpmIntellisense";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.DataHearth ];
};
};
chenglou92.rescript-vscode = callPackage ./chenglou92.rescript-vscode { }; chenglou92.rescript-vscode = callPackage ./chenglou92.rescript-vscode { };
chris-hayes.chatgpt-reborn = buildVscodeMarketplaceExtension { chris-hayes.chatgpt-reborn = buildVscodeMarketplaceExtension {
@ -1269,6 +1303,23 @@ let
}; };
}; };
ecmel.vscode-html-css = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-html-css";
publisher = "ecmel";
version = "2.0.9";
sha256 = "7c30d57d2ff9986bd5daa2c9f51ec4bb04239ca23a51e971a63f7b93d005d297";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/ecmel.vscode-html-css/changelog";
description = "CSS Intellisense for HTML";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=ecmel.vscode-html-css";
homepage = "https://github.com/ecmel/vscode-html-css";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.DataHearth ];
};
};
editorconfig.editorconfig = buildVscodeMarketplaceExtension { editorconfig.editorconfig = buildVscodeMarketplaceExtension {
mktplcRef = { mktplcRef = {
name = "EditorConfig"; name = "EditorConfig";

View File

@ -18,7 +18,7 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "portfolio"; pname = "portfolio";
version = "1.0.0"; version = "1.0.1";
format = "other"; format = "other";
@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "tchx84"; owner = "tchx84";
repo = "Portfolio"; repo = "Portfolio";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-ahVrOyyF/7X19ZJcHQ4YbC+4b96CPEnns7TUAFCvKao="; hash = "sha256-IbzAkHlD6duXkPJRSyD9HJ/JHP8+IR7vIGFp2ESbBug=";
}; };
postPatch = '' postPatch = ''
@ -78,6 +78,7 @@ python3.pkgs.buildPythonApplication rec {
changelog = "https://github.com/tchx84/Portfolio/blob/v${version}/CHANGELOG.md"; changelog = "https://github.com/tchx84/Portfolio/blob/v${version}/CHANGELOG.md";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.linux;
mainProgram = "dev.tchx84.Portfolio";
maintainers = with maintainers; [ dotlambda chuangzhu ]; maintainers = with maintainers; [ dotlambda chuangzhu ];
}; };
} }

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "tippecanoe"; pname = "tippecanoe";
version = "2.43.0"; version = "2.45.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "felt"; owner = "felt";
repo = "tippecanoe"; repo = "tippecanoe";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-qJB3Y4UaSmSsDbT/EB+aQSvJj8+yYkI3sQR2UOjilfE="; hash = "sha256-LsXK3qcS7x0FHJH5QQ0rM/h+jFSnkwa8mUbHKgcQ6NU=";
}; };
buildInputs = [ sqlite zlib ]; buildInputs = [ sqlite zlib ];

View File

@ -7,13 +7,13 @@
buildGoModule rec { buildGoModule rec {
pname = "arkade"; pname = "arkade";
version = "0.10.20"; version = "0.11.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "alexellis"; owner = "alexellis";
repo = "arkade"; repo = "arkade";
rev = version; rev = version;
hash = "sha256-aOJ07Ks+J7cDvF3InKGYx4dJAql9ltJQqa8P+4cKhNk="; hash = "sha256-SNYaUbWj8t73Aaamg2SOu5EBiYjDMHCiXlaERqGmr2A=";
}; };
CGO_ENABLED = 0; CGO_ENABLED = 0;

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "atmos"; pname = "atmos";
version = "1.60.0"; version = "1.63.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cloudposse"; owner = "cloudposse";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-sc0tKOv5J4lF00Zzs2X6ff1EC1xrTRbDvVopq+1Wn6Y="; sha256 = "sha256-3XmRTboq8DSIV4w6EFsbgl21eY3QA5DicE9nM5sAZOQ=";
}; };
vendorHash = "sha256-wmpFWySQ9MaRGT3yw4gUQEWsF4MNbSDUu68/LHjE28w="; vendorHash = "sha256-i7m9YXPlWqHtvC4Df7v5bLWt2tqeT933t2+Xit5RQxg=";
ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ];

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "helm-diff"; pname = "helm-diff";
version = "3.9.2"; version = "3.9.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "databus23"; owner = "databus23";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-4EjvjvW8aal/ekGV0ePevPf30NarrWIh6id30n1r2dE="; sha256 = "sha256-hDni0bAF4tp7upP/D5S6dGN//zaNHidWAYf/l6W9j28=";
}; };
vendorHash = "sha256-RPb5+tZkOsubOl0YlSXsybmlOtKVbJ97c+f/wiz/gmE="; vendorHash = "sha256-51xjHGU9TC4Nwa9keR0b7bgwpZcRmG7duT9R1JRr3Uw=";
ldflags = [ "-s" "-w" "-X github.com/databus23/helm-diff/v3/cmd.Version=${version}" ]; ldflags = [ "-s" "-w" "-X github.com/databus23/helm-diff/v3/cmd.Version=${version}" ];

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "kubeseal"; pname = "kubeseal";
version = "0.25.0"; version = "0.26.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bitnami-labs"; owner = "bitnami-labs";
repo = "sealed-secrets"; repo = "sealed-secrets";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-maDfKFrszKexwzHw50iPu+aLLhi/QqKj6zmes9kS5Lk="; sha256 = "sha256-rOaczDGjocGpYEPJpMiveWE7sHU9L0Csx2nX0Z3IrBs=";
}; };
vendorHash = "sha256-3SrfD+6Gg9T9Qtb2PbipJZTe8Szs8Cef/61alwgHUUA="; vendorHash = "sha256-UicMiSSSQzquNAHFpnWKbybimz3jjbBgWykhyRSU7ZI=";
subPackages = [ "cmd/kubeseal" ]; subPackages = [ "cmd/kubeseal" ];

View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "kubeshark"; pname = "kubeshark";
version = "52.1.30"; version = "52.1.45";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kubeshark"; owner = "kubeshark";
repo = "kubeshark"; repo = "kubeshark";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-9nlPfWKgx56evxJkW+iRWJCBxqmMaBH0nCJBAAoibJc="; hash = "sha256-XxdOXcdXkMedhhuVbWNnW0ONVmEhsXyFqyN2moj46Nc=";
}; };
vendorHash = "sha256-SmvO9DYOXxnmN2dmHPPOguVwEbWSH/xNLBB+idpzopo="; vendorHash = "sha256-SmvO9DYOXxnmN2dmHPPOguVwEbWSH/xNLBB+idpzopo=";

View File

@ -11,11 +11,11 @@
}: }:
let let
pname = "beeper"; pname = "beeper";
version = "3.95.22"; version = "3.95.26";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.95.22-build-240206gs9w02ysg-x86_64.AppImage"; url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.95.26-build-240213e5u8pwxjw-x86_64.AppImage";
hash = "sha256-svTHoKLlKoCEL+Cc5VCJBJQSO8b/4T1Ukpwbc2nuHxA="; hash = "sha256-1jlaY5rkw/dgOboj3iUPEkCVouUTXsbPS9E9xuJn9oU=";
}; };
appimage = appimageTools.wrapType2 { appimage = appimageTools.wrapType2 {
inherit version pname src; inherit version pname src;

View File

@ -1,8 +1,8 @@
# Generated by ./update.sh - do not update manually! # Generated by ./update.sh - do not update manually!
# Last updated: 2024-01-27 # Last updated: 2024-02-16
{ {
version = "3.2.5-21159"; version = "3.2.5-21453";
urlhash = "feb78c41"; urlhash = "852276c1";
arm64_hash = "sha256-3zbhFKQrO1tMSnWJllLJLaVeVpLs44WBbuuyU1LTMIU="; arm64_hash = "sha256-g0J1FWG07bkabDHp2nuS48MNut2+N7gk0k5zWcmuQVw=";
amd64_hash = "sha256-pX99V18gjlMM6+jC9U7E5YvHDODGsrj0twt9K4rJN4Y="; amd64_hash = "sha256-6Qe4bP3q9RLEIJn9EfqqYaVTF8FRBNcjtVPl+zY7v5c=";
} }

View File

@ -19,14 +19,14 @@
let let
pname = "qownnotes"; pname = "qownnotes";
appname = "QOwnNotes"; appname = "QOwnNotes";
version = "24.2.0"; version = "24.2.3";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit pname version; inherit pname version;
src = fetchurl { src = fetchurl {
url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz";
hash = "sha256-mk7yFlL+NiTZ0JtSY3y/Y1NrN1QYcBxveMImv1zB1l8="; hash = "sha256-US+RyjKpzIPpqvc19nInUW5/x/osLbc6xk4yKEdQYic=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "QtRVSim"; pname = "QtRVSim";
version = "0.9.6"; version = "0.9.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cvut"; owner = "cvut";
repo = "qtrvsim"; repo = "qtrvsim";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-cC3DvQj2VBnGad6ZDn3x4gHQfsPpySzjTi17PQoaxPU="; sha256 = "sha256-SelmqHauj5Yxg043NZqR4bhqW5clwg1h7UD8mW7j7vE=";
}; };
nativeBuildInputs = [ cmake wrapQtAppsHook ]; nativeBuildInputs = [ cmake wrapQtAppsHook ];

View File

@ -1,7 +1,7 @@
{ fetchurl, lib, stdenv }: { fetchurl, lib, stdenv }:
let let
version = "1.5.0"; version = "1.6.0";
# nixpkgs-update: no auto update # nixpkgs-update: no auto update
suffix = { suffix = {
@ -23,8 +23,8 @@ stdenv.mkDerivation {
sourceRoot = "."; sourceRoot = ".";
src = dlbin { src = dlbin {
x86_64-linux = "sha256-TzNPWcLDKOv12eJ9PHckdJ7tfdlozPoXj2fbdOzHfAk="; x86_64-linux = "sha256-FflAYvWTcigIchVrAaUgg6IRleEtis6eh6fCqrZ5lb8=";
aarch64-linux = "sha256-cHNMfcoHCBw+BnWx9USny8jyvH97gXCCJW1aKvPXgCs="; aarch64-linux = "sha256-4O0kPMl7RbMjszUNql0OQrl/4or/e8ZCHPngqq0CNxk=";
}; };
dontConfigure = true; dontConfigure = true;
@ -54,6 +54,6 @@ stdenv.mkDerivation {
mainProgram = "firecracker"; mainProgram = "firecracker";
license = licenses.asl20; license = licenses.asl20;
platforms = [ "x86_64-linux" "aarch64-linux" ]; platforms = [ "x86_64-linux" "aarch64-linux" ];
maintainers = with maintainers; [ thoughtpolice endocrimes ]; maintainers = with maintainers; [ thoughtpolice endocrimes qjoly ];
}; };
} }

View File

@ -24,13 +24,13 @@ let
hy3 = { fetchFromGitHub, cmake, hyprland }: hy3 = { fetchFromGitHub, cmake, hyprland }:
mkHyprlandPlugin rec { mkHyprlandPlugin rec {
pluginName = "hy3"; pluginName = "hy3";
version = "0.34.0"; version = "0.35.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "outfoxxed"; owner = "outfoxxed";
repo = "hy3"; repo = "hy3";
rev = "hl${version}"; rev = "hl${version}";
hash = "sha256-Jd1bSwelh7WA8aeYrV+CxxtpsmSITUDruKdNNLHdV7c="; hash = "sha256-lFe7Lf0K5ePTh4gflnvBohOGH4ayGDtNkbg/XtoNqRo=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View File

@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "miriway"; pname = "miriway";
version = "unstable-2024-01-30"; version = "unstable-2024-02-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Miriway"; owner = "Miriway";
repo = "Miriway"; repo = "Miriway";
rev = "429ace6c7d9ea6799a01875ff61f1e554d5eabd9"; rev = "ad4d311269dc25789f7412211ddddad383d9700c";
hash = "sha256-8qsDyHbJJMxevMIi6Kde+zr2yJAtFaq19TTcAGXMnrE="; hash = "sha256-kPrsyrAHvwrktBFITuhpFKyjmedv04ONFhuxiBDlAJA=";
}; };
strictDeps = true; strictDeps = true;

View File

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "ast-grep"; pname = "ast-grep";
version = "0.18.1"; version = "0.19.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ast-grep"; owner = "ast-grep";
repo = "ast-grep"; repo = "ast-grep";
rev = version; rev = version;
hash = "sha256-hr6VAqBsv3szVClR93y5ickkrNKjvl6BfzqKA3zc6vM="; hash = "sha256-ho4o7Ryp6IwBZ66Sag9IC67EfC/opfkicksouHKPURc=";
}; };
cargoHash = "sha256-ttJMtaQfVnFj4/wUz4fn8X/EmUwW+usqhmWhy4Y0AB8="; cargoHash = "sha256-EDgtXZhAOd8I9TwzpXsVpUpi8uoxyBBIxWyF7wSazwo=";
# Work around https://github.com/NixOS/nixpkgs/issues/166205. # Work around https://github.com/NixOS/nixpkgs/issues/166205.
env = lib.optionalAttrs stdenv.cc.isClang { env = lib.optionalAttrs stdenv.cc.isClang {

View File

@ -13,10 +13,10 @@ let
}.${system} or throwSystem; }.${system} or throwSystem;
hash = { hash = {
x86_64-linux = "sha256-xAo8XtNXUJXjGu+LMoRj/s0/VFtVwIC6TCc4a1wrzzQ="; x86_64-linux = "sha256-nyw52kjBC4NCnb/WLkeozjH8A7kL+oRY7ayvGM70I9c=";
aarch64-linux = "sha256-HOfSb87g6iN5IwmYZ20F91y+a8fbAhTQ+OhHGq7E9ko="; aarch64-linux = "sha256-GmTAdiOctV2rNwlospYtQmNbspDvdXlV6j/Q5v+GD/k=";
x86_64-darwin = "sha256-GCP+apn5g/aPZcwHBhKj9Oy90hMpTWRZNLUtOk3yNTc="; x86_64-darwin = "sha256-YMUztQRdjIqpFQqnK9gfZhMSKUAJlKWvcYH3Xns26hQ=";
aarch64-darwin = "sha256-EwpO/gOnv/XIxdV1I1dV+i4w5A4avMcv1zPnBLEqoLI="; aarch64-darwin = "sha256-cV/ZjmX9DfYyBdrVpbBZxAHfW70FVg+8R0Pxji38lRg=";
}.${system} or throwSystem; }.${system} or throwSystem;
bin = "$out/bin/codeium_language_server"; bin = "$out/bin/codeium_language_server";
@ -24,7 +24,7 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "codeium"; pname = "codeium";
version = "1.6.34"; version = "1.6.36";
src = fetchurl { src = fetchurl {
name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; name = "${finalAttrs.pname}-${finalAttrs.version}.gz";
url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz";

View File

@ -2,7 +2,7 @@
ocamlPackages.buildDunePackage rec { ocamlPackages.buildDunePackage rec {
pname = "docfd"; pname = "docfd";
version = "2.1.0"; version = "2.2.0";
minimalOCamlVersion = "5.1"; minimalOCamlVersion = "5.1";
@ -10,7 +10,7 @@ ocamlPackages.buildDunePackage rec {
owner = "darrenldl"; owner = "darrenldl";
repo = "docfd"; repo = "docfd";
rev = version; rev = version;
hash = "sha256-1DobGm6nI14951KNKEE0D3AF1TFsWQUEhe4L1PdWBDw="; hash = "sha256-v6V9+/Ra19Xy6nCLe/ODJ1uVBwNkQO4lKcxcr2pmxIY=";
}; };
nativeBuildInputs = [ python3 dune_3 makeWrapper ]; nativeBuildInputs = [ python3 dune_3 makeWrapper ];

View File

@ -0,0 +1,53 @@
{ lib
, fetchurl
, appimageTools
}:
appimageTools.wrapType2 rec {
pname = "miru";
version = "4.5.10";
src = fetchurl {
url = "https://github.com/ThaUnknown/miru/releases/download/v${version}/linux-Miru-${version}.AppImage";
name = "${pname}-${version}.AppImage";
sha256 = "sha256-ptaviLwr0X/MuF517YLW7i9+rtnktcpgHVqMHn+tXWg=";
};
extraInstallCommands =
let
contents = appimageTools.extractType2 { inherit pname version src; };
in
''
mkdir -p "$out/share/applications"
mkdir -p "$out/share/lib/miru"
cp -r ${contents}/{locales,resources} "$out/share/lib/miru"
cp -r ${contents}/usr/* "$out"
cp "${contents}/${pname}.desktop" "$out/share/applications/"
mv "$out/bin/${pname}-${version}" "$out/bin/${pname}"
substituteInPlace $out/share/applications/${pname}.desktop --replace 'Exec=AppRun' 'Exec=${pname}'
'';
meta = with lib; {
description = "Stream anime torrents, real-time with no waiting for downloads";
homepage = "https://github.com/ThaUnknown/miru#readme";
license = licenses.gpl3Plus;
maintainers = [ maintainers.d4ilyrun ];
mainProgram = "miru";
platforms = [ "x86_64-linux" ];
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
longDescription = ''
A pure JS BitTorrent streaming environment, with a built-in list manager.
Imagine qBit + Taiga + MPV, all in a single package, but streamed real-time.
Completely ad free with no tracking/data collection.
This app is meant to feel look, work and perform like a streaming website/app,
while providing all the advantages of torrenting, like file downloads,
higher download speeds, better video quality and quicker releases.
Unlike qBit's sequential, seeking into undownloaded data will prioritise downloading that data,
instead of flat out closing MPV.
'';
};
}

View File

@ -0,0 +1,52 @@
{ lib, stdenv, fetchzip, makeWrapper, openjdk21, openjfx21, jvmFlags ? [ ] }:
let jdk = openjdk21.override { enableJavaFX = true; };
in stdenv.mkDerivation (finalAttrs: {
pname = "moneydance";
version = "2023.3_5064";
src = fetchzip {
url = "https://infinitekind.com/stabledl/${finalAttrs.version}/moneydance-linux.tar.gz";
hash = "sha256-jHr1V/gV1seenw2Q0/G405lTiabEYEsOS8p/XyByrtM=";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jdk openjfx21 ];
# Note the double escaping in the call to makeWrapper. The escapeShellArgs
# call quotes each element of the flags list as a word[1] and returns a
# space-separated result; the escapeShellArg call quotes that result as a
# single word to pass to --add-flags. The --add-flags implementation[2]
# loops over the words in its argument.
#
# 1. https://www.gnu.org/software/bash/manual/html_node/Word-Splitting.html
# 2. https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/setup-hooks/make-wrapper.sh
installPhase = let
finalJvmFlags = [
"-client"
"--add-modules"
"javafx.swing,javafx.controls,javafx.graphics"
"-classpath"
"${placeholder "out"}/libexec/*"
] ++ jvmFlags ++ [ "Moneydance" ];
in ''
runHook preInstall
mkdir -p $out/libexec $out/bin
cp -p $src/lib/* $out/libexec/
makeWrapper ${jdk}/bin/java $out/bin/moneydance \
--add-flags ${lib.escapeShellArg (lib.escapeShellArgs finalJvmFlags)}
runHook postInstall
'';
passthru = { inherit jdk; };
meta = {
homepage = "https://infinitekind.com/moneydance";
description = "An easy to use and full-featured personal finance app that doesn't compromise your privacy";
sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
license = lib.licenses.unfree;
platforms = jdk.meta.platforms;
maintainers = [ lib.maintainers.lucasbergman ];
};
})

View File

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "preserves-tools"; pname = "preserves-tools";
version = "4.992.2"; version = "4.994.0";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
hash = "sha256-1IX6jTAH6qWE8X7YtIka5Z4y70obiVotOXzRnu+Z6a0="; hash = "sha256-+I2uxdAe4SHg8ZLRvkIUr862FH6GvCwnyhxcCPD3JBA=";
}; };
cargoHash = "sha256-D/ZCKRqZtPoCJ9t+5+q1Zm79z3K6Rew4eyuyDiGVGUs="; cargoHash = "sha256-09uxXD9EZzzk42tBYbuqaLRFyGmOUuvC7G0XMDjsK6E=";
meta = { meta = {
description = description =

View File

@ -7,10 +7,10 @@
inherit buildUnstable; inherit buildUnstable;
}).overrideAttrs (finalAttrs: _: { }).overrideAttrs (finalAttrs: _: {
pname = "renode-unstable"; pname = "renode-unstable";
version = "1.14.0+20240212git8eb88bb9c"; version = "1.14.0+20240215git10667c665";
src = fetchurl { src = fetchurl {
url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz"; url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz";
hash = "sha256-WwsIiyKF6hskv6NSTPiyY80nE3q97xzH359wFmN0OkU="; hash = "sha256-4u2mAW93ivXteVBimjbjDhYHzHHIQCdrINEFzapCd3c=";
}; };
}) })

View File

@ -4,16 +4,16 @@
}: }:
buildGoModule rec { buildGoModule rec {
pname = "tdl"; pname = "tdl";
version = "0.15.1"; version = "0.16.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "iyear"; owner = "iyear";
repo = "tdl"; repo = "tdl";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-vKcKHxPwF7kdsEASJ4VunPZ9kVztPq3yH8RnCd9uI9A="; hash = "sha256-Myf10+Y7lyJFhiRpJFkXe5Rng0ChzOm0EGvPEuFMYp4=";
}; };
vendorHash = "sha256-v5okd7PAnA2JsgZ4SqvpZmXOQXSCzl+SwFx9NWo7C/0="; vendorHash = "sha256-n3AISS4/yujTNqgGjeEK2eWw0YI1XUafZP36yD+axN4=";
ldflags = [ ldflags = [
"-s" "-s"

View File

@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
changelog = "https://gitlab.com/ita1024/waf/blob/${finalAttrs.version}/ChangeLog"; changelog = "https://gitlab.com/ita1024/waf/blob/${finalAttrs.version}/ChangeLog";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
mainProgram = "waf"; mainProgram = "waf";
maintainers = with lib.maintainers; [ AndersonTorres vrthra ]; maintainers = with lib.maintainers; [ AndersonTorres ];
inherit (python3.meta) platforms; inherit (python3.meta) platforms;
sourceProvenance = [ lib.sourceTypes.fromSource ]; sourceProvenance = [ lib.sourceTypes.fromSource ];
}; };

View File

@ -5,18 +5,18 @@
buildGoModule rec { buildGoModule rec {
pname = "cel-go"; pname = "cel-go";
version = "0.19.0"; version = "0.20.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = "cel-go"; repo = "cel-go";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-r3xBg+8C3VZ3sHYKMyQoBVGe+puWdRO4q3e9bur9ZoY="; hash = "sha256-rjhTKZ2d1jDby4tacLfbKJj0Y7F/KkECWAL/WsqJ6sg=";
}; };
modRoot = "repl"; modRoot = "repl";
vendorHash = "sha256-7WBom6FS/GX+pM3zv59BZOwmAIokKkZcN3yGbcQb09Q="; vendorHash = "sha256-h+f/ILk6mDzRBW1FI1jFyWxkV3bvrJ/BMsCuuf+E+J0=";
subPackages = [ subPackages = [
"main" "main"

View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dqlite"; pname = "dqlite";
version = "1.16.0"; version = "1.16.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "canonical"; owner = "canonical";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-8MPAyCqqjDpDHSyiZ1cvvgflaOLNzPGswZSsSjSffvw="; hash = "sha256-rzKZvVybKLQKT9ZiGT/9LgU7hxI6knVXkPawNhbW/DQ=";
}; };
nativeBuildInputs = [ autoreconfHook file pkg-config ]; nativeBuildInputs = [ autoreconfHook file pkg-config ];

View File

@ -20,7 +20,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "exiv2"; pname = "exiv2";
version = "0.28.1"; version = "0.28.2";
outputs = [ "out" "lib" "dev" "doc" "man" ]; outputs = [ "out" "lib" "dev" "doc" "man" ];
@ -28,16 +28,9 @@ stdenv.mkDerivation rec {
owner = "exiv2"; owner = "exiv2";
repo = "exiv2"; repo = "exiv2";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Jim8vYWyCa16LAJ1GuP8cCzhXIc2ouo6hVsHg3UQbdg="; hash = "sha256-0TgvIiuHMeohStIwmHOq4yvTj2H07wyx4w3iIdkrLTc=";
}; };
patches = [
(fetchpatch {
url = "https://github.com/Exiv2/exiv2/commit/c351c7cce317571934abf693055779a59df30d6e.patch";
hash = "sha256-fWJT4IUBrAELl6ku0M1iTzGFX74le8Z0UzTJLU/gYls=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
doxygen doxygen
@ -94,7 +87,7 @@ stdenv.mkDerivation rec {
''; '';
preFixup = '' preFixup = ''
remove-references-to -t ${stdenv.cc.cc} $lib/lib/*.so.*.*.* $out/bin/exiv2 $static/lib/*.a remove-references-to -t ${stdenv.cc.cc} $lib/lib/*.so.*.*.* $out/bin/exiv2
''; '';
disallowedReferences = [ stdenv.cc.cc ]; disallowedReferences = [ stdenv.cc.cc ];

View File

@ -1,4 +1,4 @@
{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config { lib, mkDerivation, fetchFromGitHub, fetchpatch, cmake, pkg-config
, marisa, qttools, qtlocation }: , marisa, qttools, qtlocation }:
mkDerivation rec { mkDerivation rec {
@ -12,6 +12,16 @@ mkDerivation rec {
sha256 = "sha256-Qe5TkF4BwlsEI7emC0gdc7SmS4QrSGLiO0QdjuJA09g="; sha256 = "sha256-Qe5TkF4BwlsEI7emC0gdc7SmS4QrSGLiO0QdjuJA09g=";
}; };
patches = [
# Fix build with libxml v2.12
# FIXME: Remove at next package update
(fetchpatch {
name = "libxml-2.12-fix.patch";
url = "https://github.com/Framstag/libosmscout/commit/db7b307de1a1146a6868015a0adfc2e21b7d5e39.patch";
hash = "sha256-5NDamzb2K18sMVfREnUNksgD2NL7ELzLl83SlGIveO0=";
})
];
cmakeFlags = [ "-DOSMSCOUT_BUILD_TESTS=OFF" ]; cmakeFlags = [ "-DOSMSCOUT_BUILD_TESTS=OFF" ];
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];

View File

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiopvapi"; pname = "aiopvapi";
version = "3.0.1"; version = "3.0.2";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -18,15 +18,9 @@ buildPythonPackage rec {
owner = "sander76"; owner = "sander76";
repo = "aio-powerview-api"; repo = "aio-powerview-api";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-+jhfp8gLEmL8TGPPN7QY8lw1SkV4sMSDb4VSq2OJ6PU="; hash = "sha256-NfSGu4M0NWfCDc37zRwUjYtZz5jOtw3pYgF6fIsB/Yo=";
}; };
postPatch = ''
# https://github.com/sander76/aio-powerview-api/pull/31
substituteInPlace setup.py \
--replace '"asyncio", ' ""
'';
nativeBuildInputs = [ nativeBuildInputs = [
setuptools setuptools
]; ];
@ -43,16 +37,6 @@ buildPythonPackage rec {
"aiopvapi" "aiopvapi"
]; ];
disabledTestPaths = [
# https://github.com/sander76/aio-powerview-api/issues/32
"tests/test_shade.py"
"tests/test_scene.py"
"tests/test_room.py"
"tests/test_apiresource.py"
"tests/test_hub.py"
"tests/test_scene_members.py"
];
meta = with lib; { meta = with lib; {
description = "Python API for the PowerView API"; description = "Python API for the PowerView API";
homepage = "https://github.com/sander76/aio-powerview-api"; homepage = "https://github.com/sander76/aio-powerview-api";

View File

@ -23,14 +23,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ansible-runner"; pname = "ansible-runner";
version = "2.3.4"; version = "2.3.5";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-eaG9E02BPI6jdAWZxv2WGhFCXOd1fy/XJc9W1qGnI2w="; hash = "sha256-zZ3dV2WHDqPFRbbLR6qtXwTZowpijdP82082eijCIIU=";
}; };
patches = [ patches = [

View File

@ -15,7 +15,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cohere"; pname = "cohere";
version = "4.37"; version = "4.37";
format = "pyproject"; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -24,15 +24,6 @@ buildPythonPackage rec {
hash = "sha256-eIAh2dmSxsMdGYXZXMyyd8cmWILErNekmz5H2ne0vsg="; hash = "sha256-eIAh2dmSxsMdGYXZXMyyd8cmWILErNekmz5H2ne0vsg=";
}; };
patches = [
# https://github.com/cohere-ai/cohere-python/pull/289
(fetchpatch {
name = "replace-poetry-with-poetry-core.patch";
url = "https://github.com/cohere-ai/cohere-python/commit/e86480336331c0cf6f67e26b0825467dfca5b277.patch";
hash = "sha256-P1Ioq5ypzT3tx6cxrI3ep34Fi4cUx88YkfJ5ErN3VHk=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
poetry-core poetry-core
]; ];

View File

@ -20,7 +20,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-pattern-library"; pname = "django-pattern-library";
version = "1.1.0"; version = "1.1.0";
format = "pyproject"; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "torchbox"; owner = "torchbox";
@ -29,14 +29,6 @@ buildPythonPackage rec {
hash = "sha256-9uuLYwG0/NYGouncuaN8S+3CBABSxSOkcrP59p5v84U="; hash = "sha256-9uuLYwG0/NYGouncuaN8S+3CBABSxSOkcrP59p5v84U=";
}; };
patches = [
(fetchpatch {
# https://github.com/torchbox/django-pattern-library/pull/232
url = "https://github.com/torchbox/django-pattern-library/commit/e7a9a8928a885941391fb584eba81578a292ee7d.patch";
hash = "sha256-3uUoxdVYEiF+to88qZRhOkh1++RfmsqCzO9JNMDqz6g=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
poetry-core poetry-core
]; ];

View File

@ -17,7 +17,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "fakeredis"; pname = "fakeredis";
version = "2.21.0"; version = "2.21.1";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "dsoftwareinc"; owner = "dsoftwareinc";
repo = "fakeredis-py"; repo = "fakeredis-py";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-A+XOCWeXVt8SUkKM+TKra8xODuCD0QE9+/8FefUt4OY="; hash = "sha256-2+ZZTWhUb6rj7oWPnDP0PJUHj0CJpOD8iZxmtO4xSbo=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -2,6 +2,7 @@
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, pythonOlder , pythonOlder
, setuptools
, pytestCheckHook , pytestCheckHook
, go , go
, ffmpeg-headless , ffmpeg-headless
@ -9,8 +10,8 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ffmpy"; pname = "ffmpy";
version = "0.3.1"; version = "0.3.2";
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -18,7 +19,7 @@ buildPythonPackage rec {
owner = "Ch00k"; owner = "Ch00k";
repo = "ffmpy"; repo = "ffmpy";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-kuLhmCG80BmXdqpW67UanBnuYiL2Oh1jKt7IgmVNEAM="; hash = "sha256-q41JjAWcIiD2nJck5Zzb/lhfIZ3xJGU1I2crsMN0T8Q=";
}; };
postPatch = '' postPatch = ''
@ -34,6 +35,10 @@ buildPythonPackage rec {
pythonImportsCheck = [ "ffmpy" ]; pythonImportsCheck = [ "ffmpy" ];
nativeBuildInputs = [
setuptools
];
nativeCheckInputs = [ nativeCheckInputs = [
pytestCheckHook pytestCheckHook
go go

View File

@ -2,14 +2,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "mkl-service"; pname = "mkl-service";
version = "2.4.0.post1"; version = "2.4.1";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "IntelPython"; owner = "IntelPython";
repo = "mkl-service"; repo = "mkl-service";
rev = "v${version}"; rev = "refs/tags/v${version}";
sha256 = "0ysjn8z1hkscb4cycbrvcb93r04w5793yylsy40h5dvjd04ns5jc"; sha256 = "sha256-4UPiQt1hVVlPFZnuKlMK3FLv2cIEXToHKxnyYLXR/sY=";
}; };
MKLROOT = mkl; MKLROOT = mkl;

View File

@ -16,12 +16,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "mplhep"; pname = "mplhep";
version = "0.3.32"; version = "0.3.33";
format = "pyproject"; format = "pyproject";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-xwlrMZLJKRW6iqMsDKS5BDqejADSk/qGOAnQDZ2fTPc="; hash = "sha256-YTqiZCM5Dvsse+isQ4WSQgHfDGAVtmYVLHPR4Mmme6Q=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -14,7 +14,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "oci"; pname = "oci";
version = "2.120.0"; version = "2.121.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "oracle"; owner = "oracle";
repo = "oci-python-sdk"; repo = "oci-python-sdk";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-KUiv0cNkkvaouhR2UgdMVBwrZoqCxVif71/eiyjpskI="; hash = "sha256-oOy0gOTekPXv557dl0A0b8TJVGSUYPq38h2Fu8PN03o=";
}; };
pythonRelaxDeps = [ pythonRelaxDeps = [

View File

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyprecice"; pname = "pyprecice";
version = "2.5.0.4"; version = "3.0.0.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "precice"; owner = "precice";
repo = "python-bindings"; repo = "python-bindings";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-Nau4ytOSv5WOly/hbHO2M6Rgx1ileJrzfCfNJFnwVaw="; hash = "sha256-iW3Mll28Z3Ew+eIJxeF1HR7JhVhXs9FiYaAb5TwYSpg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -13,12 +13,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pytest-testinfra"; pname = "pytest-testinfra";
version = "10.0.0"; version = "10.1.0";
format = "setuptools"; format = "setuptools";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-L7fQGFRYqbpmn/FNDdvsizkAxr3j+2+tmwlzdM5Kt30="; hash = "sha256-93Qzm5R3Ws3zqMSjeTqOrS6N/HD/NLd4vhWquhQPoZ4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "qcodes-contrib-drivers"; pname = "qcodes-contrib-drivers";
version = "0.18.0"; version = "0.21.0";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
format = "pyproject"; format = "pyproject";
@ -21,8 +21,8 @@ buildPythonPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "QCoDeS"; owner = "QCoDeS";
repo = "Qcodes_contrib_drivers"; repo = "Qcodes_contrib_drivers";
rev = "v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-hg3jSiuOkiuOInnUzzlKtBeoP5zkCDBQ3xP6KCwq+lU="; sha256 = "sha256-7WkG6Bq4J4PU4eWX52RaupQ8cNzE+sJ7s3PoXFRxG2w=";
}; };
nativeBuildInputs = [ setuptools versioningit ]; nativeBuildInputs = [ setuptools versioningit ];

View File

@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "danmar"; owner = "danmar";
repo = "cppcheck"; repo = "cppcheck";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-YCE4TAi5eNUosQMsTn0kEcUh1AVw4rssrj+xB+ef4bE="; hash = "sha256-Bz8ACCsxKfN1Y8TpS+oD/6lixLItL1TQR0Ud4gj1txk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "ctlptl"; pname = "ctlptl";
version = "0.8.26"; version = "0.8.27";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tilt-dev"; owner = "tilt-dev";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Qi9fN66YLow8TO/4GmJBIcj8CnH7jbpyryjnMG6yp0U="; hash = "sha256-4g5QfeAtPEUW7vwOwkJd8W3V6z1DxAmZngbrroCFr5M=";
}; };
vendorHash = "sha256-gortoYTYGtvhM1XWVhI2bB+cKtbTADpKl5W9h1QSEPc="; vendorHash = "sha256-DEUZbqHHYfjD5jGT5nn3UbWT1aODRsLailSorI/W6w4=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View File

@ -2,7 +2,7 @@
buildGoModule rec { buildGoModule rec {
pname = "goconvey"; pname = "goconvey";
version = "1.8.0"; version = "1.8.1";
excludedPackages = "web/server/watch/integration_testing"; excludedPackages = "web/server/watch/integration_testing";
@ -10,10 +10,10 @@ buildGoModule rec {
owner = "smartystreets"; owner = "smartystreets";
repo = "goconvey"; repo = "goconvey";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-JgforTGu5aiQHltZrAfy16Bsu4UJ2pj6cCiof6sxz7s="; hash = "sha256-6SrlPsOqRxNNwEYx2t1v+rEHnQ58GvJtjo87SZo/Omk=";
}; };
vendorHash = "sha256-CCtWsljI14VOGjPid6ouzvieDbylh9ljoUcAoR9r4b4="; vendorHash = "sha256-020bxa0LErrvRKe3HirCWZDaBQFfKsWgl4mxfLtl1lg=";
ldflags = [ "-s" "-w" ]; ldflags = [ "-s" "-w" ];

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "golangci-lint"; pname = "golangci-lint";
version = "1.56.1"; version = "1.56.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "golangci"; owner = "golangci";
repo = "golangci-lint"; repo = "golangci-lint";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-6mwdDi9ltEKpDNa+GPEHiJdQO8csUg6MnuyiKQ02B80="; hash = "sha256-P1bgyYJCzHWWcmAHmBAyghFzKCwiQW3KNkbk5gogpn8=";
}; };
vendorHash = "sha256-Y+y3X0pGFYeAMpvRWFgzcWRpHQL+X9J3/ehiO2N2P2o="; vendorHash = "sha256-9M9BPLEtNlhmZbS/Kn9yh2att2oIgF+smP7y1XCvrjI=";
subPackages = [ "cmd/golangci-lint" ]; subPackages = [ "cmd/golangci-lint" ];

View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "gqlgenc"; pname = "gqlgenc";
version = "0.19.0"; version = "0.19.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "yamashou"; owner = "yamashou";
repo = "gqlgenc"; repo = "gqlgenc";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-V2YKRRJP1KQDo0oIoKU3g/3H1Xeo2oLg3arCDU6NMto="; sha256 = "sha256-raddO2rhRZa/KeDWsMCxYITlYYgnFt19Dj+FbBgeu0A=";
}; };
excludedPackages = [ "example" ]; excludedPackages = [ "example" ];

View File

@ -1792,7 +1792,7 @@ dependencies = [
[[package]] [[package]]
name = "rye" name = "rye"
version = "0.23.0" version = "0.24.0"
dependencies = [ dependencies = [
"age", "age",
"anyhow", "anyhow",

View File

@ -12,13 +12,13 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rye"; pname = "rye";
version = "0.23.0"; version = "0.24.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mitsuhiko"; owner = "mitsuhiko";
repo = "rye"; repo = "rye";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-0sbfqiPxo68429q676hs3vB3wRNmF/+OO7Ykg2x7HIQ="; hash = "sha256-OiChd0qwgs3Wi4Xky27/99vBwaKNsq+4E+gpu5zwFqs=";
}; };
cargoLock = { cargoLock = {

View File

@ -7,16 +7,16 @@
buildGoModule rec { buildGoModule rec {
pname = "zed"; pname = "zed";
version = "1.13.0"; version = "1.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "brimdata"; owner = "brimdata";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-xyTHCBvklK8x6V7WsWDYytnVEfLcja78crvs62WJJ9o="; sha256 = "sha256-1k5qw/uWe5gtDUjDcMW54ezoXOBLt4T9lRmiOS06hz8=";
}; };
vendorHash = "sha256-m8GOKBwXlNhjEIkkbaIOAGslX4WRVPZ0OknGEG29b4E="; vendorHash = "sha256-X1rE6/sgpB6jeTjLZJL/a7ghjRJYTXSQDHB4PmEFUmU=";
subPackages = [ "cmd/zed" "cmd/zq" ]; subPackages = [ "cmd/zed" "cmd/zq" ];

View File

@ -2,56 +2,56 @@
"x86_64-linux": { "x86_64-linux": {
"alpha": { "alpha": {
"experimental": { "experimental": {
"name": "factorio_alpha_x64-1.1.101.tar.xz", "name": "factorio_alpha_x64-1.1.104.tar.xz",
"needsAuth": true, "needsAuth": true,
"sha256": "07f8hcyf4hmf9lpa2ljm6ygpaaj2yd28da4krwa5yzjvqs88b4fq", "sha256": "0aizllbfzbn2j0560n4f823jqq7v7qz813an4wlm39rfsfx7b0vq",
"tarDirectory": "x64", "tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.101/alpha/linux64", "url": "https://factorio.com/get-download/1.1.104/alpha/linux64",
"version": "1.1.101" "version": "1.1.104"
}, },
"stable": { "stable": {
"name": "factorio_alpha_x64-1.1.101.tar.xz", "name": "factorio_alpha_x64-1.1.104.tar.xz",
"needsAuth": true, "needsAuth": true,
"sha256": "07f8hcyf4hmf9lpa2ljm6ygpaaj2yd28da4krwa5yzjvqs88b4fq", "sha256": "0aizllbfzbn2j0560n4f823jqq7v7qz813an4wlm39rfsfx7b0vq",
"tarDirectory": "x64", "tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.101/alpha/linux64", "url": "https://factorio.com/get-download/1.1.104/alpha/linux64",
"version": "1.1.101" "version": "1.1.104"
} }
}, },
"demo": { "demo": {
"experimental": { "experimental": {
"name": "factorio_demo_x64-1.1.101.tar.xz", "name": "factorio_demo_x64-1.1.104.tar.xz",
"needsAuth": false, "needsAuth": false,
"sha256": "14cnz4y1iqjv8ks0w1k60qy1nqjn33wajwzdpnmxgcz01rzfqd8a", "sha256": "0x08dy6pagfpqc9c2cl239b1f7pf0p4cghzp7avxmbkmbl1fan2l",
"tarDirectory": "x64", "tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.101/demo/linux64", "url": "https://factorio.com/get-download/1.1.104/demo/linux64",
"version": "1.1.101" "version": "1.1.104"
}, },
"stable": { "stable": {
"name": "factorio_demo_x64-1.1.101.tar.xz", "name": "factorio_demo_x64-1.1.104.tar.xz",
"needsAuth": false, "needsAuth": false,
"sha256": "14cnz4y1iqjv8ks0w1k60qy1nqjn33wajwzdpnmxgcz01rzfqd8a", "sha256": "0x08dy6pagfpqc9c2cl239b1f7pf0p4cghzp7avxmbkmbl1fan2l",
"tarDirectory": "x64", "tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.101/demo/linux64", "url": "https://factorio.com/get-download/1.1.104/demo/linux64",
"version": "1.1.101" "version": "1.1.104"
} }
}, },
"headless": { "headless": {
"experimental": { "experimental": {
"name": "factorio_headless_x64-1.1.101.tar.xz", "name": "factorio_headless_x64-1.1.104.tar.xz",
"needsAuth": false, "needsAuth": false,
"sha256": "14l3cg8swl3l7lzp44j4zk9wldzf4g23vda67wyzfyx82pvad206", "sha256": "10qmq2mw2j97s64skwr3m7hmv21h3m0r8rdhnyfrhmrxn8x3a4wf",
"tarDirectory": "x64", "tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.101/headless/linux64", "url": "https://factorio.com/get-download/1.1.104/headless/linux64",
"version": "1.1.101" "version": "1.1.104"
}, },
"stable": { "stable": {
"name": "factorio_headless_x64-1.1.101.tar.xz", "name": "factorio_headless_x64-1.1.104.tar.xz",
"needsAuth": false, "needsAuth": false,
"sha256": "14l3cg8swl3l7lzp44j4zk9wldzf4g23vda67wyzfyx82pvad206", "sha256": "10qmq2mw2j97s64skwr3m7hmv21h3m0r8rdhnyfrhmrxn8x3a4wf",
"tarDirectory": "x64", "tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.101/headless/linux64", "url": "https://factorio.com/get-download/1.1.104/headless/linux64",
"version": "1.1.101" "version": "1.1.104"
} }
} }
} }

View File

@ -10,13 +10,13 @@
buildGoModule rec { buildGoModule rec {
pname = "fastly"; pname = "fastly";
version = "10.8.1"; version = "10.8.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fastly"; owner = "fastly";
repo = "cli"; repo = "cli";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-iT4pLzuIXlijQhFzIi5S+Gt6py9cZKTDs7/49Rs/+GI="; hash = "sha256-IUdpnbYxwiS1ibmqvULAhXRAzr9hmJeRKVWo2w1Odrk=";
# The git commit is part of the `fastly version` original output; # The git commit is part of the `fastly version` original output;
# leave that output the same in nixpkgs. Use the `.git` directory # leave that output the same in nixpkgs. Use the `.git` directory
# to retrieve the commit SHA, and remove the directory afterwards, # to retrieve the commit SHA, and remove the directory afterwards,

View File

@ -5,8 +5,8 @@
, buildWebExtension ? false , buildWebExtension ? false
}: }:
let let
version = "1.6.7"; version = "1.6.9";
gitHash = "8a168bd"; gitHash = "f1bdf38";
in in
buildNpmPackage rec { buildNpmPackage rec {
pname = "vencord"; pname = "vencord";
@ -16,7 +16,7 @@ buildNpmPackage rec {
owner = "Vendicated"; owner = "Vendicated";
repo = "Vencord"; repo = "Vencord";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-opQm0/nBt0O9iVPbLJAn5G2wPe20mhWroG0Y7ug3S7A="; hash = "sha256-ROdp/ZajDvePgTksncPigATkogd3q1OqHl3xPw33txU=";
}; };
ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: { ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: {
@ -34,7 +34,7 @@ buildNpmPackage rec {
npmRebuildFlags = [ "|| true" ]; npmRebuildFlags = [ "|| true" ];
makeCacheWritable = true; makeCacheWritable = true;
npmDepsHash = "sha256-78eZrnXRZwu365mKoBonrpy1fP/chVoQ2qIOhUkdWc8="; npmDepsHash = "sha256-55ggitOOHk4BdNq8AlV0n75eWAbiya5qGr0yCS8vNF4=";
npmFlags = [ "--legacy-peer-deps" ]; npmFlags = [ "--legacy-peer-deps" ];
npmBuildScript = if buildWebExtension then "buildWeb" else "build"; npmBuildScript = if buildWebExtension then "buildWeb" else "build";
npmBuildFlags = [ "--" "--standalone" "--disable-updater" ]; npmBuildFlags = [ "--" "--standalone" "--disable-updater" ];

View File

@ -1,12 +1,12 @@
{ {
"name": "vencord", "name": "vencord",
"version": "1.6.7", "version": "1.6.9",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "vencord", "name": "vencord",
"version": "1.6.7", "version": "1.6.9",
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
"dependencies": { "dependencies": {
"@sapphi-red/web-noise-suppressor": "0.3.3", "@sapphi-red/web-noise-suppressor": "0.3.3",
@ -894,9 +894,9 @@
"dev": true "dev": true
}, },
"node_modules/@types/node": { "node_modules/@types/node": {
"version": "18.19.14", "version": "18.19.17",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.14.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.17.tgz",
"integrity": "sha512-EnQ4Us2rmOS64nHDWr0XqAD8DsO6f3XR6lf9UIIrZQpUzPVdN/oPuEzfDWNHSyXLvoGgjuEm/sPwFGSSs35Wtg==", "integrity": "sha512-SzyGKgwPzuWp2SHhlpXKzCX0pIOfcI4V2eF37nNBJOhwlegQ83omtVQ1XxZpDE06V/d6AQvfQdPfnw0tRC//Ng==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"undici-types": "~5.26.4" "undici-types": "~5.26.4"
@ -915,9 +915,9 @@
"dev": true "dev": true
}, },
"node_modules/@types/react": { "node_modules/@types/react": {
"version": "18.2.51", "version": "18.2.55",
"resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.51.tgz", "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.55.tgz",
"integrity": "sha512-XeoMaU4CzyjdRr3c4IQQtiH7Rpo18V07rYZUucEZQwOUEtGgTXv7e6igQiQ+xnV6MbMe1qjEmKdgMNnfppnXfg==", "integrity": "sha512-Y2Tz5P4yz23brwm2d7jNon39qoAtMMmalOQv6+fEFt1mT+FcM3D841wDpoUvFXhaYenuROCy3FZYqdTjM7qVyA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@types/prop-types": "*", "@types/prop-types": "*",
@ -926,9 +926,9 @@
} }
}, },
"node_modules/@types/react-dom": { "node_modules/@types/react-dom": {
"version": "18.2.18", "version": "18.2.19",
"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.18.tgz", "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.19.tgz",
"integrity": "sha512-TJxDm6OfAX2KJWJdMEVTwWke5Sc/E/RlnPGvGfS0W7+6ocy2xhDVQVh/KvC2Uf7kACs+gDytdusDSdWfWkaNzw==", "integrity": "sha512-aZvQL6uUbIJpjZk4U8JZGbau9KDeAwMfmhyWorxgBkqDIEf6ROjRozcmPIicqsUwPUjbkDfHKgGee1Lq65APcA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@types/react": "*" "@types/react": "*"
@ -941,9 +941,9 @@
"dev": true "dev": true
}, },
"node_modules/@types/semver": { "node_modules/@types/semver": {
"version": "7.5.6", "version": "7.5.7",
"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.7.tgz",
"integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==", "integrity": "sha512-/wdoPq1QqkSj9/QOeKkFquEuPzQbHTWAMPH/PaUMB+JuR31lXhlWXRZ52IpfDYVlDOUBvX09uBrPwxGT1hjNBg==",
"dev": true "dev": true
}, },
"node_modules/@types/yauzl": { "node_modules/@types/yauzl": {
@ -1872,9 +1872,9 @@
"dev": true "dev": true
}, },
"node_modules/diff": { "node_modules/diff": {
"version": "5.1.0", "version": "5.2.0",
"resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz", "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
"integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==", "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": ">=0.3.1" "node": ">=0.3.1"
@ -2306,9 +2306,9 @@
} }
}, },
"node_modules/escalade": { "node_modules/escalade": {
"version": "3.1.1", "version": "3.1.2",
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": ">=6" "node": ">=6"
@ -2670,9 +2670,9 @@
} }
}, },
"node_modules/fastq": { "node_modules/fastq": {
"version": "1.17.0", "version": "1.17.1",
"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.0.tgz", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
"integrity": "sha512-zGygtijUMT7jnk3h26kUms3BkSDp4IfIKjmnqI2tvx6nuBfiF1UqOxbnLfzdv+apBy+53oaImsKtMw/xYbW+1w==", "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"reusify": "^1.0.4" "reusify": "^1.0.4"
@ -3052,9 +3052,9 @@
} }
}, },
"node_modules/hasown": { "node_modules/hasown": {
"version": "2.0.0", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz",
"integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", "integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"function-bind": "^1.1.2" "function-bind": "^1.1.2"
@ -4052,9 +4052,9 @@
} }
}, },
"node_modules/postcss": { "node_modules/postcss": {
"version": "8.4.33", "version": "8.4.35",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz",
"integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==", "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==",
"dev": true, "dev": true,
"funding": [ "funding": [
{ {
@ -4485,9 +4485,9 @@
} }
}, },
"node_modules/semver": { "node_modules/semver": {
"version": "7.5.4", "version": "7.6.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
"integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"lru-cache": "^6.0.0" "lru-cache": "^6.0.0"
@ -4743,9 +4743,9 @@
} }
}, },
"node_modules/spdx-exceptions": { "node_modules/spdx-exceptions": {
"version": "2.4.0", "version": "2.5.0",
"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.4.0.tgz", "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
"integrity": "sha512-hcjppoJ68fhxA/cjbN4T8N6uCUejN8yFw69ttpqtBeCbF3u13n7mb31NB9jKwGTTWWnt9IbRA/mf1FprYS8wfw==", "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
"dev": true "dev": true
}, },
"node_modules/spdx-expression-parse": { "node_modules/spdx-expression-parse": {
@ -4759,9 +4759,9 @@
} }
}, },
"node_modules/spdx-license-ids": { "node_modules/spdx-license-ids": {
"version": "3.0.16", "version": "3.0.17",
"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz", "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz",
"integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==", "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==",
"dev": true "dev": true
}, },
"node_modules/split-string": { "node_modules/split-string": {

View File

@ -1,7 +1,9 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#! nix-shell -I nixpkgs=../../.. -i bash -p curl jq common-updater-scripts prefetch-npm-deps nodejs #! nix-shell -i bash -p curl jq common-updater-scripts prefetch-npm-deps nodejs
set -eou pipefail set -eou pipefail
pkgDir="$(dirname "$(readlink -f "$0")")"
tempDir=$(mktemp -d) tempDir=$(mktemp -d)
ghTags=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/Vendicated/Vencord/tags") ghTags=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/Vendicated/Vencord/tags")
@ -15,10 +17,8 @@ npm install --legacy-peer-deps -f
npmDepsHash=$(prefetch-npm-deps ./package-lock.json) npmDepsHash=$(prefetch-npm-deps ./package-lock.json)
popd popd
pushd ../../..
update-source-version vencord "${latestTag#v}" update-source-version vencord "${latestTag#v}"
popd
sed -E 's#\bgitHash = ".*?"#gitHash = "'"${gitHash:0:7}"'"#' -i default.nix sed -E 's#\bgitHash = ".*?"#gitHash = "'"${gitHash:0:7}"'"#' -i "$pkgDir/default.nix"
sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' -i default.nix sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' -i "$pkgDir/default.nix"
cp "$tempDir/package-lock.json" package-lock.json cp "$tempDir/package-lock.json" "$pkgDir/package-lock.json"

View File

@ -70,11 +70,11 @@ rec {
# Vulkan developer beta driver # Vulkan developer beta driver
# See here for more information: https://developer.nvidia.com/vulkan-driver # See here for more information: https://developer.nvidia.com/vulkan-driver
vulkan_beta = generic rec { vulkan_beta = generic rec {
version = "535.43.25"; version = "535.43.28";
persistencedVersion = "535.98"; persistencedVersion = "535.98";
settingsVersion = "535.98"; settingsVersion = "535.98";
sha256_64bit = "sha256-Ir75rT1xs3Cycd1Wl7EqIUuU5bGfeSPYbGiq2Eqjlsw="; sha256_64bit = "sha256-ic7r3MPp65fdEwqDRyc0WiKonL5eF6KZUpfD/C3vYaU=";
openSha256 = "sha256-HnM4/sUKvZ8hGuwa0YSTAuC9HShw6on3+lk0TcqcPEQ="; openSha256 = "sha256-a5iccyISHheOfTwpsrz6puqrVhgzYWFvNlykVG3+PVc=";
settingsSha256 = "sha256-jCRfeB1w6/dA27gaz6t5/Qo7On0zbAPIi74LYLel34s="; settingsSha256 = "sha256-jCRfeB1w6/dA27gaz6t5/Qo7On0zbAPIi74LYLel34s=";
persistencedSha256 = "sha256-WviDU6B50YG8dO64CGvU3xK8WFUX8nvvVYm/fuGyroM="; persistencedSha256 = "sha256-WviDU6B50YG8dO64CGvU3xK8WFUX8nvvVYm/fuGyroM=";
url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux"; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux";

View File

@ -8,8 +8,6 @@ python3.pkgs.buildPythonApplication rec {
version = "4.4.2"; version = "4.4.2";
pyproject = true; pyproject = true;
disabled = python3.pythonOlder "3.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AppDaemon"; owner = "AppDaemon";
repo = "appdaemon"; repo = "appdaemon";
@ -17,12 +15,10 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-T3InE4J4qYeFJTq6nrW8y5BOA7Z0n3t9eVpl641r/xk="; hash = "sha256-T3InE4J4qYeFJTq6nrW8y5BOA7Z0n3t9eVpl641r/xk=";
}; };
postPatch = '' pythonRelaxDeps = true;
# relax dependencies
sed -i 's/~=/>=/' pyproject.toml
'';
nativeBuildInputs = with python3.pkgs; [ nativeBuildInputs = with python3.pkgs; [
pythonRelaxDepsHook
setuptools setuptools
]; ];

View File

@ -1891,13 +1891,11 @@
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
fetchSubmodules = false; remotes = ["https://rubygems.org"];
rev = "e020fcc3a54d993ab45b7194d89ab720296c111b"; sha256 = "1narh0bj0c9pg8cb2jhpydfa9mnm3dclckzk5s6xrwa2gm99hnk4";
sha256 = "18pbm9qkancy38v0gpb6f5k0xd8r347jl4xvj4jn98ihfhzgwygj"; type = "gem";
type = "git";
url = "https://github.com/jhawthorn/nsa.git";
}; };
version = "0.2.8"; version = "0.3.0";
}; };
oj = { oj = {
groups = ["default"]; groups = ["default"];
@ -2065,10 +2063,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0pfj771p5a29yyyw58qacks464sl86d5m3jxjl5rlqqw2m3v5xq4"; sha256 = "0s4vskbydg5k0z86v2g5drf03lslkr4b1l421vz29531jlrsljvy";
type = "gem"; type = "gem";
}; };
version = "1.5.4"; version = "1.5.5";
}; };
pghero = { pghero = {
dependencies = ["activerecord"]; dependencies = ["activerecord"];

View File

@ -1,7 +1,7 @@
# This file was generated by pkgs.mastodon.updateScript. # This file was generated by pkgs.mastodon.updateScript.
{ fetchFromGitHub, applyPatches, patches ? [] }: { fetchFromGitHub, applyPatches, patches ? [] }:
let let
version = "4.2.6"; version = "4.2.7";
in in
( (
applyPatches { applyPatches {
@ -9,7 +9,7 @@ in
owner = "mastodon"; owner = "mastodon";
repo = "mastodon"; repo = "mastodon";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-xUJiyQN3xsl/8+D/kaky+iYunY0ctlSbjkftN2+NQNw="; hash = "sha256-lz1HMg/B6BOqGxypzDTTO5yY7C5B6QRNIpRnDZW2eGs=";
}; };
patches = patches ++ []; patches = patches ++ [];
}) // { }) // {

View File

@ -5,13 +5,13 @@
buildGoModule rec { buildGoModule rec {
pname = "rqlite"; pname = "rqlite";
version = "8.20.0"; version = "8.20.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rqlite"; owner = "rqlite";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-c8icZD30khoPzWx04HG55bsjqUV1kRmNmCgvTOHSyQA="; sha256 = "sha256-QMaCtl18adOLuWUXDlnVphkLyQUTEhYx+6HAJ3qYPW8=";
}; };
vendorHash = "sha256-FzxY6CTcFwSmW9LEKzPRtCsKxsGedwU9G3A3efYG9zk="; vendorHash = "sha256-FzxY6CTcFwSmW9LEKzPRtCsKxsGedwU9G3A3efYG9zk=";

View File

@ -12,7 +12,7 @@
}: }:
let let
version = "1.58.2"; version = "1.60.0";
in in
buildGoModule { buildGoModule {
pname = "tailscale"; pname = "tailscale";
@ -22,9 +22,9 @@ buildGoModule {
owner = "tailscale"; owner = "tailscale";
repo = "tailscale"; repo = "tailscale";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-FiFFfUtse0CKR4XJ82HEjpZNxCaa4FnwSJfEzJ5kZgk="; hash = "sha256-qx6ukgaEsdsq76E+GQkYH/Ydv3VKO9jLTh1zm0pGeWw=";
}; };
vendorHash = "sha256-BK1zugKGtx2RpWHDvFZaFqz/YdoewsG8SscGt25uwtQ="; vendorHash = "sha256-eci4f6golU1eIQOezplA+I+gmOfof40ktIdpr0v/uMc=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];

View File

@ -2,7 +2,7 @@
buildGoModule rec { buildGoModule rec {
pname = "okta-aws-cli"; pname = "okta-aws-cli";
version = "2.0.1"; version = "2.1.0";
subPackages = [ "cmd/okta-aws-cli" ]; subPackages = [ "cmd/okta-aws-cli" ];
@ -10,7 +10,7 @@ buildGoModule rec {
owner = "okta"; owner = "okta";
repo = "okta-aws-cli"; repo = "okta-aws-cli";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-A49TpwvF7zQFCqffLeb1FOxbRwe4yhKSGs7YKNfpNSY="; sha256 = "sha256-ovmN/BYQInbfvMaSl7WNXC7dBkLMyZdZstc164yj5Qo=";
}; };
vendorHash = "sha256-SjABVO6tHYRc/1pYjOqfZP+NfnK1/WnAcY5NQ4hMssE="; vendorHash = "sha256-SjABVO6tHYRc/1pYjOqfZP+NfnK1/WnAcY5NQ4hMssE=";

View File

@ -6,7 +6,7 @@
, libsecret , libsecret
, python3 , python3
, pkg-config , pkg-config
, nodePackages , nodejs
, electron , electron
, makeWrapper , makeWrapper
, makeDesktopItem , makeDesktopItem
@ -63,7 +63,6 @@ stdenvNoCC.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
python3 python3
pkg-config pkg-config
nodePackages.node-gyp
]; ];
buildInputs = [ buildInputs = [
libsecret libsecret
@ -76,6 +75,15 @@ stdenvNoCC.mkDerivation rec {
}; };
}; };
# needed for node-gyp, copied from https://nixos.org/manual/nixpkgs/unstable/#javascript-yarn2nix-pitfalls
# permalink: https://github.com/NixOS/nixpkgs/blob/d176767c02cb2a048e766215078c3d231e666091/doc/languages-frameworks/javascript.section.md#pitfalls-javascript-yarn2nix-pitfalls
preBuild = ''
mkdir -p $HOME/.node-gyp/${nodejs.version}
echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion
ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version}
export npm_config_nodedir=${nodejs}
'';
packageJSON = "${src}/package.json"; packageJSON = "${src}/package.json";
yarnLock = ./yarn.lock; yarnLock = ./yarn.lock;

View File

@ -2,13 +2,14 @@
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, buildNpmPackage , buildNpmPackage
, makeWrapper , nodejs_18
, coreutils , coreutils
, ffmpeg-headless , ffmpeg-headless
, imagemagick_light , imagemagick_light
, procps , procps
, python3 , python3
, xorg , xorg
, nix-update-script
# chromedriver is more efficient than geckodriver, but is available on less platforms. # chromedriver is more efficient than geckodriver, but is available on less platforms.
@ -23,15 +24,17 @@
assert (!withFirefox && !withChromium) -> throw "Either `withFirefox` or `withChromium` must be enabled."; assert (!withFirefox && !withChromium) -> throw "Either `withFirefox` or `withChromium` must be enabled.";
buildNpmPackage rec { buildNpmPackage rec {
pname = "sitespeed-io"; pname = "sitespeed-io";
version = "27.3.1"; version = "33.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sitespeedio"; owner = "sitespeedio";
repo = "sitespeed.io"; repo = "sitespeed.io";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Z4U4ZIw5Du/VSHIsGKdgu7wRv/6XVh/nMFDs8aYwkOQ="; hash = "sha256-UmviwcxL67fn8B4ruJH9yKdcYVqmxqKSImQszKhDHZ0=";
}; };
nodejs = nodejs_18;
postPatch = '' postPatch = ''
ln -s npm-shrinkwrap.json package-lock.json ln -s npm-shrinkwrap.json package-lock.json
''; '';
@ -41,11 +44,9 @@ buildNpmPackage rec {
GECKODRIVER_SKIP_DOWNLOAD = true; GECKODRIVER_SKIP_DOWNLOAD = true;
EDGEDRIVER_SKIP_DOWNLOAD = true; EDGEDRIVER_SKIP_DOWNLOAD = true;
nativeBuildInputs = [ python3 makeWrapper ];
dontNpmBuild = true; dontNpmBuild = true;
npmInstallFlags = [ "--omit=dev" ]; npmInstallFlags = [ "--omit=dev" ];
npmDepsHash = "sha256-RfZlXE8hnAJKiiWdOGFsAFGcxwgnLNvLrXeIinABFb0="; npmDepsHash = "sha256-FggwOnuQ+azgdLxfc6EUAsbl0+il6/2+p1t7MCrTNgE=";
postInstall = '' postInstall = ''
mv $out/bin/sitespeed{.,-}io mv $out/bin/sitespeed{.,-}io
@ -81,6 +82,10 @@ buildNpmPackage rec {
${lib.optionalString (withFirefox && !withChromium) "--add-flags '-b firefox'"} ${lib.optionalString (withFirefox && !withChromium) "--add-flags '-b firefox'"}
''; '';
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; { meta = with lib; {
description = "An open source tool that helps you monitor, analyze and optimize your website speed and performance"; description = "An open source tool that helps you monitor, analyze and optimize your website speed and performance";
homepage = "https://sitespeed.io"; homepage = "https://sitespeed.io";

View File

@ -8,16 +8,16 @@
buildGoModule rec { buildGoModule rec {
pname = "doppler"; pname = "doppler";
version = "3.66.5"; version = "3.67.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dopplerhq"; owner = "dopplerhq";
repo = "cli"; repo = "cli";
rev = version; rev = version;
sha256 = "sha256-/kcGfTDthm4gp1M4lSeY1x8Q7EWVX2pZVjF2rAbz+Es="; sha256 = "sha256-aBdpcmKv8EwUu8MKsC/aoSkiXf+JuTmhpGrPauWpThc=";
}; };
vendorHash = "sha256-FOmaK6S61fkzybpDx6qfi6m4e2IaqBpavaFhEgIvmqw="; vendorHash = "sha256-NUHWKPszQH/pvnA+j65+bJ6t+C0FDRRbTviqkYztpE4=";
ldflags = [ ldflags = [
"-s -w" "-s -w"

View File

@ -14837,7 +14837,6 @@ with pkgs;
volumeicon = callPackage ../tools/audio/volumeicon { }; volumeicon = callPackage ../tools/audio/volumeicon { };
waf = callPackage ../development/tools/build-managers/waf { };
# An alias to work around the splicing incidents # An alias to work around the splicing incidents
# Related: # Related:
# https://github.com/NixOS/nixpkgs/issues/204303 # https://github.com/NixOS/nixpkgs/issues/204303
@ -27224,7 +27223,9 @@ with pkgs;
systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { };
tailscale = callPackage ../servers/tailscale { }; tailscale = callPackage ../servers/tailscale {
buildGoModule = buildGo122Module;
};
tailscale-systray = callPackage ../applications/misc/tailscale-systray { }; tailscale-systray = callPackage ../applications/misc/tailscale-systray { };
@ -33129,9 +33130,7 @@ with pkgs;
libowlevelzs = callPackage ../development/libraries/libowlevelzs { }; libowlevelzs = callPackage ../development/libraries/libowlevelzs { };
librecad = libsForQt5.callPackage ../applications/misc/librecad { librecad = libsForQt5.callPackage ../applications/misc/librecad { };
boost = boost175;
};
libreoffice-bin = callPackage ../applications/office/libreoffice/darwin { }; libreoffice-bin = callPackage ../applications/office/libreoffice/darwin { };