gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-04-15 00:16:09 +00:00
committed by GitHub
parent f15bbc3b3c 32bb18de3f
commit c7b5ebf8f6
77 changed files with 943 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+6
View File
@@ -2103,6 +2103,12 @@
githubId = 21687187;
name = "Mirza Arnaut";
};
asakura = {
email = "mikalai.seva+nixpkgs@gmail.com";
github = "asakura";
githubId = 29058;
name = "Mikalai Seva";
};
asappia = {
email = "asappia@gmail.com";
github = "asappia";
nixos/modules/services/torrent/cross-seed.nix
+35 -1
View File
@@ -14,6 +14,15 @@ let
types
;
settingsFormat = pkgs.formats.json { };
generatedConfig =
pkgs.runCommand "cross-seed-gen-config" { nativeBuildInputs = [ pkgs.cross-seed ]; }
''
export HOME=$(mktemp -d)
cross-seed gen-config
mkdir $out
cp -r $HOME/.cross-seed/config.js $out/
'';
in
{
options.services.cross-seed = {
@@ -40,6 +49,22 @@ in
description = "Cross-seed config directory";
};
useGenConfigDefaults = mkOption {
type = types.bool;
default = false;
description = ''
Whether to use the option defaults from the configuration generated by
{command}`cross-seed gen-config`.
Those are the settings recommended by the project, and can be inspected
from their [template file](https://github.com/cross-seed/cross-seed/blob/master/src/config.template.cjs).
Settings set in {option}`services.cross-seed.settings` and
{option}`services.cross-seed.settingsFile` will override the ones from
this option.
'';
};
settings = mkOption {
default = { };
type = types.submodule {
@@ -120,6 +145,13 @@ in
let
jsonSettingsFile = settingsFormat.generate "settings.json" cfg.settings;
genConfigSegment =
lib.optionalString cfg.useGenConfigDefaults # js
''
const gen_config_js = "${generatedConfig}/config.js";
Object.assign(loaded_settings, require(gen_config_js));
'';
# Since cross-seed uses a javascript config file, we can use node's
# ability to parse JSON directly to avoid having to do any conversion.
# This also means we don't need to use any external programs to merge the
@@ -138,7 +170,9 @@ in
"use strict";
const fs = require("fs");
const settings_json = "${jsonSettingsFile}";
let loaded_settings = JSON.parse(fs.readFileSync(settings_json, "utf8"));
let loaded_settings = {};
${genConfigSegment}
Object.assign(loaded_settings, JSON.parse(fs.readFileSync(settings_json, "utf8")));
${secretSettingsSegment}
module.exports = loaded_settings;
'';
pkgs/applications/editors/eclipse/eclipses.json
+1
View File
@@ -1,6 +1,7 @@
{
"platform_major": "4",
"platform_minor": "34",
"version": "4.34",
"year": "2024",
"month": "12",
"buildmonth": "11",
pkgs/applications/editors/eclipse/update.sh
+5 -1
View File
@@ -41,7 +41,11 @@ esac
ECLIPSES_JSON=$(dirname $0)/eclipses.json;
t=$(mktemp);
cat $ECLIPSES_JSON | jq ". + {platform_major: \"${platform_major}\",platform_minor: \"${platform_minor}\",year: \"${year}\",month: \"${month}\",buildmonth: \"${buildmonth}\",dayHourMinute: \"${builddaytime}\"}" > $t;
# note: including platform_major, platform_minor, and version may seem redundant
# the first two are needed for the derivation itself; the third is necessary so
# that nixpkgs-update can see that the version changes as a result of this update
# script.
cat $ECLIPSES_JSON | jq ". + {platform_major: \"${platform_major}\",platform_minor: \"${platform_minor}\",version:\"${platform_major}.${platform_minor}\",year: \"${year}\",month: \"${month}\",buildmonth: \"${buildmonth}\",dayHourMinute: \"${builddaytime}\"}" > $t;
mv $t $ECLIPSES_JSON;
# prefetch new download hashes
pkgs/applications/editors/vim/plugins/generated.nix
+302 -302
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+11
View File
@@ -217,6 +217,17 @@
};
meta.homepage = "https://github.com/ambroisie/tree-sitter-bp";
};
brightscript = buildGrammar {
language = "brightscript";
version = "0.0.0+rev=48ce168";
src = fetchFromGitHub {
owner = "ajdelcimmuto";
repo = "tree-sitter-brightscript";
rev = "48ce1687125c6dfefcc7a1bef19fa0f0f00426cc";
hash = "sha256-eVHAl8qykIS90SpWHvpT6VEqjKuXCX8zIYlRGlhUm7w=";
};
meta.homepage = "https://github.com/ajdelcimmuto/tree-sitter-brightscript";
};
c = buildGrammar {
language = "c";
version = "0.0.0+rev=2a265d6";
pkgs/applications/editors/vim/plugins/overrides.nix
+12 -2
View File
@@ -2558,9 +2558,15 @@ in
};
nvzone-menu = super.nvzone-menu.overrideAttrs {
checkInputs = with self; [
# Optional integrations
nvim-tree-lua
neo-tree-nvim
# FIXME: should propagate from neo-tree-nvim
nui-nvim
plenary-nvim
];
dependencies = [ self.nvzone-volt ];
# Optional nvimtree integration
nvimSkipModules = "menus.nvimtree";
};
nvzone-minty = super.nvzone-minty.overrideAttrs {
@@ -2580,6 +2586,10 @@ in
telescope-nvim
];
dependencies = [ self.plenary-nvim ];
nvimSkipModules = [
# Issue reproduction file
"minimal"
];
};
octo-nvim = super.octo-nvim.overrideAttrs {
pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py
+10 -3
View File
@@ -62,11 +62,18 @@ def update_grammars(nvim_treesitter_dir: str):
generated_file = """# generated by pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py
{ buildGrammar, """
{
buildGrammar,
"""
generated_file += subprocess.check_output(["nurl", "-Ls", ", "], text=True)
# Get the output and format it properly
nurl_output = subprocess.check_output(["nurl", "-Ls", ","], text=True).strip()
# Add proper indentation (2 spaces) to the comma-separated list
indented_output = nurl_output.replace(",", ",\n ")
generated_file += indented_output
generated_file += """ }:
generated_file += """,
}:
{
"""
pkgs/applications/misc/pdfpc/default.nix
+7 -21
View File
@@ -16,21 +16,21 @@
gobject-introspection,
wrapGAppsHook3,
qrencode,
webkitgtk_4_0,
webkitgtk_4_1,
discount,
json-glib,
fetchpatch,
nix-update-script,
}:
stdenv.mkDerivation rec {
pname = "pdfpc";
version = "4.6.0";
version = "4.7.0";
src = fetchFromGitHub {
repo = "pdfpc";
owner = "pdfpc";
rev = "v${version}";
hash = "sha256-5HFmbVsNajMwo+lBe9kJcJyQGe61N6Oy2CI/WJwmSE4=";
hash = "sha256-fPhCrn1ELC03/II+e021BUNJr1OKCBIcFCM7z+2Oo+s=";
};
nativeBuildInputs = [
@@ -52,29 +52,15 @@ stdenv.mkDerivation rec {
(gst-plugins-good.override { gtkSupport = true; })
gst-libav
qrencode
webkitgtk_4_0
webkitgtk_4_1
discount
json-glib
];
patches = [
# needed for compiling pdfpc 4.6.0 with vala 0.56.7, see
# https://github.com/pdfpc/pdfpc/issues/686
# https://github.com/pdfpc/pdfpc/pull/687
(fetchpatch {
url = "https://github.com/pdfpc/pdfpc/commit/d38edfac63bec54173b4b31eae5c7fb46cd8f714.diff";
hash = "sha256-KC2oyzcwU2fUmxaed8qAsKcePwR5KcXgpVdstJg8KmU=";
})
# Allow compiling with markdown3
# https://github.com/pdfpc/pdfpc/pull/716
(fetchpatch {
url = "https://github.com/pdfpc/pdfpc/commit/08e66b9d432e9598c1ee9a78b2355728036ae1a1.patch";
hash = "sha256-SKH2GQ5/6Is36xOFmSs89Yw/w7Fnma3FrNqwjOlUQKM=";
})
];
cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin (lib.cmakeBool "MOVIES" false);
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "Presenter console with multi-monitor support for PDF files";
mainProgram = "pdfpc";
pkgs/applications/networking/cluster/terraform-providers/providers.json
+6 -6
View File
@@ -831,13 +831,13 @@
"vendorHash": "sha256-1nm2Y4T9/mCWMXMjXEzBz3w08AYHjQJeb9mYPQeWPs0="
},
"mongodbatlas": {
"hash": "sha256-hsm5a6rHVy/m+nc77vwogQx4xnerwpkYKQF9FagbK9c=",
"hash": "sha256-V1kQPFNW0/C1Rw6gbHpQ1+yK5L8dO+zFIHkQs93a56Y=",
"homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
"owner": "mongodb",
"repo": "terraform-provider-mongodbatlas",
"rev": "v1.31.0",
"rev": "v1.32.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-ml6bduGjFy6cN4zwMMQnw6Ie73Ucx3H1en7viQksGBk="
"vendorHash": "sha256-VznDrCvaY6O8n1bl/fx/PIdKfFD32pQaGn5Ti1sJucU="
},
"namecheap": {
"hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=",
@@ -885,13 +885,13 @@
"vendorHash": "sha256-YmZvHzrEZVvXI8CIcjX40s+MHTThPeXNQ05cnqkNbbE="
},
"ns1": {
"hash": "sha256-KvslOHWMEYFFrVCF2AOH3x2ENtoZeZQ+WC3ZvXiEcEc=",
"hash": "sha256-Ufj6mrxeTVpc9rWJX3hpzoBGNnNxOMMb8TgC39Z1vqo=",
"homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1",
"owner": "ns1-terraform",
"repo": "terraform-provider-ns1",
"rev": "v2.6.2",
"rev": "v2.6.3",
"spdx": "MPL-2.0",
"vendorHash": "sha256-1qFfXwlLRIAKUswrTeLtWVsZmOE/LfXrfnW8MgM8JaU="
"vendorHash": "sha256-QmL/LghZgOtdkgy102/76zFD+1lxnxn2d/11WaETIE4="
},
"null": {
"hash": "sha256-zvzBWnxWVXNOebnlgaP8lzwk6DMwwkGxx4i1QKCLSz0=",
pkgs/servers/dns/acme-dns/default.nix → pkgs/by-name/ac/acme-dns/package.nix
View File
pkgs/by-name/bd/bdsync/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "bdsync";
version = "0.11.3";
version = "0.11.4";
src = fetchFromGitHub {
owner = "rolffokkens";
repo = "bdsync";
rev = "v${version}";
sha256 = "sha256-58yoF6s0WjH+1mTY7X5OX53YgcnDmGxoCR8Kvl6lP+A=";
sha256 = "sha256-uvP26gdyIPC+IHxO5CYVuabfT4mnoWDOyaLTplYCW0I=";
};
nativeBuildInputs = [
pkgs/by-name/bu/buildbox/package.nix
+1 -1
View File
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
];
postFixup = ''
makeWrapper $out/bin/buildbox-run-bubblewrap $out/bin/buildbox-run --prefix PATH : ${lib.makeBinPath [ bubblewrap ]}
wrapProgram $out/bin/buildbox-run --prefix PATH : ${lib.makeBinPath [ bubblewrap ]}
'';
meta = {
pkgs/by-name/ca/cargo-show-asm/package.nix
+3 -3
View File
@@ -10,15 +10,15 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-show-asm";
version = "0.2.48";
version = "0.2.49";
src = fetchCrate {
inherit pname version;
hash = "sha256-y8qGadmp+6exKAJvNIyBQLZnIe0DYRkiWMyIAMXMr0s=";
hash = "sha256-DH3jE7nGdwIQVHk80EsC4gYh5+wk6VMWS0d+jZYnX1I=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-6AE/Ym6Uc2kXafWW3Z/qr8O3tLcbO1wkoYdGjDw5/Do=";
cargoHash = "sha256-R+I6EVzHvI1Et4nvxENc3IvfmSLr/g77x4wCMNb2R88=";
nativeBuildInputs = [
installShellFiles
pkgs/by-name/ce/certbot/package.nix
-13
View File
@@ -7,19 +7,6 @@ let
python = python3.override {
self = python;
packageOverrides = self: super: {
josepy = super.josepy.overridePythonAttrs (old: rec {
version = "1.15.0";
src = fetchFromGitHub {
owner = "certbot";
repo = "josepy";
tag = "v${version}";
hash = "sha256-fK4JHDP9eKZf2WO+CqRdEjGwJg/WNLvoxiVrb5xQxRc=";
};
dependencies = with self; [
pyopenssl
cryptography
];
});
};
};
in
pkgs/by-name/ch/checkov/package.nix
+2 -2
View File
@@ -25,14 +25,14 @@ with py.pkgs;
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
version = "3.2.403";
version = "3.2.404";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
tag = version;
hash = "sha256-/gcDSlxPaRvqtRGmdr4xOa782cP58a7THCRatXGRYQ8=";
hash = "sha256-hxu2FAdLMm54b0SNiHcvdKgxmsDZtA9qEqD/c9vL3Yg=";
};
pythonRelaxDeps = [
pkgs/by-name/co/conftest/package.nix
+3 -3
View File
@@ -7,15 +7,15 @@
buildGoModule rec {
pname = "conftest";
version = "0.58.0";
version = "0.59.0";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "conftest";
tag = "v${version}";
hash = "sha256-zvm4IPtv2B5gw3r3/ZtWcAXF632100xl8VgxhthsKkY=";
hash = "sha256-bmZp1cPNTm6m30YxjlWdnfv2437nDXH+taDNFZ0OKIY=";
};
vendorHash = "sha256-1jMMz661ND6MAbRk+FgdA8KtpsNdrNFM8OPBuJmS0Sk=";
vendorHash = "sha256-aPvGbtAucb9OdcydO4dMLJrrM3XretPI7zyJULlm1fg=";
ldflags = [
"-s"
pkgs/by-name/de/deltachat-desktop/package.nix
+2
View File
@@ -116,6 +116,8 @@ stdenv.mkDerivation (finalAttrs: {
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
--inherit-argv0
install -Dt "$out/share/icons/hicolor/scalable/apps" images/tray/deltachat.svg
runHook postInstall
'';
pkgs/by-name/du/dummyhttp/package.nix
+3 -3
View File
@@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "dummyhttp";
version = "1.1.0";
version = "1.1.1";
src = fetchFromGitHub {
owner = "svenstaro";
repo = "dummyhttp";
rev = "v${version}";
hash = "sha256-LgOIL4kg3cH0Eo+Z+RGwxZTPzCNSGAdKT7N8tZWHSQQ=";
hash = "sha256-C3fjZgjVazZ8BNhcFJD5SsRO+xjHxw9XQPfPS+qnGtc=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-IDvl3qCTUO0KWaAVsF1sTf9lFhVITY6EZgllfw4U/Ho=";
cargoHash = "sha256-bjNB0aoG9Mrz1JzD80j2Czfg0pfU2uGlFFsi5WO4pdU=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Security
pkgs/by-name/ex/exploitdb/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2025-04-11";
version = "2025-04-14";
src = fetchFromGitLab {
owner = "exploit-database";
repo = "exploitdb";
rev = "refs/tags/${version}";
hash = "sha256-sR1VHGFsnLmzO7umcJn88jFWU57LlanPuDu708pSBW0=";
hash = "sha256-yoQB2QM9Fg4tKKPeGTM68+Su98mt8znkINNQY9cVUoI=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/by-name/fo/forecast/package.nix
+3 -3
View File
@@ -16,13 +16,13 @@
rustPlatform.buildRustPackage {
pname = "forecast";
version = "0-unstable-2025-03-09";
version = "0-unstable-2025-04-12";
src = fetchFromGitHub {
owner = "cosmic-utils";
repo = "forecast";
rev = "393ea6ed4d6b1ba5bba71216bd25a869811ad14d";
hash = "sha256-r0S3AzbpK8l3wrXNT2F1v4GHJFom32YJ63qjhrtBgB0=";
rev = "2dc599ff9a4417d511305d910367dd195aa1378a";
hash = "sha256-sD6aGpU1gET+0YPCD8wtxJWEJgWE/xYTWQAaIu2+e/8=";
};
useFetchCargoVendor = true;
pkgs/by-name/gl/glooctl/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "glooctl";
version = "1.18.13";
version = "1.18.14";
src = fetchFromGitHub {
owner = "solo-io";
repo = "gloo";
rev = "v${version}";
hash = "sha256-qn4hQKl3E36q7HsgOVWz+eRceKGysyy5rHXzQnOc7JY=";
hash = "sha256-NFcUSvtoXTXGLOGKsf6620R80b19ce++gfG5njDyvI0=";
};
vendorHash = "sha256-lcnsmeZ2XobBE95KqIhUZCKmevg2WEGuZC4qUVkdafM=";
pkgs/by-name/gr/graphene-hardened-malloc/package.nix
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "graphene-hardened-malloc";
version = "2025032100";
version = "2025041100";
src = fetchFromGitHub {
owner = "GrapheneOS";
repo = "hardened_malloc";
rev = finalAttrs.version;
hash = "sha256-8EIdJmnPdJgES+8QwWzL1oKVqO62CQdtjyMgFw+P0+g=";
hash = "sha256-HCuH5SUiw/+3T1dv+IKKsQEC1GbuG0Se376bw2fG5u8=";
};
nativeCheckInputs = [ python3 ];
pkgs/by-name/hw/hwinfo/package.nix
+2 -2
View File
@@ -20,13 +20,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "hwinfo";
version = "23.4";
version = "23.5";
src = fetchFromGitHub {
owner = "opensuse";
repo = "hwinfo";
rev = finalAttrs.version;
hash = "sha256-mTkDyfdAwjJwBEp/bOYRz0zfzPSzOUEI5hp+mridZsA=";
hash = "sha256-OweEFxNxQpD7blHywhmHTA66vsYG+Qvsufm3huyUhi0=";
};
nativeBuildInputs = [
pkgs/by-name/in/iniparser/package.nix
+2 -2
View File
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "iniparser";
version = "4.2.5";
version = "4.2.6";
src = fetchFromGitLab {
owner = "iniparser";
repo = "iniparser";
rev = "v${finalAttrs.version}";
hash = "sha256-YyIuvkM58WilqggzFcG7BNWSG5t2vHMOUu78PKvdItQ=";
hash = "sha256-z10S9ODLprd7CbL5Ecgh7H4eOwTetYwFXiWBUm6fIr4=";
};
patches = lib.optionals finalAttrs.finalPackage.doCheck [
pkgs/by-name/jb/jbigkit/package.nix
+3
View File
@@ -89,6 +89,9 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = true;
# Testing deletes all files on each test, causes test failures.
enableParallelChecking = false;
meta = {
description = "Software implementation of the JBIG1 data compression standard";
homepage = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/";
pkgs/by-name/li/librechat/0001-npm-pack.patch
+20
View File
@@ -0,0 +1,20 @@
diff --git a/package.json b/package.json
index 2131951..91e4846 100644
--- a/package.json
+++ b/package.json
@@ -114,5 +114,15 @@
"admin/",
"packages/"
]
+ },
+ "files": [
+ "api",
+ "client/dist",
+ "packages/data-provider",
+ "packages/data-schemas",
+ "packages/mcp"
+ ],
+ "bin": {
+ "librechat-server": "api/server/index.js"
}
}
pkgs/by-name/li/librechat/0002-logs.patch
+26
View File
@@ -0,0 +1,26 @@
diff --git a/api/config/meiliLogger.js b/api/config/meiliLogger.js
index 195b387..d445e54 100644
--- a/api/config/meiliLogger.js
+++ b/api/config/meiliLogger.js
@@ -2,7 +2,7 @@ const path = require('path');
const winston = require('winston');
require('winston-daily-rotate-file');
-const logDir = path.join(__dirname, '..', 'logs');
+const logDir = path.join('.', 'logs');
const { NODE_ENV } = process.env;
diff --git a/api/config/winston.js b/api/config/winston.js
index 8f51b99..2ebd041 100644
--- a/api/config/winston.js
+++ b/api/config/winston.js
@@ -3,7 +3,7 @@ const winston = require('winston');
require('winston-daily-rotate-file');
const { redactFormat, redactMessage, debugTraverse, jsonTruncateFormat } = require('./parsers');
-const logDir = path.join(__dirname, '..', 'logs');
+const logDir = path.join('.', 'logs');
const { NODE_ENV, DEBUG_LOGGING = true, DEBUG_CONSOLE = false, CONSOLE_JSON = false } = process.env;
pkgs/by-name/li/librechat/0003-upload-paths.patch
+20
View File
@@ -0,0 +1,20 @@
diff --git a/api/config/paths.js b/api/config/paths.js
index 165e9e6..fc85083 100644
--- a/api/config/paths.js
+++ b/api/config/paths.js
@@ -2,13 +2,13 @@ const path = require('path');
module.exports = {
root: path.resolve(__dirname, '..', '..'),
- uploads: path.resolve(__dirname, '..', '..', 'uploads'),
+ uploads: path.resolve('.', 'uploads'),
clientPath: path.resolve(__dirname, '..', '..', 'client'),
dist: path.resolve(__dirname, '..', '..', 'client', 'dist'),
publicPath: path.resolve(__dirname, '..', '..', 'client', 'public'),
fonts: path.resolve(__dirname, '..', '..', 'client', 'public', 'fonts'),
assets: path.resolve(__dirname, '..', '..', 'client', 'public', 'assets'),
- imageOutput: path.resolve(__dirname, '..', '..', 'client', 'public', 'images'),
+ imageOutput: path.resolve('.', 'images'),
structuredTools: path.resolve(__dirname, '..', 'app', 'clients', 'tools', 'structured'),
pluginManifest: path.resolve(__dirname, '..', 'app', 'clients', 'tools', 'manifest.json'),
};
pkgs/by-name/li/librechat/package.nix
+73
View File
@@ -0,0 +1,73 @@
{
lib,
buildNpmPackage,
fetchFromGitHub,
pkg-config,
node-gyp,
vips,
nix-update-script,
}:
buildNpmPackage rec {
pname = "librechat";
version = "0.7.7";
src = fetchFromGitHub {
owner = "danny-avila";
repo = "LibreChat";
tag = "v${version}";
hash = "sha256-U0yIoJt7wE4a7WbryN7hheLRFTRVol5qawIrmKte41M=";
};
patches = [
# `buildNpmPackage` relies on `npm pack`, which only includes files explicitly
# listed in the project's package.json `files` array if this property is set.
# LibreChat does not set this property, but we can avoid packaging the whole
# workspace by simply adding the relevant paths here ourselves.
# Also, we set the `bin` property to the server script to benefit from the
# auto-generated wrapper.
./0001-npm-pack.patch
# LibreChat tries writing logs to the package directory, which is immutable
# in our case. We patch the log directory to target the current working directory
# instead, which in case of NixOS will be the service's data directory.
./0002-logs.patch
# Similarly to the logs, user uploads are by default written to the package
# directory as well. Again, we patch this to be relative to the current working
# directory instead.
./0003-upload-paths.patch
];
npmDepsHash = "sha256-r06Hcdxa7pYMqIvNWP4VclJ4woiPd9kJxEmQO88i8J8=";
nativeBuildInputs = [
pkg-config
node-gyp
];
buildInputs = [
vips
];
# required for sharp
makeCacheWritable = true;
npmBuildScript = "frontend";
npmPruneFlags = [ "--omit=dev" ];
passthru = {
updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"^v(\\d+\\.\\d+\\.\\d+)$"
];
};
};
meta = {
description = "Open-source app for all your AI conversations, fully customizable and compatible with any AI provider";
homepage = "https://github.com/danny-avila/LibreChat";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ niklaskorz ];
mainProgram = "librechat-server";
};
}
pkgs/by-name/lp/lpairs2/package.nix
+4 -2
View File
@@ -11,11 +11,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lpairs2";
version = "2.3.1";
version = "2.3.2";
src = fetchurl {
url = "mirror://sourceforge/lgames/lpairs2-${finalAttrs.version}.tar.gz";
hash = "sha256-ES5RGr817vc8t2DFNeETTqrm0uwk3JuTypSZjXK86Bg=";
hash = "sha256-y4eRLWhfI4XMBtGCqdM/l69pftGGIbVjVEkz/v5ytZI=";
};
buildInputs = [
@@ -25,6 +25,8 @@ stdenv.mkDerivation (finalAttrs: {
SDL2_ttf
];
enableParallelBuilding = true;
passthru.updateScript = directoryListingUpdater {
inherit (finalAttrs) pname version;
url = "https://lgames.sourceforge.io/LPairs/";
pkgs/by-name/ma/makima/package.nix
+3 -3
View File
@@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "makima";
version = "0.10.0";
version = "0.10.1";
src = fetchFromGitHub {
owner = "cyber-sushi";
repo = "makima";
rev = "v${version}";
hash = "sha256-kC0GJ1K7DMfkYxaYog5y1y0DMfFjZ7iD7pGQQE67N9o=";
hash = "sha256-Pb9XBMs0AeklobxEDRQ1GDeI6hQFZ43EJt/+XQEGrWU=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-d9MUH8cORFaxgAKV/Mgq3tiNuoAJ2YTcbgvwPTOIlkw=";
cargoHash = "sha256-7XpecFwkUW3VVMYUAmHEL9gk5mpwC0mWN2N8Dptm3iI=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ udev ];
pkgs/by-name/na/natscli/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "natscli";
version = "0.2.1";
version = "0.2.2";
src = fetchFromGitHub {
owner = "nats-io";
repo = "natscli";
tag = "v${version}";
hash = "sha256-yYE04QayL2WeZZa2I4lThCzqalxhSGFB7LYlqSGE2SA=";
hash = "sha256-5iGU23HsaMuRDcy3qeCJZE3p2ikaIlLnuWyGfCAlMYQ=";
};
vendorHash = "sha256-WtfvuccRm6jx04jz+8MGjn4mrJ7nvtdACwyL2OjE+tc=";
vendorHash = "sha256-8JtMcEI3UMMuTa9jmkTspjKtseIb2XUcbNuWlrkAVfg=";
ldflags = [
"-s"
pkgs/by-name/nw/nwg-panel/package.nix
+2 -2
View File
@@ -23,13 +23,13 @@
python3Packages.buildPythonApplication rec {
pname = "nwg-panel";
version = "0.10.0";
version = "0.10.1";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = "nwg-panel";
tag = "v${version}";
hash = "sha256-DdDWOIT9/a4z3UTQcGJfGQEl0XyR11WsKg96HfYpEeE=";
hash = "sha256-ZQQRuYcctVKkE1GLx0VRAOZc0VTl1DuyR6y9CE5TbcE=";
};
# No tests
pkgs/by-name/oh/oh-my-zsh/package.nix
+3 -3
View File
@@ -19,14 +19,14 @@
}:
stdenv.mkDerivation rec {
version = "2025-04-03";
version = "2025-04-13";
pname = "oh-my-zsh";
src = fetchFromGitHub {
owner = "ohmyzsh";
repo = "ohmyzsh";
rev = "750d3ac4b493dca13ef0ced55fa6a2cd02dc7ee8";
sha256 = "sha256-f0pwEhxCsPuGhkSQW4A/KTffwLzKMaVCKQ8o4ZFfVhM=";
rev = "a84a0332a822a78ddf3f66d0e1ed3990d4badd12";
sha256 = "sha256-oBSs8DuPI7DgKaSSbuK5FgFwmGIVAp2B+YI9Hr1/mRw=";
};
strictDeps = true;
pkgs/by-name/on/onefetch/package.nix
+3 -3
View File
@@ -16,17 +16,17 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "onefetch";
version = "2.23.1";
version = "2.24.0";
src = fetchFromGitHub {
owner = "o2sh";
repo = "onefetch";
rev = version;
hash = "sha256-lQxv2gwZOGtxJrXjxvjBnbl225ppSs3cVNCfePFeqEE=";
hash = "sha256-Q74iqCSH8sdGFWC5DmMZhvUoL/Hzz4XNj548Gls6Hzk=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-s1xA7UHArHeGaXrGQmqn9pKvtSW175ci4ipQEmKQQ5s=";
cargoHash = "sha256-BpWc1GEj94vGEXDJEyocItggP1vQC441wp8r3DwalFw=";
cargoPatches = [
# enable pkg-config feature of zstd
pkgs/by-name/op/open-webui/package.nix
+4 -3
View File
@@ -8,13 +8,13 @@
}:
let
pname = "open-webui";
version = "0.6.2";
version = "0.6.5";
src = fetchFromGitHub {
owner = "open-webui";
repo = "open-webui";
tag = "v${version}";
hash = "sha256-E9bZr2HG1TSZQDW4KBd3rV8AoQ3lWH8tfTsCY7XAwy0=";
hash = "sha256-NBXyPpXkU0lzNj9Eowykhn/i0GfX8uxac8lh5GnCW8Q=";
};
frontend = buildNpmPackage rec {
@@ -30,7 +30,7 @@ let
url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2";
};
npmDepsHash = "sha256-PNuZ1PsUtNfwI24zfzvnUzkvBznZQHLUG12E+p1bL68=";
npmDepsHash = "sha256-C7YuXxCrnJ+8L7JNh6TA8xi0G3y1FwFb9DQwhS+igME=";
# Disabling `pyodide:fetch` as it downloads packages during `buildPhase`
# Until this is solved, running python packages from the browser will not work.
@@ -179,6 +179,7 @@ python312.pkgs.buildPythonApplication rec {
sentence-transformers
sentencepiece
soundfile
tencentcloud-sdk-python
tiktoken
transformers
unstructured
pkgs/by-name/os/ostree/fix-1592.patch
+151
View File
@@ -0,0 +1,151 @@
diff --git a/tests/basic-test.sh b/tests/basic-test.sh
index c8f853f8..a58ad3de 100644
--- a/tests/basic-test.sh
+++ b/tests/basic-test.sh
@@ -242,7 +242,7 @@ cd ${test_tmpdir}
if $OSTREE commit ${COMMIT_ARGS} -b test-bootable --bootable $test_tmpdir/checkout-test2-4 2>err.txt; then
fatal "committed non-bootable tree"
fi
-assert_file_has_content err.txt "error: .*No such file or directory"
+assert_file_has_content err.txt "error:.*No such file or directory"
echo "ok commit fails bootable if no kernel"
cd ${test_tmpdir}
diff --git a/tests/pull-test.sh b/tests/pull-test.sh
index d61735a0..9e751d82 100644
--- a/tests/pull-test.sh
+++ b/tests/pull-test.sh
@@ -297,7 +297,7 @@ ostree_repo_init mirrorrepo-local --mode=archive
if ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo 2>err.txt; then
fatal "pull with mixed refs succeeded?"
fi
-assert_file_has_content err.txt "error: Invalid ref name origin:main"
+assert_file_has_content err.txt "Invalid ref name origin:main"
${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo localbranch
${CMD_PREFIX} ostree --repo=mirrorrepo-local rev-parse localbranch
${CMD_PREFIX} ostree --repo=mirrorrepo-local fsck
@@ -308,7 +308,7 @@ if ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo nosuchbranc
fatal "pulled nonexistent branch"
fi
# So true
-assert_file_has_content_literal err.txt "error: Refspec 'nosuchbranch' not found"
+assert_file_has_content_literal err.txt "Refspec 'nosuchbranch' not found"
echo "ok pull-local nonexistent branch"
cd ${test_tmpdir}
@@ -687,5 +687,5 @@ rm ostree-srv/gnomerepo/summary
if ${CMD_PREFIX} ostree --repo=repo pull origin main 2>err.txt; then
fatal "pull of invalid ref succeeded"
fi
-assert_file_has_content_literal err.txt 'error: Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of'
+assert_file_has_content_literal err.txt 'Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of'
echo "ok pull got HTML for a ref"
diff --git a/tests/test-config.sh b/tests/test-config.sh
index 2d9aaf53..f1e28614 100755
--- a/tests/test-config.sh
+++ b/tests/test-config.sh
@@ -44,7 +44,7 @@ assert_file_has_content list.txt "http://example\.com/ostree/repo/"
if ${CMD_PREFIX} ostree config --repo=repo get --group=core lock-timeout-secs extra 2>err.txt; then
assert_not_reached "ostree config get should error out if too many arguments are given"
fi
-assert_file_has_content err.txt "error: Too many arguments given"
+assert_file_has_content err.txt "Too many arguments given"
echo "ok config get"
${CMD_PREFIX} ostree config --repo=repo set core.mode bare-user-only
@@ -61,7 +61,7 @@ assert_file_has_content repo/config "http://example\.com/ostree/"
if ${CMD_PREFIX} ostree config --repo=repo set --group=core lock-timeout-secs 120 extra 2>err.txt; then
assert_not_reached "ostree config set should error out if too many arguments are given"
fi
-assert_file_has_content err.txt "error: Too many arguments given"
+assert_file_has_content err.txt "Too many arguments given"
echo "ok config set"
# Check that using `--` works and that "ostree config unset" works
@@ -78,7 +78,7 @@ if ${CMD_PREFIX} ostree config --repo=repo get core.lock-timeout-secs 2>err.txt;
fi
# Check for any character where quotation marks would be as they appear differently in the Fedora and Debian
# test suites (“” and '' respectively). See: https://github.com/ostreedev/ostree/pull/1839
-assert_file_has_content err.txt "error: Key file does not have key .lock-timeout-secs. in group .core."
+assert_file_has_content err.txt "Key file does not have key .lock-timeout-secs. in group .core."
# Check that it's idempotent
${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs
@@ -95,5 +95,5 @@ ${CMD_PREFIX} ostree config --repo=repo unset --group='remote "aoeuhtns"' 'xa.ti
if ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs extra 2>err.txt; then
assert_not_reached "ostree config unset should error out if too many arguments are given"
fi
-assert_file_has_content err.txt "error: Too many arguments given"
+assert_file_has_content err.txt "Too many arguments given"
echo "ok config unset"
diff --git a/tests/test-fsck-collections.sh b/tests/test-fsck-collections.sh
index 3dbcdd23..d6359979 100755
--- a/tests/test-fsck-collections.sh
+++ b/tests/test-fsck-collections.sh
@@ -98,7 +98,7 @@ ${CMD_PREFIX} ostree fsck --repo=repo
if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
fi
-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)"
+assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)"
assert_file_has_content fsck "^Validating refs\.\.\.$"
echo "ok 3 fsck detects missing ref bindings"
@@ -111,7 +111,7 @@ ${CMD_PREFIX} ostree --repo=repo refs --collections --create=org.example.Collect
if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
fi
-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)"
+assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)"
assert_file_has_content fsck "^Validating refs\.\.\.$"
assert_file_has_content fsck "^Validating refs in collections\.\.\.$"
@@ -125,7 +125,7 @@ ${CMD_PREFIX} ostree --repo=repo refs --collections --create=org.example.Collect
if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
fi
-assert_file_has_content fsck-error "Commit has collection ID ‘org\.example\.Collection’ in collection binding metadata, while the remote it came from has collection ID ‘org\.example\.Collection2’"
+assert_file_has_content fsck-error "Commit has collection ID .org\.example\.Collection. in collection binding metadata, while the remote it came from has collection ID .org\.example\.Collection2."
assert_file_has_content fsck "^Validating refs\.\.\.$"
assert_file_has_content fsck "^Validating refs in collections\.\.\.$"
@@ -145,7 +145,7 @@ echo "ok 6 fsck ignores unreferenced ref bindings"
if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then
assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
fi
-assert_file_has_content fsck-error "Collection–ref (org\.example\.Collection, ref1) in bindings for commit .* does not exist"
+assert_file_has_content fsck-error 'Collection.ref (org\.example\.Collection, ref1) in bindings for commit .* does not exist'
assert_file_has_content fsck "^Validating refs\.\.\.$"
assert_file_has_content fsck "^Validating refs in collections\.\.\.$"
@@ -184,7 +184,7 @@ ${CMD_PREFIX} ostree --repo=repo refs --create=new-ref $(cat ref3-checksum)
if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
fi
-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref3’, ‘ref4’)"
+assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref3., .ref4.)"
assert_file_has_content fsck "^Validating refs\.\.\.$"
echo "ok 9 fsck detects missing ref bindings"
@@ -203,7 +203,7 @@ echo "ok 10 fsck ignores unreferenced ref bindings"
if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then
assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
fi
-assert_file_has_content fsck-error "Ref ‘ref3’ in bindings for commit .* does not exist"
+assert_file_has_content fsck-error 'Ref .ref3. in bindings for commit .* does not exist'
assert_file_has_content fsck "^Validating refs\.\.\.$"
echo "ok 11 fsck ignores unreferenced ref bindings"
diff --git a/tests/test-remote-add.sh b/tests/test-remote-add.sh
index 2f5ea634..0f63853c 100755
--- a/tests/test-remote-add.sh
+++ b/tests/test-remote-add.sh
@@ -81,7 +81,7 @@ echo "ok remote delete"
if $OSTREE remote delete nosuchremote 2>err.txt; then
assert_not_reached "Deleting remote unexpectedly succeeded"
fi
-assert_file_has_content err.txt "error: "
+assert_file_has_content err.txt "not found"
$OSTREE remote delete --if-exists nosuchremote
echo "ok"
pkgs/by-name/os/ostree/fix-test-paths.patch
+55
View File
@@ -0,0 +1,55 @@
diff --git a/tests/libtest.sh b/tests/libtest.sh
index 2c2a33f0..4e9d3fa2 100755
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
@@ -761,12 +761,12 @@ gen_ed25519_keys ()
{
# Generate private key in PEM format
pemfile="$(mktemp -p ${test_tmpdir} ed25519_XXXXXX.pem)"
- openssl genpkey -algorithm ed25519 -outform PEM -out "${pemfile}"
+ @openssl@ genpkey -algorithm ed25519 -outform PEM -out "${pemfile}"
# Based on: http://openssl.6102.n7.nabble.com/ed25519-key-generation-td73907.html
# Extract the private and public parts from generated key.
- ED25519PUBLIC="$(openssl pkey -outform DER -pubout -in ${pemfile} | tail -c 32 | base64)"
- ED25519SEED="$(openssl pkey -outform DER -in ${pemfile} | tail -c 32 | base64)"
+ ED25519PUBLIC="$(@openssl@ pkey -outform DER -pubout -in ${pemfile} | tail -c 32 | base64)"
+ ED25519SEED="$(@openssl@ pkey -outform DER -in ${pemfile} | tail -c 32 | base64)"
# Secret key is concantination of SEED and PUBLIC
ED25519SECRET="$(echo ${ED25519SEED}${ED25519PUBLIC} | base64 -d | base64 -w 0)"
@@ -777,7 +777,7 @@ gen_ed25519_keys ()
gen_ed25519_random_public()
{
- openssl genpkey -algorithm ED25519 | openssl pkey -outform DER | tail -c 32 | base64
+ @openssl@ genpkey -algorithm ED25519 | @openssl@ pkey -outform DER | tail -c 32 | base64
}
is_bare_user_only_repo () {
diff --git a/tests/test-basic-user-only.sh b/tests/test-basic-user-only.sh
index f6e8606d..1fed2465 100755
--- a/tests/test-basic-user-only.sh
+++ b/tests/test-basic-user-only.sh
@@ -27,7 +27,7 @@ extra_basic_tests=7
. $(dirname $0)/basic-test.sh
$CMD_PREFIX ostree --version > version.yaml
-python3 -c 'import yaml; yaml.safe_load(open("version.yaml"))'
+@python3@ -c 'import yaml; yaml.safe_load(open("version.yaml"))'
echo "ok yaml version"
# Reset things so we don't inherit a lot of state from earlier tests
diff --git a/tests/test-remote-headers.sh b/tests/test-remote-headers.sh
index d3bf4f97..0d2331ba 100755
--- a/tests/test-remote-headers.sh
+++ b/tests/test-remote-headers.sh
@@ -24,7 +24,7 @@ echo '1..2'
. $(dirname $0)/libtest.sh
V=$($CMD_PREFIX ostree --version | \
- python3 -c 'import sys, yaml; print(yaml.safe_load(sys.stdin)["libostree"]["Version"])')
+ @python3@ -c 'import sys, yaml; print(yaml.safe_load(sys.stdin)["libostree"]["Version"])')
setup_fake_remote_repo1 "archive" "" \
--expected-header foo=bar \
pkgs/by-name/os/ostree/package.nix
+20 -20
View File
@@ -2,7 +2,6 @@
stdenv,
lib,
fetchurl,
fetchpatch,
pkg-config,
gtk-doc,
nixosTests,
@@ -11,8 +10,7 @@
glib,
xz,
e2fsprogs,
libsoup_2_4,
wrapGAppsNoGuiHook,
libsoup_3,
gpgme,
which,
makeWrapper,
@@ -36,14 +34,15 @@
composefs,
withGjs ? lib.meta.availableOn stdenv.hostPlatform gjs,
gjs,
withGlibNetworking ? lib.meta.availableOn stdenv.hostPlatform glib-networking,
glib-networking,
withIntrospection ?
lib.meta.availableOn stdenv.hostPlatform gobject-introspection
&& stdenv.hostPlatform.emulatorAvailable buildPackages,
gobject-introspection,
withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
systemd,
replaceVars,
openssl,
ostree-full,
}:
let
@@ -53,9 +52,9 @@ let
]
);
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "ostree";
version = "2024.10";
version = "2025.2";
outputs = [
"out"
@@ -65,15 +64,19 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
sha256 = "sha256-VOM4fe4f8WAxoGeayitg2pCrf0omwhGCIzPH8jAAq+4=";
url = "https://github.com/ostreedev/ostree/releases/download/v${finalAttrs.version}/libostree-${finalAttrs.version}.tar.xz";
hash = "sha256-8kSkCMkJmYp3jhJ/zCLBtQK00BPxXyaUj0fMcv/i7vQ=";
};
patches = [
(fetchpatch {
name = "static-pkg-config.patch";
url = "https://github.com/ostreedev/ostree/pull/3382.patch";
hash = "sha256-VCQLq4OqmojtB7WFHNNV82asgXPGq5tKoJun66eUntY=";
# Workarounds for installed tests failing in pseudoterminal
# https://github.com/ostreedev/ostree/issues/1592
./fix-1592.patch
# Hard-code paths in installed tests
(replaceVars ./fix-test-paths.patch {
python3 = testPython.interpreter;
openssl = "${openssl}/bin/openssl";
})
];
@@ -91,7 +94,6 @@ stdenv.mkDerivation rec {
libxslt
docbook-xsl-nons
docbook_xml_dtd_42
wrapGAppsNoGuiHook
]
++ lib.optionals withIntrospection [
gobject-introspection
@@ -102,7 +104,7 @@ stdenv.mkDerivation rec {
curl
glib
e2fsprogs
libsoup_2_4
libsoup_3 # for trivial-httpd for tests
gpgme
fuse3
libselinux
@@ -122,9 +124,6 @@ stdenv.mkDerivation rec {
++ lib.optionals withGjs [
gjs
]
++ lib.optionals withGlibNetworking [
glib-networking
]
++ lib.optionals withSystemd [
systemd
];
@@ -160,7 +159,7 @@ stdenv.mkDerivation rec {
let
typelibPath = lib.makeSearchPath "/lib/girepository-1.0" [
(placeholder "out")
gobject-introspection
glib.out
];
in
lib.optionalString withIntrospection ''
@@ -173,6 +172,7 @@ stdenv.mkDerivation rec {
tests = {
musl = pkgsCross.musl64.ostree;
installedTests = nixosTests.installed-tests.ostree;
inherit ostree-full;
};
};
@@ -183,4 +183,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
maintainers = with maintainers; [ copumpkin ];
};
}
})
pkgs/by-name/pi/picard-tools/package.nix
+2 -2
View File
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "picard-tools";
version = "3.3.0";
version = "3.4.0";
src = fetchurl {
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
sha256 = "sha256-WIGadmBka3SzTigvXU0hyNuuoi3e/5bjJYdV2voPhtw=";
sha256 = "sha256-52EowoOIn8WDyd6jOjt0SJdMBn0QLJ41vhUmQtTV+QE=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/by-name/qo/qownnotes/package.nix
+2 -2
View File
@@ -17,11 +17,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qownnotes";
appname = "QOwnNotes";
version = "25.4.1";
version = "25.4.3";
src = fetchurl {
url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
hash = "sha256-1Als8iv9L9fOL9JNXRsM5ilfSXwd/l4kE6wnWkz1BBE=";
hash = "sha256-BjtRrRRV7Rs4PTa7DZ3+fFfpx7sH7xtvsf1ALUUvjd0=";
};
nativeBuildInputs =
pkgs/by-name/ra/rabbitmq-server/package.nix
+2 -2
View File
@@ -42,12 +42,12 @@ in
stdenv.mkDerivation rec {
pname = "rabbitmq-server";
version = "4.0.8";
version = "4.0.9";
# when updating, consider bumping elixir version in all-packages.nix
src = fetchurl {
url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
hash = "sha256-FWB5riSCb8WsGLfNJO6SZRtQxvHpwea+YosvvU8iqng=";
hash = "sha256-imBxBn8RQS0jBGfT5KLLLt+fKvyybzLzPZu9DpFOos8=";
};
nativeBuildInputs = [
pkgs/by-name/ro/root/package.nix
+2 -5
View File
@@ -51,7 +51,7 @@
stdenv.mkDerivation rec {
pname = "root";
version = "6.34.06";
version = "6.34.08";
passthru = {
tests = import ./tests { inherit callPackage; };
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
hash = "sha256-p5nWMtrlux7Ifq5uvARqEiaMaEnyqIN5IcEY/FG2z/M=";
hash = "sha256-gGBFsVbeA/6PVmGmcOq4d/Lk0tpsI03D4x6Y4tfZb+g=";
};
clad_src = fetchgit {
@@ -137,9 +137,6 @@ stdenv.mkDerivation rec {
# Eliminate impure reference to /System/Library/PrivateFrameworks
substituteInPlace core/macosx/CMakeLists.txt \
--replace-fail "-F/System/Library/PrivateFrameworks " ""
# Just like in libpng/12.nix to build the builtin libpng on macOS
substituteInPlace graf2d/asimage/src/libAfterImage/libpng/pngpriv.h \
--replace-fail '<fp.h>' '<math.h>'
''
+
lib.optionalString
pkgs/by-name/si/simp_le/package.nix
+9 -1
View File
@@ -10,7 +10,15 @@ let
python = python3.override {
self = python;
packageOverrides = self: super: {
# acme doesn't support josepy v2
certbot = super.certbot.overridePythonAttrs rec {
version = "3.1.0";
src = fetchFromGitHub {
owner = "certbot";
repo = "certbot";
tag = "v${version}";
hash = "sha256-lYGJgUNDzX+bE64GJ+djdKR+DXmhpcNbFJrAEnP86yQ=";
};
};
josepy = super.josepy.overridePythonAttrs (old: rec {
version = "1.15.0";
src = fetchFromGitHub {
pkgs/by-name/td/tdlib/package.nix
+3 -3
View File
@@ -36,7 +36,7 @@ in
stdenv.mkDerivation {
pname = "tdlib";
version = "1.8.46";
version = "1.8.47";
src = fetchFromGitHub {
owner = "tdlib";
@@ -45,8 +45,8 @@ stdenv.mkDerivation {
# The tdlib authors do not set tags for minor versions, but
# external programs depending on tdlib constrain the minor
# version, hence we set a specific commit with a known version.
rev = "207f3be7b58b2a2b9f0a066b5b6ef18782b8b517";
hash = "sha256-+cqdRp+J/W1Cyh+TqbglaerN4w3AVGp5NC5JLVK5e3k=";
rev = "a03a90470d6fca9a5a3db747ba3f3e4a465b5fe7";
hash = "sha256-RS7N+MMie/gNtcvPT4yjE2ymhZCsByS96O9nhiJ/bNY=";
};
buildInputs = [
pkgs/by-name/te/telegraf/package.nix
+3 -3
View File
@@ -10,7 +10,7 @@
buildGoModule rec {
pname = "telegraf";
version = "1.34.1";
version = "1.34.2";
subPackages = [ "cmd/telegraf" ];
@@ -18,10 +18,10 @@ buildGoModule rec {
owner = "influxdata";
repo = "telegraf";
rev = "v${version}";
hash = "sha256-q+v4cKqBLGxsvR5e8OS6Ix/0JZ+0I/cf0M6P27ym9Go=";
hash = "sha256-M11yqIPVVHmyZf2qcoVxY00P/Pr3ch0uyJn2evofDmI=";
};
vendorHash = "sha256-681a1K1wsjTgZXCx5fuz0/HZ52KucVGnqiv/EIz34Bg=";
vendorHash = "sha256-ldEIZFtoLJetSij614mvOos/kVQTakn2Fj0CNMEdEWE=";
proxyVendor = true;
ldflags = [
pkgs/by-name/te/television/package.nix
+7 -7
View File
@@ -6,19 +6,19 @@
television,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "television";
version = "0.11.6";
version = "0.11.7";
src = fetchFromGitHub {
owner = "alexpasmantier";
repo = "television";
tag = version;
hash = "sha256-wfIzmk4mCSdfSAJP2DcnpuQAg62m6CfynmxoH580k9A=";
tag = finalAttrs.version;
hash = "sha256-cxbg7ic/LzQPfq5VFr9iSaEfL3SF1Aca1/SfXWCOTQo=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-C/umcbD/wb+Bz9Qbp7gx70Cr5blcXgEqsIfLKefZrrY=";
cargoHash = "sha256-T8m/B95PoKeIR7A8Kh6j1sicYlaUk6pb4os+XxC356U=";
passthru = {
tests.version = testers.testVersion {
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
fuzzy matching algorithm and is designed to be easily extensible.
'';
homepage = "https://github.com/alexpasmantier/television";
changelog = "https://github.com/alexpasmantier/television/releases/tag/${version}";
changelog = "https://github.com/alexpasmantier/television/releases/tag/${finalAttrs.version}";
license = lib.licenses.mit;
mainProgram = "tv";
maintainers = with lib.maintainers; [
@@ -45,4 +45,4 @@ rustPlatform.buildRustPackage rec {
getchoo
];
};
}
})
pkgs/by-name/th/theharvester/package.nix
+2 -2
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "theharvester";
version = "4.7.0";
version = "4.7.1";
pyproject = true;
src = fetchFromGitHub {
owner = "laramies";
repo = "theharvester";
tag = version;
hash = "sha256-eO4jRyzMZQT4Fy1i1OHIf5UDqX8o1gmj6yHrIAxc0Mw=";
hash = "sha256-IBisnQGdhPCoVPPH/GHLJg5qoh08KfMuMxbsqF3jjpE=";
};
postPatch = ''
pkgs/by-name/ti/tio/package.nix
+2 -2
View File
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "tio";
version = "3.8";
version = "3.9";
src = fetchFromGitHub {
owner = "tio";
repo = "tio";
rev = "v${finalAttrs.version}";
hash = "sha256-8BeTC3rlDK6xmfguNlKQg48L03knU7sb1t8F1oLIi8s=";
hash = "sha256-92+F41kDGKgzV0e7Z6xly1NRDm8Ayg9eqeKN+05B4ok=";
};
strictDeps = true;
pkgs/by-name/tr/trdl-client/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "trdl-client";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "werf";
repo = "trdl";
rev = "v${version}";
hash = "sha256-f7gyGGClMk/5+FCivuLasiIG/Ty17yeJ8qQ/GVEbC14=";
hash = "sha256-0Q0qs7lzLnJChhT3LGVCHIz1ruci/PGGLJdR9FO1RyE=";
};
sourceRoot = "${src.name}/client";
pkgs/by-name/tw/twitterBootstrap/package.nix
+2 -2
View File
@@ -7,11 +7,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bootstrap";
version = "5.3.4";
version = "5.3.5";
src = fetchurl {
url = "https://github.com/twbs/bootstrap/releases/download/v${finalAttrs.version}/bootstrap-${finalAttrs.version}-dist.zip";
hash = "sha256-m6iuhq6yF540N5WchvEoflWJheNzFe/QR9pW2LaXGfs=";
hash = "sha256-0dKtiLr8Y55I2V4yYL8qQzUCqPjFnzleKVscLLdHG8g=";
};
nativeBuildInputs = [ unzip ];
pkgs/by-name/va/vault-tasks/package.nix
+3 -3
View File
@@ -5,7 +5,7 @@
nix-update-script,
}:
let
version = "0.10.0";
version = "0.11.0";
in
rustPlatform.buildRustPackage {
pname = "vault-tasks";
@@ -14,10 +14,10 @@ rustPlatform.buildRustPackage {
owner = "louis-thevenet";
repo = "vault-tasks";
rev = "v${version}";
hash = "sha256-EUzlJh+PpesfTBQbbxjC1HbeuN/+oGCZeR2XJl1bitI=";
hash = "sha256-3hRn3x86XLVMBtDlMsuqeEWgsgSeapri9MYNLqDxGF4=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-rDyzbcKa8cU7qSuzbI7KxTNUeiNuGFdf3HcDITvd+HI=";
cargoHash = "sha256-mh6LUb1gS/cICyVWCYvmCSeqxaIWI6PyLeQx13dZ0CA=";
postInstall = "install -Dm444 desktop/vault-tasks.desktop -t $out/share/applications";
pkgs/by-name/ve/vegur/package.nix
+10 -9
View File
@@ -4,16 +4,14 @@
fetchzip,
}:
let
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "vegur";
version = "${finalAttrs.majorVersion}.${finalAttrs.minorVersion}";
majorVersion = "0";
minorVersion = "701";
in
stdenvNoCC.mkDerivation {
pname = "vegur";
version = "${majorVersion}.${minorVersion}";
src = fetchzip {
url = "https://dotcolon.net/download/fonts/vegur_${majorVersion}${minorVersion}.zip";
url = "https://dotcolon.net/files/fonts/vegur_${finalAttrs.majorVersion}${finalAttrs.minorVersion}.zip";
hash = "sha256-sGb3mEb3g15ZiVCxEfAanly8zMUopLOOjw8W4qbXLPA=";
stripRoot = false;
};
@@ -27,10 +25,13 @@ stdenvNoCC.mkDerivation {
'';
meta = with lib; {
homepage = "http://dotcolon.net/font/vegur/";
homepage = "http://dotcolon.net/fonts/vegur/";
description = "Humanist sans serif font";
platforms = platforms.all;
maintainers = with maintainers; [ minijackson ];
maintainers = with maintainers; [
djacu
minijackson
];
license = licenses.cc0;
};
}
})
pkgs/by-name/vg/vgmplay-libvgm/package.nix
+3 -3
View File
@@ -12,13 +12,13 @@
stdenv.mkDerivation {
pname = "vgmplay-libvgm";
version = "0.51.1-unstable-2024-01-03";
version = "0.51.1-unstable-2025-04-05";
src = fetchFromGitHub {
owner = "ValleyBell";
repo = "vgmplay-libvgm";
rev = "7db1c63c056d79a8f9f533aa7eb82b7fdf7d456c";
hash = "sha256-GjBwu8Y/lOI8SLO4SrAWcntQIwKe/hXuh9tKbOPHQiA=";
rev = "7aa3f749468e15ea6dcb94edce51315c19ee448e";
hash = "sha256-g+nG+OdZjeHaLADQts0PcKbs3dXoBvL9qLgds+ozyRw=";
};
nativeBuildInputs = [
pkgs/development/python-modules/aiojobs/default.nix
+3 -3
View File
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "aiojobs";
version = "1.3.0";
version = "1.4.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "aio-libs";
repo = "aiojobs";
tag = "v${version}";
hash = "sha256-FNc71YyAjtR+hd0UOqFAy6XW0PwHSlM76C3ecPM5vsU=";
hash = "sha256-MgGUmDG0b0V/k+mCeiVRnBxa+ChK3URnGv6P8QP7RzQ=";
};
nativeBuildInputs = [ setuptools ];
@@ -51,7 +51,7 @@ buildPythonPackage rec {
meta = {
description = "Jobs scheduler for managing background task (asyncio)";
homepage = "https://github.com/aio-libs/aiojobs";
changelog = "https://github.com/aio-libs/aiojobs/blob/v${version}/CHANGES.rst";
changelog = "https://github.com/aio-libs/aiojobs/blob/${src.tag}/CHANGES.rst";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ cmcdragonkai ];
};
pkgs/development/python-modules/aiomqtt/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "aiomqtt";
version = "2.3.1";
version = "2.3.2";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "sbtinstruments";
repo = "aiomqtt";
tag = "v${version}";
hash = "sha256-1UTCcvzbuZJ3KpYsVxiaVn9MjjS1MYYduM4jASAOR3Y=";
hash = "sha256-34YfCeJvCGl0dojlSmnGxcboGK0GdcI42DarCG8lbDA=";
};
build-system = [ hatchling ];
pkgs/development/python-modules/azure-servicebus/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "azure-servicebus";
version = "7.14.1";
version = "7.14.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "azure_servicebus";
inherit version;
hash = "sha256-qd9vWcZe5BeSN/FrAKlu4W6BzOTiyC4mFoBP57yS+0Y=";
hash = "sha256-QBS3rIguDZ/4dqMwKBhgfhpkC5Pp1IIHPWOfWwQmblw=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/certbot/default.nix
+2 -4
View File
@@ -23,14 +23,14 @@
buildPythonPackage rec {
pname = "certbot";
version = "3.1.0";
version = "4.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "certbot";
repo = "certbot";
tag = "v${version}";
hash = "sha256-lYGJgUNDzX+bE64GJ+djdKR+DXmhpcNbFJrAEnP86yQ=";
hash = "sha256-GS4JLLXrX4+BQ4S6ySbOHUaUthCFYTCHWnOaMpfnIj8=";
};
postPatch = "cd certbot"; # using sourceRoot would interfere with patches
@@ -84,8 +84,6 @@ buildPythonPackage rec {
'';
meta = with lib; {
# AttributeError: module 'josepy' has no attribute 'ComparableX509'
broken = lib.versionAtLeast josepy.version "2";
homepage = "https://github.com/certbot/certbot";
changelog = "https://github.com/certbot/certbot/blob/${src.tag}/certbot/CHANGELOG.md";
description = "ACME client that can obtain certs and extensibly update server configurations";
pkgs/development/python-modules/dj-rest-auth/default.nix
+10
View File
@@ -6,6 +6,7 @@
djangorestframework,
djangorestframework-simplejwt,
fetchFromGitHub,
fetchpatch,
python,
responses,
setuptools,
@@ -24,6 +25,15 @@ buildPythonPackage rec {
hash = "sha256-bus7Sf5H4PA5YFrkX7hbALOq04koDz3KTO42hHFJPhw=";
};
patches = [
# See https://github.com/iMerica/dj-rest-auth/pull/683
(fetchpatch {
name = "djangorestframework-simplejwt_5.5_compatibility.patch";
url = "https://github.com/iMerica/dj-rest-auth/commit/cc5587e4e3f327697709f3f0d491650bff5464e7.diff";
hash = "sha256-2LahibxuNECAfjqsbNs2ezaWt1VH0ZBNwSNWCZwIe8I=";
})
];
postPatch = ''
substituteInPlace setup.py \
--replace-fail "==" ">="
pkgs/development/python-modules/django-rosetta/default.nix
+3 -3
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "django-rosetta";
version = "0.10.1";
version = "0.10.2";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "mbi";
repo = "django-rosetta";
tag = "v${version}";
hash = "sha256-b+iCUA3i3Ej6S5XcGQhBIEIJFx6vOL2sq3xkkA9wqek=";
hash = "sha256-NqDrCDvvyZsce7/VWXujAStAW8UtNSro8aelrDi4EEs=";
};
build-system = [ setuptools ];
@@ -39,7 +39,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Rosetta is a Django application that facilitates the translation process of your Django projects";
homepage = "https://github.com/mbi/django-rosetta";
changelog = "https://github.com/mbi/django-rosetta/releases/tag/v${version}";
changelog = "https://github.com/mbi/django-rosetta/releases/tag/${src.tag}";
license = licenses.mit;
maintainers = with maintainers; [ derdennisop ];
};
pkgs/development/python-modules/highdicom/default.nix
+2 -2
View File
@@ -25,7 +25,7 @@ let
in
buildPythonPackage rec {
pname = "highdicom";
version = "0.24.0";
version = "0.25.1";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -34,7 +34,7 @@ buildPythonPackage rec {
owner = "MGHComputationalPathology";
repo = "highdicom";
tag = "v${version}";
hash = "sha256-1LRXJkltRLtPJ/NrFZVyjTusXfmcEVOTFEuq0gOI+yQ=";
hash = "sha256-AwKaqCqPjLyNwXomV/pxijpsTQajekBO/rgLQJpuYww=";
};
build-system = [
pkgs/development/python-modules/liquidctl/default.nix
+3 -3
View File
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "liquidctl";
version = "1.14.0";
version = "1.15.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
tag = "v${version}";
hash = "sha256-HkMxYULeWcAYdlEI4N4qv7AGh/+xY0zuvV2mFPStPq8=";
hash = "sha256-ifYPUAF0lR9aCwiseNQZXbq+d+CXD/MwnZQhAM1TRLI=";
};
nativeBuildInputs = [
@@ -77,7 +77,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Cross-platform CLI and Python drivers for AIO liquid coolers and other devices";
homepage = "https://github.com/liquidctl/liquidctl";
changelog = "https://github.com/liquidctl/liquidctl/blob/v${version}/CHANGELOG.md";
changelog = "https://github.com/liquidctl/liquidctl/blob/${src.tag}/CHANGELOG.md";
license = licenses.gpl3Plus;
maintainers = with maintainers; [
arturcygan
pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "marshmallow-sqlalchemy";
version = "1.4.1";
version = "1.4.2";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "marshmallow_sqlalchemy";
inherit version;
hash = "sha256-tKqWQ1bQDheL24Rpoo2qkCKzdf9PXAT44rmq/h5lxSk=";
hash = "sha256-ZBAwS/mOwm6jXz+dPO6C5R/Qk8Q0YSrdMqC9zbVmj3w=";
};
build-system = [ flit-core ];
pkgs/development/python-modules/mkdocs-awesome-nav/default.nix
+2 -2
View File
@@ -16,14 +16,14 @@
}:
buildPythonPackage rec {
pname = "mkdocs-awesome-nav";
version = "3.1.0";
version = "3.1.1";
pyproject = true;
src = fetchFromGitHub {
owner = "lukasgeiter";
repo = "mkdocs-awesome-nav";
tag = "v${version}";
hash = "sha256-UxqOaAXy5Sc41FYE3mSKDBpWWJ3g0YwkRkOeSXwqz7o=";
hash = "sha256-K7W8RHLzVx3wvLPjDEHLhednxViWWfez/w1tbDfcvrA=";
};
build-system = [ flit-core ];
pkgs/development/python-modules/netbox-dns/default.nix
+2 -2
View File
@@ -7,14 +7,14 @@
}:
buildPythonPackage rec {
pname = "netbox-plugin-dns";
version = "1.2.6";
version = "1.2.7";
pyproject = true;
src = fetchFromGitHub {
owner = "peteeckel";
repo = "netbox-plugin-dns";
tag = version;
hash = "sha256-jpxKq5dASyPlbmVzm7it65g8eZ78XuXKdpJKKhzx614=";
hash = "sha256-l0jPn4dyUHm/E8tmSpmSXkSRa5dsD7ap8Gl3RSdfRoU=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/orderly-set/default.nix
+3 -3
View File
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "orderly-set";
version = "5.3.0";
version = "5.3.2";
pyproject = true;
src = fetchFromGitHub {
owner = "seperman";
repo = "orderly-set";
tag = version;
hash = "sha256-8tqQR8Oa/1jcfokBVKdvsC7Ya26bn0XHM9/QsstM07E=";
hash = "sha256-W42p0wJqomJdS47n3MP/BbxZmlYNLLAMnfQ/hvKn+60=";
};
build-system = [
@@ -40,7 +40,7 @@ buildPythonPackage rec {
meta = {
description = "Multiple implementations of Ordered Set";
homepage = "https://github.com/seperman/orderly-set";
changelog = "https://github.com/seperman/orderly-set/blob/${src.rev}/CHANGELOG.md";
changelog = "https://github.com/seperman/orderly-set/blob/${src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ doronbehar ];
};
pkgs/development/python-modules/python-engineio/default.nix
+3 -3
View File
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "python-engineio";
version = "4.11.2";
version = "4.12.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "miguelgrinberg";
repo = "python-engineio";
tag = "v${version}";
hash = "sha256-3yCT9u3Bz5QPaDtPe1Ezio+O+wWjQ+4pLh55sYAfnNc=";
hash = "sha256-PeVQT1gT2XAPJgR7EDPmN1j2p9hDrwF0LWbqVtgkZ7M=";
};
build-system = [ setuptools ];
@@ -80,7 +80,7 @@ buildPythonPackage rec {
bidirectional event-based communication between clients and a server.
'';
homepage = "https://github.com/miguelgrinberg/python-engineio/";
changelog = "https://github.com/miguelgrinberg/python-engineio/blob/v${version}/CHANGES.md";
changelog = "https://github.com/miguelgrinberg/python-engineio/blob/${src.tag}/CHANGES.md";
license = with licenses; [ mit ];
maintainers = with maintainers; [ mic92 ];
};
pkgs/development/python-modules/python-linkplay/default.nix
+2 -2
View File
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "python-linkplay";
version = "0.2.2";
version = "0.2.3";
pyproject = true;
src = fetchFromGitHub {
owner = "Velleman";
repo = "python-linkplay";
tag = "v${version}";
hash = "sha256-K5MDpMza5z3CYuGymXusZ5WMmmN/6rVxegiiO8RtOTc=";
hash = "sha256-xs91de8ELDbBU7deDiOXgnyGMqmYcQY38HkltvPpScU=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/rapidfuzz/default.nix
+10 -15
View File
@@ -2,7 +2,6 @@
lib,
stdenv,
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
cmake,
cython,
@@ -18,16 +17,14 @@
buildPythonPackage rec {
pname = "rapidfuzz";
version = "3.12.2";
version = "3.13.0";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "maxbachmann";
repo = "RapidFuzz";
tag = "v${version}";
hash = "sha256-keV+IBBHkdDpKuT1o6xNA5UAHlG1I9vkt13W8dafiDw=";
hash = "sha256-vwAqlTq4HIbmCL1HsHcgfVWETImxdqTsnenmX2RGXw8=";
};
build-system = [
@@ -44,13 +41,11 @@ buildPythonPackage rec {
taskflow
];
preBuild =
''
export RAPIDFUZZ_BUILD_EXTENSION=1
''
+ lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
export CMAKE_ARGS="-DCMAKE_CXX_COMPILER_AR=$AR -DCMAKE_CXX_COMPILER_RANLIB=$RANLIB"
'';
env.RAPIDFUZZ_BUILD_EXTENSION = 1;
preBuild = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
export CMAKE_ARGS="-DCMAKE_CXX_COMPILER_AR=$AR -DCMAKE_CXX_COMPILER_RANLIB=$RANLIB"
'';
optional-dependencies = {
all = [ numpy ];
@@ -78,11 +73,11 @@ buildPythonPackage rec {
"rapidfuzz.utils"
];
meta = with lib; {
meta = {
description = "Rapid fuzzy string matching";
homepage = "https://github.com/maxbachmann/RapidFuzz";
changelog = "https://github.com/maxbachmann/RapidFuzz/blob/${src.tag}/CHANGELOG.rst";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dotlambda ];
};
}
pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1358";
version = "3.0.1359";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
tag = version;
hash = "sha256-MiFP3xQbjkH+JnYG0wgvN8cxCvpOuNgze83PR0X1mSU=";
hash = "sha256-ey1bFsaEbetTLDtmTO3xFtAO1OeChS9lJf23cXGyG5Q=";
};
build-system = [ setuptools ];
pkgs/development/tools/apko/default.nix
+3 -3
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "apko";
version = "0.25.6";
version = "0.25.7";
src = fetchFromGitHub {
owner = "chainguard-dev";
repo = pname;
tag = "v${version}";
hash = "sha256-BtEk5XncGPxs8Voy6p2zovwCipdlUdQ48IOW1Gah9fY=";
hash = "sha256-vE7aFdpzm8i/luF50g/De+tSHKMHDMtyJf9hOZ6hhSY=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -25,7 +25,7 @@ buildGoModule rec {
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
vendorHash = "sha256-pFraDvKiQdj7zx20gZbE76mtfkUnnJnUDsdQus+SDes=";
vendorHash = "sha256-v7u3NKiaNPqSCP7lsw+On1j/h7zYUyIE6WoooaX1aZc=";
nativeBuildInputs = [ installShellFiles ];
pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
+2 -2
View File
@@ -11,13 +11,13 @@
buildHomeAssistantComponent rec {
owner = "al-one";
domain = "xiaomi_miot";
version = "1.0.15";
version = "1.0.16";
src = fetchFromGitHub {
owner = "al-one";
repo = "hass-xiaomi-miot";
rev = "v${version}";
hash = "sha256-2qUzLGFXbBq5m+ecSQScC2PHeI6kz6CDeRAjyVu4oWk=";
hash = "sha256-wsc1XSq1KYq7Rs99XK/wL2PYWrxbMblWPHzgopeQ5IM=";
};
dependencies = [
pkgs/servers/home-assistant/default.nix
-16
View File
@@ -163,22 +163,6 @@ let
};
});
# acme and thus hass-nabucasa doesn't support josepy v2
# https://github.com/certbot/certbot/issues/10185
josepy = super.josepy.overridePythonAttrs (old: rec {
version = "1.15.0";
src = fetchFromGitHub {
owner = "certbot";
repo = "josepy";
tag = "v${version}";
hash = "sha256-fK4JHDP9eKZf2WO+CqRdEjGwJg/WNLvoxiVrb5xQxRc=";
};
dependencies = with self; [
pyopenssl
cryptography
];
});
openhomedevice = super.openhomedevice.overridePythonAttrs (oldAttrs: rec {
version = "2.2";
src = fetchFromGitHub {
pkgs/tools/misc/birdfont/default.nix
+14 -9
View File
@@ -1,7 +1,7 @@
{
lib,
stdenv,
fetchurl,
fetchFromGitHub,
pkg-config,
python3,
xmlbird,
@@ -10,7 +10,7 @@
libgee,
glib,
gtk3,
webkitgtk_4_0,
webkitgtk_4_1,
libnotify,
sqlite,
vala,
@@ -18,15 +18,18 @@
gsettings-desktop-schemas,
wrapGAppsHook3,
autoPatchelfHook,
nix-update-script,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "birdfont";
version = "2.33.3";
version = "2.33.6";
src = fetchurl {
url = "https://birdfont.org/releases/birdfont-${version}.tar.xz";
sha256 = "sha256-NNw7203BtHhNyyQezb3/EP98cTsu7ABDFBnM5Ms2ePY=";
src = fetchFromGitHub {
owner = "johanmattssonm";
repo = "birdfont";
tag = "v${finalAttrs.version}";
sha256 = "sha256-7xVjY/yH7pMlUBpQc5Gb4t4My24Mx5KkARVp2KSr+Iw=";
};
nativeBuildInputs = [
@@ -44,7 +47,7 @@ stdenv.mkDerivation rec {
gdk-pixbuf
glib
gtk3
webkitgtk_4_0
webkitgtk_4_1
libnotify
sqlite
gsettings-desktop-schemas
@@ -61,10 +64,12 @@ stdenv.mkDerivation rec {
installPhase = "./install.py";
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "Font editor which can generate fonts in TTF, EOT, SVG and BIRDFONT format";
homepage = "https://birdfont.org";
license = licenses.gpl3;
maintainers = with maintainers; [ dtzWill ];
};
}
})
pkgs/top-level/all-packages.nix
-2
View File
@@ -1025,8 +1025,6 @@ with pkgs;
_7zz = darwin.apple_sdk_11_0.callPackage ../tools/archivers/7zz { };
_7zz-rar = _7zz.override { enableUnfree = true; };
acme-dns = callPackage ../servers/dns/acme-dns/default.nix { };
acquire = with python3Packages; toPythonApplication acquire;
actdiag = with python3.pkgs; toPythonApplication actdiag;
pkgs/top-level/perl-packages.nix
+3 -2
View File
@@ -118,11 +118,11 @@ with self;
ack = buildPerlPackage rec {
pname = "ack";
version = "3.8.0";
version = "3.8.2";
src = fetchurl {
url = "mirror://cpan/authors/id/P/PE/PETDANCE/ack-v${version}.tar.gz";
hash = "sha256-ZAsaGzbKFaTR0XkvKkTmmurlg5HPDSH6iilmWoiV9xg=";
hash = "sha256-pSOfWiwS4Me05DL/1+k2/u+UWpYhpBWRx307DPRYVgs=";
};
outputs = [
@@ -143,6 +143,7 @@ with self;
description = "Grep-like tool tailored to working with large trees of source code";
homepage = "https://beyondgrep.com";
license = with lib.licenses; [ artistic2 ];
maintainers = [ maintainers.asakura ];
};
};