mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Merge 7b97a86791 into haskell-updates
This commit is contained in:
commit
41a68a1180
277 changed files with 4748 additions and 4698 deletions
|
|
@ -23,9 +23,12 @@
|
|||
let
|
||||
inherit (lib)
|
||||
addErrorContext
|
||||
any
|
||||
assertMsg
|
||||
attrNames
|
||||
attrValues
|
||||
concatLists
|
||||
concatMap
|
||||
concatMapStringsSep
|
||||
concatStrings
|
||||
concatStringsSep
|
||||
|
|
@ -52,6 +55,7 @@ let
|
|||
isString
|
||||
last
|
||||
length
|
||||
genAttrs
|
||||
mapAttrs
|
||||
mapAttrsToList
|
||||
optionals
|
||||
|
|
@ -379,55 +383,69 @@ rec {
|
|||
See the [git-config documentation](https://git-scm.com/docs/git-config#_variables) for possible values.
|
||||
*/
|
||||
toGitINI =
|
||||
attrs:
|
||||
let
|
||||
mkSectionName =
|
||||
let
|
||||
containsQuote = hasInfix ''"'';
|
||||
in
|
||||
name:
|
||||
let
|
||||
containsQuote = hasInfix ''"'' name;
|
||||
sections = splitString "." name;
|
||||
section = head sections;
|
||||
subsections = tail sections;
|
||||
subsection = concatStringsSep "." subsections;
|
||||
in
|
||||
if containsQuote || subsections == [ ] then name else ''${section} "${subsection}"'';
|
||||
if containsQuote name || length sections == 1 then
|
||||
name
|
||||
else
|
||||
''${head sections} "${concatStringsSep "." (tail sections)}"'';
|
||||
|
||||
mkValueString =
|
||||
v:
|
||||
let
|
||||
escapedV = ''"${replaceStrings [ "\n" " " ''"'' "\\" ] [ "\\n" "\\t" ''\"'' "\\\\" ] v}"'';
|
||||
escape = replaceStrings [ "\n" " " ''"'' "\\" ] [ "\\n" "\\t" ''\"'' "\\\\" ];
|
||||
in
|
||||
mkValueStringDefault { } (if isString v then escapedV else v);
|
||||
v: mkValueStringDefault { } (if isString v then ''"${escape v}"'' else v);
|
||||
|
||||
# generation for multiple ini values
|
||||
mkKeyValue =
|
||||
k: v:
|
||||
let
|
||||
mkKeyValue = mkKeyValueDefault { inherit mkValueString; } " = " k;
|
||||
mkKeyValue = mkKeyValueDefault { inherit mkValueString; } " = ";
|
||||
attrToString = k: v: "\t" + mkKeyValue k v;
|
||||
in
|
||||
concatStringsSep "\n" (map (kv: "\t" + mkKeyValue kv) (toList v));
|
||||
k: v: if isList v then concatStringsSep "\n" (map (attrToString k) v) else attrToString k v;
|
||||
|
||||
# converts { a.b.c = 5; } to { "a.b".c = 5; } for toINI
|
||||
gitFlattenAttrs =
|
||||
let
|
||||
isNonDrvAttrs = value: isAttrs value && !isDerivation value;
|
||||
recurse =
|
||||
path: value:
|
||||
if isAttrs value && !isDerivation value then
|
||||
mapAttrsToList (name: value: recurse ([ name ] ++ path) value) value
|
||||
if isNonDrvAttrs value then
|
||||
concatMap (name: recurse ([ name ] ++ path) value.${name}) (attrNames value)
|
||||
else if length path > 1 then
|
||||
{
|
||||
${concatStringsSep "." (reverseList (tail path))}.${head path} = value;
|
||||
}
|
||||
[
|
||||
{
|
||||
${concatStringsSep "." (reverseList (tail path))}.${head path} = value;
|
||||
}
|
||||
]
|
||||
else
|
||||
{
|
||||
${head path} = value;
|
||||
};
|
||||
[
|
||||
{
|
||||
${head path} = value;
|
||||
}
|
||||
];
|
||||
in
|
||||
attrs: foldl recursiveUpdate { } (flatten (recurse [ ] attrs));
|
||||
attrs:
|
||||
let
|
||||
# Filter the names for any that contain nested attrsets. attrs that
|
||||
# don't contain nested attrsets can stay the same =
|
||||
namesToRewrite = filter (
|
||||
name: isAttrs attrs.${name} && any isNonDrvAttrs (attrValues attrs.${name})
|
||||
) (attrNames attrs);
|
||||
attrsToRewrite = genAttrs namesToRewrite (name: attrs.${name});
|
||||
in
|
||||
removeAttrs attrs namesToRewrite // foldl recursiveUpdate { } (recurse [ ] attrsToRewrite);
|
||||
|
||||
toINI_ = toINI { inherit mkKeyValue mkSectionName; };
|
||||
in
|
||||
toINI_ (gitFlattenAttrs attrs);
|
||||
attrs: toINI_ (gitFlattenAttrs attrs);
|
||||
|
||||
/**
|
||||
`mkKeyValueDefault` wrapper that handles dconf INI quirks.
|
||||
|
|
|
|||
|
|
@ -575,6 +575,13 @@ lib.mapAttrs mkLicense (
|
|||
free = false;
|
||||
};
|
||||
|
||||
enpl = {
|
||||
fullName = "Emmi AI Non-Production License";
|
||||
url = "https://github.com/Emmi-AI/noether/blob/main/LICENSE.txt";
|
||||
free = false;
|
||||
redistributable = true;
|
||||
};
|
||||
|
||||
epl10 = {
|
||||
spdxId = "EPL-1.0";
|
||||
fullName = "Eclipse Public License 1.0";
|
||||
|
|
@ -1150,6 +1157,12 @@ lib.mapAttrs mkLicense (
|
|||
redistributable = true; # Only if used in Netdata products.
|
||||
};
|
||||
|
||||
netboxLimitedUse = {
|
||||
fullName = "NetBox Limited Use License 1.0";
|
||||
free = false;
|
||||
url = "https://github.com/netboxlabs/netbox-branching/blob/8465b9aee69ded23930cfe1a522695bfb8955a5a/LICENSE.md";
|
||||
};
|
||||
|
||||
ngpl = {
|
||||
spdxId = "NGPL";
|
||||
fullName = "Nethack General Public License";
|
||||
|
|
|
|||
|
|
@ -1158,8 +1158,10 @@ let
|
|||
value = if opt ? apply then opt.apply res.mergedValue else res.mergedValue;
|
||||
|
||||
warnDeprecation =
|
||||
warnIf (opt.type.deprecationMessage != null)
|
||||
"The type `types.${opt.type.name}' of option `${showOption loc}' defined in ${showFiles opt.declarations} is deprecated. ${opt.type.deprecationMessage}";
|
||||
if (opt.type.deprecationMessage != null) then
|
||||
warn "The type `types.${opt.type.name}' of option `${showOption loc}' defined in ${showFiles opt.declarations} is deprecated. ${opt.type.deprecationMessage}"
|
||||
else
|
||||
x: x;
|
||||
|
||||
in
|
||||
warnDeprecation opt
|
||||
|
|
|
|||
|
|
@ -7657,6 +7657,12 @@
|
|||
github = "eclairevoyant";
|
||||
name = "éclairevoyant";
|
||||
};
|
||||
eConnah = {
|
||||
email = "git@econnah.uk";
|
||||
github = "eConnah";
|
||||
githubId = 63052937;
|
||||
name = "Connor Alecks";
|
||||
};
|
||||
edanaher = {
|
||||
email = "nixos@edanaher.net";
|
||||
github = "edanaher";
|
||||
|
|
@ -8313,6 +8319,11 @@
|
|||
githubId = 5427394;
|
||||
name = "Ersin Akinci";
|
||||
};
|
||||
es-sai-fi = {
|
||||
name = "es-sai-fi";
|
||||
github = "es-sai-fi";
|
||||
githubId = 96452903;
|
||||
};
|
||||
esau79p = {
|
||||
github = "EsAu79p";
|
||||
githubId = 21313906;
|
||||
|
|
@ -16283,6 +16294,11 @@
|
|||
githubId = 26020062;
|
||||
name = "lumi";
|
||||
};
|
||||
luminarleaf = {
|
||||
github = "LuminarLeaf";
|
||||
githubId = 80571430;
|
||||
name = "Luminar Leaf";
|
||||
};
|
||||
luna_1024 = {
|
||||
email = "contact@luna.computer";
|
||||
github = "luna-1024";
|
||||
|
|
@ -18260,6 +18276,12 @@
|
|||
githubId = 16974598;
|
||||
name = "Mike Playle";
|
||||
};
|
||||
mkannwischer = {
|
||||
email = "matthias@kannwischer.eu";
|
||||
github = "mkannwischer";
|
||||
githubId = 3984960;
|
||||
name = "Matthias Kannwischer";
|
||||
};
|
||||
mkez = {
|
||||
email = "matias+nix@zwinger.fi";
|
||||
github = "mk3z";
|
||||
|
|
@ -25652,12 +25674,6 @@
|
|||
githubId = 216167;
|
||||
name = "Steve Jones";
|
||||
};
|
||||
sjmackenzie = {
|
||||
email = "setori88@gmail.com";
|
||||
github = "sjmackenzie";
|
||||
githubId = 158321;
|
||||
name = "Stewart Mackenzie";
|
||||
};
|
||||
skaphi = {
|
||||
name = "Oskar Philipsson";
|
||||
email = "oskar.philipsson@gmail.com";
|
||||
|
|
@ -29439,6 +29455,12 @@
|
|||
github = "wdavidw";
|
||||
githubId = 46896;
|
||||
};
|
||||
wduo87391 = {
|
||||
name = "wduo87391";
|
||||
email = "wduo87391@gmail.com";
|
||||
github = "wduo87391";
|
||||
githubId = 197874825;
|
||||
};
|
||||
weathercold = {
|
||||
name = "Weathercold";
|
||||
email = "weathercold.scr@proton.me";
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ passed and a selection of packages has been built successfully
|
|||
(see `nixos/release-combined.nix` and `nixos/release-small.nix`).
|
||||
These channels are:
|
||||
|
||||
- *Stable channels*, such as [`nixos-25.11`](https://channels.nixos.org/nixos-25.11).
|
||||
- *Stable channels*, such as [`nixos-26.05`](https://channels.nixos.org/nixos-26.05).
|
||||
These only get conservative bug fixes and package upgrades. For
|
||||
instance, a channel update may cause the Linux kernel on your system
|
||||
to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), but not
|
||||
|
|
@ -21,7 +21,7 @@ These channels are:
|
|||
radical changes between channel updates. It's not recommended for
|
||||
production systems.
|
||||
|
||||
- *Small channels*, such as [`nixos-25.11-small`](https://channels.nixos.org/nixos-25.11-small)
|
||||
- *Small channels*, such as [`nixos-26.05-small`](https://channels.nixos.org/nixos-26.05-small)
|
||||
or [`nixos-unstable-small`](https://channels.nixos.org/nixos-unstable-small).
|
||||
These are identical to the stable and unstable channels described above,
|
||||
except that they contain fewer binary packages. This means they get updated
|
||||
|
|
@ -40,8 +40,8 @@ supported stable release.
|
|||
|
||||
When you first install NixOS, you're automatically subscribed to the
|
||||
NixOS channel that corresponds to your installation source. For
|
||||
instance, if you installed from a 25.11 ISO, you will be subscribed to
|
||||
the `nixos-25.11` channel. To see which NixOS channel you're subscribed
|
||||
instance, if you installed from a 26.05 ISO, you will be subscribed to
|
||||
the `nixos-26.05` channel. To see which NixOS channel you're subscribed
|
||||
to, run the following as root:
|
||||
|
||||
```ShellSession
|
||||
|
|
@ -56,16 +56,16 @@ To switch to a different NixOS channel, do
|
|||
```
|
||||
|
||||
(Be sure to include the `nixos` parameter at the end.) For instance, to
|
||||
use the NixOS 25.11 stable channel:
|
||||
use the NixOS 26.05 stable channel:
|
||||
|
||||
```ShellSession
|
||||
# nix-channel --add https://channels.nixos.org/nixos-25.11 nixos
|
||||
# nix-channel --add https://channels.nixos.org/nixos-26.05 nixos
|
||||
```
|
||||
|
||||
If you have a server, you may want to use the "small" channel instead:
|
||||
|
||||
```ShellSession
|
||||
# nix-channel --add https://channels.nixos.org/nixos-25.11-small nixos
|
||||
# nix-channel --add https://channels.nixos.org/nixos-26.05-small nixos
|
||||
```
|
||||
|
||||
And if you want to live on the bleeding edge:
|
||||
|
|
@ -118,5 +118,5 @@ the new generation contains a different kernel, initrd or kernel
|
|||
modules. You can also specify a channel explicitly, e.g.
|
||||
|
||||
```nix
|
||||
{ system.autoUpgrade.channel = "https://channels.nixos.org/nixos-25.11"; }
|
||||
{ system.autoUpgrade.channel = "https://channels.nixos.org/nixos-26.05"; }
|
||||
```
|
||||
|
|
|
|||
|
|
@ -8,6 +8,21 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
inherit (lib)
|
||||
attrNames
|
||||
catAttrs
|
||||
concatLines
|
||||
concatMap
|
||||
filter
|
||||
unique
|
||||
flip
|
||||
elem
|
||||
attrValues
|
||||
concatMapStrings
|
||||
hasPrefix
|
||||
concatStringsSep
|
||||
sort
|
||||
;
|
||||
|
||||
moduleSettingsType =
|
||||
with lib.types;
|
||||
|
|
@ -881,41 +896,30 @@ let
|
|||
|
||||
text =
|
||||
let
|
||||
ensureUniqueOrder =
|
||||
type: rules:
|
||||
let
|
||||
checkPair =
|
||||
a: b:
|
||||
assert lib.assertMsg (a.order != b.order)
|
||||
"security.pam.services.${name}.rules.${type}: rules '${a.name}' and '${b.name}' cannot have the same order value (${toString a.order})";
|
||||
b;
|
||||
checked = lib.zipListsWith checkPair rules (lib.drop 1 rules);
|
||||
in
|
||||
lib.take 1 rules ++ checked;
|
||||
# Formats a string for use in `module-arguments`. See `man pam.conf`.
|
||||
formatModuleArgument =
|
||||
token: if lib.hasInfix " " token then "[${lib.replaceStrings [ "]" ] [ "\\]" ] token}]" else token;
|
||||
|
||||
formatRules =
|
||||
type:
|
||||
lib.pipe cfg.rules.${type} [
|
||||
lib.attrValues
|
||||
(lib.filter (rule: rule.enable))
|
||||
(lib.sort (a: b: a.order < b.order))
|
||||
(ensureUniqueOrder type)
|
||||
(map (
|
||||
rule:
|
||||
lib.concatStringsSep " " (
|
||||
[
|
||||
type
|
||||
rule.control
|
||||
rule.modulePath
|
||||
]
|
||||
++ map formatModuleArgument rule.args
|
||||
++ [ "# ${rule.name} (order ${toString rule.order})" ]
|
||||
concatStringsSep "\n" (
|
||||
map
|
||||
(
|
||||
rule:
|
||||
"${type} ${rule.control} ${rule.modulePath}${
|
||||
if rule.args == [ ] then "" else " " + concatStringsSep " " (map formatModuleArgument rule.args)
|
||||
} # ${rule.name} (order ${toString rule.order})"
|
||||
)
|
||||
))
|
||||
(lib.concatStringsSep "\n")
|
||||
];
|
||||
(
|
||||
sort (
|
||||
a: b:
|
||||
if a.order != b.order then
|
||||
a.order < b.order
|
||||
else
|
||||
throw "security.pam.services.${name}.rules.${type}: rules '${a.name}' and '${b.name}' cannot have the same order value (${toString a.order})"
|
||||
) (filter (rule: rule.enable) (attrValues cfg.rules.${type}))
|
||||
)
|
||||
);
|
||||
in
|
||||
lib.mkDefault ''
|
||||
# Account management.
|
||||
|
|
@ -2637,35 +2641,29 @@ in
|
|||
};
|
||||
|
||||
security.apparmor.includes."abstractions/pam" =
|
||||
lib.concatMapStrings (name: "r ${config.environment.etc."pam.d/${name}".source},\n") (
|
||||
lib.attrNames enabledServices
|
||||
concatMapStrings (name: "r ${config.environment.etc."pam.d/${name}".source},\n") (
|
||||
attrNames enabledServices
|
||||
)
|
||||
+ (
|
||||
with lib;
|
||||
pipe enabledServices [
|
||||
lib.attrValues
|
||||
(catAttrs "rules")
|
||||
(lib.concatMap lib.attrValues)
|
||||
(lib.concatMap lib.attrValues)
|
||||
(lib.filter (rule: rule.enable))
|
||||
(lib.filter (
|
||||
let
|
||||
types = concatMap attrValues (catAttrs "rules" (attrValues enabledServices));
|
||||
rules = concatMap attrValues types;
|
||||
|
||||
isDirect = flip elem [
|
||||
"include"
|
||||
"substack"
|
||||
];
|
||||
activeRules = filter (rule: rule.enable && !isDirect rule.control) rules;
|
||||
|
||||
modulePaths = concatMap (
|
||||
rule:
|
||||
!builtins.elem rule.control [
|
||||
"include"
|
||||
"substack"
|
||||
]
|
||||
))
|
||||
(lib.catAttrs "modulePath")
|
||||
(map (
|
||||
modulePath:
|
||||
lib.throwIfNot (lib.hasPrefix "/" modulePath)
|
||||
''non-absolute PAM modulePath "${modulePath}" is unsupported by apparmor''
|
||||
modulePath
|
||||
))
|
||||
lib.unique
|
||||
(map (module: "mr ${module},"))
|
||||
concatLines
|
||||
]
|
||||
if (!hasPrefix "/" rule.modulePath) then
|
||||
throw ''non-absolute PAM modulePath "${rule.modulePath}" is unsupported by apparmor''
|
||||
else
|
||||
[ rule.modulePath ]
|
||||
) activeRules;
|
||||
in
|
||||
concatLines (map (module: "mr ${module},") (unique modulePaths))
|
||||
);
|
||||
|
||||
security.sudo.extraConfig = optionalSudoConfigForSSHAgentAuth;
|
||||
|
|
|
|||
|
|
@ -93,6 +93,7 @@ in
|
|||
systemd.services.bird = {
|
||||
description = "BIRD Internet Routing Daemon";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
reloadTriggers = lib.optional cfg.autoReload config.environment.etc."bird/bird.conf".source;
|
||||
serviceConfig = {
|
||||
Type = "forking";
|
||||
|
|
|
|||
|
|
@ -166,7 +166,6 @@ in
|
|||
SystemCallErrorNumber = "EPERM";
|
||||
ProtectProc = "invisible";
|
||||
ProtectHostname = true;
|
||||
ProcSubset = "pid";
|
||||
WorkingDirectory = "/tmp";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -50,6 +50,10 @@ in
|
|||
};
|
||||
|
||||
ui = {
|
||||
enable = lib.mkEnableOption "Nominatim UI" // {
|
||||
default = true;
|
||||
};
|
||||
|
||||
package = lib.mkPackageOption pkgs "nominatim-ui" { };
|
||||
|
||||
config = lib.mkOption {
|
||||
|
|
@ -277,7 +281,7 @@ in
|
|||
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
appendHttpConfig = ''
|
||||
appendHttpConfig = lib.mkIf cfg.ui.enable ''
|
||||
map $args $format {
|
||||
default default;
|
||||
~(^|&)format=html(&|$) html;
|
||||
|
|
@ -304,19 +308,19 @@ in
|
|||
enableACME = lib.mkDefault true;
|
||||
locations = {
|
||||
"= /" = {
|
||||
extraConfig = ''
|
||||
extraConfig = lib.mkIf cfg.ui.enable ''
|
||||
return 301 $scheme://$http_host/ui/search.html;
|
||||
'';
|
||||
};
|
||||
"/" = {
|
||||
proxyPass = "http://nominatim";
|
||||
extraConfig = ''
|
||||
extraConfig = lib.mkIf cfg.ui.enable ''
|
||||
if ($forward_to_ui) {
|
||||
rewrite ^(/[^/.]*) /ui$1.html redirect;
|
||||
}
|
||||
'';
|
||||
};
|
||||
"/ui/" = {
|
||||
"/ui/" = lib.mkIf cfg.ui.enable {
|
||||
alias = "${uiPackage}/";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -380,6 +380,8 @@ in
|
|||
MACHINE_LEARNING_WORKERS = "1";
|
||||
MACHINE_LEARNING_WORKER_TIMEOUT = "120";
|
||||
MACHINE_LEARNING_CACHE_FOLDER = "/var/cache/immich";
|
||||
# TODO: drop when insightface no longer unconditionally imports matplotlib
|
||||
MPLCONFIGDIR = "/var/cache/immich";
|
||||
XDG_CACHE_HOME = "/var/cache/immich";
|
||||
IMMICH_HOST = "localhost";
|
||||
IMMICH_PORT = "3003";
|
||||
|
|
|
|||
|
|
@ -82,12 +82,12 @@ final: prev: {
|
|||
|
||||
CopilotChat-nvim = buildVimPlugin {
|
||||
pname = "CopilotChat.nvim";
|
||||
version = "4.7.4-unstable-2026-04-26";
|
||||
version = "4.7.4-unstable-2026-05-25";
|
||||
src = fetchFromGitHub {
|
||||
owner = "CopilotC-Nvim";
|
||||
repo = "CopilotChat.nvim";
|
||||
rev = "137d3bc527518f5ea982c43c43084496732365c3";
|
||||
hash = "sha256-jYKtDG9J7bEPDaQCorCuTZtePBTN4MAKZZqPduPSBtE=";
|
||||
rev = "2db7b404110f92e6d9197fee9cb9a708ae205a10";
|
||||
hash = "sha256-5w87xSlTugmXanoWb+UthZ0EV+xwJKFpkVMR62JIMMU=";
|
||||
};
|
||||
meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "GPL-3.0-only";
|
||||
|
|
@ -334,12 +334,12 @@ final: prev: {
|
|||
|
||||
NrrwRgn = buildVimPlugin {
|
||||
pname = "NrrwRgn";
|
||||
version = "0.34-unstable-2026-05-07";
|
||||
version = "0.34-unstable-2026-05-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "chrisbra";
|
||||
repo = "NrrwRgn";
|
||||
rev = "5c49cfe52eee3912fa72b1d4f838b6bf9686972a";
|
||||
hash = "sha256-amf9Xve9/eOYnbewQMAA4qWR1ffo+UgTz3RvFHAO5f0=";
|
||||
rev = "e6f29bd507903b587229c544d3e1eba3cc0f0a13";
|
||||
hash = "sha256-Bc21IfVV5YpHMgXaCybOkwAy73pPjqjc1qaZi/SAFjo=";
|
||||
};
|
||||
meta.homepage = "https://github.com/chrisbra/NrrwRgn/";
|
||||
meta.license = unfree;
|
||||
|
|
@ -446,12 +446,12 @@ final: prev: {
|
|||
|
||||
SchemaStore-nvim = buildVimPlugin {
|
||||
pname = "SchemaStore.nvim";
|
||||
version = "0-unstable-2026-05-24";
|
||||
version = "0-unstable-2026-05-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "b0o";
|
||||
repo = "SchemaStore.nvim";
|
||||
rev = "68ba9015c0cc77a0fe954bd2578dfa7a5c24134f";
|
||||
hash = "sha256-Odk14VqfchdeGwSAaQyNmIX42GaJSm/1xpX7jth6oxU=";
|
||||
rev = "e25e63f3b24fd6b8c2fc713107ad5d5594028eac";
|
||||
hash = "sha256-VhA3NUiiGs29Q23Xos/0tsWPm0Pl/CcZocznUz3/z9M=";
|
||||
};
|
||||
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "Apache-2.0";
|
||||
|
|
@ -868,12 +868,12 @@ final: prev: {
|
|||
|
||||
ale = buildVimPlugin {
|
||||
pname = "ale";
|
||||
version = "4.0.0-unstable-2026-05-17";
|
||||
version = "4.0.0-unstable-2026-05-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dense-analysis";
|
||||
repo = "ale";
|
||||
rev = "2a3af30fb6a725ec7215435369b310b1d2dc4c09";
|
||||
hash = "sha256-ch5JeEz16tsH6+bxDaGY4mbK26PZ4ev7JhWOm5YTD9k=";
|
||||
rev = "399c0ffd64affec81331c9046d454fd5d4be6c78";
|
||||
hash = "sha256-JV0c8IL5zdFz647b9dY0v7pH3JaPW2nqaP1uKFzK88k=";
|
||||
};
|
||||
meta.homepage = "https://github.com/dense-analysis/ale/";
|
||||
meta.license = getLicenseFromSpdxId "BSD-2-Clause";
|
||||
|
|
@ -1800,7 +1800,7 @@ final: prev: {
|
|||
hash = "sha256-3w+vQf3N6+umBUF+PkCbPXggn53rNekxHgR2y+ICwHw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/joelazar/blink-calc/";
|
||||
meta.license = unfree;
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
|
|
@ -1848,12 +1848,12 @@ final: prev: {
|
|||
|
||||
blink-cmp-dictionary = buildVimPlugin {
|
||||
pname = "blink-cmp-dictionary";
|
||||
version = "3.0.1";
|
||||
version = "3.1.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kaiser-Yang";
|
||||
repo = "blink-cmp-dictionary";
|
||||
tag = "v3.0.1";
|
||||
hash = "sha256-z41OnVbJAQe4FMvdazs0Uw8sAOyXEBJcx3IVqjOWGyI=";
|
||||
tag = "v3.1.0";
|
||||
hash = "sha256-Tw907lwbBemPLJr0W8Zqe6idUqoHMKmmpLnKW/l6p+g=";
|
||||
};
|
||||
meta.homepage = "https://github.com/Kaiser-Yang/blink-cmp-dictionary/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
|
|
@ -1876,12 +1876,12 @@ final: prev: {
|
|||
|
||||
blink-cmp-git = buildVimPlugin {
|
||||
pname = "blink-cmp-git";
|
||||
version = "3.0.0-unstable-2026-04-24";
|
||||
version = "3.0.0-unstable-2026-05-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kaiser-Yang";
|
||||
repo = "blink-cmp-git";
|
||||
rev = "302b9dabec3284de29665e2311118a3202cb192a";
|
||||
hash = "sha256-s9nn6XRaCYxiwiEkv9J345hN3ppcblVHKE8WP6m+Atg=";
|
||||
rev = "d3f2a9067ab028e779d08e61bf0b054939011316";
|
||||
hash = "sha256-Q/QUN2R3zgrJwyypD3b7da1PVOnn8zyoqctoyhZdK+M=";
|
||||
};
|
||||
meta.homepage = "https://github.com/Kaiser-Yang/blink-cmp-git/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
|
|
@ -3484,12 +3484,12 @@ final: prev: {
|
|||
|
||||
coc-nvim = buildVimPlugin {
|
||||
pname = "coc.nvim";
|
||||
version = "0.0.82-unstable-2026-05-22";
|
||||
version = "0.0.82-unstable-2026-05-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neoclide";
|
||||
repo = "coc.nvim";
|
||||
rev = "a23e8e5c3a7ee77073862c98800948ef20a5e7e6";
|
||||
hash = "sha256-3l0e0jbtVvALHVfOHeCiWY3/Z5MfPCJqI43UrKk3FKM=";
|
||||
rev = "7b8dcb974b9acea90dc0c26ec4031fb7f2da0bb0";
|
||||
hash = "sha256-ueSwDmTzbyTJnc1q0/5baSGATft+969ryNPXBD27YXs=";
|
||||
};
|
||||
meta.homepage = "https://github.com/neoclide/coc.nvim/";
|
||||
meta.license = unfree;
|
||||
|
|
@ -3964,8 +3964,8 @@ final: prev: {
|
|||
src = fetchFromGitHub {
|
||||
owner = "stevearc";
|
||||
repo = "conform.nvim";
|
||||
rev = "24c70347f6b2128679f47d2eb765156ef34bf9e0";
|
||||
hash = "sha256-Jky3GonVfO4M5G9KD8JQYorNav9PKSe4NvZXVbn9EYg=";
|
||||
rev = "619363c30309d29ffa631e67c8183f2a72caa373";
|
||||
hash = "sha256-pMWvC7sqOFjsMUhxTzMcoSifn7E5CVindvQVl9dEfB8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/stevearc/conform.nvim/";
|
||||
|
|
@ -4255,12 +4255,12 @@ final: prev: {
|
|||
|
||||
csharpls-extended-lsp-nvim = buildVimPlugin {
|
||||
pname = "csharpls-extended-lsp.nvim";
|
||||
version = "0.3.0-unstable-2026-04-29";
|
||||
version = "0.3.0-unstable-2026-05-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Decodetalkers";
|
||||
repo = "csharpls-extended-lsp.nvim";
|
||||
rev = "be8093d19af1538aad9ee77dc5589e55b083967a";
|
||||
hash = "sha256-MDr3n9LaQ/YTHD7egDohQ7YmT2+itWXNoMLigmZp3KQ=";
|
||||
rev = "ed20a88af5774319c7eafc7faa45c9fde7314b4e";
|
||||
hash = "sha256-Q9WmFNosh4RZy7+izC1dHpaYUT0Mb8lvczgZXlzNq4k=";
|
||||
};
|
||||
meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
|
|
@ -4581,8 +4581,8 @@ final: prev: {
|
|||
src = fetchFromGitHub {
|
||||
owner = "LumaKernel";
|
||||
repo = "ddc-source-file";
|
||||
rev = "294a3274eaff4b3a37d1a033effd07f4d0d6cec1";
|
||||
hash = "sha256-y03JT0/QOEjfxOBPzwN7c5xorCkSOUKkcZs+OVh5Q6A=";
|
||||
rev = "b2ff132a07a881251edbc03b5c81f3655803a5b9";
|
||||
hash = "sha256-Iw6dYzIUzx7O6+YmNl1W7kjBgjc52m1KGG0oFBySqfk=";
|
||||
};
|
||||
meta.homepage = "https://github.com/LumaKernel/ddc-source-file/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
|
|
@ -5335,12 +5335,12 @@ final: prev: {
|
|||
|
||||
dracula-vim = buildVimPlugin {
|
||||
pname = "dracula-vim";
|
||||
version = "2.0.0-unstable-2026-04-22";
|
||||
version = "2.0.0-unstable-2026-05-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dracula";
|
||||
repo = "vim";
|
||||
rev = "e7b91facff94bdf3a248df9b683119b84672256a";
|
||||
hash = "sha256-OkLtrd6Cq7ZwF5r5/SBc9Uyp26q/gIgHLrVKLxboLCA=";
|
||||
rev = "4f068752154e70ef8e03d6a70992033fff20a165";
|
||||
hash = "sha256-vJpCU+7B7OC0nO8RV6PYG/UUXxQRMPP5eR85E7I7Tyo=";
|
||||
};
|
||||
meta.homepage = "https://github.com/dracula/vim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
|
|
@ -5405,12 +5405,12 @@ final: prev: {
|
|||
|
||||
easy-dotnet-nvim = buildVimPlugin {
|
||||
pname = "easy-dotnet.nvim";
|
||||
version = "0-unstable-2026-05-22";
|
||||
version = "0-unstable-2026-05-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "GustavEikaas";
|
||||
repo = "easy-dotnet.nvim";
|
||||
rev = "5d5b3e2491a81efe252004e1876bd67af7dfc9c1";
|
||||
hash = "sha256-0rvkOKGWSYrB/GoV48Q4JSwbcz5SKIJGvXPwR7vJROM=";
|
||||
rev = "e466cc59958c78c7c3a67f35cfe4797d04b8da33";
|
||||
hash = "sha256-aINQ8o8xIgOsOHZDXq1vT3O8cz/aQzFOT6ugtRK2zus=";
|
||||
};
|
||||
meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
|
|
@ -5854,12 +5854,12 @@ final: prev: {
|
|||
|
||||
ferret = buildVimPlugin {
|
||||
pname = "ferret";
|
||||
version = "5.1-unstable-2025-02-19";
|
||||
version = "5.1-unstable-2026-05-25";
|
||||
src = fetchFromGitHub {
|
||||
owner = "wincent";
|
||||
repo = "ferret";
|
||||
rev = "80a1c6f2f6e18952fa6eb85000446650216987fd";
|
||||
hash = "sha256-7dUPFfVvmImddhPhhOLiGXd45vmNeejOQ9jTPWyXKzg=";
|
||||
rev = "b572870055c860b20ceefec66e107bb6d26e250e";
|
||||
hash = "sha256-grAwqyYOBo91Msbv62mW9zrcqEWYBUbNpApVMp3Vr1E=";
|
||||
};
|
||||
meta.homepage = "https://github.com/wincent/ferret/";
|
||||
meta.license = getLicenseFromSpdxId "BSD-2-Clause";
|
||||
|
|
@ -7045,12 +7045,12 @@ final: prev: {
|
|||
|
||||
guihua-lua = buildVimPlugin {
|
||||
pname = "guihua.lua";
|
||||
version = "0.1-unstable-2026-05-24";
|
||||
version = "0.1-unstable-2026-05-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ray-x";
|
||||
repo = "guihua.lua";
|
||||
rev = "8c34ebbb59990c6cb70110d786ad82b2a7182c78";
|
||||
hash = "sha256-TWXsHAYXz4UejiRpsMyuYKA70wFrXGvVMXsFL8qnGyY=";
|
||||
rev = "f8e06bd8a26dee3377d63c2adf1e57cdb58ac474";
|
||||
hash = "sha256-lupDg/yt75164H8zQs/HTKqC3Y1FnQCzoMq90nwapO8=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ray-x/guihua.lua/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
|
|
@ -8222,12 +8222,12 @@ final: prev: {
|
|||
|
||||
kanagawa-paper-nvim = buildVimPlugin {
|
||||
pname = "kanagawa-paper.nvim";
|
||||
version = "4.0.0-unstable-2026-03-16";
|
||||
version = "4.0.0-unstable-2026-05-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "thesimonho";
|
||||
repo = "kanagawa-paper.nvim";
|
||||
rev = "3a024e8fd7105ee9416aafcdb0a7787be1795d68";
|
||||
hash = "sha256-UDHWREwo+cCK+lxhXhAOZ7hyRaP36TRcCucJgMRwJHU=";
|
||||
rev = "ecf19801a2673054c19421d82b766f7641688320";
|
||||
hash = "sha256-yzu0EvZseFlLB1Flho6WigMnuLL3inLIflxPU3LUPv0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/thesimonho/kanagawa-paper.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
|
|
@ -8334,12 +8334,12 @@ final: prev: {
|
|||
|
||||
koda-nvim = buildVimPlugin {
|
||||
pname = "koda.nvim";
|
||||
version = "2.10.2";
|
||||
version = "2.10.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "oskarnurm";
|
||||
repo = "koda.nvim";
|
||||
tag = "v2.10.2";
|
||||
hash = "sha256-Um8lD0/RMvtHQLYyT5xToQzp/6bI4H7xZVnqT8CagR0=";
|
||||
tag = "v2.10.3";
|
||||
hash = "sha256-CU634QzBkPRVntJ/fKBu/V0WNQ7K9fzqOtMIUEb9/Vw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/oskarnurm/koda.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
|
|
@ -8376,12 +8376,12 @@ final: prev: {
|
|||
|
||||
kulala-nvim = buildVimPlugin {
|
||||
pname = "kulala.nvim";
|
||||
version = "6.2.0";
|
||||
version = "6.5.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mistweaverco";
|
||||
repo = "kulala.nvim";
|
||||
tag = "v6.2.0";
|
||||
hash = "sha256-Uh2Lt6VZv5X9eqlbaquL40wNfJX8kON8vU9h+cHhlHg=";
|
||||
tag = "v6.5.0";
|
||||
hash = "sha256-rlp6H/s8A3bQH61lqvE37rMVPlxOm/zqcQ2y0vDLpD4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/mistweaverco/kulala.nvim/";
|
||||
|
|
@ -10126,12 +10126,12 @@ final: prev: {
|
|||
|
||||
mini-misc = buildVimPlugin {
|
||||
pname = "mini.misc";
|
||||
version = "0.17.0-unstable-2026-05-12";
|
||||
version = "0.17.0-unstable-2026-05-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-mini";
|
||||
repo = "mini.misc";
|
||||
rev = "37b585358662a90c360060da6c5e61810524542e";
|
||||
hash = "sha256-eAg/5aLDVH/IUJYoNDjd/AaHPZcVVaDjbUF2aH0EOgU=";
|
||||
rev = "eb2246ede307fc863a12e9d9b0fa4b7ca9b88188";
|
||||
hash = "sha256-gX1li7+jJq0/I0rT13aJsBIbFFrufJIFhz2bFGGy+mw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-mini/mini.misc/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
|
|
@ -10168,12 +10168,12 @@ final: prev: {
|
|||
|
||||
mini-nvim = buildVimPlugin {
|
||||
pname = "mini.nvim";
|
||||
version = "0.17.0-unstable-2026-05-23";
|
||||
version = "0.17.0-unstable-2026-05-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-mini";
|
||||
repo = "mini.nvim";
|
||||
rev = "44657837c7338e52727facc85c1d95bec1f6bd7c";
|
||||
hash = "sha256-BjGHDUWVyyodTJmTbMqUWDy70Ug5iCqpPkCJwhOLTaI=";
|
||||
rev = "15abccbe23525ee0502d2efe620c77db00bfb93c";
|
||||
hash = "sha256-W/5h9HmYxqnL8Ooe3nuilx49GVCpmbJBK/kWD6bwTo8=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-mini/mini.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
|
|
@ -10210,12 +10210,12 @@ final: prev: {
|
|||
|
||||
mini-pick = buildVimPlugin {
|
||||
pname = "mini.pick";
|
||||
version = "0.17.0-unstable-2026-05-21";
|
||||
version = "0.17.0-unstable-2026-05-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-mini";
|
||||
repo = "mini.pick";
|
||||
rev = "4522d9ab65224675df2cf1ede8c12f0410aae2be";
|
||||
hash = "sha256-ppt7E8v/8deRpKbx0aknqGvZ7FM8a3T1jsMsoitaizA=";
|
||||
rev = "26f94e9c84f529d713de00b900c0a307ca260f35";
|
||||
hash = "sha256-p5ID8qSG98CzCB7JcRTb1o3nTCPpZixFVIycTIIz0XY=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-mini/mini.pick/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
|
|
@ -10924,12 +10924,12 @@ final: prev: {
|
|||
|
||||
neoconf-nvim = buildVimPlugin {
|
||||
pname = "neoconf.nvim";
|
||||
version = "1.4.0-unstable-2026-05-20";
|
||||
version = "1.4.0-unstable-2026-05-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "neoconf.nvim";
|
||||
rev = "de6cd4ce8491116a7df44b714b4b963dbad50393";
|
||||
hash = "sha256-8RJ/jjbFa6C389u7CfYAqx+yM33Lijh40egIg+Vt1sU=";
|
||||
rev = "b77377f04751357651bff37834056789110cce7e";
|
||||
hash = "sha256-JlBvbsd0vhbeuxieKdc0s8yOVx4v3MjXamoEK2i3/Qw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/neoconf.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "Apache-2.0";
|
||||
|
|
@ -11711,12 +11711,12 @@ final: prev: {
|
|||
|
||||
nerdy-nvim = buildVimPlugin {
|
||||
pname = "nerdy.nvim";
|
||||
version = "1.6-unstable-2026-05-19";
|
||||
version = "1.6-unstable-2026-05-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "2KAbhishek";
|
||||
repo = "nerdy.nvim";
|
||||
rev = "f06c60542cb04a549588eed98e55f5a9a3de9ccf";
|
||||
hash = "sha256-20uvY8KBR4TY28pTGI5C8XVLa0LIO/0E9GZRohwzmms=";
|
||||
rev = "8fd18f0075c480b4e0865464dcd4fb7a42c6889e";
|
||||
hash = "sha256-huI2IhQeCnwoRLUviZA82p/1zmSqcCnSg/vMZQhh6Qg=";
|
||||
};
|
||||
meta.homepage = "https://github.com/2KAbhishek/nerdy.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "GPL-3.0-only";
|
||||
|
|
@ -12088,12 +12088,12 @@ final: prev: {
|
|||
|
||||
numb-nvim = buildVimPlugin {
|
||||
pname = "numb.nvim";
|
||||
version = "0-unstable-2026-01-17";
|
||||
version = "1.1.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nacro90";
|
||||
repo = "numb.nvim";
|
||||
rev = "12ef3913dea8727d4632c6f2ed47957a993de627";
|
||||
hash = "sha256-RisbKK1mTrYnIFfsODx7zdy76lYsHXpWWPrM6wpO9Ds=";
|
||||
tag = "v1.1.0";
|
||||
hash = "sha256-tSUMyyPvO04bmI0V/Nt9Yc0G02OfFS/orZdEx81JaLg=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nacro90/numb.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
|
|
@ -12867,12 +12867,12 @@ final: prev: {
|
|||
|
||||
nvim-jump = buildVimPlugin {
|
||||
pname = "nvim-jump";
|
||||
version = "0-unstable-2026-04-14";
|
||||
version = "0-unstable-2026-05-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "yorickpeterse";
|
||||
repo = "nvim-jump";
|
||||
rev = "672204397c51507d7a821bc61ba9fad7dbed4303";
|
||||
hash = "sha256-Ci2AwFBY8UYp57F3d+z4aTRJYtzau2cdhkqc8GWkltc=";
|
||||
rev = "f58eb5a36c414c19965e1c4d5dfb74d5a1f21ede";
|
||||
hash = "sha256-VqPeNWllhB89v5a36qDOiGB5guzMzmCJ7eRFYwzr15o=";
|
||||
};
|
||||
meta.homepage = "https://github.com/yorickpeterse/nvim-jump/";
|
||||
meta.license = getLicenseFromSpdxId "MPL-2.0";
|
||||
|
|
@ -13230,12 +13230,12 @@ final: prev: {
|
|||
|
||||
nvim-origami = buildVimPlugin {
|
||||
pname = "nvim-origami";
|
||||
version = "1.9-unstable-2026-04-06";
|
||||
version = "1.9-unstable-2026-05-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "chrisgrieser";
|
||||
repo = "nvim-origami";
|
||||
rev = "67c15fd14037778644371487fc68855b530ccd7d";
|
||||
hash = "sha256-l47szqnNCnOU8Mnw0KQ3pDnRz0SwTF/0m6JjTfU23gw=";
|
||||
rev = "47be2209d09755c0202da1e22a8d67af8f5ae178";
|
||||
hash = "sha256-Pg6pwiB8mEQfMDv5aLZKx06EEZuaVN1xtuVBOpd4iWo=";
|
||||
};
|
||||
meta.homepage = "https://github.com/chrisgrieser/nvim-origami/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
|
|
@ -14028,12 +14028,12 @@ final: prev: {
|
|||
|
||||
ocaml-nvim = buildVimPlugin {
|
||||
pname = "ocaml.nvim";
|
||||
version = "1.0.0-unstable-2026-03-06";
|
||||
version = "1.0.0-unstable-2026-05-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tarides";
|
||||
repo = "ocaml.nvim";
|
||||
rev = "d56d551f1b7efbb2ebd250b4701e0a38568cec04";
|
||||
hash = "sha256-atRXtqMIhsmwR1INrhbFsywWAgLTbT9bz/LLfcN4Lfg=";
|
||||
rev = "f1ef89e7f2a0c24974798b1c9ad7b73222283d08";
|
||||
hash = "sha256-ViZPylvq40WM8WibABWnDlWMY45b4BATkLFu5x4kFrA=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tarides/ocaml.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
|
|
@ -14438,8 +14438,8 @@ final: prev: {
|
|||
src = fetchFromGitHub {
|
||||
owner = "stevearc";
|
||||
repo = "overseer.nvim";
|
||||
rev = "473944a838d7efa112a6c8e481d27f1a76236a90";
|
||||
hash = "sha256-Ie4yhebBv+Pq7pqBx+TGHA7p3HUCU1+nQ5d/IpcjUqU=";
|
||||
rev = "a93d9f6d6defdac4bcd6d2c8ba988650e42e0a0e";
|
||||
hash = "sha256-eNDOUIPVbdo3jt4q+1Rw1QkGj7l0DTZu393V1xSiXi0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/stevearc/overseer.nvim/";
|
||||
|
|
@ -14982,12 +14982,12 @@ final: prev: {
|
|||
|
||||
project-nvim = buildVimPlugin {
|
||||
pname = "project.nvim";
|
||||
version = "4.1.1-1";
|
||||
version = "4.2.0-1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "DrKJeff16";
|
||||
repo = "project.nvim";
|
||||
tag = "v4.1.1-1";
|
||||
hash = "sha256-zZX8RDA17WUztVCtH+x3QopDlGjO3PDq3K9S+UtvKP8=";
|
||||
tag = "v4.2.0-1";
|
||||
hash = "sha256-CJG3vyIM4n4p1mk60DDEo2N5CxL5i02rqbfcRJJEbtQ=";
|
||||
};
|
||||
meta.homepage = "https://github.com/DrKJeff16/project.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "Apache-2.0";
|
||||
|
|
@ -15360,12 +15360,12 @@ final: prev: {
|
|||
|
||||
refactoring-nvim = buildVimPlugin {
|
||||
pname = "refactoring.nvim";
|
||||
version = "0-unstable-2026-05-23";
|
||||
version = "0-unstable-2026-05-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theprimeagen";
|
||||
repo = "refactoring.nvim";
|
||||
rev = "8f2045241fb105ab092021e3e58b5b99f34f07d0";
|
||||
hash = "sha256-ZYEX22JJ1d+BeTq1aaTR/sKwjVCUlJMnEOtyVBrVt9A=";
|
||||
rev = "624c01e8175901484eac74512baf35e9dfe269b8";
|
||||
hash = "sha256-PPGSMbLVHLghqaVfRsViw7gYHrL4RtiH0Svw8H65TpE=";
|
||||
};
|
||||
meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
|
|
@ -15444,12 +15444,12 @@ final: prev: {
|
|||
|
||||
render-markdown-nvim = buildVimPlugin {
|
||||
pname = "render-markdown.nvim";
|
||||
version = "8.12.0-unstable-2026-05-07";
|
||||
version = "8.12.0-unstable-2026-05-25";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MeanderingProgrammer";
|
||||
repo = "render-markdown.nvim";
|
||||
rev = "629eb9533ec989d9d5c6cab8f3ad5372422c24e0";
|
||||
hash = "sha256-IBqQmerjJz9g0QR/Elym7WsNuk1scLaeI9isvjcCFqw=";
|
||||
rev = "5adf0895310c1904e5abfaad40a2baad7fe44a07";
|
||||
hash = "sha256-vB8rFNSUW9pcBiCjtsA+LRbuysP8HnpsCQHPEFyHTrM=";
|
||||
};
|
||||
meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
|
|
@ -15808,12 +15808,12 @@ final: prev: {
|
|||
|
||||
scretch-nvim = buildVimPlugin {
|
||||
pname = "scretch.nvim";
|
||||
version = "1.2.3-unstable-2025-09-11";
|
||||
version = "1.2.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "0xJohnnyboy";
|
||||
repo = "scretch.nvim";
|
||||
rev = "c37292af17af42091b3c58c53c56fe67705d684d";
|
||||
hash = "sha256-KrQndfxx0H9RRHFhAA2Rjp3D+kihkBl8CQLOllF6tnI=";
|
||||
tag = "v1.2.4";
|
||||
hash = "sha256-FCv6EI/aYV/RDSeLGPSCkrAbNMfbTWVCIrmX+7tV+AE=";
|
||||
};
|
||||
meta.homepage = "https://github.com/0xJohnnyboy/scretch.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "AGPL-3.0-only";
|
||||
|
|
@ -16131,12 +16131,12 @@ final: prev: {
|
|||
|
||||
snacks-nvim = buildVimPlugin {
|
||||
pname = "snacks.nvim";
|
||||
version = "2.31.0-unstable-2026-05-21";
|
||||
version = "2.31.0-unstable-2026-05-25";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "snacks.nvim";
|
||||
rev = "0770753c88228f7f15449c6a5b242e3f7cd0d71c";
|
||||
hash = "sha256-lMCozVT9RRgJwsudAUrrinI6WdiPb+gykcQe46OmRh4=";
|
||||
rev = "882c996cf28183f4d63640de0b4c02ec886d01f2";
|
||||
hash = "sha256-gU0XjCcnmZNwZ/erukA8miBiMKaSsSiInLtiv+OyEJI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/snacks.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "Apache-2.0";
|
||||
|
|
@ -17830,12 +17830,12 @@ final: prev: {
|
|||
|
||||
tiny-inline-diagnostic-nvim = buildVimPlugin {
|
||||
pname = "tiny-inline-diagnostic.nvim";
|
||||
version = "0-unstable-2026-04-22";
|
||||
version = "0-unstable-2026-05-25";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rachartier";
|
||||
repo = "tiny-inline-diagnostic.nvim";
|
||||
rev = "147af4e49f51dd48f41972de26552872b8ba7b25";
|
||||
hash = "sha256-LpZuRNGSK8AHLTIPIWoQlGot89qubFRL/RZ+EMs4bnQ=";
|
||||
rev = "6bdbc9a2f5a846ff5fc55a998ff97c0e2968b7e5";
|
||||
hash = "sha256-QPJcIZ8anNHABExoESn1lAPvKFHHgkity6IkExtL248=";
|
||||
};
|
||||
meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
|
|
@ -18056,12 +18056,12 @@ final: prev: {
|
|||
|
||||
treesj = buildVimPlugin {
|
||||
pname = "treesj";
|
||||
version = "0-unstable-2026-04-16";
|
||||
version = "0-unstable-2026-05-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Wansmer";
|
||||
repo = "treesj";
|
||||
rev = "5fa4e7ba3517f8fe743bb4488f9e9c7ce83330fc";
|
||||
hash = "sha256-qtfZ+wc5oWiuomvzD3SWUvYr6/z2wp+kZeMjKELJHog=";
|
||||
rev = "79aedb401bbdc7e4202f7881eab5f6feb2105b0a";
|
||||
hash = "sha256-MoR46Z3ghEfsVaB8D3tE154DRdg/2iT2l54PICgC/X4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/Wansmer/treesj/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
|
|
@ -21068,12 +21068,12 @@ final: prev: {
|
|||
|
||||
vim-habamax = buildVimPlugin {
|
||||
pname = "vim-habamax";
|
||||
version = "0-unstable-2026-05-19";
|
||||
version = "0-unstable-2026-05-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "habamax";
|
||||
repo = "vim-habamax";
|
||||
rev = "a27ce6a6b905482309865ce9bb624cbf8cc6056c";
|
||||
hash = "sha256-ZThjsCI5LsGlTefIZMFJJyNGeaIzR+DWbFkJ436T0Aw=";
|
||||
rev = "b1ecb8b42390e6a4f3cbfcb1e919436ac1d98773";
|
||||
hash = "sha256-s3P4FHXx2BmEoHx24GzzUVw+2ImAUDx8yBCqpWn/gVk=";
|
||||
};
|
||||
meta.homepage = "https://github.com/habamax/vim-habamax/";
|
||||
meta.license = unfree;
|
||||
|
|
@ -21756,12 +21756,12 @@ final: prev: {
|
|||
|
||||
vim-kitty-navigator = buildVimPlugin {
|
||||
pname = "vim-kitty-navigator";
|
||||
version = "0-unstable-2026-03-26";
|
||||
version = "0-unstable-2026-05-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "knubie";
|
||||
repo = "vim-kitty-navigator";
|
||||
rev = "504032c138261b10b281a1d83b2d47078e4566df";
|
||||
hash = "sha256-XoOEVCCAmD5TfyuUrHXNFmmXLIFwgJgl/fSFTbgytyg=";
|
||||
rev = "c40c7d6181fa44fade771980952c60c1d89c28ea";
|
||||
hash = "sha256-IJioVpk+f/IyH0y7yjA2q9ys+tAGP/ZsFW9D0whuCWI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/knubie/vim-kitty-navigator/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
|
|
@ -23855,12 +23855,12 @@ final: prev: {
|
|||
|
||||
vim-spirv = buildVimPlugin {
|
||||
pname = "vim-spirv";
|
||||
version = "0.5.2-unstable-2026-05-21";
|
||||
version = "0.5.2-unstable-2026-05-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kbenzie";
|
||||
repo = "vim-spirv";
|
||||
rev = "4f35017d1a52c3fa836329a50c29783fc765da5e";
|
||||
hash = "sha256-xIoJeN7wOM5piBFGBJNzuzguCanAZfBZCZGUPJpV8Jk=";
|
||||
rev = "e7de5b5adbb3c59014d98cf0d1198919f9fa5e1c";
|
||||
hash = "sha256-MoHDekfBwUBBsrR7AYkL3tT0aSIDqcFOK13+mEjdpfo=";
|
||||
};
|
||||
meta.homepage = "https://github.com/kbenzie/vim-spirv/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
|
|
@ -25101,12 +25101,12 @@ final: prev: {
|
|||
|
||||
vimtex = buildVimPlugin {
|
||||
pname = "vimtex";
|
||||
version = "2.17-unstable-2026-05-12";
|
||||
version = "2.17-unstable-2026-05-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lervag";
|
||||
repo = "vimtex";
|
||||
rev = "182ad387e3f3107699483606c9a2b6648f8437b2";
|
||||
hash = "sha256-dvrSe4dxbGl+rGScQDBK0tQUz4Pr37E3V326XcFGSQg=";
|
||||
rev = "24e229914182ff301496a3e2c4214b28c4928d3f";
|
||||
hash = "sha256-y45zOpF68G51jVdCsa27iiDdw2YEmHZNgkIHDI62nAo=";
|
||||
};
|
||||
meta.homepage = "https://github.com/lervag/vimtex/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
|
|
@ -25213,12 +25213,12 @@ final: prev: {
|
|||
|
||||
visual-whitespace-nvim = buildVimPlugin {
|
||||
pname = "visual-whitespace.nvim";
|
||||
version = "0-unstable-2026-02-21";
|
||||
version = "0-unstable-2026-05-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mcauley-penney";
|
||||
repo = "visual-whitespace.nvim";
|
||||
rev = "49ff2b1c572ed7033a584381fa23aad2bf3bb258";
|
||||
hash = "sha256-svKfA9p6WC6k3kbxG4TJxe2r0xpRPdbNTVk2PZcPAiY=";
|
||||
rev = "02714f141dc0783eb814af6be534bdb0273142ff";
|
||||
hash = "sha256-DFzkAAJvzb2blLXwVZ6u9KkpjnUSLCyPUGV+Eai8n+E=";
|
||||
};
|
||||
meta.homepage = "https://github.com/mcauley-penney/visual-whitespace.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
|
|
@ -25661,12 +25661,12 @@ final: prev: {
|
|||
|
||||
y9nika-nvim = buildVimPlugin {
|
||||
pname = "y9nika.nvim";
|
||||
version = "0-unstable-2026-04-29";
|
||||
version = "0-unstable-2026-05-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "y9san9";
|
||||
repo = "y9nika.nvim";
|
||||
rev = "8f04a16421c79564073e5e680192d0b493f79436";
|
||||
hash = "sha256-ZGccQC4YVLlWECXsxUTPjsEIoKyE0kXjRpkXUmYAQ50=";
|
||||
rev = "0fc35319498d8e4509601546f4efb423026e53a1";
|
||||
hash = "sha256-0S2+9L1gW6Rbh1lUP+EGJ0AGIUnNAiTlrGAEJrbm7rc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/y9san9/y9nika.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
|
|
@ -25927,11 +25927,11 @@ final: prev: {
|
|||
|
||||
zk-nvim = buildVimPlugin {
|
||||
pname = "zk-nvim";
|
||||
version = "0.4.7-unstable-2026-05-18";
|
||||
version = "0.4.8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zk-org";
|
||||
repo = "zk-nvim";
|
||||
rev = "bc3b39374b25fad977cecc936588cb060f15a773";
|
||||
tag = "v0.4.8";
|
||||
hash = "sha256-cq76bVNyoK1Oi0d61Wa3B3iFvLzboozZaZlWBTJik5U=";
|
||||
};
|
||||
meta.homepage = "https://github.com/zk-org/zk-nvim/";
|
||||
|
|
|
|||
|
|
@ -21,26 +21,26 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
|
|||
sources = {
|
||||
"x86_64-linux" = {
|
||||
arch = "linux-x64";
|
||||
hash = "sha256-D9fCOrdx2lzkafxPJENKc8tZnO+03c7CR3w/3LAQOa8=";
|
||||
hash = "sha256-XfjNSoYIUEPgVI9deA9RDx2ur0oqIbDzvkYErfI0Fyw=";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
arch = "linux-arm64";
|
||||
hash = "sha256-E4VUFvsyp0sJ1I0dIRAgIfa09zyvZHzZvKCMq5H9sig=";
|
||||
hash = "sha256-/W5i1ODeA7YwsCb3gw0njQbf9WplsaZJZG84/czNxs4=";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
arch = "darwin-x64";
|
||||
hash = "sha256-4k71rBIHOjmC9iJvaZlD6t36jqM6fclqM/yTWSoYrvs=";
|
||||
hash = "sha256-fNsrRK6kaqqHgUD2TdvFni7nZXrAPdkC1dR2qFKdNas=";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
arch = "darwin-arm64";
|
||||
hash = "sha256-08QK3qOhE6f+LaSL2qVZgecfO6/Lqw3WVCD1wABluho=";
|
||||
hash = "sha256-4O/PZWXDHo+fcrNW7aDvUYc6x49k5CQNjy28KsgkpGM=";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "claude-code";
|
||||
publisher = "anthropic";
|
||||
version = "2.1.152";
|
||||
version = "2.1.154";
|
||||
}
|
||||
// sources.${stdenvNoCC.hostPlatform.system}
|
||||
or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
|||
mktplcRef = {
|
||||
publisher = "ms-python";
|
||||
name = "isort";
|
||||
version = "2026.4.0";
|
||||
hash = "sha256-9UwAZfr8MnshHvZFCXl2v8IpgFJJrYuM5Z6Zn/uqlOQ=";
|
||||
version = "2026.6.0";
|
||||
hash = "sha256-bWkn9XPgHqYDOlT3W0kJvF7q1WnQblwhM9J2VecXjO0=";
|
||||
};
|
||||
meta = {
|
||||
description = "Import sorting extension for Visual Studio Code using isort";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchNpmDeps,
|
||||
nodejs,
|
||||
nodejs-slim,
|
||||
npmHooks,
|
||||
pkg-config,
|
||||
|
|
@ -38,7 +37,8 @@ let
|
|||
libsecret
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
nodejs-slim
|
||||
nodejs-slim.npm
|
||||
nodejs-slim.python
|
||||
npmHooks.npmConfigHook
|
||||
]
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
fetchFromGitHub,
|
||||
fetchNpmDeps,
|
||||
libsecret,
|
||||
nodejs,
|
||||
nodejs-slim,
|
||||
npmHooks,
|
||||
pkg-config,
|
||||
|
|
@ -37,7 +36,8 @@ let
|
|||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
nodejs-slim
|
||||
nodejs-slim.npm
|
||||
nodejs-slim.python
|
||||
npmHooks.npmConfigHook
|
||||
]
|
||||
|
|
|
|||
|
|
@ -151,9 +151,9 @@ rec {
|
|||
|
||||
unstable = fetchurl rec {
|
||||
# NOTE: Don't forget to change the hash for staging as well.
|
||||
version = "11.8";
|
||||
version = "11.9";
|
||||
url = "https://dl.winehq.org/wine/source/11.x/wine-${version}.tar.xz";
|
||||
hash = "sha256-U6qFmV1Ll/ARahxWuKahQXcw71mid4GdLT0xNk6lVrA=";
|
||||
hash = "sha256-45zBjbKHNYokNvivSYvtx+RE1V65nvVFtg53i7TqD28=";
|
||||
|
||||
patches = [
|
||||
# Also look for root certificates at $NIX_SSL_CERT_FILE
|
||||
|
|
@ -163,7 +163,7 @@ rec {
|
|||
# see https://gitlab.winehq.org/wine/wine-staging
|
||||
staging = fetchFromGitLab {
|
||||
inherit version;
|
||||
hash = "sha256-lW5dfCfsB+z84mlLpfmkR7QDxmhL+RcBufSftUutHto=";
|
||||
hash = "sha256-IQSu/Nr3JynVv95/jaZCZrCQWKE8/pp9JGEwfmDdI9s=";
|
||||
domain = "gitlab.winehq.org";
|
||||
owner = "wine";
|
||||
repo = "wine-staging";
|
||||
|
|
@ -186,9 +186,9 @@ rec {
|
|||
|
||||
## see http://wiki.winehq.org/Mono
|
||||
mono = fetchurl rec {
|
||||
version = "11.0.0";
|
||||
version = "11.1.0";
|
||||
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
|
||||
hash = "sha256-1+/t4Lm9z1ITT4zWztWdn+zpdvcLEaQAvbR7hkVpzSc=";
|
||||
hash = "sha256-3rA0FDH4Jgsgn/9rx53cxUFLl/jpI2q5+9ykzlngqbk=";
|
||||
};
|
||||
|
||||
updateScript = writeShellScript "update-wine-unstable" ''
|
||||
|
|
|
|||
|
|
@ -367,6 +367,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
meta = {
|
||||
description = "GNU Image Manipulation Program";
|
||||
homepage = "https://www.gimp.org/";
|
||||
donationPage = "https://www.gimp.org/donating/";
|
||||
maintainers = with lib.maintainers; [ jtojnar ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{
|
||||
"chromium": {
|
||||
"version": "148.0.7778.178",
|
||||
"version": "148.0.7778.215",
|
||||
"chromedriver": {
|
||||
"version": "148.0.7778.179",
|
||||
"hash_darwin": "sha256-jDw+ON0X8rePW1HLBZ5FVKMibImBuW/Tp0EDZ/UjJlw=",
|
||||
"hash_darwin_aarch64": "sha256-hNaaKMVy8sKNU444Uf78YI3ayUATrTBAr6/7Z3jewv0="
|
||||
"version": "148.0.7778.216",
|
||||
"hash_darwin": "sha256-gsK7Q3rwfQQ0iE5e/st/3gGtU+D8dGsTycffpEejmhw=",
|
||||
"hash_darwin_aarch64": "sha256-zHASbRPnYf2q1qq8FsKnYrLwPjzoGk0tzLxB9SdTXFw="
|
||||
},
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
|
|
@ -21,8 +21,8 @@
|
|||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "d096af1c9e98c45c3596e59620622b1a049bfecb",
|
||||
"hash": "sha256-XRalekzeALnDh9KiGqhYdhXvkGkjO3TOIZeqwpPLO+U=",
|
||||
"rev": "7c855c70efe3f6ade6663c1520913fa7f63a0b2b",
|
||||
"hash": "sha256-uDVYgSjxQ+xw8DHVd5UNkqnUrJ6P5ZWxL2tZToBhgQg=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
|
|
@ -92,8 +92,8 @@
|
|||
},
|
||||
"src/third_party/angle": {
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git",
|
||||
"rev": "50fd896fb21cca91f325812d01d1e971593efc73",
|
||||
"hash": "sha256-HcfKm7UQmg3wMDOytmaYzm7Z7gRdOrRoqAKaE0ZdI4E="
|
||||
"rev": "a101e2d1db6da927325273566fe8f5404fa3a9bd",
|
||||
"hash": "sha256-uIqodvHxEY9xNse2IHNns2Mz9zLAUZSSIN7pAXB8cPs="
|
||||
},
|
||||
"src/third_party/angle/third_party/glmark2/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
|
||||
|
|
@ -132,8 +132,8 @@
|
|||
},
|
||||
"src/third_party/dawn": {
|
||||
"url": "https://dawn.googlesource.com/dawn.git",
|
||||
"rev": "19696dd088b8ed5804e2f02a8f83f5afdb3e99e3",
|
||||
"hash": "sha256-ihnVPCk9412UzCmoABWVUhiGaIdIYxiYMkk43KDqpg8="
|
||||
"rev": "78a9030d63048d832c4b822839bffe38ad4f20e5",
|
||||
"hash": "sha256-ZknkLN64TYAN5j9WsgtKlRBrAc3iCM084zpc8Zui8Ts="
|
||||
},
|
||||
"src/third_party/dawn/third_party/glfw3/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
|
||||
|
|
@ -267,8 +267,8 @@
|
|||
},
|
||||
"src/third_party/devtools-frontend/src": {
|
||||
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
|
||||
"rev": "6efd6eb1d85fd67fdcc2385c54fa56c524bec3f7",
|
||||
"hash": "sha256-1pr3+RK519m+wtcacJB3PcDTL+qSHlOn1ctxpoLzTf8="
|
||||
"rev": "1fb83ff123c44ab59a480056c8c1ba3d33c2caf0",
|
||||
"hash": "sha256-S6agM7HMZ2g2W6e9tYdLSXr0Lc6zeQF9hAYLIeImAYQ="
|
||||
},
|
||||
"src/third_party/dom_distiller_js/dist": {
|
||||
"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
|
||||
|
|
@ -332,8 +332,8 @@
|
|||
},
|
||||
"src/third_party/freetype/src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
|
||||
"rev": "99b479dc34728936b006679a31e12b8cf432fc55",
|
||||
"hash": "sha256-H5RzBFYWIp/QYKyeBM2wfuX7FvXHPbhCAp7qne5Zvhw="
|
||||
"rev": "6d9fc45fc4bca8aef0b8f65592520673638c3334",
|
||||
"hash": "sha256-A21ONLz8HxoBkOL/jHfs5YwePmOnFyNdlNYSJa9wers="
|
||||
},
|
||||
"src/third_party/fxdiv/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git",
|
||||
|
|
@ -342,8 +342,8 @@
|
|||
},
|
||||
"src/third_party/harfbuzz/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
|
||||
"rev": "f027b8e9039f73bf803eae684fee2eb2d30e4180",
|
||||
"hash": "sha256-HWb3QbPl+RE2oI/Jwv5BjKwv9UnJ8VcJvk+uGy9cAqM="
|
||||
"rev": "67bb413f586f36ba44d740319cb7a28b3d283ea6",
|
||||
"hash": "sha256-WCPEkbiiU8dENM+ik0KokW9Uxmz0xlsRFVVPPOEOZXw="
|
||||
},
|
||||
"src/third_party/ink/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/ink.git",
|
||||
|
|
@ -432,8 +432,8 @@
|
|||
},
|
||||
"src/third_party/libaom/source/libaom": {
|
||||
"url": "https://aomedia.googlesource.com/aom.git",
|
||||
"rev": "b63f30b6d30028a3d7d9c5223def8f3ad97dcc4c",
|
||||
"hash": "sha256-LaBEcVcSB8WB9ZNRgPSiGaKdQL5f3wll2sPb9OhN5SE="
|
||||
"rev": "343cee0a952f8c7d329e59ff3ac2c8bdbe70ec6a",
|
||||
"hash": "sha256-H8Eu3BiUIiZcyReGDyFq9UvjdMJOX00ERjru8+I0zL8="
|
||||
},
|
||||
"src/third_party/crabbyavif/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
|
||||
|
|
@ -612,8 +612,8 @@
|
|||
},
|
||||
"src/third_party/pdfium": {
|
||||
"url": "https://pdfium.googlesource.com/pdfium.git",
|
||||
"rev": "a78c62d93a8f514ea2cd98a70bd1d21226be9d93",
|
||||
"hash": "sha256-qd3Oa/JFzoI5hKDY2/OQAzdr2z9srUj0H6oKz0R516U="
|
||||
"rev": "72ea487e4399c44c3a53a48b104f9612ca772008",
|
||||
"hash": "sha256-0VgmDPyF5k81nBXdo88CcIIbz6XRhaiADnG8gwDGZZk="
|
||||
},
|
||||
"src/third_party/perfetto": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
|
||||
|
|
@ -662,8 +662,8 @@
|
|||
},
|
||||
"src/third_party/skia": {
|
||||
"url": "https://skia.googlesource.com/skia.git",
|
||||
"rev": "a2888b27a98e4ff30085d4d2dba8a1a99baf6dfb",
|
||||
"hash": "sha256-eOjFuMmXr9YtZ0e4yDB8JMjTrNWEg5OlTkAMGuHZIWE="
|
||||
"rev": "03c3234e64f9fbbbcf6a7b9c79e94059df49dbfe",
|
||||
"hash": "sha256-e0MSCbqv4u4995nowzipKorkn6mPpO7tf8+ygj3/nFY="
|
||||
},
|
||||
"src/third_party/smhasher/src": {
|
||||
"url": "https://chromium.googlesource.com/external/smhasher.git",
|
||||
|
|
@ -797,8 +797,8 @@
|
|||
},
|
||||
"src/third_party/webrtc": {
|
||||
"url": "https://webrtc.googlesource.com/src.git",
|
||||
"rev": "9a7f650bcd14f241d20f88f4e1ea3b7300de72ac",
|
||||
"hash": "sha256-k5cHE4XURJQrPURmXk4MMNV5k8+ryKfjmsVTzARRro4="
|
||||
"rev": "e3ee86921c57b9f8921045e77f098604803cb66c",
|
||||
"hash": "sha256-n39HENOXmatsZLF6jdYRsb+wl2cM0i6ngT4Zbyu5ayE="
|
||||
},
|
||||
"src/third_party/wuffs/src": {
|
||||
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
|
||||
|
|
@ -822,13 +822,13 @@
|
|||
},
|
||||
"src/v8": {
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git",
|
||||
"rev": "ad6e4525c418a92147c8247ef9d144ce4c242a38",
|
||||
"hash": "sha256-+cQdsWTgIohd3yOCsNCprSr4Ctes77fWGdmPxN2tQlM="
|
||||
"rev": "5e24a1fd6ffb840b93ee90a800897fcb4d60eeab",
|
||||
"hash": "sha256-JcBGaXhqNRIA4NPPV4eANVM93wsQ9QxSLO/Ecz3wklU="
|
||||
}
|
||||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "148.0.7778.178",
|
||||
"version": "148.0.7778.215",
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
"rev": "41c40cfaec7ee3bf0423c59925d8b23982a601f1",
|
||||
|
|
@ -840,16 +840,16 @@
|
|||
"hash": "sha256-BTPD8WM1pVAMkFDlHekMdWFGyf63KdhKkKwsqikqoBQ="
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "148.0.7778.178-1",
|
||||
"hash": "sha256-s4zTU4rQUcrfpg7CWFdvEn3JYNqhHGsAFcYmQGS64fc="
|
||||
"rev": "148.0.7778.215-1",
|
||||
"hash": "sha256-Rp+PuyOQ26Cqiu+8sNlJkjp/3bO968NYNX1AgHOyYOA="
|
||||
},
|
||||
"npmHash": "sha256-JuVcY8iFRDWcPcP4Pg+qm5rnTXkiVfNsqSkXbDWqsE8="
|
||||
},
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "d096af1c9e98c45c3596e59620622b1a049bfecb",
|
||||
"hash": "sha256-XRalekzeALnDh9KiGqhYdhXvkGkjO3TOIZeqwpPLO+U=",
|
||||
"rev": "7c855c70efe3f6ade6663c1520913fa7f63a0b2b",
|
||||
"hash": "sha256-uDVYgSjxQ+xw8DHVd5UNkqnUrJ6P5ZWxL2tZToBhgQg=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
|
|
@ -919,8 +919,8 @@
|
|||
},
|
||||
"src/third_party/angle": {
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git",
|
||||
"rev": "50fd896fb21cca91f325812d01d1e971593efc73",
|
||||
"hash": "sha256-HcfKm7UQmg3wMDOytmaYzm7Z7gRdOrRoqAKaE0ZdI4E="
|
||||
"rev": "a101e2d1db6da927325273566fe8f5404fa3a9bd",
|
||||
"hash": "sha256-uIqodvHxEY9xNse2IHNns2Mz9zLAUZSSIN7pAXB8cPs="
|
||||
},
|
||||
"src/third_party/angle/third_party/glmark2/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
|
||||
|
|
@ -959,8 +959,8 @@
|
|||
},
|
||||
"src/third_party/dawn": {
|
||||
"url": "https://dawn.googlesource.com/dawn.git",
|
||||
"rev": "19696dd088b8ed5804e2f02a8f83f5afdb3e99e3",
|
||||
"hash": "sha256-ihnVPCk9412UzCmoABWVUhiGaIdIYxiYMkk43KDqpg8="
|
||||
"rev": "78a9030d63048d832c4b822839bffe38ad4f20e5",
|
||||
"hash": "sha256-ZknkLN64TYAN5j9WsgtKlRBrAc3iCM084zpc8Zui8Ts="
|
||||
},
|
||||
"src/third_party/dawn/third_party/glfw3/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
|
||||
|
|
@ -1094,8 +1094,8 @@
|
|||
},
|
||||
"src/third_party/devtools-frontend/src": {
|
||||
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
|
||||
"rev": "6efd6eb1d85fd67fdcc2385c54fa56c524bec3f7",
|
||||
"hash": "sha256-1pr3+RK519m+wtcacJB3PcDTL+qSHlOn1ctxpoLzTf8="
|
||||
"rev": "1fb83ff123c44ab59a480056c8c1ba3d33c2caf0",
|
||||
"hash": "sha256-S6agM7HMZ2g2W6e9tYdLSXr0Lc6zeQF9hAYLIeImAYQ="
|
||||
},
|
||||
"src/third_party/dom_distiller_js/dist": {
|
||||
"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
|
||||
|
|
@ -1159,8 +1159,8 @@
|
|||
},
|
||||
"src/third_party/freetype/src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
|
||||
"rev": "99b479dc34728936b006679a31e12b8cf432fc55",
|
||||
"hash": "sha256-H5RzBFYWIp/QYKyeBM2wfuX7FvXHPbhCAp7qne5Zvhw="
|
||||
"rev": "6d9fc45fc4bca8aef0b8f65592520673638c3334",
|
||||
"hash": "sha256-A21ONLz8HxoBkOL/jHfs5YwePmOnFyNdlNYSJa9wers="
|
||||
},
|
||||
"src/third_party/fxdiv/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git",
|
||||
|
|
@ -1169,8 +1169,8 @@
|
|||
},
|
||||
"src/third_party/harfbuzz/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
|
||||
"rev": "f027b8e9039f73bf803eae684fee2eb2d30e4180",
|
||||
"hash": "sha256-HWb3QbPl+RE2oI/Jwv5BjKwv9UnJ8VcJvk+uGy9cAqM="
|
||||
"rev": "67bb413f586f36ba44d740319cb7a28b3d283ea6",
|
||||
"hash": "sha256-WCPEkbiiU8dENM+ik0KokW9Uxmz0xlsRFVVPPOEOZXw="
|
||||
},
|
||||
"src/third_party/ink/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/ink.git",
|
||||
|
|
@ -1259,8 +1259,8 @@
|
|||
},
|
||||
"src/third_party/libaom/source/libaom": {
|
||||
"url": "https://aomedia.googlesource.com/aom.git",
|
||||
"rev": "b63f30b6d30028a3d7d9c5223def8f3ad97dcc4c",
|
||||
"hash": "sha256-LaBEcVcSB8WB9ZNRgPSiGaKdQL5f3wll2sPb9OhN5SE="
|
||||
"rev": "343cee0a952f8c7d329e59ff3ac2c8bdbe70ec6a",
|
||||
"hash": "sha256-H8Eu3BiUIiZcyReGDyFq9UvjdMJOX00ERjru8+I0zL8="
|
||||
},
|
||||
"src/third_party/crabbyavif/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
|
||||
|
|
@ -1439,8 +1439,8 @@
|
|||
},
|
||||
"src/third_party/pdfium": {
|
||||
"url": "https://pdfium.googlesource.com/pdfium.git",
|
||||
"rev": "a78c62d93a8f514ea2cd98a70bd1d21226be9d93",
|
||||
"hash": "sha256-qd3Oa/JFzoI5hKDY2/OQAzdr2z9srUj0H6oKz0R516U="
|
||||
"rev": "72ea487e4399c44c3a53a48b104f9612ca772008",
|
||||
"hash": "sha256-0VgmDPyF5k81nBXdo88CcIIbz6XRhaiADnG8gwDGZZk="
|
||||
},
|
||||
"src/third_party/perfetto": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
|
||||
|
|
@ -1489,8 +1489,8 @@
|
|||
},
|
||||
"src/third_party/skia": {
|
||||
"url": "https://skia.googlesource.com/skia.git",
|
||||
"rev": "a2888b27a98e4ff30085d4d2dba8a1a99baf6dfb",
|
||||
"hash": "sha256-eOjFuMmXr9YtZ0e4yDB8JMjTrNWEg5OlTkAMGuHZIWE="
|
||||
"rev": "03c3234e64f9fbbbcf6a7b9c79e94059df49dbfe",
|
||||
"hash": "sha256-e0MSCbqv4u4995nowzipKorkn6mPpO7tf8+ygj3/nFY="
|
||||
},
|
||||
"src/third_party/smhasher/src": {
|
||||
"url": "https://chromium.googlesource.com/external/smhasher.git",
|
||||
|
|
@ -1624,8 +1624,8 @@
|
|||
},
|
||||
"src/third_party/webrtc": {
|
||||
"url": "https://webrtc.googlesource.com/src.git",
|
||||
"rev": "9a7f650bcd14f241d20f88f4e1ea3b7300de72ac",
|
||||
"hash": "sha256-k5cHE4XURJQrPURmXk4MMNV5k8+ryKfjmsVTzARRro4="
|
||||
"rev": "e3ee86921c57b9f8921045e77f098604803cb66c",
|
||||
"hash": "sha256-n39HENOXmatsZLF6jdYRsb+wl2cM0i6ngT4Zbyu5ayE="
|
||||
},
|
||||
"src/third_party/wuffs/src": {
|
||||
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
|
||||
|
|
@ -1649,8 +1649,8 @@
|
|||
},
|
||||
"src/v8": {
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git",
|
||||
"rev": "ad6e4525c418a92147c8247ef9d144ce4c242a38",
|
||||
"hash": "sha256-+cQdsWTgIohd3yOCsNCprSr4Ctes77fWGdmPxN2tQlM="
|
||||
"rev": "5e24a1fd6ffb840b93ee90a800897fcb4d60eeab",
|
||||
"hash": "sha256-JcBGaXhqNRIA4NPPV4eANVM93wsQ9QxSLO/Ecz3wklU="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -598,13 +598,13 @@
|
|||
"vendorHash": "sha256-5KnOUVvMNhWhOGsbcZWN2cCOKL2jrZeiDnLZ53Dd9zM="
|
||||
},
|
||||
"hashicorp_helm": {
|
||||
"hash": "sha256-S4Fe65f+gEWWxRMC+/i93dwwe7QigPccx4wiqNBpcL8=",
|
||||
"hash": "sha256-K9O2uAqEN/YoZVh9HFnsSbaxhnCzcqkPbJlmxNpZxa0=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/helm",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-helm",
|
||||
"rev": "v3.1.1",
|
||||
"rev": "v3.1.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-qzwm0R51jvElo+T8ypkHrlQy/MH8c/o+NWIS+YrQ4uw="
|
||||
"vendorHash": "sha256-n3+BGx8n1kN+kxg2tW90GGJ8zc7uXa/7morRuFXzwhY="
|
||||
},
|
||||
"hashicorp_http": {
|
||||
"hash": "sha256-5zZSKmlhSuIaIiXUZhmTCFwfJ/3QxdDOg4RVooY7qcA=",
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ runCommandLocal "bitlbee-plugins"
|
|||
inherit plugins;
|
||||
buildInputs = [
|
||||
bitlbee
|
||||
plugins
|
||||
];
|
||||
]
|
||||
++ plugins;
|
||||
}
|
||||
''
|
||||
mkdir -p $out/lib/bitlbee
|
||||
|
|
|
|||
|
|
@ -420,14 +420,14 @@ in
|
|||
|
||||
docker_29 =
|
||||
let
|
||||
version = "29.5.1";
|
||||
version = "29.5.2";
|
||||
in
|
||||
callPackage dockerGen {
|
||||
inherit version;
|
||||
cliRev = "v${version}";
|
||||
cliHash = "sha256-oobGr0UaeJL800hHx3K0tQs50HZbOn559WcLnSRiRhU=";
|
||||
cliHash = "sha256-kHgDZVr6mAyCtZ6bSG9FWV0GhWDfXLXzHYFrmjFzO9w=";
|
||||
mobyRev = "docker-v${version}";
|
||||
mobyHash = "sha256-ghYEOWr5RUDm0YLyupaDSpLd+8gFqxp3VjCt+3lztcA=";
|
||||
mobyHash = "sha256-lux7tTyF6vm5wuIXs+z3Ygd2v4JjgHbRvOXNA4kjNtg=";
|
||||
runcRev = "v1.3.5";
|
||||
runcHash = "sha256-Swphxbu/OLkUrfRjLMZIVGwYb7AN0xHdyxm0ysAVam0=";
|
||||
containerdRev = "v2.2.3";
|
||||
|
|
|
|||
|
|
@ -39,9 +39,9 @@ rec {
|
|||
src,
|
||||
...
|
||||
}:
|
||||
assert lib.assertMsg (
|
||||
assert
|
||||
name == null
|
||||
) "The `name` argument is deprecated. Use `pname` and `version` instead to construct the name.";
|
||||
|| throw "The `name` argument is deprecated. Use `pname` and `version` instead to construct the name.";
|
||||
pkgs.runCommand "${pname}-${version}-extracted"
|
||||
{
|
||||
nativeBuildInputs = [ appimage-exec ];
|
||||
|
|
|
|||
|
|
@ -64,9 +64,7 @@ let
|
|||
let
|
||||
matches = (builtins.length (builtins.split "\\{}" prog) - 1) / 2;
|
||||
in
|
||||
lib.assertMsg (
|
||||
matches == 1
|
||||
) "compressor ${ext} needs to have exactly one '{}', found ${toString matches}";
|
||||
matches == 1 || throw "compressor ${ext} needs to have exactly one '{}', found ${toString matches}";
|
||||
mkCmd =
|
||||
ext: prog:
|
||||
assert validProg ext prog;
|
||||
|
|
|
|||
|
|
@ -71,8 +71,7 @@ lib.extendMkDerivation {
|
|||
if autoPubspecLock == null then
|
||||
throw "The pubspecLock argument is required. If import-from-derivation is allowed (it isn't in Nixpkgs), you can set autoPubspecLock to the path to a pubspec.lock instead."
|
||||
else
|
||||
assert lib.assertMsg (builtins.pathExists autoPubspecLock)
|
||||
"The pubspec.lock file could not be found!";
|
||||
assert builtins.pathExists autoPubspecLock || throw "The pubspec.lock file could not be found!";
|
||||
lib.importJSON (
|
||||
runCommand "${lib.getName args}-pubspec-lock-json" {
|
||||
nativeBuildInputs = [ yq ];
|
||||
|
|
|
|||
|
|
@ -94,8 +94,9 @@ let
|
|||
|
||||
mkPathDependencySource =
|
||||
name: details:
|
||||
assert lib.assertMsg details.description.relative
|
||||
"Only relative paths are supported - ${name} has an absolue path!";
|
||||
assert
|
||||
details.description.relative
|
||||
|| throw "Only relative paths are supported - ${name} has an absolue path!";
|
||||
(
|
||||
if lib.isDerivation src then
|
||||
src
|
||||
|
|
|
|||
|
|
@ -655,9 +655,12 @@ rec {
|
|||
checked =
|
||||
lib.warnIf (contents != null)
|
||||
"in docker image ${name}: The contents parameter is deprecated. Change to copyToRoot if the contents are designed to be copied to the root filesystem, such as when you use `buildEnv` or similar between contents and your packages. Use copyToRoot = buildEnv { ... }; or similar if you intend to add packages to /bin."
|
||||
lib.throwIf
|
||||
(contents != null && copyToRoot != null)
|
||||
"in docker image ${name}: You can not specify both contents and copyToRoot.";
|
||||
(
|
||||
if (contents != null && copyToRoot != null) then
|
||||
throw "in docker image ${name}: You can not specify both contents and copyToRoot."
|
||||
else
|
||||
x: x
|
||||
);
|
||||
|
||||
rootContents = if copyToRoot == null then contents else copyToRoot;
|
||||
|
||||
|
|
@ -1030,11 +1033,12 @@ rec {
|
|||
debug ? false,
|
||||
}:
|
||||
assert (
|
||||
lib.assertMsg (layeringPipeline == null -> maxLayers > 1)
|
||||
"the maxLayers argument of dockerTools.buildLayeredImage function must be greather than 1 (current value: ${toString maxLayers})"
|
||||
(layeringPipeline == null -> maxLayers > 1)
|
||||
|| throw "the maxLayers argument of dockerTools.buildLayeredImage function must be greather than 1 (current value: ${toString maxLayers})"
|
||||
);
|
||||
assert (
|
||||
lib.assertMsg (enableFakechroot -> !stdenv.hostPlatform.isDarwin) ''
|
||||
(enableFakechroot -> !stdenv.hostPlatform.isDarwin)
|
||||
|| throw ''
|
||||
cannot use `enableFakechroot` because `proot` is not portable to Darwin. Workarounds:
|
||||
- use `fakeRootCommands` with the restricted `fakeroot` environment
|
||||
- cross-compile your packages
|
||||
|
|
@ -1271,11 +1275,11 @@ rec {
|
|||
command ? null,
|
||||
run ? null,
|
||||
}:
|
||||
assert lib.assertMsg (!(drv.drvAttrs.__structuredAttrs or false))
|
||||
"streamNixShellImage: Does not work with the derivation ${drv.name} because it uses __structuredAttrs";
|
||||
assert lib.assertMsg (
|
||||
command == null || run == null
|
||||
) "streamNixShellImage: Can't specify both command and run";
|
||||
assert
|
||||
!(drv.drvAttrs.__structuredAttrs or false)
|
||||
|| throw "streamNixShellImage: Does not work with the derivation ${drv.name} because it uses __structuredAttrs";
|
||||
assert
|
||||
command == null || run == null || throw "streamNixShellImage: Can't specify both command and run";
|
||||
let
|
||||
|
||||
# A binary that calls the command to build the derivation
|
||||
|
|
|
|||
|
|
@ -24,9 +24,8 @@ lib.makeOverridable (
|
|||
}@args:
|
||||
|
||||
assert (
|
||||
lib.assertMsg (lib.xor (tag == null) (
|
||||
rev == null
|
||||
)) "fetchFromBitbucket requires one of either `rev` or `tag` to be provided (not both)."
|
||||
lib.xor (tag == null) (rev == null)
|
||||
|| throw "fetchFromBitbucket requires one of either `rev` or `tag` to be provided (not both)."
|
||||
);
|
||||
|
||||
let
|
||||
|
|
|
|||
|
|
@ -177,7 +177,8 @@ lib.makeOverridable (
|
|||
sparseCheckoutText =
|
||||
# Changed to throw on 2023-06-04
|
||||
assert (
|
||||
lib.assertMsg (lib.isList finalAttrs.sparseCheckout) "Please provide directories/patterns for sparse checkout as a list of strings. Passing a (multi-line) string is not supported any more."
|
||||
lib.isList finalAttrs.sparseCheckout
|
||||
|| throw "Please provide directories/patterns for sparse checkout as a list of strings. Passing a (multi-line) string is not supported any more."
|
||||
);
|
||||
assert finalAttrs.nonConeMode -> (finalAttrs.sparseCheckout != [ ]);
|
||||
# git-sparse-checkout(1) says:
|
||||
|
|
|
|||
|
|
@ -59,9 +59,8 @@ decorate (
|
|||
}@args:
|
||||
|
||||
assert (
|
||||
lib.assertMsg (lib.xor (tag == null) (
|
||||
rev == null
|
||||
)) "fetchFromGitHub requires one of either `rev` or `tag` to be provided (not both)."
|
||||
lib.xor (tag == null) (rev == null)
|
||||
|| throw "fetchFromGitHub requires one of either `rev` or `tag` to be provided (not both)."
|
||||
);
|
||||
|
||||
let
|
||||
|
|
|
|||
|
|
@ -14,9 +14,8 @@ lib.makeOverridable (
|
|||
}@args:
|
||||
|
||||
assert (
|
||||
lib.assertMsg (lib.xor (tag == null) (
|
||||
rev == null
|
||||
)) "fetchFromGitiles requires one of either `rev` or `tag` to be provided (not both)."
|
||||
lib.xor (tag == null) (rev == null)
|
||||
|| throw "fetchFromGitiles requires one of either `rev` or `tag` to be provided (not both)."
|
||||
);
|
||||
|
||||
let
|
||||
|
|
|
|||
|
|
@ -27,9 +27,8 @@ lib.makeOverridable (
|
|||
}@args:
|
||||
|
||||
assert (
|
||||
lib.assertMsg (lib.xor (tag == null) (
|
||||
rev == null
|
||||
)) "fetchFromGitLab requires one of either `rev` or `tag` to be provided (not both)."
|
||||
lib.xor (tag == null) (rev == null)
|
||||
|| throw "fetchFromGitLab requires one of either `rev` or `tag` to be provided (not both)."
|
||||
);
|
||||
|
||||
let
|
||||
|
|
@ -65,43 +64,46 @@ lib.makeOverridable (
|
|||
fetcher = if useFetchGit then fetchgit else fetchzip;
|
||||
|
||||
privateAttrs = lib.optionalAttrs private (
|
||||
lib.throwIfNot (protocol == "https") "private token login is only supported for https" {
|
||||
netrcPhase = ''
|
||||
if [ -z "''$${varBase}USERNAME" -o -z "''$${varBase}PASSWORD" ]; then
|
||||
echo "Error: Private fetchFromGitLab requires the nix building process (nix-daemon in multi user mode) to have the ${varBase}USERNAME and ${varBase}PASSWORD env vars set." >&2
|
||||
exit 1
|
||||
fi
|
||||
''
|
||||
+ (
|
||||
if useFetchGit then
|
||||
# GitLab supports HTTP Basic Authentication only when Git is used:
|
||||
# https://docs.gitlab.com/ee/user/project/settings/project_access_tokens.html#project-access-tokens
|
||||
''
|
||||
cat > netrc <<EOF
|
||||
machine ${domain}
|
||||
login ''$${varBase}USERNAME
|
||||
password ''$${varBase}PASSWORD
|
||||
EOF
|
||||
''
|
||||
else
|
||||
# Access via the GitLab API requires a custom header and does not work
|
||||
# with HTTP Basic Authentication:
|
||||
# https://docs.gitlab.com/ee/api/#personalprojectgroup-access-tokens
|
||||
''
|
||||
# needed because fetchurl always sets --netrc-file if a netrcPhase is present
|
||||
touch netrc
|
||||
if protocol != "https" then
|
||||
throw "private token login is only supported for https"
|
||||
else
|
||||
{
|
||||
netrcPhase = ''
|
||||
if [ -z "''$${varBase}USERNAME" -o -z "''$${varBase}PASSWORD" ]; then
|
||||
echo "Error: Private fetchFromGitLab requires the nix building process (nix-daemon in multi user mode) to have the ${varBase}USERNAME and ${varBase}PASSWORD env vars set." >&2
|
||||
exit 1
|
||||
fi
|
||||
''
|
||||
+ (
|
||||
if useFetchGit then
|
||||
# GitLab supports HTTP Basic Authentication only when Git is used:
|
||||
# https://docs.gitlab.com/ee/user/project/settings/project_access_tokens.html#project-access-tokens
|
||||
''
|
||||
cat > netrc <<EOF
|
||||
machine ${domain}
|
||||
login ''$${varBase}USERNAME
|
||||
password ''$${varBase}PASSWORD
|
||||
EOF
|
||||
''
|
||||
else
|
||||
# Access via the GitLab API requires a custom header and does not work
|
||||
# with HTTP Basic Authentication:
|
||||
# https://docs.gitlab.com/ee/api/#personalprojectgroup-access-tokens
|
||||
''
|
||||
# needed because fetchurl always sets --netrc-file if a netrcPhase is present
|
||||
touch netrc
|
||||
|
||||
cat > private-token <<EOF
|
||||
PRIVATE-TOKEN: ''$${varBase}PASSWORD
|
||||
EOF
|
||||
curlOpts="$curlOpts --header @./private-token"
|
||||
''
|
||||
);
|
||||
netrcImpureEnvVars = [
|
||||
"${varBase}USERNAME"
|
||||
"${varBase}PASSWORD"
|
||||
];
|
||||
}
|
||||
cat > private-token <<EOF
|
||||
PRIVATE-TOKEN: ''$${varBase}PASSWORD
|
||||
EOF
|
||||
curlOpts="$curlOpts --header @./private-token"
|
||||
''
|
||||
);
|
||||
netrcImpureEnvVars = [
|
||||
"${varBase}USERNAME"
|
||||
"${varBase}PASSWORD"
|
||||
];
|
||||
}
|
||||
);
|
||||
|
||||
gitRepoUrl = "${protocol}://${domain}/${slug}.git";
|
||||
|
|
|
|||
|
|
@ -30,14 +30,18 @@ lib.extendMkDerivation {
|
|||
|
||||
outputHashAlgo = if finalAttrs.hash != null && finalAttrs.hash != "" then null else "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = lib.throwIf (hash != null && sha256 != null) "Only one of sha256 or hash can be set" (
|
||||
if finalAttrs.hash != null then
|
||||
finalAttrs.hash
|
||||
else if sha256 != null then
|
||||
sha256
|
||||
outputHash =
|
||||
if (hash != null && sha256 != null) then
|
||||
throw "Only one of sha256 or hash can be set"
|
||||
else
|
||||
""
|
||||
);
|
||||
(
|
||||
if finalAttrs.hash != null then
|
||||
finalAttrs.hash
|
||||
else if sha256 != null then
|
||||
sha256
|
||||
else
|
||||
""
|
||||
);
|
||||
|
||||
inherit url rev hash;
|
||||
inherit preferLocalBuild;
|
||||
|
|
|
|||
|
|
@ -38,10 +38,10 @@ in
|
|||
let
|
||||
inherit (args') stripLen extraPrefix;
|
||||
in
|
||||
lib.throwIfNot (excludes == [ ] || includes == [ ])
|
||||
"fetchpatch: cannot use excludes and includes simultaneously"
|
||||
fetchurl
|
||||
(
|
||||
if excludes != [ ] && includes != [ ] then
|
||||
throw "fetchpatch: cannot use excludes and includes simultaneously"
|
||||
else
|
||||
fetchurl (
|
||||
{
|
||||
nativeBuildInputs = [ patchutils ] ++ nativeBuildInputs;
|
||||
postFetch = ''
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@ lib.makeOverridable (
|
|||
...
|
||||
}@args:
|
||||
|
||||
assert lib.assertMsg (lib.xor (tag != null) (
|
||||
rev != null
|
||||
)) "fetchFromRadicle requires one of either `rev` or `tag` to be provided (not both).";
|
||||
assert
|
||||
lib.xor (tag != null) (rev != null)
|
||||
|| throw "fetchFromRadicle requires one of either `rev` or `tag` to be provided (not both).";
|
||||
|
||||
let
|
||||
namespacePrefix = lib.optionalString (node != null) "refs/namespaces/${node}/";
|
||||
|
|
|
|||
|
|
@ -12,9 +12,8 @@ lib.makeOverridable (
|
|||
...
|
||||
}@args:
|
||||
|
||||
assert lib.assertMsg (
|
||||
!args ? rev && !args ? tag
|
||||
) "fetchRadiclePatch does not accept `rev` or `tag` arguments.";
|
||||
assert
|
||||
(!args ? rev && !args ? tag) || throw "fetchRadiclePatch does not accept `rev` or `tag` arguments.";
|
||||
|
||||
fetchFromRadicle (
|
||||
{
|
||||
|
|
|
|||
|
|
@ -28,9 +28,8 @@ makeOverridable (
|
|||
}@args:
|
||||
|
||||
assert (
|
||||
lib.assertMsg (lib.xor (tag == null) (
|
||||
rev == null
|
||||
)) "fetchFromSourcehut requires one of either `rev` or `tag` to be provided (not both)."
|
||||
lib.xor (tag == null) (rev == null)
|
||||
|| throw "fetchFromSourcehut requires one of either `rev` or `tag` to be provided (not both)."
|
||||
);
|
||||
|
||||
assert (
|
||||
|
|
|
|||
|
|
@ -83,12 +83,16 @@ let
|
|||
else
|
||||
[ ];
|
||||
in
|
||||
assert lib.assertMsg (config != { } -> backend == "transmission") ''
|
||||
json config for configuring fetchtorrent only works with the transmission backend
|
||||
'';
|
||||
assert lib.assertMsg (backend == "transmission" -> flatten') ''
|
||||
`flatten = false` is only supported by the rqbit backend for fetchtorrent
|
||||
'';
|
||||
assert
|
||||
(config != { } -> backend == "transmission")
|
||||
|| throw ''
|
||||
json config for configuring fetchtorrent only works with the transmission backend
|
||||
'';
|
||||
assert
|
||||
(backend == "transmission" -> flatten')
|
||||
|| throw ''
|
||||
`flatten = false` is only supported by the rqbit backend for fetchtorrent
|
||||
'';
|
||||
runCommand name
|
||||
{
|
||||
inherit meta;
|
||||
|
|
|
|||
|
|
@ -327,23 +327,27 @@ lib.extendMkDerivation {
|
|||
|
||||
outputHashMode = if (recursiveHash || executable) then "recursive" else "flat";
|
||||
|
||||
curlOpts = lib.warnIf (lib.isList curlOpts) (
|
||||
let
|
||||
url = toString (builtins.head urls_);
|
||||
curlOptsRepresentation = lib.generators.toPretty { multiline = false; } curlOpts;
|
||||
curlOptsAsStringRepresentation = lib.strings.escapeNixString (toString curlOpts);
|
||||
curlOptsListElementsRepresentation =
|
||||
lib.concatMapStringsSep " " lib.strings.escapeNixString
|
||||
curlOpts;
|
||||
in
|
||||
''
|
||||
fetchurl for ${url}: curlOpts is a list (${curlOptsRepresentation}), which is not supported anymore.
|
||||
- If you wish to get the same effect as before, for elements with spaces (even if escaped) to expand to multiple curl arguments, use a string argument instead:
|
||||
curlOpts = ${curlOptsAsStringRepresentation};
|
||||
- If you wish for each list element to be passed as a separate curl argument, allowing arguments to contain spaces, use curlOptsList instead:
|
||||
curlOptsList = [ ${curlOptsListElementsRepresentation} ];
|
||||
''
|
||||
) curlOpts;
|
||||
curlOpts =
|
||||
if lib.isList curlOpts then
|
||||
lib.warn (
|
||||
let
|
||||
url = toString (builtins.head urls_);
|
||||
curlOptsRepresentation = lib.generators.toPretty { multiline = false; } curlOpts;
|
||||
curlOptsAsStringRepresentation = lib.strings.escapeNixString (toString curlOpts);
|
||||
curlOptsListElementsRepresentation =
|
||||
lib.concatMapStringsSep " " lib.strings.escapeNixString
|
||||
curlOpts;
|
||||
in
|
||||
''
|
||||
fetchurl for ${url}: curlOpts is a list (${curlOptsRepresentation}), which is not supported anymore.
|
||||
- If you wish to get the same effect as before, for elements with spaces (even if escaped) to expand to multiple curl arguments, use a string argument instead:
|
||||
curlOpts = ${curlOptsAsStringRepresentation};
|
||||
- If you wish for each list element to be passed as a separate curl argument, allowing arguments to contain spaces, use curlOptsList instead:
|
||||
curlOptsList = [ ${curlOptsListElementsRepresentation} ];
|
||||
''
|
||||
) curlOpts
|
||||
else
|
||||
curlOpts;
|
||||
|
||||
inherit
|
||||
curlOptsList
|
||||
|
|
|
|||
|
|
@ -106,9 +106,11 @@ lib.extendMkDerivation {
|
|||
)
|
||||
+ ''
|
||||
${postFetch}
|
||||
${lib.warnIf (extraPostFetch != "")
|
||||
"use 'postFetch' instead of 'extraPostFetch' with 'fetchzip' and 'fetchFromGitHub' or 'fetchFromGitLab'."
|
||||
extraPostFetch
|
||||
${
|
||||
if extraPostFetch != "" then
|
||||
lib.warn "use 'postFetch' instead of 'extraPostFetch' with 'fetchzip' and 'fetchFromGitHub' or 'fetchFromGitLab'." extraPostFetch
|
||||
else
|
||||
extraPostFetch
|
||||
}
|
||||
chmod 755 "$out"
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -34,7 +34,8 @@ let
|
|||
|
||||
keywordsSection =
|
||||
let
|
||||
mustBeAList = attr: attrName: lib.throwIfNot (lib.isList attr) "'${attrName}' must be a list" attr;
|
||||
mustBeAList =
|
||||
attr: attrName: if !(lib.isList attr) then throw "'${attrName}' must be a list" else attr;
|
||||
in
|
||||
{
|
||||
"Name" = name;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
fetchNpmDeps,
|
||||
buildPackages,
|
||||
nodejs,
|
||||
nodejs-slim,
|
||||
cctools,
|
||||
}@topLevelArgs:
|
||||
|
||||
|
|
@ -102,7 +101,7 @@ lib.extendMkDerivation {
|
|||
(if npmConfigHook != null then npmConfigHook else npmHooks.npmConfigHook)
|
||||
(if npmBuildHook != null then npmBuildHook else npmHooks.npmBuildHook)
|
||||
(if npmInstallHook != null then npmInstallHook else npmHooks.npmInstallHook)
|
||||
nodejs-slim.python
|
||||
nodejs.python
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ];
|
||||
buildInputs = buildInputs ++ [ nodejs ];
|
||||
|
|
|
|||
|
|
@ -60,17 +60,17 @@ in
|
|||
pnpm-fixup-state-db;
|
||||
in
|
||||
# pnpmWorkspace was deprecated, so throw if it's used.
|
||||
assert (lib.throwIf (args ? pnpmWorkspace)
|
||||
"fetchPnpmDeps: `pnpmWorkspace` is no longer supported, please migrate to `pnpmWorkspaces`."
|
||||
) true;
|
||||
assert
|
||||
!args ? pnpmWorkspace
|
||||
|| throw "fetchPnpmDeps: `pnpmWorkspace` is no longer supported, please migrate to `pnpmWorkspaces`.";
|
||||
|
||||
assert (lib.throwIf (fetcherVersion == null)
|
||||
"fetchPnpmDeps: `fetcherVersion` is not set, see https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion."
|
||||
) true;
|
||||
assert
|
||||
fetcherVersion != null
|
||||
|| throw "fetchPnpmDeps: `fetcherVersion` is not set, see https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion.";
|
||||
|
||||
assert (lib.throwIf (!(builtins.elem fetcherVersion supportedFetcherVersions))
|
||||
"fetchPnpmDeps `fetcherVersion` is not set to a supported value (${lib.concatStringsSep ", " (map toString supportedFetcherVersions)}), see https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion."
|
||||
) true;
|
||||
assert
|
||||
builtins.elem fetcherVersion supportedFetcherVersions
|
||||
|| throw "fetchPnpmDeps `fetcherVersion` is not set to a supported value (${lib.concatStringsSep ", " (map toString supportedFetcherVersions)}), see https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion.";
|
||||
|
||||
lib.warnIf (fetcherVersion < 3)
|
||||
"fetchPnpmDeps: `fetcherVersion = ${toString fetcherVersion}` is deprecated and scheduled for removal in the 26.11 release. Please migrate `${pname}` to `fetcherVersion = 3` and regenerate the hash. See https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion."
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
nix-prefetch-git,
|
||||
fetchurl,
|
||||
jq,
|
||||
nodejs,
|
||||
nodejs-slim,
|
||||
prefetch-yarn-deps,
|
||||
fixup-yarn-lock,
|
||||
|
|
|
|||
|
|
@ -19,11 +19,10 @@
|
|||
...
|
||||
}@args:
|
||||
|
||||
lib.throwIf (args ? minimalOCamlVersion && lib.versionOlder ocaml.version args.minimalOCamlVersion)
|
||||
"${pname}-${version} is not available for OCaml ${ocaml.version}"
|
||||
|
||||
stdenv.mkDerivation
|
||||
(
|
||||
if (args ? minimalOCamlVersion && lib.versionOlder ocaml.version args.minimalOCamlVersion) then
|
||||
throw "${pname}-${version} is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
stdenv.mkDerivation (
|
||||
{
|
||||
|
||||
dontAddStaticConfigureFlags = true;
|
||||
|
|
|
|||
|
|
@ -24,24 +24,20 @@ let
|
|||
phpDrv = finalAttrs.php or php;
|
||||
composer = finalAttrs.composer or phpDrv.packages.composer-local-repo-plugin;
|
||||
in
|
||||
assert (lib.assertMsg (previousAttrs ? src) "mkComposerRepository expects src argument.");
|
||||
assert previousAttrs ? src || throw "mkComposerRepository expects src argument.";
|
||||
assert previousAttrs ? vendorHash || throw "mkComposerRepository expects vendorHash argument.";
|
||||
assert previousAttrs ? version || throw "mkComposerRepository expects version argument.";
|
||||
assert previousAttrs ? pname || throw "mkComposerRepository expects pname argument.";
|
||||
assert (
|
||||
lib.assertMsg (previousAttrs ? vendorHash) "mkComposerRepository expects vendorHash argument."
|
||||
);
|
||||
assert (lib.assertMsg (previousAttrs ? version) "mkComposerRepository expects version argument.");
|
||||
assert (lib.assertMsg (previousAttrs ? pname) "mkComposerRepository expects pname argument.");
|
||||
assert (
|
||||
lib.assertMsg (previousAttrs ? composerNoDev) "mkComposerRepository expects composerNoDev argument."
|
||||
previousAttrs ? composerNoDev || throw "mkComposerRepository expects composerNoDev argument."
|
||||
);
|
||||
assert (
|
||||
lib.assertMsg (
|
||||
previousAttrs ? composerNoPlugins
|
||||
) "mkComposerRepository expects composerNoPlugins argument."
|
||||
previousAttrs ? composerNoPlugins
|
||||
|| throw "mkComposerRepository expects composerNoPlugins argument."
|
||||
);
|
||||
assert (
|
||||
lib.assertMsg (
|
||||
previousAttrs ? composerNoScripts
|
||||
) "mkComposerRepository expects composerNoScripts argument."
|
||||
previousAttrs ? composerNoScripts
|
||||
|| throw "mkComposerRepository expects composerNoScripts argument."
|
||||
);
|
||||
{
|
||||
composerNoDev = previousAttrs.composerNoDev or true;
|
||||
|
|
|
|||
|
|
@ -25,9 +25,9 @@ let
|
|||
dontCheckForBrokenSymlinks ? true,
|
||||
...
|
||||
}@args:
|
||||
assert (lib.assertMsg (args ? pname) "mkComposerVendor expects pname argument.");
|
||||
assert (lib.assertMsg (args ? version) "mkComposerVendor expects version argument.");
|
||||
assert (lib.assertMsg (args ? src) "mkComposerVendor expects src argument.");
|
||||
assert args ? pname || throw "mkComposerVendor expects pname argument.";
|
||||
assert args ? version || throw "mkComposerVendor expects version argument.";
|
||||
assert args ? src || throw "mkComposerVendor expects src argument.";
|
||||
{
|
||||
name = "${args.pname}-composer-vendor-${args.version}";
|
||||
|
||||
|
|
|
|||
|
|
@ -87,9 +87,9 @@ let
|
|||
};
|
||||
in
|
||||
|
||||
assert lib.assertMsg (lib.all (
|
||||
u: lib.hasPrefix pname u.name
|
||||
) units) "Unit names must be prefixed with the service name";
|
||||
assert
|
||||
lib.all (u: lib.hasPrefix pname u.name) units
|
||||
|| throw "Unit names must be prefixed with the service name";
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "${pname}-img";
|
||||
|
|
|
|||
|
|
@ -4669,7 +4669,7 @@ rec {
|
|||
# Not rate-limited, CDN URL.
|
||||
url = "https://static.crates.io/crates/${crateConfig.crateName}/${crateConfig.crateName}-${crateConfig.version}.crate";
|
||||
sha256 =
|
||||
assert (lib.assertMsg (crateConfig ? sha256) "Missing sha256 for ${name}");
|
||||
assert crateConfig ? sha256 || throw "Missing sha256 for ${name}";
|
||||
crateConfig.sha256;
|
||||
});
|
||||
extraRustcOpts =
|
||||
|
|
|
|||
|
|
@ -78,8 +78,9 @@ lib.extendMkDerivation {
|
|||
...
|
||||
}@args:
|
||||
|
||||
assert lib.assertMsg useFetchCargoVendor
|
||||
"buildRustPackage: `useFetchCargoVendor` is non‐optional and enabled by default as of 25.05, remove it";
|
||||
assert
|
||||
useFetchCargoVendor
|
||||
|| throw "buildRustPackage: `useFetchCargoVendor` is non‐optional and enabled by default as of 25.05, remove it";
|
||||
|
||||
assert lib.warnIf (args ? useFetchCargoVendor)
|
||||
"buildRustPackage: `useFetchCargoVendor` is non‐optional and enabled by default as of 25.05, remove it"
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
pname ? null,
|
||||
# The `dl` field of the registry's index configuration
|
||||
# https://doc.rust-lang.org/cargo/reference/registry-index.html#index-configuration
|
||||
registryDl ? "https://crates.io/api/v1/crates",
|
||||
registryDl ? "https://static.crates.io/crates",
|
||||
version,
|
||||
unpack ? true,
|
||||
...
|
||||
|
|
|
|||
|
|
@ -120,9 +120,11 @@ let
|
|||
checksum =
|
||||
pkg.checksum or parsedLockFile.metadata."checksum ${pkg.name} ${pkg.version} (${pkg.source})";
|
||||
in
|
||||
assert lib.assertMsg (checksum != null) ''
|
||||
Package ${pkg.name} does not have a checksum.
|
||||
'';
|
||||
assert
|
||||
checksum != null
|
||||
|| throw ''
|
||||
Package ${pkg.name} does not have a checksum.
|
||||
'';
|
||||
fetchurl {
|
||||
name = "crate-${pkg.name}-${pkg.version}.tar.gz";
|
||||
url = "${downloadUrl}/${pkg.name}/${pkg.version}/download";
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ makeSetupHook {
|
|||
# depsTargetTargetPropagated will essentially be buildInputs when wrapGAppsHook3 is placed into nativeBuildInputs
|
||||
# the librsvg and gtk3 above should be removed but kept to not break anything that implicitly depended on its binaries
|
||||
depsTargetTargetPropagated =
|
||||
assert (lib.assertMsg (!targetPackages ? raw) "wrapGAppsHook3 must be in nativeBuildInputs");
|
||||
assert (!targetPackages ? raw || throw "wrapGAppsHook3 must be in nativeBuildInputs");
|
||||
lib.optionals isGraphical [
|
||||
# librsvg provides a module for gdk-pixbuf to allow rendering
|
||||
# SVG icons. Most icon themes are SVG-based and so are some
|
||||
|
|
|
|||
|
|
@ -54,8 +54,9 @@ optionalDeprecationWarning stdenvNoCC.mkDerivation (
|
|||
// args
|
||||
// lib.optionalAttrs (args ? substitutions) {
|
||||
substitutions =
|
||||
assert lib.assertMsg (lib.isList args.substitutions)
|
||||
''pkgs.substitute: For "${name}", `substitutions` is passed, which is expected to be a list, but it's a ${builtins.typeOf args.substitutions} instead.'';
|
||||
assert
|
||||
lib.isList args.substitutions
|
||||
|| throw ''pkgs.substitute: For "${name}", `substitutions` is passed, which is expected to be a list, but it's a ${builtins.typeOf args.substitutions} instead.'';
|
||||
lib.escapeShellArgs args.substitutions;
|
||||
}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -131,12 +131,14 @@ rec {
|
|||
preferLocalBuild
|
||||
;
|
||||
destination =
|
||||
assert lib.assertMsg (destination != "" -> (lib.hasPrefix "/" destination && destination != "/")) ''
|
||||
destination must be an absolute path, relative to the derivation's out path,
|
||||
got '${destination}' instead.
|
||||
assert
|
||||
(destination != "" -> (lib.hasPrefix "/" destination && destination != "/"))
|
||||
|| throw ''
|
||||
destination must be an absolute path, relative to the derivation's out path,
|
||||
got '${destination}' instead.
|
||||
|
||||
Ensure that the path starts with a / and specifies at least the filename.
|
||||
'';
|
||||
Ensure that the path starts with a / and specifies at least the filename.
|
||||
'';
|
||||
destination;
|
||||
passAsFile = [ "text" ] ++ derivationArgs.passAsFile or [ ];
|
||||
|
||||
|
|
@ -184,8 +186,9 @@ rec {
|
|||
writeText =
|
||||
name: text:
|
||||
# TODO: To fully deprecate, replace the assertion with `lib.isString` and remove the warning
|
||||
assert lib.assertMsg (lib.strings.isConvertibleWithToString text)
|
||||
"pkgs.writeText ${lib.strings.escapeNixString name}: The second argument should be a string, but it's a ${builtins.typeOf text} instead.";
|
||||
assert
|
||||
lib.strings.isConvertibleWithToString text
|
||||
|| throw "pkgs.writeText ${lib.strings.escapeNixString name}: The second argument should be a string, but it's a ${builtins.typeOf text} instead.";
|
||||
lib.warnIf (!lib.isString text)
|
||||
"pkgs.writeText ${lib.strings.escapeNixString name}: The second argument should be a string, but it's a ${builtins.typeOf text} instead, which is deprecated. Use `toString` to convert the value to a string first."
|
||||
writeTextFile
|
||||
|
|
@ -534,9 +537,9 @@ rec {
|
|||
finalAttrs:
|
||||
args@{
|
||||
name ?
|
||||
assert lib.assertMsg (
|
||||
finalAttrs ? pname && finalAttrs ? version
|
||||
) "symlinkJoin requires either a `name` OR `pname` and `version`";
|
||||
assert
|
||||
(finalAttrs ? pname && finalAttrs ? version)
|
||||
|| throw "symlinkJoin requires either a `name` OR `pname` and `version`";
|
||||
"${finalAttrs.pname}-${finalAttrs.version}",
|
||||
paths,
|
||||
stripPrefix ? "",
|
||||
|
|
@ -546,11 +549,13 @@ rec {
|
|||
failOnMissing ? stripPrefix == "",
|
||||
...
|
||||
}:
|
||||
assert lib.assertMsg (stripPrefix != "" -> (hasPrefix "/" stripPrefix && stripPrefix != "/")) ''
|
||||
stripPrefix must be either an empty string (disable stripping behavior), or relative path prefixed with /.
|
||||
assert
|
||||
(stripPrefix != "" -> (hasPrefix "/" stripPrefix && stripPrefix != "/"))
|
||||
|| throw ''
|
||||
stripPrefix must be either an empty string (disable stripping behavior), or relative path prefixed with /.
|
||||
|
||||
Ensure that the path starts with / and specifies path to the subdirectory.
|
||||
'';
|
||||
Ensure that the path starts with / and specifies path to the subdirectory.
|
||||
'';
|
||||
let
|
||||
mapPaths =
|
||||
f:
|
||||
|
|
@ -1012,12 +1017,9 @@ rec {
|
|||
src,
|
||||
...
|
||||
}@args:
|
||||
assert lib.assertMsg (
|
||||
!args ? meta
|
||||
) "applyPatches will not merge 'meta', change it in 'src' instead";
|
||||
assert lib.assertMsg (
|
||||
!args ? passthru
|
||||
) "applyPatches will not merge 'passthru', change it in 'src' instead";
|
||||
assert !args ? meta || throw "applyPatches will not merge 'meta', change it in 'src' instead";
|
||||
assert
|
||||
!args ? passthru || throw "applyPatches will not merge 'passthru', change it in 'src' instead";
|
||||
let
|
||||
keepAttrs = names: lib.filterAttrs (name: val: lib.elem name names);
|
||||
# enables tools like nix-update to determine what src attributes to replace
|
||||
|
|
|
|||
|
|
@ -1095,14 +1095,6 @@ rec {
|
|||
*/
|
||||
writeJSBin = name: writeJS "/bin/${name}";
|
||||
|
||||
awkFormatNginx = builtins.toFile "awkFormat-nginx.awk" ''
|
||||
awk -f
|
||||
{sub(/^[ \t]+/,"");idx=0}
|
||||
/\{/{ctx++;idx=1}
|
||||
/\}/{ctx--}
|
||||
{id="";for(i=idx;i<ctx;i++)id=sprintf("%s%s", id, "\t");printf "%s%s\n", id, $0}
|
||||
'';
|
||||
|
||||
writeNginxConfig =
|
||||
name: text:
|
||||
pkgs.runCommandLocal name
|
||||
|
|
@ -1112,8 +1104,9 @@ rec {
|
|||
nativeBuildInputs = [ gixy ];
|
||||
} # sh
|
||||
''
|
||||
# nginx-config-formatter has an error - https://github.com/1connect/nginx-config-formatter/issues/16
|
||||
awk -f ${awkFormatNginx} "$textPath" | sed '/^\s*$/d' > $out
|
||||
cp "$textPath" $out
|
||||
${lib.getExe pkgs.nginx-config-formatter} --max-empty-lines 0 $out
|
||||
${lib.getExe pkgs.gnused} -i 's/ ;/;/g' $out
|
||||
gixy $out || (echo "\n\nThis can be caused by combining multiple incompatible services on the same hostname.\n\nFull merged config:\n\n"; cat $out; exit 1)
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -18,39 +18,39 @@
|
|||
"sources": {
|
||||
"x86_64": {
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.12.21-x86_64.zip",
|
||||
"hash": "sha256-tAWgIe7mcaGANCn8Kr0h6+zmvqufDJMjzAI3FrAGNk0="
|
||||
"hash": "sha256-1dAmyaBMo4re1aQTk16AMEol7GjeSVhx9F4SuYBGoso="
|
||||
},
|
||||
"aarch64": {
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.12.21-aarch64.zip",
|
||||
"hash": "sha256-1c6YbzFYNyHKzY13OZ7z1Ad5hzgTIMs3aT0nluK9l0w="
|
||||
"hash": "sha256-WrWbGzBK65tVNl9Dc3OnJURiPpfbNLOYUJcVT0ETaAs="
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
"linux": {
|
||||
"version": "8.12.22-15.BETA",
|
||||
"version": "8.12.22-16.BETA",
|
||||
"sources": {
|
||||
"x86_64": {
|
||||
"url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.12.22-15.BETA.x64.tar.gz",
|
||||
"hash": "sha256-rqbbfsCgo5+3PecaVo0YKCXS9afgzSbXz1DxcVWfkf8="
|
||||
"url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.12.22-16.BETA.x64.tar.gz",
|
||||
"hash": "sha256-Kpmexrq6WpGpanTIYKaMIpM4rJiy8NV2TR8TILmuhr0="
|
||||
},
|
||||
"aarch64": {
|
||||
"url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.12.22-15.BETA.arm64.tar.gz",
|
||||
"hash": "sha256-e3IzRG/Ptj3MSszd1DRRMOXorlhVPon+oVinRy+4q+I="
|
||||
"url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.12.22-16.BETA.arm64.tar.gz",
|
||||
"hash": "sha256-7ZxrPLPdGizexCRMHkufi9WapFMApxwDw0VgBTpQ7bM="
|
||||
}
|
||||
}
|
||||
},
|
||||
"darwin": {
|
||||
"version": "8.12.22-15.BETA",
|
||||
"version": "8.12.22-16.BETA",
|
||||
"sources": {
|
||||
"x86_64": {
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.12.22-15.BETA-x86_64.zip",
|
||||
"hash": "sha256-AVKhJcRwkxp4N0s2dalY/lcFvcEzuJ0dJzVKwmEpT1M="
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.12.22-16.BETA-x86_64.zip",
|
||||
"hash": "sha256-Ce9A3UKGxJvABDlMhlw9gElGc2iKS+j+CvBnohij4mg="
|
||||
},
|
||||
"aarch64": {
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.12.22-15.BETA-aarch64.zip",
|
||||
"hash": "sha256-ZQAZUFHlNfgvBe/JKVnpjpstQsivXemXMDFiHuxM3eo="
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.12.22-16.BETA-aarch64.zip",
|
||||
"hash": "sha256-sfBVX171OQfxh+v8367nmeVNATMRAJdIk+bS2KXF+BA="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "amd-debug-tools";
|
||||
version = "0.2.13";
|
||||
version = "0.2.18";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.kernel.org/pub/scm/linux/kernel/git/superm1/amd-debug-tools.git";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-748K4Ee9HVYWQ7/DVz7F2nZNjau5v4OGvgHwJZ4vYpM=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-qBgQFjiWFRKVTsIx0aLZC9AQWsVzgbJGOPGG6ojKoDE=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -56,8 +56,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
postPhases = lib.optionals stdenvNoCC.hostPlatform.isDarwin [ "postPatchelf" ];
|
||||
postPatchelf = lib.optionalString stdenvNoCC.hostPlatform.isDarwin ''
|
||||
postInstall = lib.optionalString stdenvNoCC.hostPlatform.isDarwin ''
|
||||
'${lib.getExe' cctools "${cctools.targetPrefix}install_name_tool"}' $out/libexec/amp-cli/amp \
|
||||
-change /usr/lib/libicucore.A.dylib '${lib.getLib darwin.ICU}/lib/libicucore.A.dylib'
|
||||
'${lib.getExe rcodesign}' sign --code-signature-flags linker-signed $out/libexec/amp-cli/amp
|
||||
|
|
|
|||
13
pkgs/by-name/am/amule-daemon/package.nix
Normal file
13
pkgs/by-name/am/amule-daemon/package.nix
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
{
|
||||
amule,
|
||||
...
|
||||
}@args:
|
||||
|
||||
amule.override (
|
||||
{
|
||||
monolithic = false;
|
||||
enableDaemon = true;
|
||||
mainProgram = "amuled";
|
||||
}
|
||||
// removeAttrs args [ "amule" ]
|
||||
)
|
||||
13
pkgs/by-name/am/amule-gui/package.nix
Normal file
13
pkgs/by-name/am/amule-gui/package.nix
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
{
|
||||
amule,
|
||||
...
|
||||
}@args:
|
||||
|
||||
amule.override (
|
||||
{
|
||||
monolithic = false;
|
||||
client = true;
|
||||
mainProgram = "amulegui";
|
||||
}
|
||||
// removeAttrs args [ "amule" ]
|
||||
)
|
||||
13
pkgs/by-name/am/amule-web/package.nix
Normal file
13
pkgs/by-name/am/amule-web/package.nix
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
{
|
||||
amule,
|
||||
...
|
||||
}@args:
|
||||
|
||||
amule.override (
|
||||
{
|
||||
monolithic = false;
|
||||
httpServer = true;
|
||||
mainProgram = "amuleweb";
|
||||
}
|
||||
// removeAttrs args [ "amule" ]
|
||||
)
|
||||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "anda";
|
||||
version = "0.5.4";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FyraLabs";
|
||||
repo = "anda";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-z+oYerTP0xJ4QuHtB7uH2nTVEqFsGb2FTpk2wNpMZKU=";
|
||||
hash = "sha256-9LGFOLlv1F6tTs/Tqe+3D2M+o/5dq3zJ4X0CH7HHzBc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uoDAfsHIAJsgcMljDqCHwaHvfVZYok2GsuG8y7N0NAg=";
|
||||
cargoHash = "sha256-ErBPkTeeDJDcUMDMyOtfHnLpW6Xtsfukv6GqBSFX2DQ=";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
|
|
|
|||
82
pkgs/by-name/an/android-cli/package.nix
Normal file
82
pkgs/by-name/an/android-cli/package.nix
Normal file
|
|
@ -0,0 +1,82 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
autoPatchelfHook,
|
||||
writableTmpDirAsHomeHook,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
let
|
||||
platformData = {
|
||||
x86_64-linux = {
|
||||
url = "https://dl.google.com/android/cli/latest/linux_x86_64/android-cli";
|
||||
hash = "sha256-1F9RVDPqiy60zs2CfWytKSPKeRC9KDTogw4Ml59HaeY=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://dl.google.com/android/cli/latest/darwin_x86_64/android-cli";
|
||||
hash = "sha256-bXP9rRMSqQa3+kfUJnIeDb1LZXh2P2A6ytwunzjyfGs=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://dl.google.com/android/cli/latest/darwin_arm64/android-cli";
|
||||
hash = "sha256-r47LXmilevW0td4N+SRTR7EFnCrPBdG7G/oTUAea90Q=";
|
||||
};
|
||||
};
|
||||
|
||||
systemData =
|
||||
platformData.${stdenv.hostPlatform.system}
|
||||
or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "android-cli";
|
||||
version = "1.0.15433482";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchurl {
|
||||
name = "android-cli";
|
||||
url = systemData.url;
|
||||
hash = systemData.hash;
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
autoPatchelfHook
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -m755 -D $src $out/bin/android
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
writableTmpDirAsHomeHook
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
versionCheckKeepEnvironment = [ "HOME" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Android Command-Line Tool (CLI) by Google";
|
||||
homepage = "https://developer.android.com/tools/agents/android-cli";
|
||||
license = licenses.unfree;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with maintainers; [ kirillrdy ];
|
||||
teams = with teams; [ android ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"x86_64-darwin"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
mainProgram = "android";
|
||||
};
|
||||
}
|
||||
|
|
@ -82,13 +82,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "ansel";
|
||||
version = "0-unstable-2026-05-08";
|
||||
version = "0-unstable-2026-05-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aurelienpierreeng";
|
||||
repo = "ansel";
|
||||
rev = "6612c07ad1fd9b6411ece87ba49e02b46880c576";
|
||||
hash = "sha256-peAkfXrJPpjwUO1So9HklhqNw+gnVuliphVP3LWob1w=";
|
||||
rev = "8b076d84f00ac9aec09bbbeebc3c8bf888faab06";
|
||||
hash = "sha256-UApU+O6HbOkMt3gCIjpD4weFa/koD7ZkcsnhsfL6mD8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "apko";
|
||||
version = "1.2.4";
|
||||
version = "1.2.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chainguard-dev";
|
||||
repo = "apko";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-y1/tkLwVW/D6KDnoO/YtW88vA+O+qfbu53Ystx0zf2Y=";
|
||||
hash = "sha256-T074IzGgs0mDX4u5L96Xa0bGwpCLVYu3hNrN/7JzF1U=";
|
||||
# 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;
|
||||
|
|
@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
|
|||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
vendorHash = "sha256-xAXI1qGNOhPiDWc6KQX7ThDqs67XhP+O+ideQiMG6B8=";
|
||||
vendorHash = "sha256-Sq++amIZ5jdi/D499A8JRkr7yYPHkMXjU2yHOE8p3h4=";
|
||||
|
||||
excludedPackages = [
|
||||
"internal/gen-jsonschema"
|
||||
|
|
@ -65,7 +65,8 @@ buildGoModule (finalAttrs: {
|
|||
|
||||
checkFlags = [
|
||||
# requires networking (apk.chainreg.biz and dl-cdn.alpinelinux.org)
|
||||
"-skip=TestInitDB_ChainguardDiscovery|TestFetchPackage|TestLock/apko-discover"
|
||||
# TestSpecialModeBits fails because of sandbox setuid/setgid restrictions
|
||||
"-skip=TestInitDB_ChainguardDiscovery|TestFetchPackage|TestLock/apko-discover|TestSpecialModeBits"
|
||||
];
|
||||
|
||||
postInstall =
|
||||
|
|
|
|||
|
|
@ -39,13 +39,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "art";
|
||||
version = "1.26.4";
|
||||
version = "1.26.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "artpixls";
|
||||
repo = "ART";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-T7ri0fQz3OBLmr3BBQvYgSmAQaV/aMax6SOupAQDg5o=";
|
||||
hash = "sha256-kNe+1jwMJ8RVm4dBUg6/ik3TJRZVuGbZt5Wtx8qVbvk=";
|
||||
};
|
||||
|
||||
# Fix the build with CMake 4.
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
openssl,
|
||||
boost,
|
||||
testers,
|
||||
asioVersion ? "1.36.0",
|
||||
asioVersion ? "1.38.0",
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
|
@ -23,11 +23,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
# Preserve 1.32.0 because some project depends on asio/io_service.hpp
|
||||
"1.32.0" = "sha256-PBoa4OAOOmHas9wCutjz80rWXc3zGONntb9vTQk3FNY=";
|
||||
"1.36.0" = "sha256-BhJpE5+t0WXsuQ5CtncU0P8Kf483uFoV+OGlFLc7TpQ=";
|
||||
"1.38.0" = "sha256-pkSu8XMibmRPMoS3v5hO34oJb077bYc9KWELj3t8D6M=";
|
||||
}
|
||||
.${asioVersion} or (throw "Unsupported asio version. Please use overrideAttrs directly");
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/asio";
|
||||
sourceRoot =
|
||||
finalAttrs.src.name + lib.optionalString (lib.versionOlder finalAttrs.version "1.38.0") "/asio";
|
||||
|
||||
patches = [
|
||||
# Linking against `boost_system` fails because the stub compiled library
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "audiness";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "audiusGmbH";
|
||||
repo = "audiness";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-row372NA8/DJbI6WJyGmKrlfuCsxUa5inhMljRzShT8=";
|
||||
hash = "sha256-zru37eNQyY9AcbALge1qlINuxzVKq3RTNypm5Pyhkz8=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
file,
|
||||
python3Packages,
|
||||
rsync,
|
||||
|
|
@ -12,23 +11,18 @@
|
|||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "barman";
|
||||
version = "3.14.1";
|
||||
version = "3.19.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EnterpriseDB";
|
||||
repo = "barman";
|
||||
tag = "release/${finalAttrs.version}";
|
||||
hash = "sha256-Z3+PgUJcyG/M05hMmIhRr3HttzHUDx7BGIs44LA/qE4=";
|
||||
hash = "sha256-qjde8NdI+/2BH4L3LoxoYqdVwsaBXw1IcxYBx6sYqG8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./unwrap-subprocess.patch
|
||||
# fix building with Python 3.13
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/EnterpriseDB/barman/commit/931f997f1d73bbe360abbca737bea9ae93172989.patch?full_index=1";
|
||||
hash = "sha256-0aqyjsEabxLf4dpC4DeepmypAl7QfCedh7vy98iVifU=";
|
||||
})
|
||||
];
|
||||
|
||||
# https://github.com/EnterpriseDB/barman/blob/release/3.14.1/barman/encryption.py#L214
|
||||
|
|
@ -70,6 +64,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
|||
# Assertion error
|
||||
"test_help_output"
|
||||
"test_exits_on_unsupported_target"
|
||||
"test_resolve_mounted_volume_failure"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# FsOperationFailed
|
||||
|
|
|
|||
|
|
@ -3,7 +3,12 @@
|
|||
lib,
|
||||
fetchFromGitHub,
|
||||
bash,
|
||||
bc,
|
||||
gitMinimal,
|
||||
gnugrep,
|
||||
jq,
|
||||
which,
|
||||
writableTmpDirAsHomeHook,
|
||||
versionCheckHook,
|
||||
coreutils,
|
||||
makeBinaryWrapper,
|
||||
|
|
@ -12,13 +17,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "bashunit";
|
||||
version = "0.26.0";
|
||||
version = "0.36.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TypedDevs";
|
||||
repo = "bashunit";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-cZ2fcm4OxA3Ly8QRkOQSjaSZW80/Pu2z10+iN4pDFOs=";
|
||||
hash = "sha256-alhqJ7coRk5O4dYGx8m6u8/j7KMfr2m9Jeb5pn0wwiU=";
|
||||
forceFetchGit = true; # needed to include the tests directory for the check phase
|
||||
};
|
||||
|
||||
|
|
@ -43,9 +48,21 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
'';
|
||||
|
||||
doCheck = true;
|
||||
nativeCheckInputs = [ which ];
|
||||
nativeCheckInputs = [
|
||||
bc
|
||||
gitMinimal
|
||||
jq
|
||||
which
|
||||
];
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
patchShebangs bin/bashunit
|
||||
''
|
||||
# Disabling a failing test on Darwin platforms only
|
||||
+ lib.optionalString stdenvNoCC.hostPlatform.isDarwin ''
|
||||
rm tests/unit/console_results_test.sh
|
||||
''
|
||||
+ ''
|
||||
make test
|
||||
runHook postCheck
|
||||
'';
|
||||
|
|
@ -54,14 +71,21 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
wrapProgram $out/bin/bashunit \
|
||||
--prefix PATH : "${
|
||||
lib.makeBinPath [
|
||||
coreutils
|
||||
coreutils # cat, mktemp
|
||||
gnugrep # grep
|
||||
which
|
||||
]
|
||||
}"
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
doInstallCheck = true;
|
||||
versionCheckKeepEnvironment = [
|
||||
"HOME"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
|
|
|||
|
|
@ -6,8 +6,7 @@
|
|||
cmake,
|
||||
pkg-config,
|
||||
installShellFiles,
|
||||
autoSignDarwinBinariesHook,
|
||||
wrapQtAppsHook ? null,
|
||||
darwin,
|
||||
boost,
|
||||
libevent,
|
||||
zeromq,
|
||||
|
|
@ -16,12 +15,11 @@
|
|||
qrencode,
|
||||
libsystemtap,
|
||||
capnproto,
|
||||
qtbase ? null,
|
||||
qttools ? null,
|
||||
python3,
|
||||
versionCheckHook,
|
||||
nixosTests,
|
||||
withGui,
|
||||
withGui ? true,
|
||||
qt6,
|
||||
withWallet ? true,
|
||||
enableTracing ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isStatic,
|
||||
gnupg,
|
||||
|
|
@ -43,6 +41,9 @@ let
|
|||
url = "https://raw.githubusercontent.com/bitcoin-core/packaging/c2e5f3e20a8093ea02b73cbaf113bc0947b4140e/debian/bitcoin-qt.desktop";
|
||||
sha256 = "0cpna0nxcd1dw3nnzli36nf9zj28d2g9jf5y0zl9j18lvanvniha";
|
||||
};
|
||||
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = if withGui then "bitcoin" else "bitcoind";
|
||||
|
|
@ -65,12 +66,16 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
|
||||
autoSignDarwinBinariesHook
|
||||
]
|
||||
++ lib.optionals withGui [ wrapQtAppsHook ];
|
||||
++ lib.optionals withGui [ qt6.wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
libevent
|
||||
zeromq
|
||||
(zeromq.override {
|
||||
enableCurve = false;
|
||||
enableDrafts = false;
|
||||
libsodium = null;
|
||||
})
|
||||
zlib
|
||||
capnproto
|
||||
]
|
||||
|
|
@ -78,8 +83,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
++ lib.optionals withWallet [ sqlite ]
|
||||
++ lib.optionals withGui [
|
||||
qrencode
|
||||
qtbase
|
||||
qttools
|
||||
qt6.qtbase
|
||||
qt6.qttools
|
||||
];
|
||||
|
||||
preUnpack =
|
||||
|
|
@ -178,7 +183,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
]
|
||||
# QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI.
|
||||
# See also https://github.com/NixOS/nixpkgs/issues/24256
|
||||
++ lib.optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}";
|
||||
++ lib.optional withGui "QT_PLUGIN_PATH=${qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
@ -452,6 +452,7 @@ stdenv'.mkDerivation (finalAttrs: {
|
|||
# say: "We've decided to cancel the BL offering for an indefinite period."
|
||||
# OptiX, enabled with cudaSupport, is non-free.
|
||||
license = with lib.licenses; [ gpl2Plus ] ++ lib.optional cudaSupport nvidiaCudaRedist;
|
||||
donationPage = "https://fund.blender.org/";
|
||||
|
||||
platforms = [
|
||||
"aarch64-linux"
|
||||
|
|
|
|||
|
|
@ -7,13 +7,14 @@
|
|||
glibcLocales,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "blesh";
|
||||
version = "0.4.0-devel3";
|
||||
version = "0.4.0-devel3-unstable-2026-03-10";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/akinomyoga/ble.sh/releases/download/v${version}/ble-${version}.tar.xz";
|
||||
sha256 = "sha256-kGLp8RaInYSrJEi3h5kWEOMAbZV/gEPFUjOLgBuMhCI=";
|
||||
url = "https://github.com/akinomyoga/ble.sh/releases/download/nightly/ble-nightly-20260310%2Bb99cadb.tar.xz";
|
||||
name = "ble-nightly-20260310+b99cadb.tar.xz";
|
||||
sha256 = "sha256-rJnSEY7J4wfy8dnL9Bg59u0epPe0HL1J7piPbkNyes0=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bstone";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bibendovsky";
|
||||
repo = "bstone";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Svqm8gpZ2TgI2MdJc+gY9O7xCYYNo84/bbbqprBFpcc=";
|
||||
hash = "sha256-8ifvHNf+vUtoffxghMwFXpGuarMEEBF+bkSbE4M9zf0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
7
pkgs/by-name/ca/calyx-vpn/package.nix
Normal file
7
pkgs/by-name/ca/calyx-vpn/package.nix
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
riseup-vpn,
|
||||
}:
|
||||
|
||||
riseup-vpn.override {
|
||||
provider = "calyx";
|
||||
}
|
||||
|
|
@ -1,47 +1,47 @@
|
|||
{
|
||||
"version": "2.1.152",
|
||||
"commit": "228d8c605defcb10a183db2dbf364a2d6c490c8b",
|
||||
"buildDate": "2026-05-26T19:31:46Z",
|
||||
"version": "2.1.154",
|
||||
"commit": "b84d2da9ada13121515426fc644786a303e9ac53",
|
||||
"buildDate": "2026-05-28T12:36:02Z",
|
||||
"platforms": {
|
||||
"darwin-arm64": {
|
||||
"binary": "claude",
|
||||
"checksum": "43cb9361f7bc48c39214d5f125003b8de0ebde5cd6a1173e6b74fcdd10966d46",
|
||||
"size": 214210080
|
||||
"checksum": "bc9881b107d7be1743c64c8b72dd66798f5d0947dbc48ed0d77964c473661fd4",
|
||||
"size": 214986144
|
||||
},
|
||||
"darwin-x64": {
|
||||
"binary": "claude",
|
||||
"checksum": "e9ecf8da70518a4ff852baf36c9eac369762a4568ba3cd5078fa894303e39735",
|
||||
"size": 216724240
|
||||
"checksum": "1608d93261879201dcf77dd32dc173efbeea715187d3542fd05afcf7d5b5ec4d",
|
||||
"size": 217500304
|
||||
},
|
||||
"linux-arm64": {
|
||||
"binary": "claude",
|
||||
"checksum": "35ef2685c4f679b5c4610ef56b30a680b6d595b958b4fa5ec0bfa2852195f345",
|
||||
"size": 239515272
|
||||
"checksum": "9f732de278f7adc61d29fd5b055ddaf1bae3bb26d75fe6e06a125602565777a8",
|
||||
"size": 240301704
|
||||
},
|
||||
"linux-x64": {
|
||||
"binary": "claude",
|
||||
"checksum": "5155bdca27f754aba0d2fe2f80336f5fd4793224561c234a723f0ccef654a8e8",
|
||||
"size": 239650512
|
||||
"checksum": "67f6cab7e6c124010f62ac18f8078bc09e0db6a5b9e8ae874e9e73033c451793",
|
||||
"size": 240420560
|
||||
},
|
||||
"linux-arm64-musl": {
|
||||
"binary": "claude",
|
||||
"checksum": "b374ef7f8c59d10a04071f6c50ccd83008188b7db26589f4fb359ee435d49929",
|
||||
"size": 232370008
|
||||
"checksum": "5880876f031d5e904d107e23d9d32f717e0a30e903277970e17b82955d4c3650",
|
||||
"size": 233156440
|
||||
},
|
||||
"linux-x64-musl": {
|
||||
"binary": "claude",
|
||||
"checksum": "d4cd1951ceb25ef2bed74cd9e0dc6dec4f1219f086a35a1433eb988443096e48",
|
||||
"size": 234044464
|
||||
"checksum": "ee9b77191b949660b6ef09c42768baf04b881c963b77846e99450562a6e3ba70",
|
||||
"size": 234814512
|
||||
},
|
||||
"win32-x64": {
|
||||
"binary": "claude.exe",
|
||||
"checksum": "bbea6d550bdd765c3b9e3b1fa19a49d04dd16c1687e5b21f9e0974a18b867a73",
|
||||
"size": 235329184
|
||||
"checksum": "0a4fd0248444c6f33d659c555dcf66c2ab4a1b2c6ae8c4126c7ecf11c547791a",
|
||||
"size": 236073120
|
||||
},
|
||||
"win32-arm64": {
|
||||
"binary": "claude.exe",
|
||||
"checksum": "fd4711d17e9576fec0998c85a3726e43c26e7735e1f4552064310897acf1781b",
|
||||
"size": 231294112
|
||||
"checksum": "5db6139981642c69fcb1c7ca17bba2eed22727dbdff43422d8a1d93761d86431",
|
||||
"size": 232038560
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -276,6 +276,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
changelog = "https://curl.se/ch/${finalAttrs.version}.html";
|
||||
description = "Command line tool for transferring files with URL syntax";
|
||||
homepage = "https://curl.se/";
|
||||
donationPage = "https://curl.se/donation.html";
|
||||
license = lib.licenses.curl;
|
||||
maintainers = with lib.maintainers; [
|
||||
Scrumplex
|
||||
|
|
|
|||
|
|
@ -8,14 +8,8 @@
|
|||
# nativeBuildInputs
|
||||
cmake,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
# Qt
|
||||
qt5compat,
|
||||
qtbase,
|
||||
qtwayland,
|
||||
qtsvg,
|
||||
qttools,
|
||||
qtwebengine,
|
||||
qt6,
|
||||
# buildInputs
|
||||
graphviz,
|
||||
python3,
|
||||
|
|
@ -47,7 +41,7 @@ let
|
|||
cmake
|
||||
pkg-config
|
||||
python3
|
||||
wrapQtAppsHook
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -57,15 +51,15 @@ let
|
|||
buildInputs = [
|
||||
graphviz
|
||||
python3
|
||||
qt5compat
|
||||
qtbase
|
||||
qtsvg
|
||||
qttools
|
||||
qtwebengine
|
||||
qt6.qt5compat
|
||||
qt6.qtbase
|
||||
qt6.qtsvg
|
||||
qt6.qttools
|
||||
qt6.qtwebengine
|
||||
rizin
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
qtwayland
|
||||
qt6.qtwayland
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
@ -83,7 +77,7 @@ let
|
|||
passthru = rec {
|
||||
plugins = rizin.plugins // {
|
||||
rz-ghidra = rizin.plugins.rz-ghidra.override {
|
||||
inherit cutter qtbase qtsvg;
|
||||
inherit cutter qt6;
|
||||
enableCutterPlugin = true;
|
||||
};
|
||||
};
|
||||
|
|
@ -7,24 +7,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dcrd";
|
||||
version = "1.8.1";
|
||||
version = "2.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "decred";
|
||||
repo = "dcrd";
|
||||
tag = "release-v${finalAttrs.version}";
|
||||
hash = "sha256-nSocqwXgJhvfbdElddbb1gGxoygmtVtK6DbiSuMxYew=";
|
||||
hash = "sha256-EzNohMu0jLhQJwI16xKupH/riLKvtC1edMw5l6Bxj/I=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "dcrd-appdata-env-variable.patch";
|
||||
url = "https://github.com/decred/dcrd/pull/3152/commits/216132d7d852f3f2e2a6bf7f739f47ed62ac9387.patch";
|
||||
hash = "sha256-R1GzP0qVP5XW1GnSJqFOpJVnwrVi/62tL1L2mc33+Dw=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorHash = "sha256-Napcfj1+KjQ21Jb/qpIzg2W/grzun2Pz5FV5yIBXoTo=";
|
||||
vendorHash = "sha256-iUfTHzwjG+TyaHyhs4MGBCvfxah+Wv1+syFkiiaMLeU=";
|
||||
|
||||
subPackages = [
|
||||
"."
|
||||
|
|
|
|||
52
pkgs/by-name/de/dexed/dexed-fix-min-macos-version.patch
Normal file
52
pkgs/by-name/de/dexed/dexed-fix-min-macos-version.patch
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
From e41f1b8147bb6a5b7e9330a7ec6a598a1e74a524 Mon Sep 17 00:00:00 2001
|
||||
From: Linus Vettiger <linus4123@gmail.com>
|
||||
Date: Sat, 16 May 2026 19:09:40 +0200
|
||||
Subject: [PATCH] Bump minimum macOS version
|
||||
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
Dexed.jucer | 4 ++--
|
||||
assets/installers/make_macos_pkg.sh | 2 +-
|
||||
3 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f81961f5..8cc09541 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -19,7 +19,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "iOS")
|
||||
# set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "iPhone Developer" CACHE STRING "" FORCE)
|
||||
# set(CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "XXXXXXXXXX" CACHE STRING "" FORCE)
|
||||
else()
|
||||
- set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version" FORCE)
|
||||
+ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10" CACHE STRING "Minimum OS X deployment version" FORCE)
|
||||
endif()
|
||||
|
||||
if (CMAKE_BUILD_TYPE STREQUAL "Release")
|
||||
diff --git a/Dexed.jucer b/Dexed.jucer
|
||||
index d01029ca..b747f805 100644
|
||||
--- a/Dexed.jucer
|
||||
+++ b/Dexed.jucer
|
||||
@@ -180,8 +180,8 @@
|
||||
osxCompatibility="10.10 SDK" osxArchitecture="Native" enablePluginBinaryCopyStep="1"
|
||||
macOSDeploymentTarget="10.10"/>
|
||||
<CONFIGURATION name="Release" isDebug="0" optimisation="3" targetName="Dexed"
|
||||
- osxSDK="10.10 SDK" osxCompatibility="10.9 SDK" enablePluginBinaryCopyStep="1"
|
||||
- macOSBaseSDK="10.10" macOSDeploymentTarget="10.9"/>
|
||||
+ osxSDK="10.10 SDK" osxCompatibility="10.10 SDK" enablePluginBinaryCopyStep="1"
|
||||
+ macOSBaseSDK="10.10" macOSDeploymentTarget="10.10"/>
|
||||
</CONFIGURATIONS>
|
||||
<MODULEPATHS>
|
||||
<MODULEPATH id="juce_gui_extra" path="./assets/JUCE/modules"/>
|
||||
diff --git a/assets/installers/make_macos_pkg.sh b/assets/installers/make_macos_pkg.sh
|
||||
index 642d97c4..3103e698 100755
|
||||
--- a/assets/installers/make_macos_pkg.sh
|
||||
+++ b/assets/installers/make_macos_pkg.sh
|
||||
@@ -128,7 +128,7 @@ fi
|
||||
cat > $TMPDIR/distribution.xml << XMLEND
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<installer-gui-script minSpecVersion="1">
|
||||
- <os-version min="10.9"/>
|
||||
+ <os-version min="10.10"/>
|
||||
<title>${PRODUCT} ${VERSION}</title>
|
||||
<license file="License.txt" />
|
||||
<readme file="Readme.rtf" />
|
||||
|
|
@ -5,7 +5,6 @@
|
|||
gitUpdater,
|
||||
cmake,
|
||||
pkg-config,
|
||||
fetchpatch,
|
||||
libx11,
|
||||
libxrandr,
|
||||
libxinerama,
|
||||
|
|
@ -29,12 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-min-macos-version";
|
||||
# https://github.com/asb2m10/dexed/pull/523
|
||||
url = "https://github.com/asb2m10/dexed/commit/e41f1b8147bb6a5b7e9330a7ec6a598a1e74a524.patch";
|
||||
sha256 = "sha256-8ZrAirXUACk8BJUPfA/LQORCUOqjSTsKoS9HFyrkvV8=";
|
||||
})
|
||||
# Remove when https://github.com/asb2m10/dexed/pull/523 merged & in release
|
||||
./dexed-fix-min-macos-version.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchzip,
|
||||
bash,
|
||||
fontconfig,
|
||||
libx11,
|
||||
libxinerama,
|
||||
|
|
@ -20,12 +21,16 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
pname = "dmenu";
|
||||
version = "5.4";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://dl.suckless.org/tools/dmenu-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-6bFq3Pj3cuZqLR0pkoJyfx3CDWmmSqkDoEVptMfej7g=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
bash
|
||||
fontconfig
|
||||
libx11
|
||||
libxinerama
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dynarmic";
|
||||
version = "6.7.0-unstable-2026-01-04";
|
||||
version = "6.7.0-unstable-2026-05-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "azahar-emu";
|
||||
repo = "dynarmic";
|
||||
rev = "526227eebe1efff3fb14dbf494b9c5b44c2e9c1f";
|
||||
hash = "sha256-WG9mUFUnhEEF0+qsQzslTAj1nox3jaz6rVKs245EtV4=";
|
||||
rev = "c5f5b0d7fca772b7d2d4d8ba0975ce8653f4b055";
|
||||
hash = "sha256-ecEVqQHP2pwyqAl1s1HKBxaqSLmfOdcQP2rKbla+RLM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
|
||||
index 2c88356888..96198006b7 100644
|
||||
--- a/src/common/settings.cpp
|
||||
+++ b/src/common/settings.cpp
|
||||
@@ -176,7 +176,7 @@ bool IsFastmemEnabled() {
|
||||
if (values.cpu_accuracy.GetValue() == CpuAccuracy::Unsafe) {
|
||||
return bool(values.cpuopt_unsafe_host_mmu);
|
||||
}
|
||||
-#if !defined(__APPLE__) && !defined(__linux__) && !defined(__ANDROID__) && !defined(_WIN32)
|
||||
+#if !defined(__APPLE__) && !defined(__linux__) && !defined(__ANDROID__) && !defined(_WIN32) || (defined(__linux__) && defined(__aarch64__))
|
||||
return false;
|
||||
#else
|
||||
return true;
|
||||
54
pkgs/by-name/ed/eden/nx_tzdb.nix
Normal file
54
pkgs/by-name/ed/eden/nx_tzdb.nix
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitea,
|
||||
cmake,
|
||||
ninja,
|
||||
tzdata,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tzdb_to_nx";
|
||||
version = "230326";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.eden-emu.dev";
|
||||
owner = "eden-emu";
|
||||
repo = "tzdb_to_nx";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-koz7C63oHVfrhrf9lfdUqw6idJWi21XRKQnb5PdoEb4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeFeature "TZDB2NX_ZONEINFO_DIR" "${tzdata}/share/zoneinfo")
|
||||
(lib.cmakeFeature "TZDB2NX_VERSION" tzdata.version)
|
||||
];
|
||||
|
||||
ninjaFlags = [ "x80e" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cp -r src/tzdb/nx $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "RFC 8536 time zone data converted to the Nintendo Switch format";
|
||||
homepage = "https://git.crueter.xyz/misc/tzdb_to_nx";
|
||||
maintainers = with lib.maintainers; [ marcin-serwin ];
|
||||
license = with lib.licenses; [
|
||||
# Converter
|
||||
mit
|
||||
|
||||
# Data
|
||||
publicDomain
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
cubeb,
|
||||
enet,
|
||||
fetchFromGitea,
|
||||
fetchpatch,
|
||||
fetchurl,
|
||||
ffmpeg-headless,
|
||||
fmt,
|
||||
|
|
@ -21,9 +22,6 @@
|
|||
libopus,
|
||||
libusb1,
|
||||
lz4,
|
||||
mcl-cpp-utility-lib,
|
||||
mbedtls,
|
||||
nix-update-script,
|
||||
nlohmann_json,
|
||||
oaknut,
|
||||
openssl,
|
||||
|
|
@ -34,7 +32,6 @@
|
|||
simpleini,
|
||||
sirit,
|
||||
spirv-headers,
|
||||
spirv-tools,
|
||||
stb,
|
||||
unordered_dense,
|
||||
vulkan-headers,
|
||||
|
|
@ -44,7 +41,8 @@
|
|||
xbyak,
|
||||
zlib,
|
||||
zstd,
|
||||
tzdata,
|
||||
writeScript,
|
||||
callPackage,
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -54,52 +52,35 @@ let
|
|||
hash = "sha256-OC22KdawYK9yKiffqc1rtgrBanVExYMi9jqhvkwMD6w=";
|
||||
};
|
||||
|
||||
nx_tzdb = stdenv.mkDerivation (finalAttrs: {
|
||||
name = "tzdb_to_nx";
|
||||
version = "120226";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.crueter.xyz";
|
||||
owner = "misc";
|
||||
repo = "tzdb_to_nx";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-egPu8UVbj73RQ0Z5JMTjd5HVdy47WTfkUMlQaS0wUTg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeFeature "TZDB2NX_ZONEINFO_DIR" "${tzdata}/share/zoneinfo")
|
||||
(lib.cmakeFeature "TZDB2NX_VERSION" tzdata.version)
|
||||
];
|
||||
|
||||
ninjaFlags = [ "x80e" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cp -r src/tzdb/nx $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
});
|
||||
nx_tzdb = callPackage ./nx_tzdb.nix { };
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "eden";
|
||||
version = "0.1.1";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.eden-emu.dev";
|
||||
owner = "eden-emu";
|
||||
repo = "eden";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-tkro7ZHgn2809Utf/Li5+OiseywyQKH15eqphxlJZQQ=";
|
||||
hash = "sha256-Q/tJP6AHAtW9AXn9G+8dF4oTlKDfNHN4cuTKXtYq0T8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# httplib uses `SameMinorVersion` compatibility for its CMake files which
|
||||
# makes it reject the nixpkgs version which is newer
|
||||
name = "revert-httplib-version-specification.patch";
|
||||
url = "https://git.eden-emu.dev/eden-emu/eden/commit/9c13c71da8dcc37d03fc53bc3bc16978a65fd8f2.patch";
|
||||
hash = "sha256-g7q40BDb9TKE8eudBS7Smajq5EYCzxSemZgsl2ialJo=";
|
||||
revert = true;
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
|
|
@ -125,23 +106,21 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
libusb1
|
||||
# intentionally omitted: LLVM - heavy, only used for stack traces in the debugger
|
||||
lz4
|
||||
mcl-cpp-utility-lib
|
||||
nlohmann_json
|
||||
openssl
|
||||
qt6.qtbase
|
||||
qt6.qtmultimedia
|
||||
qt6.qtwayland
|
||||
qt6.qtwebengine
|
||||
qt6.qtcharts
|
||||
# intentionally omitted: renderdoc - heavy, developer only
|
||||
SDL2
|
||||
stb
|
||||
simpleini
|
||||
spirv-tools
|
||||
spirv-headers
|
||||
vulkan-headers
|
||||
vulkan-memory-allocator
|
||||
vulkan-utility-libraries
|
||||
mbedtls
|
||||
sirit
|
||||
unordered_dense
|
||||
zlib
|
||||
|
|
@ -154,11 +133,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
oaknut
|
||||
];
|
||||
|
||||
patches = [
|
||||
# https://git.eden-emu.dev/eden-emu/eden/issues/3484
|
||||
./aarch64-disable-fastmem.patch
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkInputs = [
|
||||
|
|
@ -166,21 +140,19 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
oaknut
|
||||
];
|
||||
|
||||
__structuredAttrs = true;
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "YUZU_TESTS" false) # some timer tests are flaky
|
||||
|
||||
# use system libraries
|
||||
(lib.cmakeBool "CPMUTIL_FORCE_SYSTEM" true)
|
||||
(lib.cmakeBool "YUZU_USE_EXTERNAL_SDL2" false)
|
||||
(lib.cmakeBool "YUZU_USE_BUNDLED_FFMPEG" false)
|
||||
(lib.cmakeFeature "YUZU_TZDB_PATH" "${nx_tzdb}")
|
||||
|
||||
# enable some optional features
|
||||
(lib.cmakeBool "YUZU_USE_QT_WEB_ENGINE" true)
|
||||
(lib.cmakeBool "YUZU_USE_QT_MULTIMEDIA" true)
|
||||
(lib.cmakeBool "ENABLE_QT_TRANSLATION" true)
|
||||
(lib.cmakeBool "ENABLE_LTO" true)
|
||||
|
||||
# We dont want to bother upstream with potentially outdated compat reports
|
||||
(lib.cmakeBool "YUZU_ENABLE_COMPATIBILITY_REPORTING" false)
|
||||
|
|
@ -209,7 +181,15 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
passthru = {
|
||||
inherit nx_tzdb compat-list;
|
||||
|
||||
updateScript = nix-update-script { };
|
||||
updateScript = writeScript "update-eden" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix-update
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
nix-update eden
|
||||
nix-update eden.nx_tzdb
|
||||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
@ -233,9 +213,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
cc-by-sa-30
|
||||
cc0
|
||||
|
||||
# Timezone data
|
||||
publicDomain
|
||||
|
||||
# Vendored/incorporated libs
|
||||
apsl20
|
||||
llvm-exception
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "entire";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "entireio";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-cSFDRZzLHUT86coxA/1fYzPSq79jNkeZMu7EYrmfeSY=";
|
||||
hash = "sha256-yGutKLwdTuGamZMdkqHlhBypZFuY9jM0w/1VW6ACppg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fuHMMQsd9FrxqjKb0M1aV+ya5yofGpH7/I10ZkBdlI4=";
|
||||
vendorHash = "sha256-pIIrrbp3x15iiY3CuA+wU7315bHUSjvJWBa4Q58OorU=";
|
||||
|
||||
subPackages = [ "cmd/entire" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
homepage = "http://wryun.github.io/es-shell/";
|
||||
license = lib.licenses.publicDomain;
|
||||
maintainers = with lib.maintainers; [
|
||||
sjmackenzie
|
||||
ttuegel
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
|
|
|
|||
|
|
@ -65,12 +65,12 @@
|
|||
let
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/f63223d9/Feishu-linux_x64-7.62.9.deb";
|
||||
sha256 = "sha256-96hOYAKsfKaZtvv+jnNCkFeeCVuwuQdwSHSPg5AGmIM=";
|
||||
url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/289abaac/Feishu-linux_x64-7.66.10.deb";
|
||||
sha256 = "sha256-68WKfT4dblQOQDd51n90nyAzOxrkBESR0pqbjbwrOso=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/d95df105/Feishu-linux_arm64-7.62.9.deb";
|
||||
sha256 = "sha256-j+fEtJd+jaHV3NB+MXg8anks6F3cd8V/Tz2PcHMQt2o=";
|
||||
url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/382a3d72/Feishu-linux_arm64-7.66.10.deb";
|
||||
sha256 = "sha256-Beh0dYJ96BuwJwTMPF61H6R9u99Jcg4pzEF1rFOj9WA=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -133,7 +133,7 @@ let
|
|||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
version = "7.62.9";
|
||||
version = "7.66.10";
|
||||
pname = "feishu";
|
||||
|
||||
src =
|
||||
|
|
|
|||
|
|
@ -31,13 +31,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flaresolverr";
|
||||
version = "3.4.6";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FlareSolverr";
|
||||
repo = "FlareSolverr";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-DeFp76VwMGBAWOsI3S3jm1qNbPw554zJZfE7hotUedY=";
|
||||
hash = "sha256-gOrfxFGNlxZWScfYEw7zfy7oVWhYEygYgP7mkO4cs/w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -56,13 +56,13 @@ assert withWayland -> withCairo;
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fltk";
|
||||
version = "1.4.4";
|
||||
version = "1.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fltk";
|
||||
repo = "fltk";
|
||||
rev = "release-${finalAttrs.version}";
|
||||
hash = "sha256-xba9uiiwQhM4a3Rf4PoGshY3mUKZrcsm+Iv7qnE2sEA=";
|
||||
tag = "release-${finalAttrs.version}";
|
||||
hash = "sha256-8Go/UNuZ1LEn8BniAyBbAPk7jdvSs5QvXxin9LAFvhU=";
|
||||
};
|
||||
|
||||
outputs = [ "out" ] ++ lib.optional withExamples "bin" ++ lib.optional withDocs "doc";
|
||||
|
|
@ -211,6 +211,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/fltk/fltk/blob/${finalAttrs.src.tag}/CHANGES.txt";
|
||||
description = "C++ cross-platform lightweight GUI library";
|
||||
homepage = "https://www.fltk.org";
|
||||
platforms = lib.platforms.unix;
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "functionalplus";
|
||||
version = "0.2.27";
|
||||
version = "0.2.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dobiasd";
|
||||
repo = "FunctionalPlus";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-LlWdzxfFkbfkb9wAmpb86Ah97pWlW3w7DdW6JPu1xdc=";
|
||||
hash = "sha256-cXZGiiuxrsYic3PMLj4F7fTPfTsWugChrFqrzI6cLt4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -42,7 +42,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
installShellCompletion --cmd git-absorb \
|
||||
--bash <($out/bin/git-absorb --gen-completions bash) \
|
||||
--fish <($out/bin/git-absorb --gen-completions fish) \
|
||||
--zsh <($out/bin/git-absorb --gen-completions zsh)
|
||||
--zsh <($out/bin/git-absorb --gen-completions zsh) \
|
||||
--nushell <($out/bin/git-absorb --gen-completions nushell)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,23 +1,24 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonApplication,
|
||||
fetchPypi,
|
||||
dropbox,
|
||||
annexremote,
|
||||
humanfriendly,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "git-annex-remote-dbx";
|
||||
version = "1.0.3";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5b6f8025ed1e9877f06882ddbd81f701a8e094647ab97595e2afc09016835a7c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "montag451";
|
||||
repo = "git-annex-remote-dbx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-a1mCLFd9fykzX3BxQBsOe6oPUzQjAzyfxExFlXCOAvQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ python3Packages.setuptools ];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
dropbox
|
||||
annexremote
|
||||
humanfriendly
|
||||
|
|
@ -30,4 +31,4 @@ buildPythonApplication rec {
|
|||
mainProgram = "git-annex-remote-dbx";
|
||||
maintainers = with lib.maintainers; [ matthiasbeyer ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "git-machete";
|
||||
version = "3.40.1";
|
||||
version = "3.41.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "virtuslab";
|
||||
repo = "git-machete";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-bKrLEXzGdvRKKwyEMsQFYgnKm2qIXj1HThCYmHjDNEM=";
|
||||
hash = "sha256-3BofEBgHgtdpQeaMx1BaNtDQ/HmX3GYagKOVHGq1+os=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "18.11.3";
|
||||
version = "18.11.4";
|
||||
package_version = "v${lib.versions.major version}";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
|
||||
|
||||
|
|
@ -21,10 +21,10 @@ let
|
|||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-oFQevVXbxu9G4LF3BrC0EUUviypSwB4cKRjipdiO3jU=";
|
||||
hash = "sha256-YQpNsSCjcMC1tpwLVN0fCB9T3vBFxp0TyrvxzJfTnFg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-123WUtoUaPIyDywcTKEhiZP2SYYHxAQoOPyCebsHYRI=";
|
||||
vendorHash = "sha256-/RJnCcmUoqGy08MSGEVM/taV1qZK65kiZw19n6S3ZQ0=";
|
||||
|
||||
ldflags = [
|
||||
"-X ${gitaly_package}/internal/version.version=${version}"
|
||||
|
|
|
|||
|
|
@ -11,17 +11,17 @@ let
|
|||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gitlab-elasticsearch-indexer";
|
||||
version = "5.14.1";
|
||||
version = "5.14.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-elasticsearch-indexer";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-yYl2cSPY5hn1GSda5ioMD3rEectNMtYGstVpz73pi3Y=";
|
||||
hash = "sha256-1fVBCem23X8u1NQ6ph37EiXRvMpzF/8Yac+VefAe9Yg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-yeVEQEXHGAkdkfcnjok8iOvVRxucObVAxhuACmyFDJw=";
|
||||
vendorHash = "sha256-cUHXrUd+pSMiS6iSwKKA+o1B6ZHbaQYHYPeVk1Y6wYM=";
|
||||
|
||||
buildInputs = [ icu ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gitlab-pages";
|
||||
version = "18.11.3";
|
||||
version = "18.11.4";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-pages";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ozkrU3QF/LK0uqfF52dnm2MCga+vRD8dGsLNnze6E+Y=";
|
||||
hash = "sha256-tE2PHWk12S482TjNhI0u7Afm0mPAgJWqcJiU5dgqN60=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-PUW4cgAiM1GTtvja894OZ4pe0SWChf5JsL4/fkns2kI=";
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gitlab-shell";
|
||||
version = "14.49.0";
|
||||
version = "14.50.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-shell";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-8PnFRwP5vctnOh6t45crxkoVF6Z03bfYry24KfFHCww=";
|
||||
hash = "sha256-a9s+TCm5yKPjNh+BD9fm6iVA4H9KJiMyWNulY+7BKZo=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
|
|||
./remove-hardcoded-locations.patch
|
||||
];
|
||||
|
||||
vendorHash = "sha256-JBKU134/Yyz49HWfU9Dw/EC4bI/o3Hs56Ou7wtzp5qM=";
|
||||
vendorHash = "sha256-ceSnQQTtGdLb0QGR9fDbGC0NtRPGqkyXJ6b0TRXkjQM=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/gitlab-shell"
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue