ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-29 08:38:18 +03:00
Code Issues Projects Releases Wiki Activity

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot] 2024-02-17 00:12:14 +00:00 committed by GitHub
commit 2f576c19f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
191 changed files with 11814 additions and 2826 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
maintainers/maintainer-list.nix
View File

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

22
nixos/modules/config/users-groups.nix
View File

@ -649,7 +649,6 @@ in {
home = "/root";
shell = mkDefault cfg.defaultUserShell;
group = "root";
initialHashedPassword = mkDefault "!";
};
nobody = {
uid = ids.uids.nobody;
@ -897,7 +896,26 @@ in {
));
warnings =
builtins.filter (x: x != null) (
flip concatMap (attrValues cfg.users) (user: let
unambiguousPasswordConfiguration = 1 >= length (filter (x: x != null) ([
user.hashedPassword
user.hashedPasswordFile
user.password
] ++ optionals cfg.mutableUsers [
# For immutable users, initialHashedPassword is set to hashedPassword,
# so using these options would always trigger the assertion.
user.initialHashedPassword
user.initialPassword
]));
in optional (!unambiguousPasswordConfiguration) ''
The user '${user.name}' has multiple of the options
`hashedPassword`, `password`, `hashedPasswordFile`, `initialPassword`
& `initialHashedPassword` set to a non-null value.
The options silently discard others by the order of precedence
given above which can lead to surprising results. To resolve this warning,
set at most one of the options above to a non-`null` value.
'')
++ builtins.filter (x: x != null) (
flip mapAttrsToList cfg.users (_: user:
# This regex matches a subset of the Modular Crypto Format (MCF)[1]
# informal standard. Since this depends largely on the OS or the

1
nixos/modules/module-list.nix
View File

@ -241,6 +241,7 @@
./programs/proxychains.nix
./programs/qdmr.nix
./programs/qt5ct.nix
./programs/quark-goldleaf.nix
./programs/regreet.nix
./programs/rog-control-center.nix
./programs/rust-motd.nix

18
nixos/modules/programs/quark-goldleaf.nix Normal file
View File

@ -0,0 +1,18 @@
{ config, lib, pkgs, ... }:
let
cfg = config.programs.quark-goldleaf;
in
{
options = {
programs.quark-goldleaf = {
enable = lib.mkEnableOption "quark-goldleaf with udev rules applied";
};
};
config = lib.mkIf cfg.enable {
environment.systemPackages = [ pkgs.quark-goldleaf ];
services.udev.packages = [ pkgs.quark-goldleaf ];
};
meta.maintainers = pkgs.quark-goldleaf.meta.maintainers;
}

3
nixos/modules/services/cluster/kubernetes/default.nix
View File

@ -285,7 +285,7 @@ in {
systemd.tmpfiles.rules = [
"d /opt/cni/bin 0755 root root -"
"d /run/kubernetes 0755 kubernetes kubernetes -"
"d /var/lib/kubernetes 0755 kubernetes kubernetes -"
"d ${cfg.dataDir} 0755 kubernetes kubernetes -"
];
users.users.kubernetes = {
@ -294,6 +294,7 @@ in {
group = "kubernetes";
home = cfg.dataDir;
createHome = true;
homeMode = "755";
};
users.groups.kubernetes.gid = config.ids.gids.kubernetes;

23
nixos/modules/services/web-apps/mastodon.nix
View File

@ -33,6 +33,7 @@ let
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.smtp.authenticate { SMTP_LOGIN = cfg.smtp.user; }
// 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);
in {
after = [ "network.target" "mastodon-init-dirs.service" ]
++ lib.optional cfg.redis.createLocally "redis-mastodon.service"
++ lib.optional databaseActuallyCreateLocally "postgresql.service"
++ lib.optional cfg.automaticMigrations "mastodon-init-db.service";
requires = [ "mastodon-init-dirs.service" ]
++ lib.optional cfg.redis.createLocally "redis-mastodon.service"
++ lib.optional databaseActuallyCreateLocally "postgresql.service"
++ lib.optional cfg.automaticMigrations "mastodon-init-db.service";
description = "Mastodon sidekiq${jobClassLabel}";
@ -146,9 +149,11 @@ let
name = "mastodon-streaming-${toString i}";
value = {
after = [ "network.target" "mastodon-init-dirs.service" ]
++ lib.optional cfg.redis.createLocally "redis-mastodon.service"
++ lib.optional databaseActuallyCreateLocally "postgresql.service"
++ lib.optional cfg.automaticMigrations "mastodon-init-db.service";
requires = [ "mastodon-init-dirs.service" ]
++ lib.optional cfg.redis.createLocally "redis-mastodon.service"
++ lib.optional databaseActuallyCreateLocally "postgresql.service"
++ lib.optional cfg.automaticMigrations "mastodon-init-db.service";
wantedBy = [ "mastodon.target" "mastodon-streaming.target" ];
@ -404,6 +409,12 @@ in {
type = lib.types.port;
default = 31637;
};
enableUnixSocket = lib.mkOption {
description = lib.mdDoc "Use Unix socket";
type = lib.types.bool;
default = true;
};
};
database = {
@ -751,9 +762,11 @@ in {
systemd.services.mastodon-web = {
after = [ "network.target" "mastodon-init-dirs.service" ]
++ lib.optional cfg.redis.createLocally "redis-mastodon.service"
++ lib.optional databaseActuallyCreateLocally "postgresql.service"
++ lib.optional cfg.automaticMigrations "mastodon-init-db.service";
requires = [ "mastodon-init-dirs.service" ]
++ lib.optional cfg.redis.createLocally "redis-mastodon.service"
++ lib.optional databaseActuallyCreateLocally "postgresql.service"
++ lib.optional cfg.automaticMigrations "mastodon-init-db.service";
wantedBy = [ "mastodon.target" ];
@ -834,11 +847,14 @@ in {
enable = true;
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;
}
(lib.mkIf (!cfg.redis.enableUnixSocket) {
port = cfg.redis.port;
bind = "127.0.0.1";
};
})
]);
services.postgresql = lib.mkIf databaseActuallyCreateLocally {
enable = true;
ensureUsers = [
@ -859,6 +875,7 @@ in {
};
})
(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;

6
nixos/modules/system/boot/systemd/oomd.nix
View File

@ -49,15 +49,15 @@ in {
systemd.slices."-".sliceConfig = lib.mkIf cfg.enableRootSlice {
ManagedOOMMemoryPressure = "kill";
ManagedOOMMemoryPressureLimit = "80%";
ManagedOOMMemoryPressureLimit = lib.mkDefault "80%";
};
systemd.slices."system".sliceConfig = lib.mkIf cfg.enableSystemSlice {
ManagedOOMMemoryPressure = "kill";
ManagedOOMMemoryPressureLimit = "80%";
ManagedOOMMemoryPressureLimit = lib.mkDefault "80%";
};
systemd.slices."user-".sliceConfig = lib.mkIf cfg.enableUserSlices {
ManagedOOMMemoryPressure = "kill";
ManagedOOMMemoryPressureLimit = "80%";
ManagedOOMMemoryPressureLimit = lib.mkDefault "80%";
};
systemd.user.units."slice" = lib.mkIf cfg.enableUserSlices {
text = ''

3
nixos/tests/lemmy.nix
View File

@ -51,7 +51,8 @@ in
with subtest("the backend starts and responds"):
server.wait_for_open_port(${toString backendPort})
server.succeed("curl --fail localhost:${toString backendPort}/api/v3/site")
# wait until succeeds, it just needs few seconds for migrations, but lets give it 10s max
server.wait_until_succeeds("curl --fail localhost:${toString backendPort}/api/v3/site", 10)
with subtest("the UI starts and responds"):
server.wait_for_unit("lemmy-ui.service")

16
nixos/tests/qownnotes.nix
View File

@ -21,6 +21,7 @@ import ./make-test-python.nix ({ lib, pkgs, ...} :
enableOCR = true;
# https://nixos.org/manual/nixos/stable/#ssec-machine-objects
testScript = { nodes, ... }: let
aliceDo = cmd: ''machine.succeed("su - alice -c '${cmd}' >&2 &");'';
in ''
@ -52,8 +53,13 @@ import ./make-test-python.nix ({ lib, pkgs, ...} :
machine.wait_for_text("App metric")
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
machine.wait_for_text("QOwnNotes - ${pkgs.qownnotes.version}")
machine.wait_for_open_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.sleep(1)
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")
'';

6
nixos/tests/web-apps/mastodon/standard.nix
View File

@ -34,12 +34,6 @@ in
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.
services.postgresql.package = pkgs.postgresql_14;

4
pkgs/applications/audio/noson/default.nix
View File

@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "noson";
version = "5.6.3";
version = "5.6.5";
src = fetchFromGitHub {
owner = "janbar";
repo = "noson-app";
rev = finalAttrs.version;
hash = "sha256-Yv5p9yAEhJHm9ZDZlR76z10oGBNpdifR7ITXcAHIb54=";
hash = "sha256-UAhaTfj2lCBmHoVEK5IvJfJ9d1OSuZZ+3f5HaTx8hhA=";
};
nativeBuildInputs = [

4
pkgs/applications/editors/vim/plugins/deprecated.json
View File

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

1286
pkgs/applications/editors/vim/plugins/generated.nix
View File

File diff suppressed because it is too large Load Diff

665
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
View File

File diff suppressed because it is too large Load Diff

4
pkgs/applications/editors/vim/plugins/overrides.nix
View File

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

6
pkgs/applications/editors/vim/plugins/vim-plugin-names
View File

@ -73,7 +73,6 @@ https://github.com/jiangmiao/auto-pairs/,,
https://github.com/pocco81/auto-save.nvim/,HEAD,
https://github.com/rmagatti/auto-session/,,
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/nullishamy/autosave.nvim/,HEAD,
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/Shougo/neocomplete.vim/,,
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/folke/neodev.nvim/,HEAD,
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/cshuaimin/ssr.nvim/,HEAD,
https://github.com/luukvbaal/stabilize.nvim/,,
https://github.com/tamton-aquib/staline.nvim/,main,
https://github.com/eigenfoo/stan-vim/,,
https://github.com/josegamez82/starrynight/,HEAD,
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/kaarmu/typst.vim/,HEAD,
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/mbbill/undotree/,,
https://github.com/chrisbra/unicode.vim/,,

51
pkgs/applications/editors/vscode/extensions/default.nix
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 {
mktplcRef = {
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 { };
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 {
mktplcRef = {
name = "EditorConfig";

16
pkgs/applications/editors/vscode/vscode.nix
View File

@ -30,21 +30,21 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "0nffz9xqm1iny7sqi1pkmnfcski15qsycw9gxir18j51kfzz50wf";
x86_64-darwin = "082m2wwd67ayjadlywqimnmdm8imw6lz0rd8rnwjd2sjksxnrsk8";
aarch64-linux = "0wlm8ajm1xw8lpmnbkzkgvaakfa9gacwi7m2fdyc4822rq7fn09b";
aarch64-darwin = "1rgcljj97f551yr0q5f0vxdkvbhxrbyqrw85gb6qfxpg5d0l7y4f";
armv7l-linux = "1wpslrysi8a6rnx99lq16zx277lnmqjp02q6gxmkpcvrvw27m6yj";
x86_64-linux = "17fzqq44p7ix4ihkg8nq582njjy96a8zz8vz9hl62hdxxg3llgfg";
x86_64-darwin = "12vbkzv2l02wifcjd7amq583vlv0iqixpa2kf5swhl0arww1viqa";
aarch64-linux = "1myv8zy2cycsmnp8xhjbm2lpcad3hj9zh79ywcinc50yncwj6wdl";
aarch64-darwin = "0vvbwcbxf0fmcfyk2y231qd8lxaj869ap865zps6wcdjqr5wnbdq";
armv7l-linux = "04gy6ls3gnbdcg4998widy9b9h04rx1gzp6iml6pi73li1cmfawz";
}.${system} or throwSystem;
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.86.1";
version = "1.86.2";
pname = "vscode" + lib.optionalString isInsiders "-insiders";
# This is used for VS Code - Remote SSH test
rev = "31c37ee8f63491495ac49e43b8544550fbae4533";
rev = "903b1e9d8990623e3d7da1df3d33db3e42d80eda";
executableName = "code" + lib.optionalString isInsiders "-insiders";
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@ -68,7 +68,7 @@ in
src = fetchurl {
name = "vscode-server-${rev}.tar.gz";
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
sha256 = "1hq6i51d1dhpippc8gmhygw3kj9cx021y54ga58l5b80wvg2cf1y";
sha256 = "06jv2kzxy7p7y7294c4sq6fk6slwk4gfw6jqh79avnq0riy669gv";
};
};

16
pkgs/applications/emulators/retroarch/cores.nix
View File

@ -48,13 +48,15 @@ let
getCore = repo: (lib.getAttr repo hashesFile);
getCoreSrc = repo:
(lib.pipe repo [
getCore
(x: builtins.removeAttrs x [ "date" ])
fetchFromGitHub
]);
let
inherit (getCore repo) src fetcher;
fetcherFn = {
inherit fetchFromGitHub;
}.${fetcher} or (throw "Unknown fetcher: ${fetcher}");
in
fetcherFn src;
getCoreDate = repo: (getCore repo).date or "unstable-1970-01-01";
getCoreVersion = repo: (getCore repo).version;
mkLibretroCore =
# Sometimes core name != repo name, so you may need to set them differently
@ -67,7 +69,7 @@ let
{ core
, repo ? core
, src ? (getCoreSrc repo)
, version ? (getCoreDate repo)
, version ? (getCoreVersion repo)
, ...
}@args:
import ./mkLibretroCore.nix ({

625
pkgs/applications/emulators/retroarch/hashes.json
View File

File diff suppressed because it is too large Load Diff

56
pkgs/applications/emulators/retroarch/update_cores.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=./ -i python3 -p "python3.withPackages (ps: with ps; [ requests ])" -p git -p nix-prefetch-github
#!nix-shell -I nixpkgs=./ -i python3 -p "python3.withPackages (ps: with ps; [ ])" -p git -p nix-prefetch-github -p nix-prefetch-scripts
import json
import os
@ -8,8 +8,6 @@ import sys
from concurrent.futures import ThreadPoolExecutor
from pathlib import Path
import requests
SCRIPT_PATH = Path(__file__).absolute().parent
HASHES_PATH = SCRIPT_PATH / "hashes.json"
GET_REPO_THREADS = int(os.environ.get("GET_REPO_THREADS", 8))
@ -19,10 +17,13 @@ GET_REPO_THREADS = int(os.environ.get("GET_REPO_THREADS", 8))
# You may set `deep_clone`, `fetch_submodules` or `leave_dot_git` options to
# `True` and they're similar to `fetchgit` options. Also if for some reason you
# need to pin a specific revision, set `rev` to a commit.
# To generate the hash file for your new core, you can run `update_cores.py
# <core>`. The script needs to be run from the root of your `nixpkgs` clone.
# Do not forget to add your core to `cores.nix` file with the proper overrides
# so the core can be build.
# There is also a `fetcher` option that for now only supports `fetchFromGitHub`
# (see `get_repo_hash()`), but it may be extended in the future if there is a
# need to support fetchers from other source hubs.
# To generate the hash file for your new core, you can run
# `<nixpkgs>/pkgs/applications/emulators/retroarch/update_cores.py <core>`. Do
# not forget to add your core to `cores.nix` file with the proper overrides so
# the core can be build.
CORES = {
"2048": {"repo": "libretro-2048"},
"atari800": {"repo": "libretro-atari800"},
@ -128,30 +129,6 @@ def info(*msg):
print(*msg, file=sys.stderr)
def get_rev_date_fetchFromGitHub(repo, owner, rev):
# https://docs.github.com/en/rest/commits/commits?apiVersion=2022-11-28#get-a-commit
url = f"https://api.github.com/repos/{owner}/{repo}/commits/{rev}"
headers = {
"Accept": "application/vnd.github+json",
"X-GitHub-Api-Version": "2022-11-28",
}
if token := os.environ.get("GITHUB_TOKEN"):
headers["Authorization"] = f"Bearer {token}"
r = requests.get(url, headers=headers)
try:
j = r.json()
except requests.exceptions.JSONDecodeError:
return None
date = j.get("commit", {}).get("committer", {}).get("date")
if date:
# Date format returned by API: 2023-01-30T06:29:13Z
return f"unstable-{date[:10]}"
else:
return None
def get_repo_hash_fetchFromGitHub(
repo,
owner="libretro",
@ -176,18 +153,24 @@ def get_repo_hash_fetchFromGitHub(
if rev:
extra_args.append("--rev")
extra_args.append(rev)
try:
result = subprocess.run(
["nix-prefetch-github", owner, repo, *extra_args],
["nix-prefetch-github", owner, repo, "--meta", *extra_args],
check=True,
capture_output=True,
text=True,
)
except subprocess.CalledProcessError as ex:
info(f"Error while updating {owner}/{repo}:", ex.stderr)
raise ex
j = json.loads(result.stdout)
date = get_rev_date_fetchFromGitHub(repo, owner, j["rev"])
if date:
j["date"] = date
return {
"fetcher": "fetchFromGitHub",
# Remove False values
return {k: v for k, v in j.items() if v}
"src": {k: v for k, v in j["src"].items() if v},
"version": f"unstable-{j['meta']['commitDate']}",
}
def get_repo_hash(fetcher="fetchFromGitHub", **kwargs):
@ -229,6 +212,7 @@ def main():
cores = {core: repo for core, repo in CORES.items() if core in cores_to_update}
repo_hashes = get_repo_hashes(cores)
repo_hashes["!comment"] = "Generated with update_cores.py script, do not edit!"
info(f"Generating '{HASHES_PATH}'...")
with open(HASHES_PATH, "w") as f:
f.write(json.dumps(dict(sorted(repo_hashes.items())), indent=4))

5
pkgs/applications/file-managers/portfolio-filemanager/default.nix
View File

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

6
pkgs/applications/misc/dasel/default.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "dasel";
version = "2.5.0";
version = "2.6.0";
src = fetchFromGitHub {
owner = "TomWright";
repo = "dasel";
rev = "v${version}";
hash = "sha256-frd4jNn5uruz9oX40ly/AR5I/uKRIfQ8IjOlIvlsOlY=";
hash = "sha256-4SINZXjTILJDmjv6ubuAhBzBmrXY0gJ0huNM3Y0O7Go=";
};
vendorHash = "sha256-B3d+pbk0smBXqcJnac5he0TZPLiT1cLtz02OAGfqhC0=";
vendorHash = "sha256-G9IdTMF5Lnwq38rdJtuvUjD4RBaSmCYs3g+ETz29Mec=";
ldflags = [
"-s" "-w" "-X github.com/tomwright/dasel/v2/internal.Version=${version}"

4
pkgs/applications/misc/mainsail/default.nix
View File

@ -5,11 +5,11 @@
stdenvNoCC.mkDerivation rec {
pname = "mainsail";
version = "2.9.1";
version = "2.10.0";
src = fetchzip {
url = "https://github.com/mainsail-crew/mainsail/releases/download/v${version}/mainsail.zip";
hash = "sha256-OrCS+0zfXs72vJbrqjvEaHJWD0ndozfCcHs1N9Gqios=";
hash = "sha256-5bRmM/BXI0Afe7UK6avh5aWFXkYF4MsUG71uYUc5JlA=";
stripRoot = false;
};

25
pkgs/applications/misc/qcad/default.nix
View File

@ -18,14 +18,14 @@
mkDerivation rec {
pname = "qcad";
version = "3.29.3.1";
version = "3.29.4.1";
src = fetchFromGitHub {
name = "qcad-${version}-src";
owner = "qcad";
repo = "qcad";
rev = "v${version}";
sha256 = "sha256-QPBiEoOseNUzAWQHPEBq6O0jg8ed5dH+8xlyRCct0g4=";
hash = "sha256-00lPgiE3hsP3SL96ygBP91CaAWi1IGOYUO7zC/ORG1U=";
};
patches = [
@ -65,23 +65,23 @@ mkDerivation rec {
"MUPARSER_DIR=${muparser}"
"INSTALLROOT=$(out)"
"BOOST_DIR=${boost.dev}"
"QMAKE_CXXFLAGS=-std=c++14"
];
qtWrapperArgs =
lib.optionals stdenv.isLinux [ "--prefix LD_LIBRARY_PATH : ${placeholder "out"}/lib" ]
++
lib.optionals stdenv.isDarwin [ "--prefix DYLD_LIBRARY_PATH : ${placeholder "out"}/lib" ];
qtWrapperArgs = lib.optionals stdenv.isLinux [
"--prefix LD_LIBRARY_PATH : ${placeholder "out"}/lib"
] ++ lib.optionals stdenv.isDarwin [
"--prefix DYLD_LIBRARY_PATH : ${placeholder "out"}/lib"
];
installPhase = ''
runHook preInstall
'' + lib.optionalString stdenv.isLinux ''
install -Dm555 release/qcad-bin $out/bin/qcad
'' + lib.optionalString stdenv.isDarwin ''
install -Dm555 release/QCAD.app/Contents/MacOS/QCAD $out/bin/qcad
mkdir -p $out/lib
'' +
''
'' + ''
install -Dm555 -t $out/lib release/libspatialindexnavel${stdenv.hostPlatform.extensions.sharedLibrary}
install -Dm555 -t $out/lib release/libqcadcore${stdenv.hostPlatform.extensions.sharedLibrary}
install -Dm555 -t $out/lib release/libqcadentity${stdenv.hostPlatform.extensions.sharedLibrary}
@ -121,11 +121,12 @@ mkDerivation rec {
runHook postInstall
'';
meta = with lib; {
meta = {
description = "2D CAD package based on Qt";
homepage = "https://qcad.org";
license = licenses.gpl3Only;
maintainers = with maintainers; [ yvesf ];
license = lib.licenses.gpl3Only;
mainProgram = "qcad";
maintainers = with lib.maintainers; [ yvesf ];
platforms = qtbase.meta.platforms;
};
}

4
pkgs/applications/misc/tippecanoe/default.nix
View File

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

4
pkgs/applications/networking/browsers/brave/default.nix
View File

@ -93,11 +93,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
version = "1.62.162";
version = "1.62.165";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
hash = "sha256-hQG6LHYPhqzfgR0Z7R+hXB1vEVDd6VEyIttSae15Mpo=";
hash = "sha256-FyTHFoPP4u5BF3vrgBnM5aFLPfijMzmkq06HXMDvv4k=";
};
dontConfigure = true;

14
pkgs/applications/networking/browsers/librewolf/src.json
View File

@ -1,15 +1,15 @@
{
"packageVersion": "122.0-2",
"packageVersion": "122.0.1-2",
"source": {
"rev": "122.0-2",
"sha256": "139vqa0czhbsg8naz75pcf5d8dql30slwrn4l8hkr4r1s1mslyq1"
"rev": "122.0.1-2",
"sha256": "0bp9x5hvjhdvrb5niyx4si7in116l37y5km7a207z7zl1z5d3q16"
},
"settings": {
"rev": "fe568fa26d52fa917c89d735468a17b990a23e2c",
"sha256": "1gska84ib386a1021r1n54mb1a47bqn459v5n26g4wqx3xrma48n"
"rev": "c242d6d6c77948451af5bd52125a8a81259a7a77",
"sha256": "1s56a4a8wz92gh1cxk8qny3qzvmanl6q34yp049f18c4zrk23lax"
},
"firefox": {
"version": "122.0",
"sha512": "619b735c16970207f3f8fb31dd2350a5e665a802c30501c89aee4817b8b0f7f466da93c66ab238e94967587e538e6858934b18164ff312dbdbfbc3b2bf8bd824"
"version": "122.0.1",
"sha512": "1d4fe1ed351edd748ede2ef6448798a32de9ed7a075a54a7ed5f7baa7b0c4c7f932c2e29f443c9066829e39f22a1dc94be5d00cc994193e949b72aa4a1c8ba41"
}
}

4
pkgs/applications/networking/cluster/arkade/default.nix
View File

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

6
pkgs/applications/networking/cluster/atmos/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "atmos";
version = "1.60.0";
version = "1.63.0";
src = fetchFromGitHub {
owner = "cloudposse";
repo = pname;
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}" ];

6
pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "helm-diff";
version = "3.9.2";
version = "3.9.4";
src = fetchFromGitHub {
owner = "databus23";
repo = pname;
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}" ];

14
pkgs/applications/networking/cluster/kubectl-klock/default.nix
View File

@ -1,17 +1,23 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub, makeWrapper }:
buildGoModule rec {
pname = "kubectl-klock";
version = "0.5.0";
version = "0.5.1";
nativeBuildInputs = [ makeWrapper ];
src = fetchFromGitHub {
owner = "applejag";
repo = pname;
rev = "v${version}";
sha256 = "sha256-fR97rTMFwtqVH9wqKy1+EzKKg753c18v8VDCQ2Y69+s=";
hash = "sha256-q7Wq1mTjOB7tT66+LWIwwqltQcQSHD/VHLO7nCTZTQ0=";
};
vendorHash = "sha256-AkYKKM4PR/msG44MwdSq6XAf6EvdtJHoXyw7Xj7MXso=";
vendorHash = "sha256-3CJ/tmFFkmq6wHxbqk8u+GxxbSrUpB/JD5s/S7hegB8=";
postInstall = ''
makeWrapper $out/bin/kubectl-klock $out/bin/kubectl_complete-klock --add-flags __complete
'';
meta = with lib; {
description = "A kubectl plugin to render watch output in a more readable fashion";

4
pkgs/applications/networking/cluster/kubernetes/default.nix
View File

@ -20,13 +20,13 @@
buildGoModule rec {
pname = "kubernetes";
version = "1.28.4";
version = "1.29.2";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
hash = "sha256-aaGcAIyy0hFJGFfOq5FaF0qAlygXcs2WcwgvMe5dkbo=";
hash = "sha256-DFQaDlp8CqN0jKTVO5N9ZQYyM2gm/VnQfO4/bfvYrTE=";
};
vendorHash = null;

6
pkgs/applications/networking/cluster/kubeseal/default.nix
View File

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

4
pkgs/applications/networking/cluster/kubeshark/default.nix
View File

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

6
pkgs/applications/networking/cluster/werf/default.nix
View File

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "werf";
version = "1.2.289";
version = "1.2.290";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
hash = "sha256-0BinJVTjD8iDlhK50qVODQIKj1KDwhgOMg3HHstYHeg=";
hash = "sha256-pXmFpXpab6YKgujMGqP6xt5iRt/7CrG3wbpBeQ9Ty6c=";
};
vendorHash = "sha256-YHLa0hTXCswkvVxyNp5ezqyEu18Jfnl9n7JMdqMeBSA=";
vendorHash = "sha256-yz0H/016NR+CwVbVfXPAIayacPprcf+MKptbG5fHwVY=";
proxyVendor = true;

6
pkgs/applications/networking/instant-messengers/beeper/default.nix
View File

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

10
pkgs/applications/networking/instant-messengers/qq/sources.nix
View File

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

4
pkgs/applications/office/homebank/default.nix
View File

@ -3,10 +3,10 @@
stdenv.mkDerivation rec {
pname = "homebank";
version = "5.7.3";
version = "5.7.4";
src = fetchurl {
url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz";
hash = "sha256-ad8XKlmazWZim/mLNmnsFSy5Oni7yv3HQxYX3SXzXcU=";
hash = "sha256-Qs5xRsh16gyjyTORtqm/RxTbRiHGP0oJTcxviYW7VOQ=";
};
nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ];

4
pkgs/applications/office/qownnotes/default.nix
View File

@ -19,14 +19,14 @@
let
pname = "qownnotes";
appname = "QOwnNotes";
version = "24.2.0";
version = "24.2.3";
in
stdenv.mkDerivation {
inherit pname version;
src = fetchurl {
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 = [

4
pkgs/applications/science/biology/last/default.nix
View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "last";
version = "1540";
version = "1541";
src = fetchFromGitLab {
owner = "mcfrith";
repo = "last";
rev = "refs/tags/${version}";
hash = "sha256-oGGpPWWQ5EVK9n5BLQwt1Wch2Xn24B+NrKg6+VrsUMY=";
hash = "sha256-gEesPeGY2RozoViZpBWNTXFJriKVb/r0Efw9XEXwXmM=";
};
nativeBuildInputs = [

4
pkgs/applications/science/computer-architecture/qtrvsim/default.nix
View File

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

4
pkgs/applications/science/logic/potassco/clingo.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "clingo";
version = "5.6.2";
version = "5.7.0";
src = fetchFromGitHub {
owner = "potassco";
repo = "clingo";
rev = "v${version}";
sha256 = "sha256-2vOscD5jengY3z9gHoY9y9y6RLfdzUj7BNKLyppNRac=";
sha256 = "sha256-mXexFRPC/+5mNRVZqzsLJKiRkKA009OQrEhOAg8M38k=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/applications/version-management/gh/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gh";
version = "2.43.1";
version = "2.44.0";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
hash = "sha256-FPKYp3tdYXncHjfo6E6tRnEG9AQ0RU6FaezwMlTOCtA=";
hash = "sha256-5UESwrEDQpwQSGCKE6WjAGAQvJXACxIt2lw3fZvhAb4=";
};
vendorHash = "sha256-r1zcwBz/mJOv1RU4Ilgg73yH37xu7a/BmqgAkiODq0I=";

45
pkgs/applications/video/crunchy-cli/default.nix
View File

@ -1,45 +0,0 @@
{ lib
, stdenv
, clangStdenv
, darwin
, xcbuild
, openssl
, pkg-config
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
pname = "crunchy-cli";
version = "3.0.0-dev.10";
src = fetchFromGitHub {
owner = "crunchy-labs";
repo = pname;
rev = "v${version}";
hash = "sha256-uc19SmVfa5BZYDidlEgV6GNvcm9Dj0mSjdwHP5S+O4A=";
};
cargoHash = "sha256-H3D55qMUAF6t45mRbGZl+DORAl1H1a7AOe+lQP0WUUQ=";
nativeBuildInputs = [
pkg-config
] ++ lib.optionals stdenv.isDarwin [
xcbuild
];
buildInputs = [
openssl
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
meta = with lib; {
description = "A pure Rust written Crunchyroll cli client and downloader";
homepage = "https://github.com/crunchy-labs/crunchy-cli";
license = with licenses; [ gpl3 ];
maintainers = with maintainers; [ stepbrobd ];
mainProgram = "crunchy-cli";
};
}

436
pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

19
pkgs/applications/virtualization/cloud-hypervisor/default.nix
View File

@ -2,27 +2,26 @@
rustPlatform.buildRustPackage rec {
pname = "cloud-hypervisor";
version = "37.0";
version = "38.0";
src = fetchFromGitHub {
owner = "cloud-hypervisor";
repo = pname;
rev = "v${version}";
hash = "sha256-zNk3KkKl0bEZUdsWe+9FEMKVepZeQWGasDIn68NEVyw=";
hash = "sha256-Lhug7DCa+QutlvksL6EFQa04UK/sWebDIkqQmwPUpX4=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"acpi_tables-0.1.0" = "sha256-FYjzwCSjuTUDCCQPC2ccDpwRRaG1eT5XgV/b8uSu8uc=";
"acpi_tables-0.1.0" = "sha256-syDq+db1hTne6QoP0vMGUv4tB0J9arQG2Ea2hHW1k3M=";
"igvm-0.1.0" = "sha256-l+Qyhdy3b8h8hPLHg5M0os8aSkjM55hAP5nqi0AGmjo=";
"kvm-bindings-0.6.0" = "sha256-wGdAuPwsgRIqx9dh0m+hC9A/Akz9qg9BM+p06Fi5ACM=";
"kvm-ioctls-0.13.0" = "sha256-jHnFGwBWnAa2lRu4a5eRNy1Y26NX5MV8alJ86VR++QE=";
"micro_http-0.1.0" = "sha256-Ov75Gs+wSmsxOHJu024nWtOJp0cKpS8bkxJJGW6jiKw=";
"mshv-bindings-0.1.1" = "sha256-4ADpLvi9hmHsMyGtqDQ2Msa3aMZmJsi4BPW7B5ZfAMw=";
"versionize_derive-0.1.4" = "sha256-oGuREJ5+FDs8ihmv99WmjIPpL2oPdOr4REk6+7cV/7o=";
"vfio-bindings-0.4.0" = "sha256-grOV+7W1tB4YDRAFbDNQp5nQ1WaivH+N+qHTIj4WA+E=";
"vfio_user-0.1.0" = "sha256-Vi6dBu1mUwyWh7ryKDOBS6GeUD2sqqIrt/bth/LDW6s=";
"kvm-bindings-0.7.0" = "sha256-hXv5N3TTwGQaVxdQ/DTzLt+uwLxFnstJwNhxRD2K8TM=";
"micro_http-0.1.0" = "sha256-gyeOop6AMXEIbLXhJMN/oYGGU8Un8Y0nFZc9ucCa0y4=";
"mshv-bindings-0.1.1" = "sha256-yWvkpOcW3lV47s+rWnN4Bki8tt8CkiPVZ0I36nrWMi4=";
"versionize_derive-0.1.6" = "sha256-eI9fM8WnEBZvskPhU67IWeN6QAPg2u5EBT+AOxfb/fY=";
"vfio-bindings-0.4.0" = "sha256-Dk4T2dMzPZ+Aoq1YSXX2z1Nky8zvyDl7b+A8NH57Hkc=";
"vfio_user-0.1.0" = "sha256-LJ84k9pMkSAaWkuaUd+2LnPXnNgrP5LdbPOc1Yjz5xA=";
"vm-fdt-0.2.0" = "sha256-lKW4ZUraHomSDyxgNlD5qTaBTZqM0Fwhhh/08yhrjyE=";
};
};

6
pkgs/applications/virtualization/docker/compose.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-compose";
version = "2.24.5";
version = "2.24.6";
src = fetchFromGitHub {
owner = "docker";
repo = "compose";
rev = "v${version}";
hash = "sha256-mn6HkGLQM5kx6yzV4IK+GTV6pCoIm1CNjQ8AZLv3sMw=";
hash = "sha256-CrQM9fTXGI3uGAk2yk/+enBr9LuMhNFLFBYHT78lNWc=";
};
postPatch = ''
@ -16,7 +16,7 @@ buildGoModule rec {
rm -rf e2e/
'';
vendorHash = "sha256-KR+4OZKabshnGpkPq8vtEutvQUE+3jVwAlfAwFVlscU=";
vendorHash = "sha256-0YZ36fouuVjj12a7d9F8OkJAmtLIHo0bZhcmOYO5Ki4=";
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];

8
pkgs/applications/virtualization/firecracker/default.nix
View File

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

4
pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix
View File

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

6
pkgs/applications/window-managers/miriway/default.nix
View File

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

4
pkgs/build-support/php/build-composer-project.nix
View File

@ -57,9 +57,9 @@ let
doInstallCheck = previousAttrs.doInstallCheck or false;
installCheckPhase = previousAttrs.installCheckPhase or ''
runHook preCheckInstall
runHook preInstallCheck
runHook postCheckInstall
runHook postInstallCheck
'';
composerRepository = phpDrv.mkComposerRepository {

4
pkgs/build-support/php/build-composer-repository.nix
View File

@ -78,9 +78,9 @@ let
doInstallCheck = previousAttrs.doInstallCheck or false;
installCheckPhase = previousAttrs.installCheckPhase or ''
runHook preCheckInstall
runHook preInstallCheck
runHook postCheckInstall
runHook postInstallCheck
'';
COMPOSER_CACHE_DIR = "/dev/null";

6
pkgs/by-name/as/ast-grep/package.nix
View File

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "ast-grep";
version = "0.18.1";
version = "0.19.0";
src = fetchFromGitHub {
owner = "ast-grep";
repo = "ast-grep";
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.
env = lib.optionalAttrs stdenv.cc.isClang {

13
pkgs/by-name/ce/certificate-ripper/fix-test-temp-dir-path.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/test/java/nl/altindag/crip/command/FileBaseTest.java b/src/test/java/nl/altindag/crip/command/FileBaseTest.java
index 674ca10..f140601 100644
--- a/src/test/java/nl/altindag/crip/command/FileBaseTest.java
+++ b/src/test/java/nl/altindag/crip/command/FileBaseTest.java
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
public class FileBaseTest extends BaseTest {
- protected static final Path TEMP_DIRECTORY = Paths.get(System.getProperty("user.home"), "certificate-ripper-temp");
+ protected static final Path TEMP_DIRECTORY = Paths.get(System.getenv("TMP"), "certificate-ripper-temp");
@BeforeEach
void createTempDirAndClearConsoleCaptor() throws IOException {

68
pkgs/by-name/ce/certificate-ripper/make-deterministic.patch Normal file
View File

@ -0,0 +1,68 @@
diff --git a/pom.xml b/pom.xml
index dd0075d..46ac184 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,7 @@
<version.license-maven-plugin>4.2.rc3</version.license-maven-plugin>
<license.git.copyrightYears>2021</license.git.copyrightYears>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.build.outputTimestamp>1980-01-01T00:00:02Z</project.build.outputTimestamp>
</properties>
<scm>
@@ -103,6 +104,55 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.4.1</version>
+ <executions>
+ <execution>
+ <id>enforce-plugin-versions</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requirePluginVersions />
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>3.1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.3.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>4.0.0-M13</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>3.1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.3.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.3.0</version>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>

56
pkgs/by-name/ce/certificate-ripper/package.nix Normal file
View File

@ -0,0 +1,56 @@
{ lib
, maven
, fetchFromGitHub
, buildGraalvmNativeImage
}:
let
pname = "certificate-ripper";
version = "2.2.0";
jar = maven.buildMavenPackage {
pname = "${pname}-jar";
inherit version;
src = fetchFromGitHub {
owner = "Hakky54";
repo = "certificate-ripper";
rev = version;
hash = "sha256-snavZVLY8sHinLnG6k61eSQlR9sb8+k5tRHqu4kzQKM=";
};
patches = [
./make-deterministic.patch
./fix-test-temp-dir-path.patch
];
mvnHash = "sha256-ahw9VVlvBPlWChcJzXFna55kxqVeJMmdaLtwWcJ+qSA=";
installPhase = ''
install -Dm644 target/crip.jar $out
'';
};
in
buildGraalvmNativeImage {
inherit pname version;
src = jar;
executable = "crip";
# Copied from pom.xml
extraNativeImageBuildArgs = [
"--no-fallback"
"-H:ReflectionConfigurationResources=graalvm_config.json"
"-H:EnableURLProtocols=https"
"-H:EnableURLProtocols=http"
];
meta = {
changelog = "https://github.com/Hakky54/certificate-ripper/releases/tag/${version}";
description = "A CLI tool to extract server certificates";
homepage = "https://github.com/Hakky54/certificate-ripper";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ tomasajt ];
};
}

10
pkgs/by-name/co/codeium/package.nix
View File

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

2354
pkgs/by-name/cr/crunchy-cli/Cargo.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

49
pkgs/by-name/cr/crunchy-cli/package.nix Normal file
View File

@ -0,0 +1,49 @@
{ lib
, stdenv
, darwin
, fetchFromGitHub
, openssl
, pkg-config
, rustPlatform
}:
rustPlatform.buildRustPackage rec {
pname = "crunchy-cli";
version = "3.2.5";
src = fetchFromGitHub {
owner = "crunchy-labs";
repo = "crunchy-cli";
rev = "v${version}";
hash = "sha256-hzmTwUd+bQwr+5UtXKMalJZUDxOC5nhXNTXbYZN8xtA=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"native-tls-0.2.11" = "sha256-+NeXsxuThKNOzVLBItKcuTAM/0zR/BzJGMKkuq99gBM=";
};
};
nativeBuildInputs = lib.optionals stdenv.isLinux [
pkg-config
];
buildInputs = lib.optionals stdenv.isLinux [
openssl
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.SystemConfiguration
];
env = {
OPENSSL_NO_VENDOR = true;
};
meta = with lib; {
description = "Command-line downloader for Crunchyroll";
homepage = "https://github.com/crunchy-labs/crunchy-cli";
license = licenses.mit;
maintainers = with maintainers; [ stepbrobd ];
mainProgram = "crunchy-cli";
};
}

4
pkgs/by-name/do/docfd/package.nix
View File

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

4
pkgs/by-name/el/elvish/package.nix
View File

@ -6,7 +6,7 @@
let
pname = "elvish";
version = "0.20.0";
version = "0.20.1";
in
buildGoModule {
inherit pname version;
@ -15,7 +15,7 @@ buildGoModule {
owner = "elves";
repo = "elvish";
rev = "v${version}";
hash = "sha256-aaj2P1V31FnRehrUh+aqpPa8QwRrUezKwAa8WBa4X0w=";
hash = "sha256-lKrX38gVUhYwwuNF25LcZ+TytP4vx/GO7ay6Au4BBZA=";
};
vendorHash = "sha256-sgVGqpncV7Ylok5FRcV01a3MCX6UdZvTt3nfVh5L2so=";

8
pkgs/by-name/er/eris-go/package.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "eris-go";
version = "20231219";
version = "20240128";
outputs = [ "out" "man" ];
src = fetchFromGitea {
@ -10,7 +10,7 @@ buildGoModule rec {
owner = "eris";
repo = "eris-go";
rev = version;
hash = "sha256-eXLfBkJgG51ZjR1qXRE2BgTrIpQsPW5SKeMlGd3J1NE=";
hash = "sha256-mS5PMrp6rBR8ehlpDAZaTQL8vhFSpcztMaQF5zjozxc=";
};
vendorHash = "sha256-pA/fz7JpDwdTRFfLDY0M6p9TeBOK68byhy/0Cw53p4M=";
@ -23,10 +23,10 @@ buildGoModule rec {
'';
postBuild = "tupBuild";
postInstall = ''
install -D *.1.man -t $man/share/man/man1
install -D *.1.gz -t $man/share/man/man1
'';
skipNetworkTests = true;
env.skipNetworkTests = true;
passthru.tests = { inherit (nixosTests) eris-server; };

53
pkgs/by-name/mi/miru/package.nix Normal file
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.
'';
};
}

52
pkgs/by-name/mo/moneydance/package.nix Normal file
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 ];
};
})

2
pkgs/by-name/ph/phel/package.nix
View File

@ -17,7 +17,7 @@ php.buildComposerProject (finalAttrs: {
vendorHash = "sha256-83GX/dxHa6w1E34wnJshg7yxlVyRkDT5jmAPCCqPdtA=";
doInstallCheck = true;
postCheckInstall = ''
postInstallCheck = ''
$out/bin/phel --version
'';

6
pkgs/by-name/pr/preserves-tools/package.nix
View File

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

2
pkgs/by-name/qu/quark-goldleaf/99-quark-goldleaf.rules Normal file
View File

@ -0,0 +1,2 @@
# Nintendo Switch HOS
SUBSYSTEM=="usb", ATTRS{idVendor}=="057e", ATTRS{idProduct}=="3000", MODE="0666"

88
pkgs/by-name/qu/quark-goldleaf/fix-maven-plugin-versions.patch Normal file
View File

@ -0,0 +1,88 @@
diff --git a/pom.xml b/pom.xml
index 5a683ca..be71e5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,7 +105,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.11.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -113,7 +114,7 @@
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <version>3.3.0</version>
<executions>
<execution>
<id>default-jar</id>
@@ -134,7 +135,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.6.0</version>
<configuration>
<finalName>Quark</finalName>
<appendAssemblyId>false</appendAssemblyId>
@@ -157,6 +158,56 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.3.0</version>
+ <executions>
+ <execution>
+ <id>require-all-plugin-versions-to-be-set</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requirePluginVersions />
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>3.1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.3.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>4.0.0-M9</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>3.1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.3.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>3.1.2</version>
+ </plugin>
</plugins>
</build>

114
pkgs/by-name/qu/quark-goldleaf/package.nix Normal file
View File

@ -0,0 +1,114 @@
{ lib
, jdk
, maven
, fetchFromGitHub
, fetchpatch
, makeDesktopItem
, copyDesktopItems
, imagemagick
, wrapGAppsHook
, gtk3
}:
let
jdk' = jdk.override { enableJavaFX = true; };
maven' = maven.override { jdk = jdk'; };
in
maven'.buildMavenPackage rec {
pname = "quark-goldleaf";
version = "1.0.0";
src = fetchFromGitHub {
owner = "XorTroll";
repo = "Goldleaf";
rev = version;
hash = "sha256-gagIQGOiygJ0Onm0SrkbFWaovqWX2WJNx7LpSRheCLM=";
};
sourceRoot = "${src.name}/Quark";
patches = [
./fix-maven-plugin-versions.patch
./remove-pom-jfx.patch
(fetchpatch {
name = "fix-config-path.patch";
url = "https://github.com/XorTroll/Goldleaf/commit/714ecc2755df9c1252615ad02cafff9c0311a739.patch";
hash = "sha256-4j+6uLIOdltZ4XIb3OtOzZg9ReH9660gZMMNQpHnn4o=";
relative = "Quark";
})
];
mvnHash = "sha256-gA3HsQZFa2POP9cyJLb1l8t3hrJYzDowhJU+5Xl79p4=";
# set fixed build timestamp for deterministic jar
mvnParameters = "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z";
nativeBuildInputs = [
imagemagick # for icon conversion
copyDesktopItems
wrapGAppsHook
];
buildInputs = [ gtk3 ];
# don't double-wrap
dontWrapGApps = true;
installPhase = ''
runHook preInstall
install -Dm644 ${./99-quark-goldleaf.rules} $out/etc/udev/rules.d/99-quark-goldleaf.rules
install -Dm644 target/Quark.jar $out/share/java/quark-goldleaf.jar
for size in 16 24 32 48 64 128; do
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
convert -resize "$size"x"$size" src/main/resources/Icon.png $out/share/icons/hicolor/"$size"x"$size"/apps/quark-goldleaf.png
done
runHook postInstall
'';
postFixup = ''
# This is in postFixup because gappsWrapperArgs are generated during preFixup
makeWrapper ${jdk'}/bin/java $out/bin/quark-goldleaf \
"''${gappsWrapperArgs[@]}" \
--add-flags "-jar $out/share/java/quark-goldleaf.jar"
'';
desktopItems = [
(makeDesktopItem {
name = "quark-goldleaf";
exec = "quark-goldleaf";
icon = "quark-goldleaf";
desktopName = "Quark";
comment = meta.description;
terminal = false;
categories = [ "Utility" "FileTransfer" ];
keywords = [ "nintendo" "switch" "goldleaf" ];
})
];
meta = {
changelog = "https://github.com/XorTroll/Goldleaf/releases/tag/${src.rev}";
description = "A GUI tool for transfering files between a computer and a Nintendo Switch running Goldleaf";
homepage = "https://github.com/XorTroll/Goldleaf#quark-and-remote-browsing";
longDescription = ''
${meta.description}
For the program to work properly, you will have to install Nintendo Switch udev rules.
You can either do this by enabling the NixOS module:
`programs.quark-goldleaf.enable = true;`
or by adding the package manually to udev packages:
`services.udev.packages = [ pkgs.quark-goldleaf ];
'';
license = lib.licenses.gpl3Only;
mainProgram = "quark-goldleaf";
maintainers = with lib.maintainers; [ tomasajt ];
platforms = with lib.platforms; linux ++ darwin;
};
}

93
pkgs/by-name/qu/quark-goldleaf/remove-pom-jfx.patch Normal file
View File

@ -0,0 +1,93 @@
diff --git a/pom.xml b/pom.xml
index 51ce56b..44dcd09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,72 +15,6 @@
</properties>
<dependencies>
- <dependency>
- <groupId>org.openjfx</groupId>
- <artifactId>javafx-controls</artifactId>
- <version>17</version>
- <classifier>linux</classifier>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.openjfx</groupId>
- <artifactId>javafx-controls</artifactId>
- <version>17</version>
- <classifier>win</classifier>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.openjfx</groupId>
- <artifactId>javafx-controls</artifactId>
- <version>17</version>
- <classifier>mac</classifier>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.openjfx</groupId>
- <artifactId>javafx-fxml</artifactId>
- <version>17</version>
- <classifier>linux</classifier>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.openjfx</groupId>
- <artifactId>javafx-fxml</artifactId>
- <version>17</version>
- <classifier>win</classifier>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.openjfx</groupId>
- <artifactId>javafx-fxml</artifactId>
- <version>17</version>
- <classifier>mac</classifier>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.openjfx</groupId>
- <artifactId>javafx-graphics</artifactId>
- <version>17</version>
- <classifier>linux</classifier>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.openjfx</groupId>
- <artifactId>javafx-graphics</artifactId>
- <version>17</version>
- <classifier>win</classifier>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.openjfx</groupId>
- <artifactId>javafx-graphics</artifactId>
- <version>17</version>
- <classifier>mac</classifier>
- <scope>compile</scope>
- </dependency>
-
<dependency>
<groupId>org.usb4java</groupId>
<artifactId>usb4java-javax</artifactId>
@@ -123,15 +57,6 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.openjfx</groupId>
- <artifactId>javafx-maven-plugin</artifactId>
- <version>0.0.8</version>
- <configuration>
- <mainClass>xortroll.goldleaf.quark.Main</mainClass>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>

12
pkgs/by-name/qu/quicktype/package.nix
View File

@ -1,14 +1,14 @@
{ lib, buildNpmPackage, fetchFromGitHub, jq }:
{ lib, buildNpmPackage, fetchFromGitHub, jq, quicktype, testers }:
buildNpmPackage rec {
pname = "quicktype";
version = "23.0.81"; # version from https://npm.im/quicktype
version = "23.0.104"; # version from https://npm.im/quicktype
src = fetchFromGitHub {
owner = "glideapps";
repo = "quicktype";
rev = "838c5e0e63a50d7c7790dc81118e664480fc4a80"; # version not tagged
hash = "sha256-+VMkfkBSomxxlkuOeMqBCySe7VCx2K5bIdF/tmVgK/Y=";
rev = "916cd94a9d4fdeab870b6a12f42ad43ebaedf314"; # version not tagged
hash = "sha256-PI9YgFVy7Mlln9+7IAU9vzyvK606PuAJ32st3NDwXIw=";
};
postPatch = ''
@ -21,6 +21,10 @@ buildNpmPackage rec {
mv packages/ $out/lib/node_modules/quicktype/
'';
passthru.tests = {
version = testers.testVersion { package = quicktype; };
};
meta = with lib; {
description = "Generate types and converters from JSON, Schema, and GraphQL";
homepage = "https://quicktype.io/";

6
pkgs/by-name/rc/rcp/package.nix
View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "rcp";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "wykurz";
repo = "rcp";
rev = "v${version}";
hash = "sha256-5CqQwTJAQhO9mLfMan6JhNY3N2gfwR6wmGtVBYzVxuc=";
hash = "sha256-a/gjphldS17W2OWUXpo+bayqaxINVLI7B27wlicT4Ks=";
};
cargoHash = "sha256-sF7RjuVRNfJa3vw71S+BKIBLeWT6biekAE/56BsZYkw=";
cargoHash = "sha256-i8CrS0WlqlyXmI1waYrbiSFifAn5vqRW0YeQ1Izu0XE=";
checkFlags = [
# this test also sets setuid permissions on a test file (3oXXX) which doesn't work in a sandbox

4
pkgs/by-name/re/renode-unstable/package.nix
View File

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

6
pkgs/by-name/se/seclists/package.nix
View File

@ -5,13 +5,13 @@
stdenvNoCC.mkDerivation {
pname = "seclists";
version = "2023.4";
version = "2024.1";
src = fetchFromGitHub {
owner = "danielmiessler";
repo = "SecLists";
rev = "2023.4";
hash = "sha256-AX2n+kpXJGYEI88iJKHHcR7NFf0YCvu4FakEPkiwXTo=";
rev = "2024.1";
hash = "sha256-0wK/8cJC9FSFrQUPhRy1/uwQONx2dR3U0XOdnMpxBuA=";
};
installPhase = ''

6
pkgs/by-name/td/tdl/package.nix
View File

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

5003
pkgs/by-name/uv/uv/Cargo.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

68
pkgs/by-name/uv/uv/package.nix Normal file
View File

@ -0,0 +1,68 @@
{ lib
, cargo
, cmake
, darwin
, fetchFromGitHub
, libgit2
, openssl
, pkg-config
, python3
, rustPlatform
, rustc
, stdenv
, zlib
}:
python3.pkgs.buildPythonApplication rec {
pname = "uv";
version = "0.1.2";
pyproject = true;
src = fetchFromGitHub {
owner = "astral-sh";
repo = "uv";
rev = version;
hash = "sha256-ZrXWipg3m5T3PiUF7IgAxtw1GGnzVZTZdodFwNCu054=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"async_zip-0.0.16" = "sha256-M94ceTCtyQc1AtPXYrVGplShQhItqZZa/x5qLiL+gs0=";
"pubgrub-0.2.1" = "sha256-yCeUJp0Cy5Fe0g3Ba9ZFqTJ7IzSFqrX8Dv3+N8DAEZs=";
};
};
nativeBuildInputs = [
cargo
cmake
pkg-config
rustPlatform.cargoSetupHook
rustPlatform.maturinBuildHook
rustc
];
buildInputs = [
libgit2
openssl
zlib
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.SystemConfiguration
];
dontUseCmakeConfigure = true;
pythonImportsCheck = [ "uv" ];
env = {
OPENSSL_NO_VENDOR = true;
};
meta = with lib; {
description = "An extremely fast Python package installer and resolver, written in Rust";
homepage = "https://github.com/astral-sh/uv";
license = with licenses; [ asl20 mit ];
maintainers = with maintainers; [ marsam ];
mainProgram = "uv";
};
}

0
pkgs/development/tools/build-managers/waf/hook.nix → pkgs/by-name/wa/waf/hook.nix
View File

2
pkgs/development/tools/build-managers/waf/default.nix → pkgs/by-name/wa/waf/package.nix
View File

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

0
pkgs/development/tools/build-managers/waf/setup-hook.sh → pkgs/by-name/wa/waf/setup-hook.sh
View File

6
pkgs/data/themes/alacritty-theme/default.nix
View File

@ -6,13 +6,13 @@
stdenvNoCC.mkDerivation (self: {
name = "alacritty-theme";
version = "unstable-2024-01-21";
version = "unstable-2024-02-11";
src = fetchFromGitHub {
owner = "alacritty";
repo = "alacritty-theme";
rev = "f03686afad05274f5fbd2507f85f95b1a6542df4";
hash = "sha256-457kKE3I4zGf1EKkEoyZu0Fa/1O3yiryzHVEw2rNZt8=";
rev = "0587019bac748dfb5cc1b768f89c88ad9291b66b";
hash = "sha256-WPatWpBCZYFCohUh3U9QzSTFJgtou8+861013jz49Lw=";
};
dontConfigure = true;

4
pkgs/development/compilers/koka/default.nix
View File

@ -31,12 +31,12 @@
}:
let
version = "3.0.4";
version = "3.1.0";
src = fetchFromGitHub {
owner = "koka-lang";
repo = "koka";
rev = "v${version}";
sha256 = "sha256-U8BW1Aq9t3je0YDV8NkE0MzdnjwXBJQbmekh5ufOs3k=";
sha256 = "sha256-Twm2Hr8BQ0xTdA30e2Az/57525jTUkmv2Zs/+SNiQns=";
fetchSubmodules = true;
};
kklib = stdenv.mkDerivation {

2
pkgs/development/coq-modules/coq-lsp/default.nix
View File

@ -10,12 +10,14 @@ mkCoqDerivation rec {
release."0.1.8+8.16".sha256 = "sha256-dEEAK5IXGjHB8D/fYJRQG/oCotoXJuWLxXB0GQlY2eo=";
release."0.1.8+8.17".sha256 = "sha256-TmaE+osn/yAPU1Dyni/UTd5w/L2+qyPE3H/g6IWvHLQ=";
release."0.1.8+8.18".sha256 = "sha256-UYmiDdbax4wxp5dLia/1t1gFyK6UELtJJvDMd5Hd14s=";
release."0.1.8+8.19".sha256 = "sha256-aO3hUAWEqVxvCF7uJs+S4yrRxSMe/GaLKVfW/vawzNs=";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = isEq "8.16"; out = "0.1.8+8.16"; }
{ case = isEq "8.17"; out = "0.1.8+8.17"; }
{ case = isEq "8.18"; out = "0.1.8+8.18"; }
{ case = isEq "8.19"; out = "0.1.8+8.19"; }
] null;
nativeBuildInputs = [ makeWrapper ];

2
pkgs/development/coq-modules/serapi/default.nix
View File

@ -2,6 +2,7 @@
let
release = {
"8.19.0+0.19.0".sha256 = "sha256-M9d0ne2veTjf8/mFIDwtWdHi64JXjwCPWupnO2Ztd/Y=";
"8.18.0+0.18.0".sha256 = "sha256-c+3yG9vcbek/uvQ27OOQGqqsIHU1VuQhQvNVOjfucbo=";
"8.17.0+0.17.0".sha256 = "sha256-I81qvaXpJfXcbFw8vyzYLzlnhPg1QD0lTqAFXhoZ0rI=";
"8.16.0+0.16.3".sha256 = "sha256-22Kawp8jAsgyBTppwN5vmN7zEaB1QfPs0qKxd6x/7Uc=";
@ -20,6 +21,7 @@ in
defaultVersion = with versions;
lib.switch coq.version [
{ case = isEq "8.19"; out = "8.19.0+0.19.0"; }
{ case = isEq "8.18"; out = "8.18.0+0.18.0"; }
{ case = isEq "8.17"; out = "8.17.0+0.17.0"; }
{ case = isEq "8.16"; out = "8.16.0+0.16.3"; }

6
pkgs/development/interpreters/cel-go/default.nix
View File

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

4
pkgs/development/libraries/cxxopts/default.nix
View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "cxxopts";
version = "3.1.1";
version = "3.2.0";
src = fetchFromGitHub {
owner = "jarro2783";
repo = "cxxopts";
rev = "v${version}";
sha256 = "sha256-lJPMaXBfrCeUhhXha5f7zmOGtyEDzU3oPTMirPTFZzQ=";
sha256 = "sha256-tOO0YCIG3MxSJZhurNcDR1pWIUEO/Har9mrCrZs3iVk=";
};
buildInputs = lib.optionals enableUnicodeHelp [ icu.dev ];

4
pkgs/development/libraries/dqlite/default.nix
View File

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

13
pkgs/development/libraries/exiv2/default.nix
View File

@ -20,7 +20,7 @@
stdenv.mkDerivation rec {
pname = "exiv2";
version = "0.28.1";
version = "0.28.2";
outputs = [ "out" "lib" "dev" "doc" "man" ];
@ -28,16 +28,9 @@ stdenv.mkDerivation rec {
owner = "exiv2";
repo = "exiv2";
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 = [
cmake
doxygen
@ -94,7 +87,7 @@ stdenv.mkDerivation rec {
'';
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 ];

4
pkgs/development/libraries/igraph/default.nix
View File

@ -26,13 +26,13 @@ assert (blas.isILP64 == lapack.isILP64 &&
stdenv.mkDerivation (finalAttrs: {
pname = "igraph";
version = "0.10.9";
version = "0.10.10";
src = fetchFromGitHub {
owner = "igraph";
repo = finalAttrs.pname;
rev = finalAttrs.version;
hash = "sha256-Iaez6Rrd684vsraCkEH5a16rXfc53MyPXcYf3sOcaOY=";
hash = "sha256-xFX48qAr0x0iNRns/aGH9UKL0wGJyfccQLdEXUFI/TU=";
};
postPatch = ''

12
pkgs/development/libraries/libosmscout/default.nix
View File

@ -1,4 +1,4 @@
{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config
{ lib, mkDerivation, fetchFromGitHub, fetchpatch, cmake, pkg-config
, marisa, qttools, qtlocation }:
mkDerivation rec {
@ -12,6 +12,16 @@ mkDerivation rec {
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" ];
nativeBuildInputs = [ cmake pkg-config ];

4
pkgs/development/libraries/nss/latest.nix
View File

@ -5,6 +5,6 @@
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
import ./generic.nix {
version = "3.97";
hash = "sha256-d26v8a+5EkQ6cFg5SZirT4L22AxfIteiUx4I42msyqw=";
version = "3.98";
hash = "sha256-0p1HzspxyzhzX46O7ax8tmYiaFEBeqEqEvman4NIiQc=";
}

6
pkgs/development/libraries/opensubdiv/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-uDKCT0Uoa5WQekMUFm2iZmzm+oWAZ6IWMwfpchkUZY0=";
};
outputs = [ "out" "dev" ];
outputs = [ "out" "dev" "static" ];
nativeBuildInputs = [
cmake
@ -65,7 +65,9 @@ stdenv.mkDerivation rec {
NIX_BUILD_CORES=$(( NIX_BUILD_CORES < ${toString maxBuildCores} ? NIX_BUILD_CORES : ${toString maxBuildCores} ))
'';
postInstall = "rm $out/lib/*.a";
postInstall = ''
moveToOutput "lib/*.a" $static
'';
meta = {
description = "An Open-Source subdivision surface library";

13
pkgs/development/libraries/tinyxml/2.6.2.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, unzip }:
{ lib, stdenv, fetchurl, fetchpatch, unzip }:
let
version = "2.6.2";
@ -21,6 +21,17 @@ in stdenv.mkDerivation {
# Use CC, CXX, and LD from environment
./2.6.2-cxx.patch
(fetchpatch {
name = "CVE-2023-34194.patch";
url = "https://salsa.debian.org/debian/tinyxml/-/raw/2366e1f23d059d4c20c43c54176b6bd78d6a83fc/debian/patches/CVE-2023-34194.patch";
hash = "sha256-ow4LmLQV24SAU6M1J8PXpW5c95+el3t8weM9JK5xJfg=";
})
(fetchpatch {
name = "CVE-2021-42260.patch";
url = "https://salsa.debian.org/debian/tinyxml/-/raw/dc332a9f4e05496c8342b778c14b256083beb1ee/debian/patches/CVE-2021-42260.patch";
hash = "sha256-pIM0uOnUQOW93w/PEPuW3yKq1mdvNT/ClCYVc2hLoY8=";
})
];
preConfigure = "export LD=${stdenv.cc.targetPrefix}c++";

7
pkgs/development/python-modules/accelerate/default.nix
View File

@ -2,8 +2,6 @@
, lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, pythonAtLeast
, pythonOlder
, pytestCheckHook
, setuptools
@ -13,6 +11,7 @@
, pyyaml
, safetensors
, torch
, cudatoolkit
, evaluate
, parameterized
, transformers
@ -52,6 +51,8 @@ buildPythonPackage rec {
preCheck = ''
export HOME=$(mktemp -d)
export PATH=$out/bin:$PATH
'' + lib.optionalString (lib.meta.availableOn stdenv.hostPlatform cudatoolkit) ''
export TRITON_PTXAS_PATH="${cudatoolkit}/bin/ptxas"
'';
pytestFlagsArray = [ "tests" ];
disabledTests = [
@ -74,6 +75,8 @@ buildPythonPackage rec {
] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [
# usual aarch64-linux RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly
"CheckpointTest"
# requires ptxas from cudatoolkit, which is unavailable on aarch64-linux
"test_dynamo_extract_model"
] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
# RuntimeError: torch_shm_manager: execl failed: Permission denied
"CheckpointTest"

20
pkgs/development/python-modules/aiopvapi/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "aiopvapi";
version = "3.0.1";
version = "3.0.2";
pyproject = true;
disabled = pythonOlder "3.7";
@ -18,15 +18,9 @@ buildPythonPackage rec {
owner = "sander76";
repo = "aio-powerview-api";
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 = [
setuptools
];
@ -43,16 +37,6 @@ buildPythonPackage rec {
"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; {
description = "Python API for the PowerView API";
homepage = "https://github.com/sander76/aio-powerview-api";

4
pkgs/development/python-modules/ansible-runner/default.nix
View File

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

14
pkgs/development/python-modules/awsiotpythonsdk/default.nix
View File

@ -2,12 +2,13 @@
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "AWSIoTPythonSDK";
version = "1.5.2";
format = "setuptools";
pname = "awsiotpythonsdk";
version = "1.5.4";
pyproject = true;
disabled = pythonOlder "3.7";
@ -15,9 +16,13 @@ buildPythonPackage rec {
owner = "aws";
repo = "aws-iot-device-sdk-python";
rev = "refs/tags/v${version}";
hash = "sha256-GHMnDRxXkaKDTaawwPtMqa7EZJ8Y35+ScgtfEP9PJGs=";
hash = "sha256-TUNIWGal7NQy2qmHVTiw6eX4t/Yt3NnM3HHztBwMfoM=";
};
nativeBuildInputs = [
setuptools
];
# Module has no tests
doCheck = false;
@ -28,6 +33,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python SDK for connecting to AWS IoT";
homepage = "https://github.com/aws/aws-iot-device-sdk-python";
changelog = "https://github.com/aws/aws-iot-device-sdk-python/releases/tag/v${version}";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};

11
pkgs/development/python-modules/cohere/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "cohere";
version = "4.37";
format = "pyproject";
pyproject = true;
disabled = pythonOlder "3.7";
@ -24,15 +24,6 @@ buildPythonPackage rec {
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 = [
poetry-core
];

4
pkgs/development/python-modules/deluge-client/default.nix
View File

@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "deluge-client";
version = "1.9.0";
version = "1.10.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "0d2f12108a147d44590c8df63997fcb32f8b2fbc18f8cbb221f0136e2e372b85";
sha256 = "sha256-Em3dVWkSYI/iBaRUIiIRsc11pg30QAvJYwa1F/Zn9Ik=";
};
# it will try to connect to a running instance

Some files were not shown because too many files have changed in this diff Show More