Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot]
2026-05-27 00:44:40 +00:00
committed by GitHub
171 changed files with 834 additions and 747 deletions
+12
View File
@@ -412,6 +412,9 @@
"sec-meta-identifiers-cpe": [
"index.html#sec-meta-identifiers-cpe"
],
"sec-meta-identifiers-purl": [
"index.html#sec-meta-identifiers-purl"
],
"sec-modify-via-packageOverrides": [
"index.html#sec-modify-via-packageOverrides"
],
@@ -932,6 +935,15 @@
"var-meta-identifiers-possibleCPEs": [
"index.html#var-meta-identifiers-possibleCPEs"
],
"var-meta-identifiers-purl": [
"index.html#var-meta-identifiers-purl"
],
"var-meta-identifiers-purlParts": [
"index.html#var-meta-identifiers-purlParts"
],
"var-meta-identifiers-purls": [
"index.html#var-meta-identifiers-purls"
],
"var-meta-teams": [
"index.html#var-meta-teams"
],
+6 -1
View File
@@ -11,12 +11,17 @@
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- `hurl` has been updated to `8.x.x` which has some breaking changes. See [upstream changelog](https://github.com/Orange-OpenSource/hurl/releases/tag/8.0.0) for details.
- `python3Packages.django-health-check` has been updated to major version 4. See its [migration guide](https://codingjoe.dev/django-health-check/migrate-to-v4/) and [changelog](https://github.com/codingjoe/django-health-check/releases/tag/4.0.0) for breaking changes.
## Other Notable Changes {#sec-nixpkgs-release-26.11-notable-changes}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- Create the first release note entry in this section!
- Package-URL (PURL, https://github.com/package-url/purl-spec) metadata identifier has been added for `fetchgit`, `fetchpypi` and `fetchFromGithub` fetchers.
`mkDerivation` has been adjusted to reuse this information.
Package-URLs allow reliably identifying and locating software packages.
Maintainers of derivations using the adapted fetchers should rely on the `drv.src.meta.identifiers.v1.purl` default identifier and can enhance their `drv.meta.identifiers.v1.purls` list once they would like to have additional identifiers.
Maintainers using `fetchurl` for `drv.src` are urged to adapt their `drv.meta.identifiers.purlParts` for proper identification.
## Nixpkgs Library {#sec-nixpkgs-release-26.11-lib}
+27
View File
@@ -334,3 +334,30 @@ A readonly attribute that concatenates all CPE parts in one string.
#### `meta.identifiers.possibleCPEs` {#var-meta-identifiers-possibleCPEs}
A readonly attribute containing the list of guesses for what CPE for this package can look like. It includes all variants of version handling mentioned above. Each item is an attrset with attributes `cpeParts` and `cpe` for each guess.
### Package URL {#sec-meta-identifiers-purl}
[Package-URL](https://github.com/package-url/purl-spec) (PURL) is a specification to reliably identify and locate software packages.
Through identification of software packages, additional (non-major) use cases are e.g. software license cross-verification via third party databases or initial vulnerability response management.
Package-URLs shall default to the `mkDerivation.src`, as the original consumed software package is the single source of truth.
#### `meta.identifiers.purlParts` {#var-meta-identifiers-purlParts}
This attribute contains an attribute set of all parts of the PURL for this package.
* `type` mandatory [type](https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/docs/standard/summary.md) which needs to be provided
* `spec` specify the PURL in accordance with the [purl-spec](https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/purl-specification.md)
#### `meta.identifiers.purl` {#var-meta-identifiers-purl}
An extendable attribute which is built based on `purlParts`.
This is the main identifier of the software package.
For handling edge cases, consider using the list interface [`meta.identifiers.purls`](#var-meta-identifiers-purls).
#### `meta.identifiers.purls` {#var-meta-identifiers-purls}
An extendable list attribute which defaults to a single element equal to [`meta.identifiers.purl`](#var-meta-identifiers-purl).
It provides an interface for additional identifiers of `mkDerivation.src` or for identifiers of vendored dependencies inside `mkDerivation.src`, which maintainers may carefully consider to specify as well.
Additional identifiers are generally not recommended, as they might cause maintenance overhead or diverge.
For example, a source distribution `pkg:github` may be hard to keep correctly aligned with the corresponding binary distribution `pkg:pypi`.
@@ -2,7 +2,7 @@
Common configuration for headless machines (e.g., Amazon EC2 instances).
Disables [vesa](#opt-boot.vesa), serial consoles,
Disables serial consoles,
[emergency mode](#opt-systemd.enableEmergencyMode),
[grub splash images](#opt-boot.loader.grub.splashImage)
and configures the kernel to reboot automatically on panic.
@@ -16,7 +16,7 @@
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- Create the first release note entry in this section!
- `boot.vesa` has been removed. It was deprecated in 2020 because Xorg now works better with kernel modesetting. If you still need the legacy VESA 800x600 fallback, set `boot.kernelParams = [ "vga=0x317" "nomodeset" ];` directly.
## Other Notable Changes {#sec-release-26.11-notable-changes}
@@ -206,11 +206,6 @@ let
if lib.isList cfg.sslCiphers then (lib.concatStringsSep ":" cfg.sslCiphers) else cfg.sslCiphers
};"
}
${optionalString (cfg.sslDhparam != false)
"ssl_dhparam ${
if cfg.sslDhparam == true then config.security.dhparams.params.nginx.path else cfg.sslDhparam
};"
}
${optionalString cfg.recommendedTlsSettings ''
# Consider https://ssl-config.mozilla.org/#server=nginx&config=intermediate as the lower bound
@@ -981,9 +976,6 @@ in
"ECDHE-RSA-AES256-GCM-SHA384"
"ECDHE-ECDSA-CHACHA20-POLY1305"
"ECDHE-RSA-CHACHA20-POLY1305"
"DHE-RSA-AES128-GCM-SHA256"
"DHE-RSA-AES256-GCM-SHA384"
"DHE-RSA-CHACHA20-POLY1305"
];
description = ''
List of available cipher suites to choose from when negotiating TLS sessions.
@@ -1002,13 +994,6 @@ in
description = "Allowed TLS protocol versions.";
};
sslDhparam = mkOption {
type = types.either types.path types.bool;
default = false;
example = "/path/to/dhparams.pem";
description = "Path to DH parameters file, or `true` to generate with `security.dhparms.params.nginx`.";
};
proxyResolveWhileRunning = mkOption {
type = types.bool;
default = false;
@@ -1308,6 +1293,13 @@ in
};
imports = [
(mkRemovedOptionModule [ "services" "nginx" "sslDhparam" ] ''
DHE cipher suites have been removed from the default nginx cipher list.
No additional configuration is required as ECDHE is used by default already.
If you wish to use Hybrid PQ key exchange, you can set services.nginx.recommendedTlsSettings = true.
'')
(mkRemovedOptionModule [ "services" "nginx" "stateDir" ] ''
The Nginx log directory has been moved to /var/log/nginx, the cache directory
to /var/cache/nginx. The option services.nginx.stateDir has been removed.
@@ -1678,8 +1670,6 @@ in
in
listToAttrs acmePairs;
security.dhparams.params.nginx = lib.mkIf (cfg.sslDhparam == true) { };
users.users = optionalAttrs (cfg.user == "nginx") {
nginx = {
group = cfg.group;
+9 -17
View File
@@ -35,6 +35,15 @@ in
{
imports = [
(mkRemovedOptionModule [ "boot" "vesa" ] ''
The `boot.vesa` option has been removed. It was deprecated in 2020
because Xorg now works better with kernel modesetting. If you still
need the legacy VESA 800x600 fallback, set
`boot.kernelParams = [ "vga=0x317" "nomodeset" ];` directly.
'')
];
###### interface
options = {
@@ -181,19 +190,6 @@ in
'';
};
boot.vesa = mkOption {
type = types.bool;
default = false;
description = ''
(Deprecated) This option, if set, activates the VESA 800x600 video
mode on boot and disables kernel modesetting. It is equivalent to
specifying `[ "vga=0x317" "nomodeset" ]` in the
{option}`boot.kernelParams` option. This option is
deprecated as of 2020: Xorg now works better with modesetting, and
you might want a different VESA vga setting, anyway.
'';
};
boot.extraModulePackages = mkOption {
type = types.listOf types.package;
default = [ ];
@@ -427,10 +423,6 @@ in
# (so you don't need to reboot to have changes take effect).
boot.kernelParams = [
"loglevel=${toString config.boot.consoleLogLevel}"
]
++ optionals config.boot.vesa [
"vga=0x317"
"nomodeset"
];
boot.kernel.sysctl."kernel.printk" = mkDefault config.boot.consoleLogLevel;
@@ -262,8 +262,8 @@ let
mktplcRef = {
name = "ng-template";
publisher = "Angular";
version = "21.2.3";
hash = "sha256-Gdxw1WvMQ/t4XUfDkekIvwOsWYjmDIjGE7scsImohNc=";
version = "21.2.4";
hash = "sha256-2oTZLOQfcbqrSpEhJ0p7et/8X2JkTi4Kf2jfqVS2DKo=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog";
@@ -2855,8 +2855,8 @@ let
mktplcRef = {
publisher = "llvm-vs-code-extensions";
name = "vscode-clangd";
version = "0.4.0";
hash = "sha256-A1+JaodEBWCQ5NqLkXfNqhOr8j2aFQzEofU+wseh/SY=";
version = "0.6.0";
hash = "sha256-hmoAPCp0BKB3z6z2Ai0w45RDE9v3BYupmu2A5y5OM50=";
};
meta = {
description = "C/C++ completion, navigation, and insights";
@@ -3491,8 +3491,8 @@ let
mktplcRef = {
name = "veriloghdl";
publisher = "mshr-h";
version = "1.22.2";
hash = "sha256-qkSBD8Mk6ow1GryitXgXx0kcLHCJeRs51VxqLQv6gac=";
version = "1.23.2";
hash = "sha256-btwEFVhvNqCnMCftSt7CS6c4lAf29N3MxBAMriKDyjg=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/mshr-h.VerilogHDL/changelog";
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "bluemsx";
version = "0-unstable-2026-05-18";
version = "0-unstable-2026-05-20";
src = fetchFromGitHub {
owner = "libretro";
repo = "bluemsx-libretro";
rev = "175438e5fe68ae0cfb7d04c29f81eed17635e6b4";
hash = "sha256-crFrG6OsmW3nNnQ+OHFtYz7cRuU9hTjWe3vq4PdYJqA=";
rev = "b76f27959a32e18aa04c619273152178fd0cf03b";
hash = "sha256-0FUfeA8IY3VyzhbZqiWYJ7Ttp4CT7kernhgwji6wALQ=";
};
meta = {
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "puae";
version = "0-unstable-2026-05-18";
version = "0-unstable-2026-05-21";
src = fetchFromGitHub {
owner = "libretro";
repo = "libretro-uae";
rev = "6fbf272e342387281484ae84f690fa129f0ab86e";
hash = "sha256-JwFIQfWaorQmDxYgHvpq/CEFMc0LVAsX6TyiGN6FhZA=";
rev = "9fda5f344470d6837e17b939b0f53e5afe938878";
hash = "sha256-gGuYxGRRGyBbHiyG7Gpoi2/frEI5d+ySo8JdZStznN8=";
};
makefile = "Makefile";
@@ -562,13 +562,13 @@
"vendorHash": "sha256-tCwe8TDqwq3lY7so//tHhbTh51EtfIE1UkBylJ8JhoU="
},
"hashicorp_dns": {
"hash": "sha256-sdJpv5Am1tlKyaUkmByrZauzRGZUeAirf7k9a/Fv0S0=",
"hash": "sha256-7sr51WH7M2x1oewGo+/1tYE2e1DKg32ryVZJPt2ZYlY=",
"homepage": "https://registry.terraform.io/providers/hashicorp/dns",
"owner": "hashicorp",
"repo": "terraform-provider-dns",
"rev": "v3.6.0",
"rev": "v3.6.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-01tI68RBp6Qpveqo6Jdynd7SWypbUsY6buPNwdcoPkc="
"vendorHash": "sha256-fnw0mG2kkeALZAyylgpGWyAdcybA77KL5MrobkZBhUU="
},
"hashicorp_external": {
"hash": "sha256-/uBQaDqZBNmIOkwYD+zOPo7ZHiHKDZO2MmD0q52KM4k=",
@@ -1292,11 +1292,11 @@
"vendorHash": "sha256-HjrB7C0KaLJz9NVLfZdq5EZbNbF9lJPxSkQwnWUF978="
},
"tailscale_tailscale": {
"hash": "sha256-c1Hz8srHNaZJq1kJrSwm8ruoHcebM11yX2wQhWavoWE=",
"hash": "sha256-h+VKIhmx3wa+kImQaHeqXYM8oxeH3Ic75bG7FHBKJ1g=",
"homepage": "https://registry.terraform.io/providers/tailscale/tailscale",
"owner": "tailscale",
"repo": "terraform-provider-tailscale",
"rev": "v0.29.0",
"rev": "v0.29.1",
"spdx": "MIT",
"vendorHash": "sha256-hl9govsnEXMd4VbOPqoSGLgSnImDA55enYTaDz2wKH0="
},
@@ -1454,13 +1454,13 @@
"vendorHash": "sha256-B4W8rzWHucYqA0HXrMrtKQ91ZfFAgcxHqFMvMnVuGfk="
},
"vmware_avi": {
"hash": "sha256-Zc9kvJgUeoYApurIAgghKoicpLuPoU+e52MedqPWhyA=",
"hash": "sha256-OPmsbEI9NgzolQSLH/OKJq8a7gvYfWNk1VVz+J9F0JA=",
"homepage": "https://registry.terraform.io/providers/vmware/avi",
"owner": "vmware",
"repo": "terraform-provider-avi",
"rev": "v31.2.2",
"rev": "v32.1.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-bmMJcNmB9Pt4Y14YLGrZt2ynnLbSm4rmrqPtdrbDU08="
"vendorHash": "sha256-WXw9H/BQj0ZEW5YLRHWTiXF4VyaVpwlxWO4Hfy4/NdM="
},
"vmware_vcd": {
"hash": "sha256-W+ffIT70IaePg3xfOaQgCjPTWTN3iSAYwkf+s+zkB84=",
@@ -30,11 +30,12 @@ let
(if lib.versionOlder version "140" then ./no-buildconfig.patch else ./no-buildconfig-tb140.patch)
];
# FIXME: let's hope that upstream will fix this soon and we can drop this hack again.
# https://bugzilla.mozilla.org/show_bug.cgi?id=2006630
# https://bugzilla.mozilla.org/show_bug.cgi?id=2040877
extraPostPatch =
lib.optionalString (lib.versionAtLeast version "147" && lib.versionOlder version "149")
lib.optionalString (lib.versionAtLeast version "151" && lib.versionOlder version "152")
''
find . -name .cargo-checksum.json | xargs sed 's/"[^"]*\.gitmodules":"[a-z0-9]*",//g' -i
echo https://hg.mozilla.org/releases/comm-release/rev/becfb8fb2c70f1603882a2787e2170d5d8013949 >> sourcestamp.txt
echo https://hg.mozilla.org/releases/mozilla-release/rev/fc12dc911f904307729760a817deb829cbf8feb4 >> sourcestamp.txt
'';
meta = {
@@ -73,8 +74,8 @@ rec {
thunderbird = thunderbird-latest;
thunderbird-latest = common {
version = "150.0.2";
sha512 = "3e52220ff34aa6cd1bf46a910dba1f30d0abf7d19ed7f501ffeeb8f5901b8d97fdc0adb0cceb434ef8e83c7f7b83f28024b872280237af72ff2da9d89fafe065";
version = "151.0.1";
sha512 = "a09c1e18faa8d7fdccf39e905542c21e817230e68c7cc6050beec048d0fec0f8eb92e51278d2ccd8d8cfa842762662235517e20238b555a4ad48ee5648dc3589";
updateScript = callPackage ./update.nix {
attrPath = "thunderbirdPackages.thunderbird-latest";
@@ -9,6 +9,7 @@
zarith,
camlp5,
camlp-streams,
pcre2,
bash,
}:
@@ -19,6 +20,7 @@ let
''
-I ${zarith}/lib/ocaml/${ocaml.version}/site-lib/zarith \
-I ${zarith}/lib/ocaml/${ocaml.version}/site-lib/stublibs \
-I ${pcre2}/lib/ocaml/${ocaml.version}/site-lib/stublibs \
''
else
lib.optionalString (num != null) ''
@@ -64,6 +66,7 @@ stdenv.mkDerivation {
];
propagatedBuildInputs = [
camlp-streams
pcre2
(if use_zarith then zarith else num)
];
+12 -1
View File
@@ -251,7 +251,18 @@ lib.makeOverridable (
${if allowedRequisites != null then "allowedRequisites" else null} = allowedRequisites;
};
inherit preferLocalBuild meta;
inherit preferLocalBuild;
meta = meta // {
identifiers = {
purlParts = {
type = "generic";
# https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/generic-definition.md
spec = "${name}?vcs_url=${url}@${(lib.revOrTag rev tag)}";
};
}
// meta.identifiers or { };
};
env = {
NIX_PREFETCH_GIT_CHECKOUT_HOOK = finalAttrs.postCheckout;
@@ -89,6 +89,22 @@ decorate (
meta
// {
homepage = meta.homepage or baseUrl;
identifiers = {
purlParts =
if githubBase == "github.com" then
{
type = "github";
# https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/github-definition.md
spec = "${owner}/${repo}@${(lib.revOrTag rev tag)}";
}
else
{
type = "generic";
# https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/generic-definition.md
spec = "${repo}?vcs_url=https://${githubBase}/${owner}/${repo}@${(lib.revOrTag rev tag)}";
};
}
// meta.identifiers or { };
}
// lib.optionalAttrs (position != null) {
# to indicate where derivation originates, similar to make-derivation.nix's mkDerivation
+15 -1
View File
@@ -51,6 +51,8 @@ lib.makeOverridable (
format ? "setuptools",
sha256 ? "",
hash ? "",
pname,
version,
...
}@attrs:
let
@@ -60,8 +62,20 @@ lib.makeOverridable (
"hash"
]
);
meta = {
identifiers.purlParts = {
type = "pypi";
# https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/pypi-definition.md
spec = "${pname}@${version}";
};
};
in
fetchurl {
inherit url sha256 hash;
inherit
url
sha256
hash
meta
;
}
)
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "9pfs";
version = "0.5";
version = "0.6";
src = fetchFromGitHub {
owner = "ftrvxmtrx";
repo = "9pfs";
tag = finalAttrs.version;
sha256 = "sha256-NT8oIQK8Os3HRZLOH2OvauiCvh5bXZFbeEtTFbzNvrs=";
sha256 = "sha256-zJ1H5UfnTqGWCPt24Pi+Fr3K04wUiPVUmx1AH2sjXmM=";
};
postPatch = ''
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "air";
version = "1.65.2";
version = "1.65.3";
src = fetchFromGitHub {
owner = "air-verse";
repo = "air";
tag = "v${finalAttrs.version}";
hash = "sha256-kQqWIqGJx8396rALn87ykdA3g+1IH+XGOpaICD02j2U=";
hash = "sha256-w3UJ6ezvud0KJYeModGueXx0gp9zTxo6R+BoZPH4Bpo=";
};
vendorHash = "sha256-03xZ3P/7xjznYdM9rv+8ZYftQlnjJ6ZTq0HdSvGpaWw=";
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "aliyun-cli";
version = "3.3.15";
version = "3.3.16";
src = fetchFromGitHub {
owner = "aliyun";
repo = "aliyun-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-7DkVhFGUvAAFWUiFTOaYARIGCyAW3UqMCLUs5F55vfM=";
hash = "sha256-us22AgTEmJ8HNlXPR9mT+WJ03Qxndt+ORfMucKvIc0U=";
fetchSubmodules = true;
};
@@ -7,16 +7,16 @@
buildNpmPackage rec {
pname = "all-the-package-names";
version = "2.0.2446";
version = "2.0.2452";
src = fetchFromGitHub {
owner = "nice-registry";
repo = "all-the-package-names";
tag = "v${version}";
hash = "sha256-77nJGQX/TCnWFYt7+ZMSMbEi8TvoO03+0EpH7h0tG+8=";
hash = "sha256-LNBEp1jGUxJ2cuIeXIx7+FMPkeLZP2XcTOkP0I3o5zw=";
};
npmDepsHash = "sha256-9fq9J/afHI3W/ghmw8VhmD/QaldB9pR5mfEHrvOvkcc=";
npmDepsHash = "sha256-ZOtL9GDQASZhNGQdhdJv+rGLscidzfCdmwVkDfyHmGo=";
passthru.updateScript = nix-update-script { };
+2 -2
View File
@@ -10,13 +10,13 @@
buildGoModule (finalAttrs: {
pname = "aws-nuke";
version = "3.64.2";
version = "3.64.4";
src = fetchFromGitHub {
owner = "ekristen";
repo = "aws-nuke";
tag = "v${finalAttrs.version}";
hash = "sha256-Rg68lngQcF6Psg7aE0N/4Nvx7ctrs2DFtcOaqXGDUGA=";
hash = "sha256-oUziuU2lhp1X/RTOYn4FtimmNZ4ZEjbihdfokoeLrmw=";
};
vendorHash = "sha256-q1ASHG4KWlU8tLjHireMqmkW33Q2hy+ikOTWQPOYIXo=";
+2 -2
View File
@@ -8,14 +8,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "badkeys";
version = "0.0.17";
version = "0.0.18";
pyproject = true;
src = fetchFromGitHub {
owner = "badkeys";
repo = "badkeys";
tag = "v${finalAttrs.version}";
hash = "sha256-sQ2HOgffVklHKpOTmIHMR0QSfsB9lxrEcaT2jzicVlM=";
hash = "sha256-sQPMil8MdGR9vauBgX+fAX/wdmSdqkchoxD4drGXR3I=";
};
build-system = with python3Packages; [
+2 -2
View File
@@ -12,14 +12,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bird";
version = "2.18.1";
version = "2.19.0";
src = fetchFromGitLab {
domain = "gitlab.nic.cz";
owner = "labs";
repo = "bird";
tag = "v${finalAttrs.version}";
hash = "sha256-tYICTipTzugtb7kv/zwsChM8v+zJ2TVsotEkJDcZCto=";
hash = "sha256-xk3z5kkjnInmIwtE6Q7kCJ5P5Njt/Oz1+HPO0vcr93E=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -12,14 +12,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bird";
version = "3.2.1";
version = "3.3.0";
src = fetchFromGitLab {
domain = "gitlab.nic.cz";
owner = "labs";
repo = "bird";
tag = "v${finalAttrs.version}";
hash = "sha256-FkrVrjT4Q9zLeauP2GOX38a7a4q7h2aQbEe/kmfKB3A=";
hash = "sha256-mH9CM9Emie2B9c5PeW4DKUQUzvgxTExPBGG06YbWqGo=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule (finalAttrs: {
pname = "buf";
version = "1.69.0";
version = "1.70.0";
src = fetchFromGitHub {
owner = "bufbuild";
repo = "buf";
tag = "v${finalAttrs.version}";
hash = "sha256-x8Dj4xl67Jq0ViWu+Tz+3lAnfIpE926dIr+oe4ul0gI=";
hash = "sha256-C06/5a4icjgI35ADQKvlZ6JmCCyW/9e0aF9VIpLCqn0=";
};
vendorHash = "sha256-zhXpWpYd/bim5f4EQJujVm072LPgBusjCFGYAwK10HE=";
vendorHash = "sha256-Vveg7rBno66IPinVs9RJtzVJdtAJE55QZfWA3WIXGDQ=";
patches = [
# Skip a test that requires networking to be available to work.
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "caligula";
version = "0.4.11";
version = "0.5.0";
src = fetchFromGitHub {
owner = "ifd3f";
repo = "caligula";
rev = "v${finalAttrs.version}";
hash = "sha256-2KCP7Utb785yIn8w/Ls19UPS9ylg1PtLRki87+BD+xw=";
hash = "sha256-0KSQd/DvIo813HSLL+Qvn+5GMFRK7CGxOSq4+Fyl8Zk=";
};
cargoHash = "sha256-C86wu2Pc9O7YM1TnnfotzzOQlnJXJe2zmsX04JyJsjA=";
cargoHash = "sha256-ICvQ7XtA7705gJ0GijuZJROGAp/BMpyqsIygR+6kJ2I=";
nativeBuildInputs = [
rustPlatform.bindgenHook
+3 -3
View File
@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "tauri";
version = "2.11.0";
version = "2.11.2";
src = fetchFromGitHub {
owner = "tauri-apps";
repo = "tauri";
tag = "tauri-cli-v${finalAttrs.version}";
hash = "sha256-hbTpLeWMc5nSJeq1vWKbVpfhp1KZjiBgmaiQMUs/MIQ=";
hash = "sha256-BH/tQlrmCMAab5LqQ/xl9+A5nCnN8sk6mavvAkajYHM=";
};
cargoHash = "sha256-PrvlPfK/9qyBWOs6hG3C3w9TMK7p1TCoKpjSWkhN2rY=";
cargoHash = "sha256-QX151ckeSxbZgbFO88zhsvnNnjZffLpR5dDp1Dv1Wlo=";
nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [
pkg-config
@@ -1,13 +0,0 @@
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 {
+12 -18
View File
@@ -7,7 +7,7 @@
buildGraalvmNativeImage (finalAttrs: {
pname = "certificate-ripper";
version = "2.4.1";
version = "2.7.1";
src = maven.buildMavenPackage {
pname = "certificate-ripper-jar";
@@ -17,30 +17,24 @@ buildGraalvmNativeImage (finalAttrs: {
owner = "Hakky54";
repo = "certificate-ripper";
tag = finalAttrs.version;
hash = "sha256-qQ5BHH+DT1sGNDGzSbclqc6+byBxyP16qvm3k9E/Yks=";
hash = "sha256-yKBINzHhUpjqrbMIt3LulKtMLyuZvuBzBaR6wMs6lCI=";
};
patches = [
./pin-default-maven-plguin-versions.patch
./fix-test-temp-dir-path.patch
];
mvnHash = "sha256-G2+Z1JyxTzCZzWjB8MQH1T9kwHjtRPag+bmzGXpQXw4=";
mvnHash = "sha256-ZuqPzFL7CJ/H6SBcQMwTMqBsKtlxv9oiQXXfFgMdQpE=";
mvnParameters =
let
disabledTests = [
"PemExportCommandShould#resolveRootCaOnlyWhenEnabled" # uses network
"DerExportCommandShould#processSystemTrustedCertificates"
"JksExportCommandShould#processSystemTrustedCertificates"
"PemExportCommandShould#processSystemTrustedCertificates"
"Pkcs12ExportCommandShould#processSystemTrustedCertificates"
];
in
lib.escapeShellArgs [
"-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z" # make timestamp deterministic
"-Dtest=${lib.concatMapStringsSep "," (t: "!" + t) disabledTests}"
];
mvnParameters = lib.escapeShellArgs [
# generate a singular .jar file
"-Pfat-jar"
# make the build timestamp deterministic
"-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z"
];
# Integration tests and network based tests fail, let's not bother with blacklisting them one-by-one
doCheck = false;
installPhase = ''
install -Dm644 target/crip.jar $out
+3 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "chess-tui";
version = "2.7.0";
version = "2.7.1";
src = fetchFromGitHub {
owner = "thomas-mauran";
repo = "chess-tui";
tag = finalAttrs.version;
hash = "sha256-BGJOPsePE5S5ySrOg63cNKn9pT+7MmDLHZrW3YhUFz8=";
hash = "sha256-B6CpUha5e2W82HnWOxV2arHAiqJCyL5bwkhELYQPxMg=";
};
cargoHash = "sha256-n9rjr5vUK619XIfuHIlf+lxUAeTbhTAzmdysliKNOFY=";
cargoHash = "sha256-Vik4FceQSYnziDpAqz7r7gpabUp2JL5u40iT0r8fnAw=";
checkFlags = [
# assertion failed: result.is_ok()
+4 -4
View File
@@ -10,13 +10,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "cpuinfo";
version = "0-unstable-2026-04-30";
version = "0-unstable-2026-05-18";
src = fetchFromGitHub {
owner = "pytorch";
repo = "cpuinfo";
rev = "3681f0ce1446167d01dfe125d6db96ba2ac31c3c";
hash = "sha256-PhWbzQgZSUb3eVyx+JTSnxVOAC2WzL2Dw1I9/6LEIsw=";
rev = "ea6b9f1bb6e1001d8b21574d5bc78ddef62e499d";
hash = "sha256-/QsOjDik0TnH3FnK7LOwsJkvX+O+2DRFX4eF3MxD3fc=";
};
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
mainProgram = "cpu-info";
maintainers = with lib.maintainers; [ pawelchcki ];
pkgConfigModules = [ "libcpuinfo" ];
# https://github.com/pytorch/cpuinfo/blob/3681f0ce1446167d01dfe125d6db96ba2ac31c3c/CMakeLists.txt#L98
# https://github.com/pytorch/cpuinfo/blob/ea6b9f1bb6e1001d8b21574d5bc78ddef62e499d/CMakeLists.txt#L98
platforms = lib.platforms.x86 ++ lib.platforms.aarch ++ lib.platforms.riscv;
};
})
+7 -3
View File
@@ -12,15 +12,17 @@
libdrm,
libxrandr,
libxext,
acl,
dbus,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "ddcutil";
version = "2.2.6";
version = "2.2.7";
src = fetchurl {
url = "https://www.ddcutil.com/tarballs/ddcutil-${finalAttrs.version}.tar.gz";
hash = "sha256-5LaRkcC0UK6iOjSlks88WPAn/hRiAgF5BwzJLV7K7Yg=";
hash = "sha256-GaxmBM8Rd7pWZm+KaCWB5x6Jc70Gx8jc8DNnTkqqpkg=";
};
nativeBuildInputs = [
@@ -29,14 +31,16 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
acl
dbus
glib
jansson
libdrm
libgudev
libusb1
udev
libxext
libxrandr
udev
];
enableParallelBuilding = true;
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "der-ascii";
version = "0.7.0";
version = "0.8.0";
src = fetchFromGitHub {
owner = "google";
repo = "der-ascii";
rev = "v${finalAttrs.version}";
sha256 = "sha256-i4rNeNDE7bIsO04haMKsbJmyvQRhhEt3I7UxmfTtL78=";
sha256 = "sha256-/9Go4fAwXmA3SLl0bP7aLy6fEItPZoscQ4pdA2GZuyM=";
};
vendorHash = null;
+2 -2
View File
@@ -9,7 +9,7 @@
buildGoModule (finalAttrs: {
pname = "doctl";
version = "1.159.0";
version = "1.160.0";
vendorHash = null;
@@ -42,7 +42,7 @@ buildGoModule (finalAttrs: {
owner = "digitalocean";
repo = "doctl";
tag = "v${finalAttrs.version}";
hash = "sha256-SBUTqJbxO2z5d78SQtGquVyPKQEeapmT/SVTd7nt7L0=";
hash = "sha256-LXALzs5oubT1uL+sgA0LsaoFbir3e8JYVlIiJv6U5J4=";
};
meta = {
+2 -2
View File
@@ -7,13 +7,13 @@
}:
llvmPackages.stdenv.mkDerivation rec {
pname = "enzyme";
version = "0.0.260";
version = "0.0.263";
src = fetchFromGitHub {
owner = "EnzymeAD";
repo = "Enzyme";
rev = "v${version}";
hash = "sha256-juYkvJZUo0b7N/yRRgD4Xwh4nHxRQFMVoWTgIW+N0/0=";
hash = "sha256-+Br2PS5IsHaAAJM5IJR7gXMx90pduixbdbSVNxL+kLo=";
};
postPatch = ''
+4 -3
View File
@@ -27,13 +27,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "euphonica";
version = "0.99.3-beta";
version = "0.99.4-beta";
src = fetchFromGitHub {
owner = "htkhiem";
repo = "euphonica";
tag = "v${finalAttrs.version}";
hash = "sha256-C9OX8RzgUMdStBFq43sSl5vG7XccXTJjFvn0E2WQDuo=";
hash = "sha256-TDW3at2NXbdfUvHAZg7KK0HEqF8xDm0cIYfGuTSlYCQ=";
fetchSubmodules = true;
};
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-3m0ObaRR/HlxPF9Z5Zg5fMQ17YVRCx6W3drI8XVwZP8=";
hash = "sha256-cXlfJ3MrW8n34KxE5uD+6dTqzaazmwgNQC3hHNPqzcE=";
};
mesonBuildType = "release";
@@ -85,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with lib.maintainers; [
paperdigits
aaravrav
doronbehar
];
mainProgram = "euphonica";
platforms = with lib.platforms; linux;
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "extest";
version = "1.0.2";
version = "1.0.3";
src = fetchFromGitHub {
owner = "Supreeeme";
repo = "extest";
rev = finalAttrs.version;
hash = "sha256-qdTF4n3uhkl3WFT+7bAlwCjxBx3ggTN6i3WzFg+8Jrw=";
hash = "sha256-4SVZD0aHKsn97B5bhCf7URR6iQhJlYGALKWhDg+lGhU=";
};
cargoHash = "sha256-82jG4tHqc5FQFGp4NANk2oJjiHc0+ekVdbdWlqjzaj8=";
cargoHash = "sha256-OBWgNQ3OfqztaQwbK4fjOp7Lbu58U6j8tbStJ17bIko=";
meta = {
description = "X11 XTEST reimplementation primarily for Steam Controller on Wayland";
+2 -2
View File
@@ -14,7 +14,7 @@
}:
stdenv.mkDerivation (finalAttrs: {
version = "1.37.2";
version = "1.38.1";
pname = "fakeroot";
src = fetchFromGitLab {
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
repo = "fakeroot";
rev = "upstream/${finalAttrs.version}";
domain = "salsa.debian.org";
hash = "sha256-TU/9oltd+2wYums8EEDUhaIVzwPeQvW13laCrJqb5A4=";
hash = "sha256-1Xmb8OPZSVP4xtSBGuwwKwdVQXixEugMgQfvAJueJAg=";
};
patches = lib.optionals stdenv.hostPlatform.isLinux [
+2 -2
View File
@@ -9,11 +9,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fetchmail";
version = "6.6.3";
version = "6.6.4";
src = fetchurl {
url = "mirror://sourceforge/fetchmail/fetchmail-${finalAttrs.version}.tar.xz";
hash = "sha256-JG5fwONck93ho/tmd446twDhaAkjLklZxQi5EhQ3S7I=";
hash = "sha256-7+AWkNIr2jWaV5x34rAHJligkr/0kOwEeKISxrfQ63A=";
};
buildInputs = [
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "fly";
version = "8.2.1";
version = "8.2.2";
src = fetchFromGitHub {
owner = "concourse";
repo = "concourse";
rev = "v${finalAttrs.version}";
hash = "sha256-YKa1hGqmmwFNcPX6N7iJUjUL6FnPJLi9DZTkcujzVkY=";
hash = "sha256-eqzrrbIpX6hS56SQe24gWlnBPMlLH1lz+NwxdNZ3OoE=";
};
vendorHash = "sha256-dvE5rtJX3MIuYyswLgcwojd5LIkhD4WnPEL3HNfmhkA=";
vendorHash = "sha256-ZNhGt+nyl7zmQIHT+5f/c2hixyZ8kLmCWO5qa7CAGuY=";
subPackages = [ "fly" ];
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule (finalAttrs: {
pname = "fn";
version = "0.6.56";
version = "0.6.58";
src = fetchFromGitHub {
owner = "fnproject";
repo = "cli";
rev = finalAttrs.version;
hash = "sha256-GeOb6HkIScxcTTPgXcZy3VyJlwK8NxDJBikDv13tTQM=";
hash = "sha256-Ysf+FmYiJ0R4NIskEqIClcG55EnMnBFLD/GDJd8G/sQ=";
};
vendorHash = null;
+2 -2
View File
@@ -7,7 +7,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ggml";
version = "0.12.0";
version = "0.13.0";
__structuredAttrs = true;
strictDeps = true;
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ggml-org";
repo = "ggml";
tag = "v${finalAttrs.version}";
hash = "sha256-xho510x/7LrCHzmw++zdTg+lI96SebJkdotqIUGLwac=";
hash = "sha256-yUd/9uk9utNqkM2V/IIkcNuEojBJQwAOEEUbBPDsNCE=";
};
# The cmake package does not handle absolute CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "git-credential-keepassxc";
version = "0.14.2";
version = "0.14.3";
src = fetchFromGitHub {
owner = "Frederick888";
repo = "git-credential-keepassxc";
rev = "v${finalAttrs.version}";
hash = "sha256-tA90IM2zLDX9LkIZ6BEW9L+Se3f/cq80f+IwLfq1cjI=";
hash = "sha256-rgYwcfglyutHIZrENFlYUHFeobMoLU6BwkdsaWqDkWE=";
};
cargoHash = "sha256-5aXVvQdiQ+3c3VsGX/nrvclgNlXUO3bs0/De8LEXDek=";
cargoHash = "sha256-zHSMbfP9ge3JYGyUI2XMGtQwQnsDPkWDnm0F3WWwfNc=";
buildFeatures =
[ ]
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "glooctl";
version = "1.21.4";
version = "1.21.6";
src = fetchFromGitHub {
owner = "solo-io";
repo = "gloo";
rev = "v${finalAttrs.version}";
hash = "sha256-cG3WKpvIanWneBYw98nprbmoTHaFbdRopJ4p5oaJkyU=";
hash = "sha256-KZh0ZUCZ5zUJRmt/JpfqowADrjuGgK27XoIJ/1TBgzA=";
};
vendorHash = "sha256-8iRotQm41EcqjHUK92wpNFcq/ODDbhAhcKSxSRFmGrA=";
vendorHash = "sha256-1bY+69XKEmcV+8HV2X2JYA6S9A29KbHTLaXSZbkFbhg=";
subPackages = [ "projects/gloo/cli/cmd" ];
+2 -2
View File
@@ -25,11 +25,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "got";
version = "0.125";
version = "0.126";
src = fetchurl {
url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz";
hash = "sha256-rdYZgBBzZDcq64Foe8WKZsDQyeCixKm7ttNxT7RSuqw=";
hash = "sha256-rXXdiDGGrxCi+Lol9bTm6bKXTTkvNcjgo5O0/xNLSC0=";
};
nativeBuildInputs = [
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "highscore-mednafen";
version = "0-unstable-2026-01-31";
version = "0-unstable-2026-05-22";
src = fetchFromGitHub {
owner = "highscore-emu";
repo = "mednafen-highscore";
rev = "f1646bbc664837f5b2ecbfb32cc5c42101466bfd";
hash = "sha256-YHVV6/8JTESLtGA5jFozE5IhXHB4RaUaT2yvFd7wGo8=";
rev = "e13c337a2cde6d5304f2a33311447280ef206a7a";
hash = "sha256-nwvOkL1RzqXCqMFiDuSvNhgmujvxFYpdp4OScvEmppI=";
};
sourceRoot = "${finalAttrs.src.name}/highscore";
+3 -3
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation {
pname = "highscore-mgba";
version = "0-unstable-2026-05-01";
version = "0-unstable-2026-05-21";
src = fetchFromGitHub {
owner = "highscore-emu";
repo = "mgba";
rev = "eeb3cf0f34af549d9224dd75a1e6cb6361d09aeb";
hash = "sha256-yGUAnG8LnZ+hCV+uE1tGX2Zmp5Hriu7LQaWfXZTJqXk=";
rev = "c010031f76b729819246497627746fb4a7bf6c85";
hash = "sha256-QhQ27s4Gc2IVkvgiB2vK2c0WXcxwl5/wmvpIRpM3NNI=";
};
outputs = [
@@ -8,14 +8,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "interactive-html-bom";
version = "2.11.1";
version = "2.11.2";
pyproject = true;
src = fetchFromGitHub {
owner = "openscopeproject";
repo = "InteractiveHtmlBom";
tag = "v${finalAttrs.version}";
hash = "sha256-j8ORSHMZ3aWtWNA5UaHeL+OXh4D1wdek5JjinmqpOfI=";
hash = "sha256-MNwQJAibnAAMvsoTWtFiIhM6TGVUs7B2w6sA4ruXFbc=";
};
build-system = [ python3Packages.hatchling ];
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "iroh-ssh";
version = "0.2.10";
version = "0.2.11";
src = fetchFromGitHub {
owner = "rustonbsd";
repo = "iroh-ssh";
tag = finalAttrs.version;
hash = "sha256-A/QdpPHI9TCqQ2oghxPUJl4KKX8gqkA3kBvN8f1Kegg=";
hash = "sha256-/g5U8WW/iqf+ccIsZ5tPhkjVFsoVgDj6sfk/aSgGJBw=";
};
cargoHash = "sha256-/cq/rOzrQ4t0qvdaqM3JhRn8IMncx7jWYDjdYmLCYvc=";
cargoHash = "sha256-2NAl4ClPN+OI1EBAkuL/KSiByxU34sBmYDjnRXYuiOY=";
nativeBuildInputs = [
installShellFiles
+4
View File
@@ -139,5 +139,9 @@ stdenv.mkDerivation (finalAttrs: {
];
platforms = lib.platforms.unix;
mainProgram = "jq";
identifiers.purlParts = {
type = "github";
spec = "jqlang/jq@jq-${finalAttrs.version}";
};
};
})
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "kdlfmt";
version = "0.1.6";
version = "0.1.7";
src = fetchFromGitHub {
owner = "hougesen";
repo = "kdlfmt";
tag = "v${finalAttrs.version}";
hash = "sha256-W4a+pPdQv6/XOS3ps1CBCLuspcSAn7FJuvkA5hesvww=";
hash = "sha256-Ftzf4gI7E5tPo8U5ZxUMqlY5+AK5IEUUAll+GsEKYpg=";
};
cargoHash = "sha256-VXg7CVsTuAvXrQNAtzlcJvd24BtS/bQYTGselh4Dzyk=";
cargoHash = "sha256-B/ir+Sf4uxQ9Fqmy6yEa3DMt0qdpfPrwD8lhUMOEUbo=";
nativeBuildInputs = [ installShellFiles ];
+3 -3
View File
@@ -7,18 +7,18 @@
buildGoModule (finalAttrs: {
pname = "kubectl-rabbitmq";
version = "2.20.1";
version = "2.21.0";
src = fetchFromGitHub {
owner = "rabbitmq";
repo = "cluster-operator";
tag = "v${finalAttrs.version}";
hash = "sha256-84rcffEG2+AxtCbOo7KnT6mQFOMpeWJyA0HgDxjmlyc=";
hash = "sha256-6kh4R84Nq82M66Y0vl1NLYUxWh52oYpCydK7vOmkMcU=";
};
modRoot = "kubectl-rabbitmq";
vendorHash = "sha256-+++RbYcQ3qrdWeBUjd50RuCuvpSbDrTycCR7mptvhoc=";
vendorHash = "sha256-/50MnUk1wxpUed8jZ8OC6rgu4Qj6CnUZdbYsgyjsxIo=";
ldflags = [
"-s"
+2 -2
View File
@@ -11,13 +11,13 @@
buildGoModule rec {
pname = "lazysql";
version = "0.5.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "jorgerojas26";
repo = "lazysql";
rev = "v${version}";
hash = "sha256-fQGojLJdMnzWXetE2AL2i0q16ZRebPsGx9UsWm1CmAs=";
hash = "sha256-rdXZmvyBzVcvycFP/AmrnOuVauQKrmJ1ZTIXc0TWxSI=";
};
vendorHash = "sha256-FbAt/HsjoxqAKWQqqWN2xuyyTG2Ic4DcyEU4O0rjpQE=";
+2 -2
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "ledfx";
version = "2.1.8";
version = "2.1.9";
pyproject = true;
src = fetchFromGitHub {
owner = "LedFx";
repo = "LedFx";
tag = "v${finalAttrs.version}";
hash = "sha256-le3SEGI9uis7wx9+SFpn0BJbpCybSecXEcxxAkC910U=";
hash = "sha256-h3bevsvgRILzAnQKSJj8X5AixB8qsyhf2+SkolSEdbk=";
};
postPatch = ''
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libglibutil";
version = "1.0.81";
version = "1.0.82";
src = fetchFromGitHub {
owner = "sailfishos";
repo = "libglibutil";
rev = finalAttrs.version;
sha256 = "sha256-sDSdcsCkmsdD6yPEOi8rdURJRJ6LN69ZeiBfLZL2I68=";
sha256 = "sha256-etFvEqU3WeXkImRhXgEw0Pd2gZvuQK4Sy4pIIyuazqc=";
};
outputs = [
@@ -5,10 +5,8 @@
fetchpatch,
cmake,
pkg-config,
wrapQtAppsHook,
marisa,
qttools,
qtlocation,
libsForQt5,
}:
stdenv.mkDerivation {
@@ -37,12 +35,12 @@ stdenv.mkDerivation {
nativeBuildInputs = [
cmake
pkg-config
wrapQtAppsHook
libsForQt5.wrapQtAppsHook
];
buildInputs = [
marisa
qttools
qtlocation
libsForQt5.qttools
libsForQt5.qtlocation
];
meta = {
+3 -3
View File
@@ -8,20 +8,20 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "librashader";
version = "0.10.1";
version = "0.11.0";
src = fetchFromGitHub {
owner = "SnowflakePowered";
repo = "librashader";
tag = "librashader-v${finalAttrs.version}";
hash = "sha256-02ZWu5kllTmQsFqQFbT8ckzhWgWkjH5YsD6mf4j0ySg=";
hash = "sha256-ZkmaPv7cy2qj1I8hBiLBAIgbATS6Ooe/Y52cjKNYyCw=";
};
patches = [
./patches/fix-optional-dep-syntax.patch
];
cargoHash = "sha256-8F7Rl1sC3UW01HFGVp9nu83sUXrigB2URyOFSiQ6Fqs=";
cargoHash = "sha256-zEHvhjFGcZ9eFWfmJfrRpbjnHPqQhZ0G3OMHBWKQBzQ=";
buildPhase = ''
runHook preBuild
+6 -3
View File
@@ -2,20 +2,23 @@
lib,
rustPlatform,
fetchFromGitHub,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "llmfit";
version = "0.9.25";
version = "0.9.28";
src = fetchFromGitHub {
owner = "AlexsJones";
repo = "llmfit";
tag = "v${finalAttrs.version}";
hash = "sha256-ijm2RkOF+B1E7dARxI3MsZz3l6OTQOUqBC+2mzZ7ruI=";
hash = "sha256-okTaIKaLw3BcBqBRe1Mz9V3tCaEStF32qxrcfggi33w=";
};
cargoHash = "sha256-BdnsqqqnvnXQl6Q1L0tVHQyn7BatQVYfYF8mLRqZfqQ=";
cargoHash = "sha256-ty45oqyDcuUuiM1J41UreCqc0SbMz8U/V9ckE2FZv3c=";
passthru.updateScript = nix-update-script { };
meta = {
description = "TUI to find LLM models right sized for the system's RAM, CPU, and GPU";
+3 -3
View File
@@ -18,16 +18,16 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "lockbook-desktop";
version = "26.4.13";
version = "26.5.22";
src = fetchFromGitHub {
owner = "lockbook";
repo = "lockbook";
tag = finalAttrs.version;
hash = "sha256-KkYe07uEj/AO1rxsa4bwVsNO6iyjAFJwHeWAyMH8RPY=";
hash = "sha256-KqqiaM0txuZsylbr1+7faTdJINy1sNttT9n/YUpqyCc=";
};
cargoHash = "sha256-/FLR2IXsxBEV9Z6GSJ0MTjIZjApNUN9J2ellKiKtL74=";
cargoHash = "sha256-d4yKch2c1w5gFBjyrYZQT/6lscRi3p05wKiJEIaXhjA=";
nativeBuildInputs = [
pkg-config
+3 -3
View File
@@ -12,16 +12,16 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "lockbook";
version = "26.4.13";
version = "26.5.22";
src = fetchFromGitHub {
owner = "lockbook";
repo = "lockbook";
tag = finalAttrs.version;
hash = "sha256-KkYe07uEj/AO1rxsa4bwVsNO6iyjAFJwHeWAyMH8RPY=";
hash = "sha256-KqqiaM0txuZsylbr1+7faTdJINy1sNttT9n/YUpqyCc=";
};
cargoHash = "sha256-/FLR2IXsxBEV9Z6GSJ0MTjIZjApNUN9J2ellKiKtL74=";
cargoHash = "sha256-d4yKch2c1w5gFBjyrYZQT/6lscRi3p05wKiJEIaXhjA=";
doCheck = false; # there are no cli tests
cargoBuildFlags = [
+2 -2
View File
@@ -6,11 +6,11 @@
stdenvNoCC.mkDerivation rec {
pname = "lxgw-neoxihei";
version = "1.301";
version = "1.302";
src = fetchurl {
url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
hash = "sha256-C/M5Dl94L83vB7TzREdx6dBms9aHPQfgdWEyjvtvS00=";
hash = "sha256-7YRfB+nDHUhzPuWyjuZUIwx7tLKjjhP9JutNWRnAw3w=";
};
dontUnpack = true;
@@ -3,7 +3,7 @@
zlib,
fetchFromGitHub,
python3Packages,
wrapQtAppsHook,
libsForQt5,
}:
python3Packages.buildPythonApplication (finalAttrs: {
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
hash = "sha256-jOhbN6lMx04q60S0VOABmSNE/x9Er9exFYvWJe2INlE=";
};
nativeBuildInputs = [ wrapQtAppsHook ];
nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ];
propagatedBuildInputs = [
python3Packages.pyqt5
@@ -2,11 +2,9 @@
stdenv,
fetchurl,
sane-backends,
qtbase,
qtsvg,
autoPatchelfHook,
lib,
wrapQtAppsHook,
libsForQt5,
}:
stdenv.mkDerivation rec {
@@ -20,12 +18,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoPatchelfHook
wrapQtAppsHook
libsForQt5.wrapQtAppsHook
];
buildInputs = [
qtbase
qtsvg
libsForQt5.qtbase
libsForQt5.qtsvg
sane-backends
stdenv.cc.cc
];
+4 -4
View File
@@ -18,23 +18,23 @@
stdenv.mkDerivation (finalAttrs: {
pname = "matrix-hookshot";
version = "7.3.2";
version = "7.3.3";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "matrix-hookshot";
tag = finalAttrs.version;
hash = "sha256-FHxR0rUrony/z8Nxv4HA0XCDlwsdoLXK/yBQlfkC6U4=";
hash = "sha256-SVQsXzQU3TTiKjd1manEsqL/Ui6s/sFoZPBf9mWp31k=";
};
offlineCache = fetchYarnDeps {
inherit (finalAttrs) src;
hash = "sha256-Qodvybg0G2a6Jtcd89Mci/PoLXrozTJCRRVh/fedngk=";
hash = "sha256-1J2a0ZRARYOEQE70WnKZlgwjIwafPfmgBtUVXX106lg=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-X0k60VOG/VoffE5+pCJ33C0Oxjr7NsOHHsLNWFb/z6s=";
hash = "sha256-EMwrIo17d5+LTczv4/+4m6XALfH0dCHnWtBU17h+mxI=";
};
buildInputs = [ openssl ];
+2 -2
View File
@@ -6,7 +6,7 @@
maven,
}:
let
version = "8.47";
version = "8.51";
in
maven.buildMavenPackage {
pname = "megabasterd";
@@ -16,7 +16,7 @@ maven.buildMavenPackage {
owner = "tonikelope";
repo = "megabasterd";
tag = "v${version}";
hash = "sha256-pJk6ZDVPs/hrm0ZZI9YXv+dfZAEbpwwI8Z1By+FPwCs=";
hash = "sha256-FbExOSdJ4XiXKzetIlsSPrD9x2H4MxM2kKCMA4XkMLA=";
};
mvnHash = "sha256-DVfPmW0ep6y/GxnwNKXxo68W5idcTkoNqUEKm7ouTEY=";
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "minimap2";
version = "2.30";
version = "2.31";
src = fetchFromGitHub {
repo = "minimap2";
owner = "lh3";
rev = "v${finalAttrs.version}";
sha256 = "sha256-TnJ/h04QdTdL56yyh+3Po19UAzrAkictu5Q6OiCQ2DY=";
sha256 = "sha256-RH9IvpmcDEnuFEXucORpzeWc+yJlAvW4r6RnaUT+//c=";
};
buildInputs = [ zlib ];
+2 -11
View File
@@ -22,22 +22,13 @@ let
hash = "sha256-1KVy9s+zjlB4w7E45PMCWRxPus24bgBmmM3k2R9d+Jg=";
};
});
# 112/2907 tests fail with textual 8.2.5:
# textual.app.InvalidThemeError: Theme 'textual-ansi' has not been registered.
textual = prev.textual.overridePythonAttrs (old: rec {
version = "8.2.4";
src = old.src.override {
tag = "v${version}";
hash = "sha256-827cm9pcj1o1FYeaoWKCJ6dEyXeDop4kYd205cySTfg=";
};
});
};
};
python3Packages = python.pkgs;
in
python3Packages.buildPythonApplication (finalAttrs: {
pname = "mistral-vibe";
version = "2.10.1";
version = "2.11.0";
pyproject = true;
__structuredAttrs = true;
@@ -45,7 +36,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
owner = "mistralai";
repo = "mistral-vibe";
tag = "v${finalAttrs.version}";
hash = "sha256-hbsOA+8tOoFuwiz2KLdcJsbrn/sYec8vqzvh6mKgX08=";
hash = "sha256-s0mgWOKO+kKwJivnZw2IJRhGRET000ApvuhK6OovIIw=";
};
build-system = with python3Packages; [
@@ -6,7 +6,6 @@
sox,
flac,
lame,
wrapQtAppsHook,
ffmpeg,
vorbis-tools,
pulseaudio,
@@ -15,7 +14,7 @@
opus-tools,
gst_all_1,
enableSonos ? true,
qtwayland,
libsForQt5,
}:
let
packages = [
@@ -44,7 +43,7 @@ python3Packages.buildPythonApplication {
hash = "sha256-UMzOIxgeTpAFQZtYirOYPoVcKgiKdGx2zwVyWmo32w4=";
};
buildInputs = lib.optional stdenv.hostPlatform.isLinux qtwayland;
buildInputs = lib.optional stdenv.hostPlatform.isLinux libsForQt5.qtwayland;
propagatedBuildInputs =
with python3Packages;
(
@@ -66,7 +65,7 @@ python3Packages.buildPythonApplication {
--replace 'platform.system() == "Linux"' 'True'
'';
nativeBuildInputs = [ wrapQtAppsHook ];
nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ];
# Relies on an old version (0.7.7) of PyChromecast unavailable in Nixpkgs.
# Is also I/O bound and impure, testing an actual device, so we disable.
+2 -2
View File
@@ -49,13 +49,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "mkvtoolnix";
version = "98.0";
version = "99.0";
src = fetchFromCodeberg {
owner = "mbunkus";
repo = "mkvtoolnix";
tag = "release-${finalAttrs.version}";
hash = "sha256-gLs2+hbWFhhpabdknwoozH8WHgVNSR0VjnrmwQA7xrc=";
hash = "sha256-re4z0ZseuOP/P1HW3qdWLIo+YhLlSRBuqefewRm6KEI=";
};
passthru = {
+3 -3
View File
@@ -7,16 +7,16 @@
buildNpmPackage (finalAttrs: {
pname = "mocha";
version = "11.7.5";
version = "11.7.6";
src = fetchFromGitHub {
owner = "mochajs";
repo = "mocha";
tag = "v${finalAttrs.version}";
hash = "sha256-Bk/yF3z/DZ4h9mj1a/EG5ofC6/CIpLd81iQ1w7XkZ0A=";
hash = "sha256-pY6LYMitbhOfjNf00UuUbLgdZii7Nr/8/SlBgM5pYMI=";
};
npmDepsHash = "sha256-dcq6P4BB6w7GGMzW2GfF8AzDnqPV/BS5nz+dxVjnc3o=";
npmDepsHash = "sha256-1uisNcDlv/EY+Mq24rM7BgA8GREKKvxX/gHt8dHlX2Q=";
postInstall = ''
# Installed only for backwards compat, but should just be removed.
@@ -4,8 +4,7 @@
fetchurl,
cmake,
pkg-config,
qttools,
wrapQtAppsHook,
libsForQt5,
hicolor-icon-theme,
openbabel,
desktop-file-utils,
@@ -45,8 +44,8 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
pkg-config
qttools
wrapQtAppsHook
libsForQt5.qttools
libsForQt5.wrapQtAppsHook
];
buildInputs = [
hicolor-icon-theme
@@ -4,11 +4,7 @@
fetchFromGitHub,
libusb1,
pkg-config,
qmake,
qttools,
wrapQtAppsHook,
qtbase,
qtwebsockets,
libsForQt5,
}:
stdenv.mkDerivation rec {
@@ -29,14 +25,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
pkg-config
qmake
qttools
wrapQtAppsHook
libsForQt5.qmake
libsForQt5.qttools
libsForQt5.wrapQtAppsHook
];
buildInputs = [
libusb1
qtbase
qtwebsockets
libsForQt5.qtbase
libsForQt5.qtwebsockets
];
doInstallCheck = true;
@@ -2,10 +2,8 @@
lib,
stdenv,
fetchFromGitHub,
qmake,
qtsvg,
makeWrapper,
wrapQtAppsHook,
libsForQt5,
xdg-utils,
}:
@@ -21,11 +19,11 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
qmake
libsForQt5.qmake
makeWrapper
wrapQtAppsHook
libsForQt5.wrapQtAppsHook
];
buildInputs = [ qtsvg ];
buildInputs = [ libsForQt5.qtsvg ];
hardeningDisable = [ "format" ];
+2 -2
View File
@@ -11,14 +11,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "nix-update";
version = "1.15.0";
version = "1.15.1";
pyproject = true;
src = fetchFromGitHub {
owner = "Mic92";
repo = "nix-update";
tag = "v${finalAttrs.version}";
hash = "sha256-M62YdrdAqK81MF0FL0bx6iKTDCaqOtPx3civlSg46uk=";
hash = "sha256-z7xXzpwsXY1x/xKeM7l2mN8dHFTp8qfgs/5xVsKjHr8=";
};
build-system = [ python3Packages.setuptools ];
+3 -3
View File
@@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation {
pname = "nu_scripts";
version = "0-unstable-2026-05-13";
version = "0-unstable-2026-05-23";
src = fetchFromGitHub {
owner = "nushell";
repo = "nu_scripts";
rev = "018fe3c3134d49504be652a7ace5512291545317";
hash = "sha256-JUsFHsacED+7eTLAlfBnF9vasIHWIL/POJMCPbC9Baw=";
rev = "57f49add9b32d4741351b63236f28341eba35077";
hash = "sha256-l0feMriwY8/WAghUOwSsD0MDUVGXgOkzUklnnvS1ij8=";
};
installPhase = ''
+5 -5
View File
@@ -7,22 +7,22 @@
}:
rustPlatform.buildRustPackage {
pname = "nufmt";
version = "0-unstable-2026-03-26";
version = "0-unstable-2026-05-18";
src = fetchFromGitHub {
owner = "nushell";
repo = "nufmt";
rev = "074930a23bc89a5f720a0d46ac2853f3153817c2";
hash = "sha256-XqiUPAVM6OuyNo9HbBKW+OKQrE7QbSjDRtyfmIYQRxs=";
rev = "2a9661dffb7e432b46c0b0956e74e0511e783dc7";
hash = "sha256-OTKtCQ1AafQ6ejW657mJ1vqtgmZCxKEnNMT/EOsT5ic=";
};
nativeBuildInputs = [
rustPlatform.bindgenHook
];
cargoHash = "sha256-heHFiW1/2qV6BJH7Y0ObSV1sPfVaU0m2KLbASdzca8s=";
cargoHash = "sha256-jgmNMk2tprJsGU/pddxfKdfWli9dNwLt02LhVhQrHc4=";
# NOTE: Patch follows similar intention upstream https://github.com/nushell/nufmt/commit/074930a23bc89a5f720a0d46ac2853f3153817c2
# NOTE: Patch follows similar intention upstream https://github.com/nushell/nufmt/commit/2a9661dffb7e432b46c0b0956e74e0511e783dc7
postPatch = ''
substituteInPlace tests/ground_truth.rs --replace-fail \
' let path = PathBuf::from(target_dir).join("debug").join(exe_name);' \
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "nu_plugin_semver";
version = "0.11.16";
version = "0.11.17";
src = fetchFromGitHub {
owner = "abusch";
repo = "nu_plugin_semver";
tag = "v${finalAttrs.version}";
hash = "sha256-LgB2a14ZIQvNpvYU4nu3AEcwjjWIpJlMS4OGB+dHj2E=";
hash = "sha256-GJ3B7dENuSEZSkHV42plt7tsGLZPqqXCO3c/0ILZQ1Y=";
};
cargoHash = "sha256-PunvfZbghJzcpAMLDIozec2GAklWTosPUWlBJ76lPV8=";
cargoHash = "sha256-U3wwXtvnHfbxfH5awVJbSI4OaVd/c/TsQHzaUljw99o=";
passthru.updateScript = nix-update-script { };
+2 -2
View File
@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "oelint-adv";
version = "9.7.1";
version = "9.8.0";
pyproject = true;
src = fetchFromGitHub {
owner = "priv-kweihmann";
repo = "oelint-adv";
tag = finalAttrs.version;
hash = "sha256-44ebctMX7QfF459RvjJM4oz+ByBF3cz4e+02GnY9h1s=";
hash = "sha256-N7S3pmxoOcntCnMuM78H9wYZR5MczJBPhv9v0wSZIuY=";
};
postPatch = ''
@@ -4,8 +4,7 @@
fetchzip,
autoreconfHook,
pkg-config,
wrapQtAppsHook,
qtbase,
libsForQt5,
}:
stdenv.mkDerivation {
@@ -20,16 +19,16 @@ stdenv.mkDerivation {
nativeBuildInputs = [
autoreconfHook
pkg-config
wrapQtAppsHook
libsForQt5.wrapQtAppsHook
];
buildInputs = [
qtbase
libsForQt5.qtbase
];
makeFlags = [
"MOC=${qtbase.dev}/bin/moc"
"UIC=${qtbase.dev}/bin/uic"
"MOC=${libsForQt5.qtbase.dev}/bin/moc"
"UIC=${libsForQt5.qtbase.dev}/bin/uic"
];
meta = {
@@ -4,9 +4,7 @@
fetchFromGitHub,
makeWrapper,
cmake,
wrapQtAppsHook,
qtbase,
qttools,
libsForQt5,
fftw,
libusb1,
libglvnd,
@@ -26,14 +24,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
makeWrapper
wrapQtAppsHook
libsForQt5.wrapQtAppsHook
];
buildInputs = [
fftw
libusb1
libglvnd
qtbase
qttools
libsForQt5.qtbase
libsForQt5.qttools
];
postPatch = ''
@@ -51,6 +49,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/OpenHantek/OpenHantek6022";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ baracoder ];
platforms = qtbase.meta.platforms;
platforms = libsForQt5.qtbase.meta.platforms;
};
}
+4 -4
View File
@@ -16,16 +16,16 @@
let
package = buildGoModule rec {
pname = "opentofu";
version = "1.11.8";
version = "1.12.0";
src = fetchFromGitHub {
owner = "opentofu";
repo = "opentofu";
tag = "v${version}";
hash = "sha256-0lsx+tLo/m7crkRLOtASwLpbjnpghFrsxuwNr2d+7y0=";
hash = "sha256-ciT5GOeL+09dnwdrRpFQBAhWVvpSBQQjJKJvNdVqjCw=";
};
vendorHash = "sha256-WO5OtKwluks5nuSHJ4NO1+EKhtCrJE9MuMGmu5fYKM4=";
vendorHash = "sha256-ZcsZv4MLcrVUNoK/NewfwDWUpMdgxO/f2DkyTjUqCK4=";
ldflags = [
"-s"
"-w"
@@ -34,7 +34,7 @@ let
];
nativeBuildInputs = [ installShellFiles ];
patches = [ ./provider-path-0_15.patch ];
patches = [ ./provider-path-1_12.patch ];
passthru = {
inherit plugins;
@@ -1,23 +0,0 @@
diff -Naur terraform.old/internal/command/init.go terraform.new/internal/command/init.go
--- terraform.old/internal/command/init.go
+++ terraform.new/internal/command/init.go
@@ -3,6 +3,7 @@
import (
"context"
"fmt"
+ "os"
"log"
"strings"
@@ -55,6 +56,11 @@
var diags tfdiags.Diagnostics
+ val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR")
+ if ok {
+ flagPluginPath = append(flagPluginPath, val)
+ }
+
if len(flagPluginPath) > 0 {
c.pluginPath = flagPluginPath
}
@@ -0,0 +1,24 @@
diff --git a/internal/command/init.go b/internal/command/init.go
index cd44c899bd..bef2426475 100644
--- a/internal/command/init.go
+++ b/internal/command/init.go
@@ -8,6 +8,7 @@ package command
import (
"context"
"fmt"
+ "os"
"log"
"reflect"
"slices"
@@ -78,6 +79,11 @@ func (c *InitCommand) Run(rawArgs []string) int {
// continue to mutate the Meta object state for now.
c.Meta.input = args.ViewOptions.InputEnabled
+ val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR")
+ if ok {
+ args.FlagPluginPath = append(args.FlagPluginPath, val)
+ }
+
if len(args.FlagPluginPath) > 0 {
c.pluginPath = args.FlagPluginPath
}
+3 -3
View File
@@ -19,16 +19,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ouch";
version = "0.7.1";
version = "0.8.0";
src = fetchFromGitHub {
owner = "ouch-org";
repo = "ouch";
rev = finalAttrs.version;
hash = "sha256-XT2CWYZiY5UskTmHKl9EVWBIJoOiR9rOCQUoN8U9o40=";
hash = "sha256-yQt+FeEUgC6JurFwOU1Yd++OYT75TmGO7/qchng/BUA=";
};
cargoHash = "sha256-ckqzptKk6aituDMTA5JGzMWoXiVuOoK3N29KNUJnmgw=";
cargoHash = "sha256-3/uO5WLcGXWryJSQ8UhJGecpAD2vQVE2c19vYAHtT/4=";
nativeBuildInputs = [
cmake
+2 -2
View File
@@ -10,13 +10,13 @@
buildGoModule (finalAttrs: {
pname = "pangolin-cli";
version = "0.8.2";
version = "0.8.3";
src = fetchFromGitHub {
owner = "fosrl";
repo = "cli";
tag = finalAttrs.version;
hash = "sha256-LMLeJVYu2L1+FVOLNapEShj36zv8vCP9BVkU4Y/g0vc=";
hash = "sha256-y+B29E6wXUcMQsWLAcLYIpg0uuqjr+zfxf2WVt0oY9A=";
};
ldflags = [
+2 -2
View File
@@ -12,14 +12,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "pdfarranger";
version = "1.13.0";
version = "1.14.0";
pyproject = true;
src = fetchFromGitHub {
owner = "pdfarranger";
repo = "pdfarranger";
tag = finalAttrs.version;
hash = "sha256-lZuzFGRk19opLJ2pnh8s/VwdzDLtGwTchFh0ZuLezU4=";
hash = "sha256-vucl04ltyAFUhwGlFfNnLEyvX2SACEt0WCG3t4QLuxc=";
};
nativeBuildInputs = [ wrapGAppsHook3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ];
@@ -3,7 +3,7 @@
stdenv,
fetchFromGitHub,
cmake,
qtbase,
libsForQt5,
zlib,
freetype,
libjpeg,
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
qtbase
libsForQt5.qtbase
];
propagatedBuildInputs = [
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "pls";
version = "0.0.1-beta.9";
version = "0.0.1-beta.10";
src = fetchFromGitHub {
owner = "pls-rs";
repo = "pls";
tag = "v${finalAttrs.version}";
hash = "sha256-ofwdhGpqYlADDY2BLe0SkoHWqSeRNtQaXK61zWVFXzw=";
hash = "sha256-j0bYikR0DoHRcArNnHsuYxdYqT9YjsH1g+T3s16UmcI=";
};
cargoHash = "sha256-P+4jRuakDUPaICJPsNJ6nXfhm09K/GC/VA9bsTXIMvc=";
cargoHash = "sha256-eh0beK1UYf/Xe30wGxli6dfPKh875yTnOn7CCN2XTtI=";
meta = {
changelog = "https://github.com/pls-rs/pls/releases/tag/${finalAttrs.src.tag}";
+4
View File
@@ -60,5 +60,9 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with lib.maintainers; [ qyliss ];
license = lib.licenses.mit;
platforms = lib.platforms.unix;
identifiers.purlParts = {
type = "github";
spec = "rpm-software-management/popt@popt-${finalAttrs.version}-release";
};
};
})
@@ -15,8 +15,7 @@
udevCheckHook,
nix-update-script,
withGui ? true,
wrapQtAppsHook,
qtbase,
libsForQt5,
withPython ? true,
python3,
withBlueshark ? false,
@@ -57,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
gcc-arm-embedded
udevCheckHook
]
++ lib.optional withGui wrapQtAppsHook;
++ lib.optional withGui libsForQt5.wrapQtAppsHook;
buildInputs = [
readline
bzip2
@@ -68,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
whereami
lua
]
++ lib.optional withGui qtbase
++ lib.optional withGui libsForQt5.qtbase
++ lib.optional withPython python3
++ lib.optional withBlueshark bluez5;
@@ -4,8 +4,7 @@
fetchFromGitHub,
testers,
doxygen,
qmake,
qtbase,
libsForQt5,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -49,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
doxygen
qmake
libsForQt5.qmake
];
dontWrapQtApps = true;
@@ -57,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
preCheck = ''
export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix}
export QT_PLUGIN_PATH=${lib.getBin libsForQt5.qtbase}/${libsForQt5.qtbase.qtPluginPrefix}
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
# at this point in the build, install_name for dylibs hasn't been patched yet so we need to set the library path.
@@ -5,10 +5,7 @@
installShellFiles,
pkg-config,
cmake,
qtbase,
qtsvg,
wrapQtAppsHook,
qttools,
libsForQt5,
pugixml,
}:
let
@@ -53,13 +50,13 @@ stdenv.mkDerivation rec {
installShellFiles
pkg-config
cmake
wrapQtAppsHook
qttools
libsForQt5.wrapQtAppsHook
libsForQt5.qttools
];
buildInputs = [
qtbase
qtsvg
libsForQt5.qtbase
libsForQt5.qtsvg
pugixml
];
@@ -88,7 +85,7 @@ stdenv.mkDerivation rec {
homepage = "https://qelectrotech.org/";
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ yvesf ];
platforms = qtbase.meta.platforms;
platforms = libsForQt5.qtbase.meta.platforms;
broken = stdenv.hostPlatform.isDarwin;
};
}
@@ -2,15 +2,10 @@
lib,
stdenv,
fetchFromGitHub,
qmake,
pkg-config,
udevCheckHook,
wrapQtAppsHook,
udev,
qtmultimedia,
qtscript,
qtserialport,
qtwebsockets,
libsForQt5,
alsa-lib,
ola,
libftdi1,
@@ -31,17 +26,17 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
qmake
libsForQt5.qmake
pkg-config
udevCheckHook
wrapQtAppsHook
libsForQt5.wrapQtAppsHook
];
buildInputs = [
udev
qtmultimedia
qtscript
qtserialport
qtwebsockets
libsForQt5.qtmultimedia
libsForQt5.qtscript
libsForQt5.qtserialport
libsForQt5.qtwebsockets
alsa-lib
ola
libftdi1
@@ -2,7 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
qmake,
libsForQt5,
}:
stdenv.mkDerivation {
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
hash = "sha256-EYBX2SJa8o4R/zEjSFbmFxhLI726WY21XmCkWIqPeFc=";
};
nativeBuildInputs = [ qmake ];
nativeBuildInputs = [ libsForQt5.qmake ];
dontWrapQtApps = true;
@@ -3,11 +3,9 @@
stdenv,
fetchFromGitHub,
boost,
qtbase,
xz,
qmake,
pkg-config,
wrapQtAppsHook,
libsForQt5,
}:
stdenv.mkDerivation rec {
@@ -27,15 +25,15 @@ stdenv.mkDerivation rec {
'';
buildInputs = [
qtbase
libsForQt5.qtbase
xz
boost
];
nativeBuildInputs = [
qmake
libsForQt5.qmake
pkg-config
wrapQtAppsHook
libsForQt5.wrapQtAppsHook
];
installFlags = [ "INSTALL_ROOT=$(out)" ];
@@ -2,10 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
qmake,
wrapQtAppsHook,
qtbase,
qtcharts,
libsForQt5,
libxrandr,
libdrm,
}:
@@ -16,12 +13,12 @@ stdenv.mkDerivation rec {
version = "20200824";
nativeBuildInputs = [
qmake
wrapQtAppsHook
libsForQt5.qmake
libsForQt5.wrapQtAppsHook
];
buildInputs = [
qtbase
qtcharts
libsForQt5.qtbase
libsForQt5.qtcharts
libxrandr
libdrm
];
+28 -21
View File
@@ -1,4 +1,5 @@
{
stdenv,
lib,
buildGoModule,
fetchFromGitHub,
@@ -16,15 +17,14 @@ let
];
in
buildGoModule rec {
buildGoModule (finalAttrs: {
pname = "regclient";
version = "0.11.3";
tag = "v${version}";
src = fetchFromGitHub {
owner = "regclient";
repo = "regclient";
rev = tag;
tag = "v${finalAttrs.version}";
sha256 = "sha256-/gKvjyFOzyTsgMuqCqZaWl2yun7f+eboQ0iLuXHh4lI=";
};
vendorHash = "sha256-P9ayAWvQY4WgmFTWzk2ZLQ5uwMvIsSfL73C99ROmze8=";
@@ -34,30 +34,37 @@ buildGoModule rec {
ldflags = [
"-s"
"-w"
"-X github.com/regclient/regclient/internal/version.vcsTag=${tag}"
"-X github.com/regclient/regclient/internal/version.vcsTag=${finalAttrs.src.tag}"
];
env.CGO_ENABLED = 0;
nativeBuildInputs = [
installShellFiles
lndir
];
postInstall = lib.concatMapStringsSep "\n" (bin: ''
export bin=''$${bin}
export outputBin=bin
postInstall = lib.concatMapStringsSep "\n" (
bin:
''
export bin=''$${bin}
export outputBin=bin
mkdir -p $bin/bin
mv $out/bin/${bin} $bin/bin
mkdir -p $bin/bin
mv $out/bin/${bin} $bin/bin
''
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd ${bin} \
--bash <($bin/bin/${bin} completion bash) \
--fish <($bin/bin/${bin} completion fish) \
--zsh <($bin/bin/${bin} completion zsh)
''
+ ''
lndir -silent $bin $out
installShellCompletion --cmd ${bin} \
--bash <($bin/bin/${bin} completion bash) \
--fish <($bin/bin/${bin} completion fish) \
--zsh <($bin/bin/${bin} completion zsh)
lndir -silent $bin $out
unset bin outputBin
'') bins;
unset bin outputBin
''
) bins;
checkFlags = [
# touches network
@@ -69,7 +76,7 @@ buildGoModule rec {
"${bin}Version" = testers.testVersion {
package = regclient;
command = "${bin} version";
version = tag;
version = finalAttrs.src.tag;
};
}) bins
);
@@ -80,6 +87,6 @@ buildGoModule rec {
description = "Docker and OCI Registry Client in Go and tooling using those libraries";
homepage = "https://github.com/regclient/regclient";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ maxbrunet ];
maintainers = [ lib.maintainers.maxbrunet ];
};
}
})
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule (finalAttrs: {
pname = "routedns";
version = "0.1.170";
version = "0.1.188";
src = fetchFromGitHub {
owner = "folbricht";
repo = "routedns";
rev = "v${finalAttrs.version}";
hash = "sha256-hCjsyBnCHewMopnLue70ibKfTt+xUmg0/Kk+eKU/+JQ=";
hash = "sha256-ZVlWN8UV/R0tZKp3w/2fAAiFKZXyiwh0RtyolNaf25k=";
};
vendorHash = "sha256-a4KcKb75yWv7+1vIYCypS9nnrFJ3zogXIPzUVVA7AXs=";

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