mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-08-26 10:14:48 +00:00
Merge staging-next into staging
This commit is contained in:
@@ -17059,6 +17059,11 @@
|
||||
githubId = 401263;
|
||||
keys = [ { fingerprint = "1147 43F1 E707 6F3E 6F4B 2C96 B9A8 B592 F126 F8E8"; } ];
|
||||
};
|
||||
macaquinyho = {
|
||||
github = "macaquinyho";
|
||||
githubId = 14185777;
|
||||
name = "Arnau Valls";
|
||||
};
|
||||
macbucheron = {
|
||||
name = "Nathan Deprat";
|
||||
github = "Macbucheron1";
|
||||
|
||||
57
nixos/doc/manual/development/state-revision.section.md
Normal file
57
nixos/doc/manual/development/state-revision.section.md
Normal file
@@ -0,0 +1,57 @@
|
||||
# State revision {#sec-state-revision}
|
||||
|
||||
NixOS includes a {option}`system.stateVersion` option, used by some modules for a
|
||||
variety of reasons related to non-backward-compatible changes to software or
|
||||
the module itself.
|
||||
Module authors are discouraged from adding new uses of
|
||||
{option}`system.stateVersion` to their module.
|
||||
|
||||
However, when the alternatives are impractical, modules that wish to consume
|
||||
{option}`system.stateVersion` should instead define their own `stateRevision`
|
||||
option using `utils.mkStateRevisionOption`.
|
||||
There should be no uses of `config.system.stateVersion` directly in the module.
|
||||
|
||||
(Note the name difference: the {option}`system.stateVersion` option, with a V,
|
||||
takes a value that looks like "YY.MM".
|
||||
A `stateRevision` option, with an R, takes a non-negative integer value.)
|
||||
|
||||
Modules should also add the value of their `stateRevision` option to
|
||||
`system.moduleStateRevisions."your.module.stateRevision"`, when the module is
|
||||
enabled.
|
||||
This is a purely informative option that exists to help describe the effects of
|
||||
changing {option}`system.stateVersion`.
|
||||
|
||||
Example:
|
||||
|
||||
```nix
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
utils,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.services.whatever;
|
||||
in
|
||||
{
|
||||
options.services.whatever = {
|
||||
enable = lib.mkEnableOption "whatever, a service that does whatever";
|
||||
stateRevision = utils.mkStateRevisionOption {
|
||||
descriptionName = "the whatever service";
|
||||
migrations = {
|
||||
"26.05" = "Rename `/var/lib/old_name` to `/var/lib/new_name`.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
systemd.services.whatever = {
|
||||
# ...
|
||||
serviceConfig.StateDirectory = if cfg.stateRevision < 1 then "old_name" else "new_name";
|
||||
};
|
||||
|
||||
# Important: this is inside the `lib.mkIf cfg.enable`
|
||||
system.moduleStateRevisions."services.whatever.stateRevision" = cfg.stateRevision;
|
||||
};
|
||||
}
|
||||
```
|
||||
@@ -220,4 +220,5 @@ importing-modules.section.md
|
||||
replace-modules.section.md
|
||||
freeform-modules.section.md
|
||||
settings-options.section.md
|
||||
state-revision.section.md
|
||||
```
|
||||
|
||||
@@ -235,6 +235,9 @@
|
||||
"sec-override-nixos-test": [
|
||||
"index.html#sec-override-nixos-test"
|
||||
],
|
||||
"sec-state-revision": [
|
||||
"index.html#sec-state-revision"
|
||||
],
|
||||
"sec-wireless-declarative": [
|
||||
"index.html#sec-wireless-declarative"
|
||||
],
|
||||
|
||||
@@ -6,8 +6,10 @@
|
||||
|
||||
let
|
||||
inherit (lib)
|
||||
all
|
||||
any
|
||||
attrNames
|
||||
concatImapStringsSep
|
||||
concatMapStringsSep
|
||||
concatStringsSep
|
||||
elem
|
||||
@@ -27,8 +29,11 @@ let
|
||||
isList
|
||||
isPath
|
||||
isString
|
||||
length
|
||||
listToAttrs
|
||||
literalMD
|
||||
mapAttrs
|
||||
mkOption
|
||||
nameValuePair
|
||||
optionalString
|
||||
removePrefix
|
||||
@@ -36,8 +41,10 @@ let
|
||||
splitString
|
||||
stringToCharacters
|
||||
types
|
||||
versionOlder
|
||||
;
|
||||
|
||||
inherit (lib.lists) findFirstIndex;
|
||||
inherit (lib.strings) toJSON escapeC;
|
||||
in
|
||||
|
||||
@@ -604,6 +611,123 @@ let
|
||||
lib.listToAttrs
|
||||
];
|
||||
};
|
||||
|
||||
/**
|
||||
Creates a per-module `stateRevision` option that takes an int value, with a
|
||||
default that is derived from `system.stateVersion`.
|
||||
|
||||
# Inputs
|
||||
|
||||
`descriptionName`
|
||||
: A human-friendly name for your module, used for the description of the
|
||||
created option.
|
||||
|
||||
`migrations`
|
||||
: Attribute set that maps from values of `system.stateVersion`
|
||||
(representing the breakpoints at which the default value of this option
|
||||
will change) to Markdown instructions to users for manually migrating
|
||||
their data to this breakpoint. The migration instructions will be
|
||||
included in the NixOS documentation for this option. (These instructions
|
||||
must only contain Markdown inlines, because they will be rendered in a
|
||||
table. In particular, lists will not render correctly.)
|
||||
|
||||
`migrations` will also be exposed as an attribute on the result.
|
||||
|
||||
# Examples
|
||||
:::{.example}
|
||||
## `lib.options.mkStateRevisionOption` usage example
|
||||
|
||||
```nix
|
||||
exampleModule =
|
||||
{ lib, config, utils, ... }:
|
||||
{
|
||||
options.services.whatever = {
|
||||
stateRevision = utils.mkStateRevisionOption {
|
||||
descriptionName = "the whatever service";
|
||||
migrations = {
|
||||
"26.05" = "Rename `/var/lib/old_name` to `/var/lib/new_name`.";
|
||||
"26.11" = "Run the `upgrade_whatever` utility.";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
(pkgs.nixos [
|
||||
exampleModule
|
||||
{ system.stateVersion = "25.11"; }
|
||||
]).config.services.whatever.stateRevision # => 0
|
||||
(pkgs.nixos [
|
||||
exampleModule
|
||||
{ system.stateVersion = "26.05"; }
|
||||
]).config.services.whatever.stateRevision # => 1
|
||||
(pkgs.nixos [
|
||||
exampleModule
|
||||
{ system.stateVersion = "27.05"; }
|
||||
]).config.services.whatever.stateRevision # => 2
|
||||
```
|
||||
|
||||
:::
|
||||
|
||||
Modules should use this function when they change how data managed by the
|
||||
module is persisted on the system between NixOS releases.
|
||||
|
||||
The default value of the option will be the number of attributes in the
|
||||
`migrations` parameter with name less than or equal to the value of
|
||||
`system.stateVersion`.
|
||||
|
||||
When using this function, don't forget to add the option's value to
|
||||
`system.moduleStateRevisions."your.module.stateRevision"` when your module is
|
||||
enabled.
|
||||
*/
|
||||
mkStateRevisionOption =
|
||||
{
|
||||
descriptionName,
|
||||
migrations,
|
||||
}:
|
||||
let
|
||||
versions = attrNames migrations;
|
||||
maxVal = length versions;
|
||||
in
|
||||
assert all (v: builtins.match "[0-9]{2}\\.[0-9]{2}" v != null) versions;
|
||||
mkOption {
|
||||
type = types.ints.between 0 maxVal;
|
||||
description = ''
|
||||
This option versions the format of state persisted by
|
||||
${descriptionName}. Its default value depends on the value of
|
||||
{option}`system.stateVersion`.
|
||||
|
||||
Users who wish to increment this option will need to take manual
|
||||
migration steps to preserve their data. **If you perform these
|
||||
migrations, rolling back to an older generation will require also
|
||||
reversing the migrations to the state expected by that generation.**
|
||||
The migrations needed to advance to each value of this option are as
|
||||
follows (perform all instructions after the row for the current
|
||||
`stateRevision`, up to and including the row for the new
|
||||
`stateRevision`):
|
||||
|
||||
| `stateRevision` | Migration instructions |
|
||||
|-----------------|------------------------|
|
||||
| 0 | (none) |
|
||||
${concatImapStringsSep "\n" (
|
||||
v: sv: "| ${toString v} | ${replaceStrings [ "\n" ] [ " " ] migrations.${sv}} |"
|
||||
) versions}
|
||||
|
||||
Note that you do **not** need to change {option}`system.stateVersion`
|
||||
in order to update this option. {option}`system.stateVersion` only
|
||||
determines the default value of this option. Most users should not
|
||||
change {option}`system.stateVersion` at all.
|
||||
'';
|
||||
default = findFirstIndex (versionOlder config.system.stateVersion) maxVal versions;
|
||||
defaultText = literalMD ''
|
||||
If {option}`system.stateVersion` is:
|
||||
${concatImapStringsSep "\n" (v: sv: "* <${sv}: ${toString (v - 1)}") versions}
|
||||
* otherwise: ${toString maxVal}
|
||||
'';
|
||||
}
|
||||
// {
|
||||
inherit migrations;
|
||||
};
|
||||
};
|
||||
in
|
||||
utils
|
||||
|
||||
@@ -12,7 +12,7 @@ let
|
||||
in
|
||||
{
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ minijackson ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
options.xdg.portal.wlr = {
|
||||
|
||||
@@ -254,6 +254,30 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
moduleStateRevisions = mkOption {
|
||||
type =
|
||||
let
|
||||
baseType = types.attrsOf types.ints.unsigned;
|
||||
isStateRevisionOption = x: lib.isOption x && x ? migrations;
|
||||
in
|
||||
types.addCheck baseType (
|
||||
attrs:
|
||||
builtins.all (
|
||||
attrPath: isStateRevisionOption (lib.attrByPath (lib.splitString "." attrPath) null options)
|
||||
) (builtins.attrNames attrs)
|
||||
)
|
||||
// {
|
||||
description = "${baseType.description}, in which every attribute name is the path to an option created with mkStateRevisionOption";
|
||||
};
|
||||
default = { };
|
||||
internal = true;
|
||||
description = ''
|
||||
NixOS modules should set attributes on this option. Users should leave
|
||||
it alone. Future tooling may use it to determine the consequences of
|
||||
updating {option}`system.stateVersion`.
|
||||
'';
|
||||
};
|
||||
|
||||
configurationRevision = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
|
||||
@@ -357,6 +357,7 @@
|
||||
./programs/wayland/gtklock.nix
|
||||
./programs/wayland/hyprland.nix
|
||||
./programs/wayland/hyprlock.nix
|
||||
./programs/wayland/kanshi.nix
|
||||
./programs/wayland/labwc.nix
|
||||
./programs/wayland/mango.nix
|
||||
./programs/wayland/miracle-wm.nix
|
||||
|
||||
46
nixos/modules/programs/wayland/kanshi.nix
Normal file
46
nixos/modules/programs/wayland/kanshi.nix
Normal file
@@ -0,0 +1,46 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.services.kanshi;
|
||||
in
|
||||
{
|
||||
options.services.kanshi = {
|
||||
enable = lib.mkEnableOption "kanshi, a Wayland daemon that automatically configures outputs";
|
||||
package = lib.mkPackageOption pkgs "kanshi" { };
|
||||
systemd.target = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = ''
|
||||
The systemd target that will automatically start the Kanshi service.
|
||||
'';
|
||||
default = "graphical-session.target";
|
||||
};
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [ pkgs.kanshi ];
|
||||
|
||||
systemd.user.services.kanshi = {
|
||||
unitConfig = {
|
||||
Description = "Dynamic output configuration";
|
||||
Documentation = "man:kanshi(1)";
|
||||
ConditionEnvironment = "WAYLAND_DISPLAY";
|
||||
PartOf = cfg.systemd.target;
|
||||
Requires = cfg.systemd.target;
|
||||
After = cfg.systemd.target;
|
||||
};
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
ExecStart = "${lib.getExe cfg.package}";
|
||||
Restart = "always";
|
||||
};
|
||||
|
||||
wantedBy = [ cfg.systemd.target ];
|
||||
};
|
||||
};
|
||||
meta.maintainers = [ lib.maintainers.macaquinyho ];
|
||||
}
|
||||
@@ -2,13 +2,14 @@
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
utils,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.services.seerr;
|
||||
# 26.05 introduced a breaking change which is guarded behind stateVersion to avoid
|
||||
# breaking users.
|
||||
useNewConfigLocation = lib.versionAtLeast config.system.stateVersion "26.05";
|
||||
# 26.05 introduced a breaking change which is guarded behind stateRevision to
|
||||
# avoid breaking users.
|
||||
useNewConfigLocation = cfg.stateRevision >= 1;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
@@ -39,8 +40,23 @@ in
|
||||
configDir = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
default = if useNewConfigLocation then "/var/lib/seerr/" else "/var/lib/jellyseerr/config";
|
||||
defaultText = lib.literalMD "{file}`/var/lib/seerr` (or {file}`/var/lib/jellyseerr/config` if {option}`services.seerr.stateRevision` < 1)";
|
||||
description = "Config data directory";
|
||||
};
|
||||
|
||||
stateRevision = utils.mkStateRevisionOption {
|
||||
descriptionName = "Seerr";
|
||||
migrations = {
|
||||
"26.05" = ''
|
||||
Move {file}`/var/lib/private/jellyseerr/config` to
|
||||
{file}`/var/lib/private/seerr`, if you have not set
|
||||
{option}`services.seerr.configDir`. (If you have set
|
||||
{option}`services.seerr.configDir`, you should also have forced
|
||||
{option}`systemd.services.seerr.serviceConfig.StateDirectory`, and in
|
||||
that case `stateRevision` does not affect your configuration.)
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
@@ -81,5 +97,7 @@ in
|
||||
networking.firewall = lib.mkIf cfg.openFirewall {
|
||||
allowedTCPPorts = [ cfg.port ];
|
||||
};
|
||||
|
||||
system.moduleStateRevisions."services.seerr.stateRevision" = cfg.stateRevision;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -479,7 +479,6 @@ in
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
minijackson
|
||||
erictapen
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1057,6 +1057,7 @@ in
|
||||
modularService = pkgs.callPackage ../modules/system/service/systemd/test.nix {
|
||||
inherit evalSystem;
|
||||
};
|
||||
moduleStateRevisions = pkgs.callPackage ./moduleStateRevisions.nix { };
|
||||
molly-brown = runTest ./molly-brown.nix;
|
||||
mollysocket = runTest ./mollysocket.nix;
|
||||
monado = runTest ./monado.nix;
|
||||
@@ -1838,7 +1839,7 @@ in
|
||||
userborn-mutable-users = runTest ./userborn-mutable-users.nix;
|
||||
userborn-static = runTest ./userborn-static.nix;
|
||||
ustreamer = runTest ./ustreamer.nix;
|
||||
utils = import ./utils { inherit runTest; };
|
||||
utils = pkgs.callPackage ./utils { inherit runTest; };
|
||||
utmp = runTest ./utmp.nix;
|
||||
uwsgi = runTest ./uwsgi.nix;
|
||||
v2ray = runTest ./v2ray.nix;
|
||||
|
||||
@@ -8,7 +8,6 @@ in
|
||||
{
|
||||
name = "mobilizon";
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
minijackson
|
||||
erictapen
|
||||
];
|
||||
|
||||
|
||||
25
nixos/tests/moduleStateRevisions.nix
Normal file
25
nixos/tests/moduleStateRevisions.nix
Normal file
@@ -0,0 +1,25 @@
|
||||
{
|
||||
lib,
|
||||
emptyFile,
|
||||
nixos,
|
||||
}:
|
||||
let
|
||||
evalModuleStateRevisions =
|
||||
cfg:
|
||||
(nixos [
|
||||
{ system.stateVersion = lib.trivial.release; }
|
||||
cfg
|
||||
]).config.system.moduleStateRevisions;
|
||||
|
||||
# For modules that follow the <module>.enable, <module>.stateRevision pattern:
|
||||
testModule =
|
||||
path:
|
||||
evalModuleStateRevisions (lib.setAttrByPath path { enable = true; })
|
||||
? "${builtins.concatStringsSep "." path}.stateRevision";
|
||||
in
|
||||
assert evalModuleStateRevisions { } == { };
|
||||
assert testModule [
|
||||
"services"
|
||||
"seerr"
|
||||
];
|
||||
emptyFile
|
||||
@@ -132,13 +132,13 @@ let
|
||||
|
||||
# Login
|
||||
# Outputs 'Redirecting' if successful
|
||||
curl -sSfb session http://127.0.0.1:8000/login \
|
||||
curl -sSf -b session -c session http://127.0.0.1:8000/login \
|
||||
-F "_csrf_token=$csrf_token" \
|
||||
-F "username=user" \
|
||||
-F "password=password" | grep Redirecting
|
||||
|
||||
# Check that we are logged in, this redirects to /admin/setting/pdns if we are
|
||||
curl -sSfb session http://127.0.0.1:8000/dashboard/ | grep /admin/setting
|
||||
curl -sSf -b session -c session http://127.0.0.1:8000/dashboard/ | grep /admin/setting
|
||||
'';
|
||||
};
|
||||
unix = {
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
{ runTest }:
|
||||
{
|
||||
callPackage,
|
||||
runTest,
|
||||
}:
|
||||
|
||||
{
|
||||
genJqSecretsReplacement = runTest ./genJqSecretsReplacement.nix;
|
||||
mkStateRevisionOption = callPackage ./mkStateRevisionOption.nix { };
|
||||
}
|
||||
|
||||
39
nixos/tests/utils/mkStateRevisionOption.nix
Normal file
39
nixos/tests/utils/mkStateRevisionOption.nix
Normal file
@@ -0,0 +1,39 @@
|
||||
{
|
||||
emptyFile,
|
||||
nixos,
|
||||
}:
|
||||
let
|
||||
result = nixos (
|
||||
{ utils, ... }:
|
||||
{
|
||||
options = {
|
||||
stateRevision1 = utils.mkStateRevisionOption {
|
||||
descriptionName = "...";
|
||||
migrations = {
|
||||
"27.05" = "...";
|
||||
};
|
||||
};
|
||||
stateRevision2 = utils.mkStateRevisionOption {
|
||||
descriptionName = "...";
|
||||
migrations = {
|
||||
"26.11" = "...";
|
||||
};
|
||||
};
|
||||
stateRevision3 = utils.mkStateRevisionOption {
|
||||
descriptionName = "...";
|
||||
migrations = {
|
||||
"24.05" = "...";
|
||||
"27.05" = "...";
|
||||
};
|
||||
};
|
||||
};
|
||||
config.system.stateVersion = "26.11";
|
||||
}
|
||||
);
|
||||
inherit (result) config options;
|
||||
in
|
||||
assert config.stateRevision1 == 0;
|
||||
assert config.stateRevision2 == 1;
|
||||
assert config.stateRevision3 == 1;
|
||||
assert options.stateRevision1.migrations == { "27.05" = "..."; };
|
||||
emptyFile
|
||||
@@ -174,6 +174,13 @@ runCommand (lib.appendToName "with-packages" emacs).name
|
||||
;; "$out/share/emacs/site-lisp" is added to load-path in wrapper.sh
|
||||
;; "$out/share/emacs/native-lisp" is added to native-comp-eln-load-path in wrapper.sh
|
||||
(add-to-list 'exec-path "$out/bin")
|
||||
;; Also expose extra package binaries via PATH so that subprocesses
|
||||
;; which rebuild their environment from PATH (e.g. direnv/envrc) can
|
||||
;; still find them. See https://github.com/purcell/envrc/issues/9
|
||||
(let ((deps-bin "$out/bin")
|
||||
(current-path (or (getenv "PATH") "")))
|
||||
(unless (member deps-bin (split-string current-path path-separator))
|
||||
(setenv "PATH" (concat deps-bin path-separator current-path))))
|
||||
${lib.optionalString withTreeSitter ''
|
||||
(add-to-list 'treesit-extra-load-path "$out/lib/")
|
||||
''}
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
melpaBuild (finalAttrs: {
|
||||
|
||||
pname = "eaf-browser";
|
||||
version = "0-unstable-2025-06-14";
|
||||
version = "0-unstable-2025-06-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacs-eaf";
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
melpaBuild (finalAttrs: {
|
||||
|
||||
pname = "eaf-map";
|
||||
version = "0-unstable-2025-07-04";
|
||||
version = "0-unstable-2025-07-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacs-eaf";
|
||||
repo = "eaf-map";
|
||||
rev = "667865a9422ec71e3518833e1a13806d4f03adfb";
|
||||
hash = "sha256-UgHIzYu/K1NzTDvUn2JkEmiyDEBT9JDmlvp6xG7Nv5k=";
|
||||
rev = "8bec6ab7c1194491ffccbeeec45451d8dc6fb405";
|
||||
hash = "sha256-rwtC4CAOTNmR8sH6P4mKyON65yNYWMBYImQkBGZH0Qs=";
|
||||
};
|
||||
|
||||
env.npmDeps = fetchNpmDeps {
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
melpaBuild {
|
||||
|
||||
pname = "eaf-pyqterminal";
|
||||
version = "0-unstable-2025-05-05";
|
||||
version = "0-unstable-2025-10-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mumu-lhl";
|
||||
repo = "eaf-pyqterminal";
|
||||
rev = "db947f136660adc4c3883b332f4465af82e4c9da";
|
||||
hash = "sha256-0BH29XvBzJPgJBFSKHiKSLo/dpj5rixg7+u+LDpB5+U=";
|
||||
rev = "37b7b2afbdd47c89d85ff6e3412e1dc6c555ab50";
|
||||
hash = "sha256-+RVA+UM473eTPrsX3TpUrzPx8UY5gAgIkMl0CB/iBTw=";
|
||||
};
|
||||
|
||||
files = ''
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
melpaBuild {
|
||||
pname = "elpaca";
|
||||
version = "0-unstable-2025-02-16";
|
||||
version = "0-unstable-2025-11-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "progfolio";
|
||||
repo = "elpaca";
|
||||
rev = "07b3a653e2411f4d4b5902af1c9b3f159e07bec5";
|
||||
hash = "sha256-+YJX2BJxH3D5u7YC/yJskZu0F4Nlat3ZROe+RCZGq9w=";
|
||||
rev = "b5ef5f19ac1224853234c9acdac0ec9ea1c440a1";
|
||||
hash = "sha256-EZ9emYTweRZzMKxZu9nbAaGgE2tInaL7KCKvJ5TaD0g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ git ];
|
||||
|
||||
@@ -54,13 +54,13 @@ in
|
||||
melpaBuild (finalAttrs: {
|
||||
|
||||
pname = "eaf";
|
||||
version = "0-unstable-2025-08-22";
|
||||
version = "0-unstable-2025-08-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacs-eaf";
|
||||
repo = "emacs-application-framework";
|
||||
rev = "dc5f6e7fa21a15b5e05c7722c2b8f32158aeab82";
|
||||
hash = "sha256-wWC5Ma9p/k0GLcGpPn7NO0KqkIXmEbaQc7TJ2ImMIr4=";
|
||||
rev = "ada92215ad864c2d142feb6ad6e1127e90bce668";
|
||||
hash = "sha256-on+cIZW+lV+J4FwPq5HH2C6FPOHRq4+BU+e0shM1l4E=";
|
||||
};
|
||||
|
||||
packageRequires = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
melpaBuild {
|
||||
pname = "git-undo";
|
||||
version = "0-unstable-2022-08-07";
|
||||
version = "0-unstable-2025-09-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jwiegley";
|
||||
repo = "git-undo-el";
|
||||
rev = "3d9c95fc40a362eae4b88e20ee21212d234a9ee6";
|
||||
hash = "sha256-xwVCAdxnIRHrFNWvtlM3u6CShsUiGgl1CiBTsp2x7IM=";
|
||||
rev = "1e94d2dad39ffa168005dee182dde5694416d9c9";
|
||||
hash = "sha256-EppewewNPWVbQN76LVoebtKu+FOFCnWDhDeUognPmAo=";
|
||||
};
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
diff --git a/notdeft-xapian.el b/notdeft-xapian.el
|
||||
index e71ef3e..5fad501 100644
|
||||
--- a/notdeft-xapian.el
|
||||
+++ b/notdeft-xapian.el
|
||||
@@ -13,17 +13,7 @@
|
||||
|
||||
;;; Code:
|
||||
|
||||
-(defcustom notdeft-xapian-program
|
||||
- (let ((dir (expand-file-name
|
||||
- "xapian"
|
||||
- (file-name-directory
|
||||
- (locate-library "notdeft-xapian.el")))))
|
||||
- (when (and dir (file-directory-p dir))
|
||||
- (cl-some (lambda (cand)
|
||||
- (let ((exe (expand-file-name cand dir)))
|
||||
- (when (file-executable-p exe)
|
||||
- exe)))
|
||||
- '("notdeft-xapian" "notdeft-xapian.exe"))))
|
||||
+(defcustom notdeft-xapian-program "@notdeft-xapian@"
|
||||
"Xapian backend's executable program path.
|
||||
Specified as an absolute path. Must be set appropriately for the
|
||||
`notdeft-xapian' feature to be usable, on which much of NotDeft
|
||||
@@ -18,21 +18,23 @@
|
||||
|
||||
melpaBuild {
|
||||
pname = "notdeft";
|
||||
version = "0-unstable-2025-02-04";
|
||||
version = "0-unstable-2025-06-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hasu";
|
||||
repo = "notdeft";
|
||||
rev = "de2b6a7666e9e5010184966f89a04241f221afe3";
|
||||
hash = "sha256-B8aVRb8hyAKmHTTVCtDRcb2F0Rs5zhlqyfRe7IxH5jc=";
|
||||
rev = "e0426807f608f550df14b7cd50b8455dee4dbfb3";
|
||||
hash = "sha256-RB7KL04JNJ0d+wH9Q7aHCLYJHevy67XfXEyDxpjTbvg=";
|
||||
};
|
||||
|
||||
packageRequires = lib.optional withHydra hydra ++ lib.optional withIvy ivy;
|
||||
|
||||
patches = [
|
||||
./notdeft-xapian-program.diff
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace notdeft-xapian.el \
|
||||
--replace-fail 'defcustom notdeft-xapian-program nil' \
|
||||
"defcustom notdeft-xapian-program \"$out/bin/notdeft-xapian\""
|
||||
--replace-fail "@notdeft-xapian@" "$out/bin/notdeft-xapian"
|
||||
'';
|
||||
|
||||
files = ''
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
melpaBuild {
|
||||
pname = "straight";
|
||||
version = "0-unstable-2025-01-30";
|
||||
version = "0-unstable-2025-11-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radian-software";
|
||||
repo = "straight.el";
|
||||
rev = "44a866f28f3ded6bcd8bc79ddc73b8b5044de835";
|
||||
hash = "sha256-riKagjhCn5NyTerw1WqGOn37TZNfmhPb7DS49TXw1CA=";
|
||||
rev = "4b6289f42a4da0c1bae694ba918b43c72daf0330";
|
||||
hash = "sha256-FlGo+Nl6n+xSwQSIrMHJa7tu+MjLG2Ldxf7poJCz4Nc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ git ];
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
melpaBuild,
|
||||
fetchFromGitHub,
|
||||
unstableGitUpdater,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
melpaBuild {
|
||||
@@ -16,7 +16,7 @@ melpaBuild {
|
||||
hash = "sha256-jV5V3TRY+D3cPSz3yFwVWn9yInhGOYIaUTPEhsOBxto=";
|
||||
};
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/devonsparks/wat-mode";
|
||||
|
||||
@@ -50,6 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
mainProgram = "gnvim";
|
||||
homepage = "https://github.com/vhakulinen/gnvim";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ minijackson ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -9464,6 +9464,20 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
lualine-so-fancy-nvim = buildVimPlugin {
|
||||
pname = "lualine-so-fancy.nvim";
|
||||
version = "0-unstable-2025-01-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "meuter";
|
||||
repo = "lualine-so-fancy.nvim";
|
||||
rev = "6ba7b138f2ca435673eb04c2cf85f0757df69b07";
|
||||
hash = "sha256-Ctdt8kCG+4ynpfEHpvUhFQpbhcaLg0hoPX+yPkUQGS0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/meuter/lualine-so-fancy.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
luasnip-latex-snippets-nvim = buildVimPlugin {
|
||||
pname = "luasnip-latex-snippets.nvim";
|
||||
version = "1.0.1-unstable-2025-04-22";
|
||||
@@ -9815,6 +9829,20 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
md-table-tidy-nvim = buildVimPlugin {
|
||||
pname = "md-table-tidy.nvim";
|
||||
version = "0-unstable-2026-02-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "timantipov";
|
||||
repo = "md-table-tidy.nvim";
|
||||
rev = "e094d694e9ca97908fe311145b36664556e7c3c2";
|
||||
hash = "sha256-vrsUk8VaivL7ZDTArJ7RkW4nW+Rl2o/FcaKH/NUfW+8=";
|
||||
};
|
||||
meta.homepage = "https://github.com/timantipov/md-table-tidy.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
mediawiki-vim = buildVimPlugin {
|
||||
pname = "mediawiki.vim";
|
||||
version = "0.2-unstable-2015-11-15";
|
||||
@@ -13815,6 +13843,20 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
nvim-toggler = buildVimPlugin {
|
||||
pname = "nvim-toggler";
|
||||
version = "0.3.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nguyenvukhang";
|
||||
repo = "nvim-toggler";
|
||||
tag = "v0.3.1";
|
||||
hash = "sha256-6X+m7FeylME0J9hLx45bDqKvHxup3d+Hpa31VESKhrs=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nguyenvukhang/nvim-toggler/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
nvim-tree-lua = buildVimPlugin {
|
||||
pname = "nvim-tree.lua";
|
||||
version = "1.18.0";
|
||||
|
||||
@@ -2419,6 +2419,10 @@ assertNoAdditions {
|
||||
dependencies = [ self.lualine-nvim ];
|
||||
};
|
||||
|
||||
lualine-so-fancy-nvim = super.lualine-so-fancy-nvim.overrideAttrs {
|
||||
dependencies = [ self.lualine-nvim ];
|
||||
};
|
||||
|
||||
luasnip-latex-snippets-nvim = super.luasnip-latex-snippets-nvim.overrideAttrs {
|
||||
dependencies = [ self.luasnip ];
|
||||
# E5108: /luasnip-latex-snippets/luasnippets/tex/utils/init.lua:3: module 'luasnip-latex-snippets.luasnippets.utils.conditions' not found:
|
||||
|
||||
@@ -674,6 +674,7 @@ https://github.com/nvimdev/lspsaga.nvim/,,
|
||||
https://github.com/barreiroleo/ltex_extra.nvim/,,
|
||||
https://github.com/nvim-java/lua-async/,,
|
||||
https://github.com/arkav/lualine-lsp-progress/,,
|
||||
https://github.com/meuter/lualine-so-fancy.nvim/,,
|
||||
https://github.com/evesdropper/luasnip-latex-snippets.nvim/,,
|
||||
https://github.com/alvarosevilla95/luatab.nvim/,,
|
||||
https://github.com/lopi-py/luau-lsp.nvim/,,
|
||||
@@ -699,6 +700,7 @@ https://github.com/kaicataldo/material.vim/,,
|
||||
https://github.com/mattn/calendar-vim/,,mattn-calendar-vim
|
||||
https://github.com/vim-scripts/mayansmoke/,,
|
||||
https://github.com/ravitemer/mcphub.nvim/,,
|
||||
https://github.com/timantipov/md-table-tidy.nvim/,,
|
||||
https://github.com/chikamichi/mediawiki.vim/,,
|
||||
https://github.com/savq/melange-nvim/,,
|
||||
https://github.com/mellow-theme/mellow.nvim/,,
|
||||
@@ -985,6 +987,7 @@ https://github.com/svermeulen/nvim-teal-maker/,,
|
||||
https://github.com/norcalli/nvim-terminal.lua/,,
|
||||
https://github.com/klen/nvim-test/,,
|
||||
https://github.com/chrisgrieser/nvim-tinygit/,,
|
||||
https://github.com/nguyenvukhang/nvim-toggler/,,
|
||||
https://github.com/nvim-tree/nvim-tree.lua/,,
|
||||
https://github.com/nvim-treesitter/nvim-treesitter/,,
|
||||
https://github.com/nvim-treesitter/nvim-treesitter-context/,,
|
||||
|
||||
@@ -34,16 +34,16 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-fWrT06eKxFUcFGMfeNfgPIUoKrUFw86LG8BOAfr+iOo=";
|
||||
aarch64-linux = "sha256-CzQScd1qm4YzqXMkeWqPWCKKWtwmKQ5AsokPy/lmowA=";
|
||||
aarch64-darwin = "sha256-bhbMscqsOU2ux4i2XShdMKgJPN8tuWVSxTzJ0CUvJNM=";
|
||||
armv7l-linux = "sha256-Q84Iac2PEr9pfTtUZPgnrDpdWxl/QCf6FTquw0MJL5I=";
|
||||
x86_64-linux = "sha256-rNrw+lV72hcglW/2XKDeCWXpLWj5fi2yI0GYRACTeu0=";
|
||||
aarch64-linux = "sha256-ID4JWcseHwRulwpYs/32CcOtXs073CLNYhMy7ZRbcHk=";
|
||||
aarch64-darwin = "sha256-j1h03B/uYvJBU6GppfTD8Qu8wo/56KBPyfTNy22dD24=";
|
||||
armv7l-linux = "sha256-gw9Lix8K6/U13+tDQcIUVf0xw5yxkKdR0GE9bTNx17w=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.130.0";
|
||||
version = "1.132.0";
|
||||
|
||||
# The update server (update.code.visualstudio.com) expects the version path
|
||||
# segment in X.Y.Z form, so we normalize X.Y to X.Y.0 (e.g. "1.110" → "1.110.0").
|
||||
@@ -51,7 +51,7 @@ let
|
||||
downloadVersion = lib.versions.pad 3 version;
|
||||
|
||||
# This is used for VS Code - Remote SSH test
|
||||
rev = "1b6a188127eeaf9194f945eb6eb89a657e93c54c";
|
||||
rev = "df53daabb18cd157bdb08c7f01c34df936cf12f4";
|
||||
in
|
||||
buildVscode {
|
||||
pname = "vscode" + lib.optionalString isInsiders "-insiders";
|
||||
@@ -84,7 +84,7 @@ buildVscode {
|
||||
src = fetchurl {
|
||||
name = "vscode-server-${rev}.tar.gz";
|
||||
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
|
||||
hash = "sha256-ogtXQGE9/8xQYvN/juDglu6wkHJzYyL8wetF8sWnqd8=";
|
||||
hash = "sha256-rfWBY2apqMQwdF+W/Xg99w52BqNTEZmarFO3CyV668A=";
|
||||
};
|
||||
stdenv = stdenvNoCC;
|
||||
};
|
||||
|
||||
@@ -838,7 +838,7 @@
|
||||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "151.0.7922.75",
|
||||
"version": "151.0.7922.108",
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
"rev": "94e89b10b92cc9d6e58fc8d1b6474b7d29e8a114",
|
||||
@@ -850,16 +850,16 @@
|
||||
"hash": "sha256-T2LdISIkp8fcUli5ZetTqrESBAc7coJhWdJv7I+o9kk="
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "151.0.7922.75-1",
|
||||
"hash": "sha256-zpW7AGN9VrdlNg+q6BzwN3XW2TACQ07i2IwodSEi3CQ="
|
||||
"rev": "151.0.7922.108-1",
|
||||
"hash": "sha256-EhnX4fkuKTTIF6wztKWitrjNzKUf36fAnr7lUkJqJtQ="
|
||||
},
|
||||
"npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg="
|
||||
},
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "1ddc0a2003eb30c3990568d74ed0437451e9c374",
|
||||
"hash": "sha256-QKVYipzVK/TUVdI4k8LLNmmhwAR6xP/Bgc1ZmNjySjo=",
|
||||
"rev": "4744b886309d987d292e43232776d2206cccb13d",
|
||||
"hash": "sha256-1i2IAA5sXyMPBzh6xOIY3CllEDtIS9Buk8Z2Vm1JnYw=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
@@ -929,8 +929,8 @@
|
||||
},
|
||||
"src/third_party/angle": {
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git",
|
||||
"rev": "392ccfac4cdbaa282d50d6db2fba742c6b91fb55",
|
||||
"hash": "sha256-D9bOXnU1B1fwQySWS1tah5gT/6n6urjbVE5ydvAsim8="
|
||||
"rev": "a17d5224d83f6018eb6a21a644ad9ef86eac475d",
|
||||
"hash": "sha256-oXjtHByC3KrLgG3by6OdvID4ViM+2AnSft+fcspbNG0="
|
||||
},
|
||||
"src/third_party/angle/third_party/glmark2/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
|
||||
@@ -1044,8 +1044,8 @@
|
||||
},
|
||||
"src/third_party/catapult": {
|
||||
"url": "https://chromium.googlesource.com/catapult.git",
|
||||
"rev": "6146421e05bbedf9d9f0fe94f16afdbfb6b8fef1",
|
||||
"hash": "sha256-AYJGyPKCz0SzAYEX2k8B7sMQugBfmmv3IELpuxT0/4U="
|
||||
"rev": "c7282e69291240dbee993364a340934982443334",
|
||||
"hash": "sha256-kYmzjsjMDj96QBwpvZagsqsibouMx/q3UkuMFJd1jt4="
|
||||
},
|
||||
"src/third_party/ced/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
|
||||
@@ -1099,8 +1099,8 @@
|
||||
},
|
||||
"src/third_party/devtools-frontend/src": {
|
||||
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
|
||||
"rev": "deb254e98496516b3d0bca323ffa49f7b08aec42",
|
||||
"hash": "sha256-yjOrjHNRw6VphX6TLJryYoo3/9vOKMUsyStSUElPTes="
|
||||
"rev": "3edf00b60c60c9248990a39a702ca4882809fe06",
|
||||
"hash": "sha256-14qm+rI536GCqNkd9umSpJ9JoXf/47wuknJsVUb3ty0="
|
||||
},
|
||||
"src/third_party/dom_distiller_js/dist": {
|
||||
"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
|
||||
@@ -1419,8 +1419,8 @@
|
||||
},
|
||||
"src/third_party/openh264/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/cisco/openh264",
|
||||
"rev": "652bdb7719f30b52b08e506645a7322ff1b2cc6f",
|
||||
"hash": "sha256-tf0lnxATCkoq+xRti6gK6J47HwioAYWnpEsLGSA5Xdg="
|
||||
"rev": "fca40fc19f5fb854609d297ae4bde71df72787c9",
|
||||
"hash": "sha256-KMn8T8jCs4tdsmrU/fEBd0IWnBdD702x9JdJ0p98ZGk="
|
||||
},
|
||||
"src/third_party/openscreen/src": {
|
||||
"url": "https://chromium.googlesource.com/openscreen",
|
||||
@@ -1494,8 +1494,8 @@
|
||||
},
|
||||
"src/third_party/skia": {
|
||||
"url": "https://skia.googlesource.com/skia.git",
|
||||
"rev": "f4eee5c6735d33a829ab2cfbf3fe23d0376e7992",
|
||||
"hash": "sha256-UKewcYGGJrWA+ZJAp5TA3gGQpns+/5L6PlFxpEHWfG8="
|
||||
"rev": "86bb2f25f46f4d620b4a26e738f59a9b6c22d2eb",
|
||||
"hash": "sha256-tnUcFuwWtw0uGNIsU38M54V1MAYFs7/2yjP9Cs1fEHo="
|
||||
},
|
||||
"src/third_party/smhasher/src": {
|
||||
"url": "https://chromium.googlesource.com/external/smhasher.git",
|
||||
@@ -1664,8 +1664,8 @@
|
||||
},
|
||||
"src/v8": {
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git",
|
||||
"rev": "792d9716fea48312ad7ce4413c538e00628b1d50",
|
||||
"hash": "sha256-oOJU+FgNSkvNarn24OFQAhXXmdH8MHAMw/Y9mfRnW4A="
|
||||
"rev": "20ad8d002c17ccc7ccfbefc6c4dcf1242fe80921",
|
||||
"hash": "sha256-J2dblSPMoZTpotDpuPp6beRYv+KtCirqNxEGEQKpqcQ="
|
||||
},
|
||||
"src/agents/shared": {
|
||||
"url": "https://chromium.googlesource.com/chromium/agents.git",
|
||||
|
||||
@@ -101,11 +101,11 @@
|
||||
"vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM="
|
||||
},
|
||||
"baidubce_baiducloud": {
|
||||
"hash": "sha256-vSEPf0r7R5anuaTsAJFIx0GPTtrSKbRqqZoQA67Q2C0=",
|
||||
"hash": "sha256-udlTXCEvvd6rbjIC1SlN/183ngs0ntb4Pgb1QqCC/S0=",
|
||||
"homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
|
||||
"owner": "baidubce",
|
||||
"repo": "terraform-provider-baiducloud",
|
||||
"rev": "v1.23.5",
|
||||
"rev": "v1.23.6",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -382,13 +382,13 @@
|
||||
"vendorHash": "sha256-y9GRTuoh1X6GfGkGZbPpO500y8DoJS1dnwZL3BCTUcY="
|
||||
},
|
||||
"equinix_equinix": {
|
||||
"hash": "sha256-Tn8CnLx2ibkj7qlzpYCX7Cm+yoTcZujVELMJSbG+/ec=",
|
||||
"hash": "sha256-HwPjxVWIqWxpdIElMgDmOUx7KXr5VEwLVNbTLeEgRRo=",
|
||||
"homepage": "https://registry.terraform.io/providers/equinix/equinix",
|
||||
"owner": "equinix",
|
||||
"repo": "terraform-provider-equinix",
|
||||
"rev": "v4.15.0",
|
||||
"rev": "v5.1.0",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-WFlKj1IO9ylXn5frdnLcctQawjUXBTqcoMhQUQTU06A="
|
||||
"vendorHash": "sha256-8v7+xVF/X9q7VmjQD4azGIggWpgPGuoNSWetsbKN7LA="
|
||||
},
|
||||
"exoscale_exoscale": {
|
||||
"hash": "sha256-QIYIqJI/xznbkqR8E8R2LwF15M6ZdEntQ8JtdIwZypM=",
|
||||
@@ -580,11 +580,11 @@
|
||||
"vendorHash": "sha256-sPQR+LDZRMXygLUd9xj6/bI+8DhAPKbkytlTzmrEOBU="
|
||||
},
|
||||
"hashicorp_google": {
|
||||
"hash": "sha256-GmScfhjCEtVb9QVMoAUMOusBUknnbImtgtDlqdkWsEA=",
|
||||
"hash": "sha256-rKwsETOAtmzID3FqtI5CJ1CO+YgL8uL9PwyuV0hZuHc=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-google",
|
||||
"rev": "v7.42.0",
|
||||
"rev": "v7.43.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-neR/S8EYCwQky1U6EfMjmyCVJPqhckhqdc9As2Nsn1I="
|
||||
},
|
||||
|
||||
@@ -21,6 +21,11 @@ let
|
||||
getName = package: package.name or "unknown";
|
||||
getVersion = package: package.version or "0.0.0";
|
||||
|
||||
isDistTag =
|
||||
constraint:
|
||||
match "[a-zA-Z][a-zA-Z0-9._-]*" constraint != null
|
||||
&& match "[vxX][0-9xX.].*|[xX]" constraint == null;
|
||||
|
||||
# Fetch a module from package-lock.json -> packages
|
||||
fetchModule =
|
||||
{
|
||||
@@ -108,8 +113,8 @@ lib.fix (self: {
|
||||
# Substitute the constraint with the version of the dependency from the top-level of package-lock.
|
||||
if
|
||||
(
|
||||
# if the version is `latest`
|
||||
version == "latest"
|
||||
# if the version is a dist tag
|
||||
isDistTag version
|
||||
||
|
||||
# Or if it's a github reference
|
||||
matchGitHubReference version != null
|
||||
|
||||
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
|
||||
saturation and gamma levels of the image by analization.
|
||||
|
||||
This can be a solution for those kind of users who are not able to manage
|
||||
and correct images with complicated graphical softwares, or just simply
|
||||
and correct images with complicated graphical software, or just simply
|
||||
don't intend to spend a lot of time with manually correcting the images
|
||||
one-by-one.
|
||||
'';
|
||||
|
||||
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
# We don't need -fno-strict-overflow because it will break UBSanitize's overflow check especially when the operation number is static definded.
|
||||
# We don't need -fno-strict-overflow because it will break UBSanitize's overflow check especially when the operation number is static defined.
|
||||
hardeningDisable = [ "strictoverflow" ];
|
||||
|
||||
env = {
|
||||
|
||||
@@ -126,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
propagatedBuildInputs =
|
||||
lib.optional mpiSupport mpi
|
||||
# create meta package providing dist-info for python3Pacakges.adios2
|
||||
# create meta package providing dist-info for python3Packages.adios2
|
||||
++ lib.optional pythonSupport (
|
||||
python3Packages.mkPythonMetaPackage {
|
||||
inherit (finalAttrs) pname version meta;
|
||||
|
||||
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
|
||||
# Required gio-unix dependency is missing in meson.build
|
||||
./add-gio-unix-dep.patch
|
||||
|
||||
# Patch custon Dex install dir
|
||||
# Patch custom Dex install dir
|
||||
./configure-dex-install-dir.patch
|
||||
];
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ let
|
||||
# We don't really want to use openjdk8 because it's unusable on HiDPI
|
||||
# and people are more likely to have a modern OpenJDK installed.
|
||||
# We use Maven to resolve these unbundled dependencies.
|
||||
# jdk_headless is just overriden so we don't have to fetch another OpenJDK for no reason.
|
||||
# jdk_headless is just overridden so we don't have to fetch another OpenJDK for no reason.
|
||||
soapDeps = (maven.override { jdk_headless = jre; }).buildMavenPackage {
|
||||
pname = "anyk-soap-deps";
|
||||
version = "1.0.0";
|
||||
|
||||
@@ -1,9 +1,12 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
python3Packages,
|
||||
cudaSupport ? config.cudaSupport,
|
||||
cudaPackages,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
@@ -25,9 +28,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
]
|
||||
++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
|
||||
|
||||
buildInputs = [ opencv4WithGtk ];
|
||||
buildInputs = [ opencv4WithGtk ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ];
|
||||
|
||||
cmakeFlags = [ (lib.cmakeBool "BUILD_EXAMPLES" true) ];
|
||||
|
||||
|
||||
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
env = {
|
||||
# UTF-8 locale for translation generation
|
||||
LANG = "C.UTF8";
|
||||
# accomodate #include <qt6/poppler-qt6.h>…
|
||||
# accommodate #include <qt6/poppler-qt6.h>…
|
||||
NIX_CFLAGS_COMPILE = "-I${qt6Packages.poppler.dev}/include/poppler";
|
||||
};
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Do not hardocde addr2line binary path
|
||||
# Do not hardcode addr2line binary path
|
||||
./no-hardcode-path-addr2line.patch
|
||||
./remove-wolfssljni.patch
|
||||
];
|
||||
|
||||
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Apple Studio Display brightness controll";
|
||||
description = "Apple Studio Display brightness control";
|
||||
mainProgram = "asdbctl";
|
||||
homepage = "https://github.com/juliuszint/asdbctl";
|
||||
changelog = "https://github.com/juliuszint/asdbctl/releases/tag/${finalAttrs.version}";
|
||||
|
||||
@@ -18,9 +18,13 @@
|
||||
icoutils,
|
||||
bintools,
|
||||
fixDarwinDylibNames,
|
||||
autoSignDarwinBinariesHook,
|
||||
darwin,
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
in
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "avalonia-ilspy";
|
||||
version = "7.2-rc";
|
||||
@@ -38,7 +38,7 @@
|
||||
xcbutilxrm,
|
||||
hicolor-icon-theme,
|
||||
asciidoctor,
|
||||
fontsConf,
|
||||
texFunctions,
|
||||
gtk3Support ? false,
|
||||
gtk3 ? null,
|
||||
}:
|
||||
@@ -51,6 +51,8 @@ let
|
||||
ps.lgi
|
||||
ps.ldoc
|
||||
]);
|
||||
|
||||
inherit (texFunctions) fontsConf;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -116,7 +118,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
propagatedUserEnvPkgs = [ hicolor-icon-theme ];
|
||||
buildInputs = [
|
||||
cairo
|
||||
(cairo.override { xcbSupport = true; })
|
||||
librsvg
|
||||
dbus
|
||||
gdk-pixbuf
|
||||
@@ -50,9 +50,9 @@
|
||||
},
|
||||
"aks-preview": {
|
||||
"pname": "aks-preview",
|
||||
"version": "21.0.0b8",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-21.0.0b8-py2.py3-none-any.whl",
|
||||
"hash": "sha256-qjmGi1RBxlmvwR0GnvQr1I272G0lcFinbftVLcJ0h2M=",
|
||||
"version": "21.0.0b13",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-21.0.0b13-py2.py3-none-any.whl",
|
||||
"hash": "sha256-l1LEKBmdG1mPynTYDqkCQxHhBgaFwXa8YYkire1M/Vw=",
|
||||
"description": "Provides a preview for upcoming AKS features"
|
||||
},
|
||||
"alb": {
|
||||
@@ -92,9 +92,9 @@
|
||||
},
|
||||
"appnet-preview": {
|
||||
"pname": "appnet-preview",
|
||||
"version": "1.0.0b2",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/appnet_preview-1.0.0b2-py3-none-any.whl",
|
||||
"hash": "sha256-JGt61AOwZxk4oxZh4ohktQQH73cBnuHyHwvreev+xH0=",
|
||||
"version": "1.0.0b3",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/appnet_preview-1.0.0b3-py3-none-any.whl",
|
||||
"hash": "sha256-2aretbpSZKQCLbTNuYtl83Ws/C0kLzocx4imjB652c8=",
|
||||
"description": "Azure CLI commands for working with Azure Kubernetes Application Network resources"
|
||||
},
|
||||
"arcgateway": {
|
||||
@@ -155,9 +155,9 @@
|
||||
},
|
||||
"azure-firewall": {
|
||||
"pname": "azure-firewall",
|
||||
"version": "2.2.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-2.2.0-py2.py3-none-any.whl",
|
||||
"hash": "sha256-f1ZxkLZVI4+kzUmwOnY8hMaR/nuxqnLM92xlLQG3rIw=",
|
||||
"version": "2.2.1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-2.2.1-py2.py3-none-any.whl",
|
||||
"hash": "sha256-q4ai0UErqKI97A8OZ4/JkuT1QLOKa36rYZPItiu1r9s=",
|
||||
"description": "Manage Azure Firewall resources"
|
||||
},
|
||||
"azurelargeinstance": {
|
||||
@@ -204,9 +204,9 @@
|
||||
},
|
||||
"cdn": {
|
||||
"pname": "cdn",
|
||||
"version": "1.0.0b1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/cdn-1.0.0b1-py2.py3-none-any.whl",
|
||||
"hash": "sha256-YybIrCjZnZQ0IFgOZbm4JfMnXNC/Sah8YaZuss1M5B4=",
|
||||
"version": "1.0.0b2",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/cdn-1.0.0b2-py2.py3-none-any.whl",
|
||||
"hash": "sha256-Dt39rt65jcU6tV9Oo8cwL74xosYFP2o791v83n6QbfM=",
|
||||
"description": "Microsoft Azure Command-Line Tools CDN and AFD Extension"
|
||||
},
|
||||
"change-analysis": {
|
||||
@@ -267,9 +267,9 @@
|
||||
},
|
||||
"connectedmachine": {
|
||||
"pname": "connectedmachine",
|
||||
"version": "2.0.0b2",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-2.0.0b2-py3-none-any.whl",
|
||||
"hash": "sha256-LZfsPWODjBB6i3Z/oAGquxlRCS8NKxkp2W3K4j+n9XQ=",
|
||||
"version": "3.0.0b1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-3.0.0b1-py3-none-any.whl",
|
||||
"hash": "sha256-IKu0T6vo2F5q2phXb+WkV98iQKPMxFbdvhX7cKyZpaU=",
|
||||
"description": "Microsoft Azure Command-Line Tools ConnectedMachine Extension"
|
||||
},
|
||||
"connectedvmware": {
|
||||
@@ -330,9 +330,9 @@
|
||||
},
|
||||
"datadog": {
|
||||
"pname": "datadog",
|
||||
"version": "3.0.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/datadog-3.0.0-py3-none-any.whl",
|
||||
"hash": "sha256-va/om8UaRL+oqYSjNK34UuBlwfH7TyTLCcODzAwh2Og=",
|
||||
"version": "3.1.0b1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/datadog-3.1.0b1-py3-none-any.whl",
|
||||
"hash": "sha256-fULYTfzTLCMVvGn3BzoU1rQ6yepMql5b6tYQduHqj3Y=",
|
||||
"description": "Microsoft Azure Command-Line Tools Datadog Extension"
|
||||
},
|
||||
"datafactory": {
|
||||
@@ -405,6 +405,13 @@
|
||||
"hash": "sha256-bdtqIfedTken/0rh+2F/MhdDtl1+mshQFXUX2/2ejpA=",
|
||||
"description": "Microsoft Azure Command-Line Tools DevCenter Extension"
|
||||
},
|
||||
"discovery": {
|
||||
"pname": "discovery",
|
||||
"version": "1.0.1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/discovery-1.0.1-py3-none-any.whl",
|
||||
"hash": "sha256-meLITo7gB1iIs0T08vDuJaGo263eUbEXdeeYV83EFaM=",
|
||||
"description": "Commands for managing Microsoft Discovery resources including bookshelves, workspaces, supercomputers, and tools"
|
||||
},
|
||||
"diskpool": {
|
||||
"pname": "diskpool",
|
||||
"version": "0.2.0",
|
||||
@@ -433,6 +440,13 @@
|
||||
"hash": "sha256-4Jaf0p22SygVmg722FOp4dkqHKlxYFoBRlvE05gmvEQ=",
|
||||
"description": "Microsoft Azure Command-Line Tools DnsResolverManagementClient Extension"
|
||||
},
|
||||
"documentdb": {
|
||||
"pname": "documentdb",
|
||||
"version": "1.0.0b1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/documentdb-1.0.0b1-py3-none-any.whl",
|
||||
"hash": "sha256-0ZbE9sj2y12PfLmkTb6H+4d/Qp86GWDuwEpacwKo9BE=",
|
||||
"description": "Microsoft Azure Command-Line Tools Documentdb Extension"
|
||||
},
|
||||
"durabletask": {
|
||||
"pname": "durabletask",
|
||||
"version": "1.0.0b8",
|
||||
@@ -512,9 +526,9 @@
|
||||
},
|
||||
"fleet": {
|
||||
"pname": "fleet",
|
||||
"version": "1.10.1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-1.10.1-py3-none-any.whl",
|
||||
"hash": "sha256-MEtlIj9z69GM/vktWbethZEr6hXyBpH310PT9A5Rtk8=",
|
||||
"version": "1.11.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-1.11.0-py3-none-any.whl",
|
||||
"hash": "sha256-RiwOFbhVsswEVMTaaXh5b/lumftpOITd5cBrWIEJsLg=",
|
||||
"description": "Microsoft Azure Command-Line Tools Fleet Extension"
|
||||
},
|
||||
"fluid-relay": {
|
||||
@@ -603,9 +617,9 @@
|
||||
},
|
||||
"horizondb": {
|
||||
"pname": "horizondb",
|
||||
"version": "1.0.0b4",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/horizondb-1.0.0b4-py2.py3-none-any.whl",
|
||||
"hash": "sha256-2p6sKyNhoBsrwneo7TUwr+MyE/6fhTxFP9apfqexP7Q=",
|
||||
"version": "1.0.0b7",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/horizondb-1.0.0b7-py2.py3-none-any.whl",
|
||||
"hash": "sha256-h+Smm4Pou2vZB/9EFOA/xtAZLYSMUCeiy/K34RKrBig=",
|
||||
"description": "Microsoft Azure Command-Line Tools HorizonDB Extension"
|
||||
},
|
||||
"hpc-cache": {
|
||||
@@ -764,9 +778,9 @@
|
||||
},
|
||||
"migrate": {
|
||||
"pname": "migrate",
|
||||
"version": "3.0.0b4",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/migrate-3.0.0b4-py3-none-any.whl",
|
||||
"hash": "sha256-4icsf1zk6OUrAgG+P+kdaG3POHnman6dmppwdGzRQzQ=",
|
||||
"version": "3.0.0b5",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/migrate-3.0.0b5-py3-none-any.whl",
|
||||
"hash": "sha256-ZQAUxctPWu/2a5vqiF2WjcpeYRgO8EP6FGkcs7AgCgs=",
|
||||
"description": "Support for Azure Migrate preview"
|
||||
},
|
||||
"mixed-reality": {
|
||||
@@ -820,10 +834,10 @@
|
||||
},
|
||||
"networkcloud": {
|
||||
"pname": "networkcloud",
|
||||
"version": "5.0.0b2",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-5.0.0b2-py3-none-any.whl",
|
||||
"hash": "sha256-npgLkxwwn3FL7w4q5bpUq2Gghuy/4zsmikW7qs86Fe0=",
|
||||
"description": "Support for Azure Operator Nexus network cloud commands based on 2026-05-01-preview API version"
|
||||
"version": "5.0.1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-5.0.1-py3-none-any.whl",
|
||||
"hash": "sha256-B4g+5HIRv8hco7p1w78GlL+5gfwKlGO2USX3jUcogdE=",
|
||||
"description": "Support for Azure Operator Nexus network cloud commands based on 2026-07-01 API version"
|
||||
},
|
||||
"new-relic": {
|
||||
"pname": "new-relic",
|
||||
@@ -869,9 +883,9 @@
|
||||
},
|
||||
"oracle-database": {
|
||||
"pname": "oracle-database",
|
||||
"version": "2.0.3",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/oracle_database-2.0.3-py3-none-any.whl",
|
||||
"hash": "sha256-Qd9WtF7opKFbotazhgJsCb6CdGO/xQ1/5De+LcIaAiY=",
|
||||
"version": "2.0.5",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/oracle_database-2.0.5-py3-none-any.whl",
|
||||
"hash": "sha256-SkmNXFR9HzH8LkClMHVNfN4IqGf/c+/DTb2JG9lpyXU=",
|
||||
"description": "Microsoft Azure Command-Line Tools OracleDatabase Extension"
|
||||
},
|
||||
"orbital": {
|
||||
@@ -939,9 +953,9 @@
|
||||
},
|
||||
"quantum": {
|
||||
"pname": "quantum",
|
||||
"version": "1.0.0b16",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/quantum-1.0.0b16-py3-none-any.whl",
|
||||
"hash": "sha256-hhDQzA4jtmPyLbd703EYDCmBDjJS2rBTj7Qgx4T4dxQ=",
|
||||
"version": "1.0.0b20",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/quantum-1.0.0b20-py3-none-any.whl",
|
||||
"hash": "sha256-VdNEwbLC4flcGdezhOc+y2YfUm5VA8LzVGXBTfT3WiE=",
|
||||
"description": "Microsoft Azure Command-Line Tools Quantum Extension"
|
||||
},
|
||||
"qumulo": {
|
||||
@@ -1100,9 +1114,9 @@
|
||||
},
|
||||
"storage-mover": {
|
||||
"pname": "storage-mover",
|
||||
"version": "1.3.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_mover-1.3.0-py3-none-any.whl",
|
||||
"hash": "sha256-gPJWrRTS7q4cig11lCpnueSzO/EqjW++YW3yqa/U3oA=",
|
||||
"version": "1.3.1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_mover-1.3.1-py3-none-any.whl",
|
||||
"hash": "sha256-XtFAhouEZH9bGjUY6Hgm+aw5OQrzYUpgoEggcAZxNgA=",
|
||||
"description": "Microsoft Azure Command-Line Tools StorageMover Extension"
|
||||
},
|
||||
"storagesync": {
|
||||
@@ -1163,9 +1177,9 @@
|
||||
},
|
||||
"virtual-network-manager": {
|
||||
"pname": "virtual-network-manager",
|
||||
"version": "3.0.1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_network_manager-3.0.1-py3-none-any.whl",
|
||||
"hash": "sha256-vY9LN/k44HIVB3bkSC+We5/26yzhOVeBYkEeG6wQOT8=",
|
||||
"version": "3.0.2",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_network_manager-3.0.2-py3-none-any.whl",
|
||||
"hash": "sha256-FfMTkG6sisvkyhQGYcROhaeZtbzcftMUwpQVf7q25kQ=",
|
||||
"description": "Microsoft Azure Command-Line Tools NetworkManagementClient Extension"
|
||||
},
|
||||
"virtual-network-tap": {
|
||||
|
||||
@@ -187,7 +187,7 @@ def find_extension_version(
|
||||
return None
|
||||
if ext_name and latest["metadata"]["name"] != ext_name:
|
||||
return None
|
||||
if not requirements and "run_requires" in latest["metadata"]:
|
||||
if not requirements and latest["metadata"].get("run_requires"):
|
||||
return None
|
||||
return latest
|
||||
|
||||
@@ -450,12 +450,22 @@ def main() -> None:
|
||||
logger.info("updating generated extension set")
|
||||
|
||||
extensions_remote_filtered = set()
|
||||
extensions_gained_requirements = set()
|
||||
for _ext_name, extension in extensions_remote.items():
|
||||
extension = find_and_transform_extension_version(
|
||||
extension, cli_version, args.extension
|
||||
without_req = find_and_transform_extension_version(
|
||||
extension, cli_version, requirements=False
|
||||
)
|
||||
if extension:
|
||||
extensions_remote_filtered.add(extension)
|
||||
if without_req:
|
||||
extensions_remote_filtered.add(without_req)
|
||||
continue
|
||||
# The latest compatible version was dropped by the requirement-less
|
||||
# filter, i.e. it declares run_requires. Keep track of it so we can tell
|
||||
# extensions that merely gained requirements apart from genuine removals.
|
||||
with_req = find_and_transform_extension_version(
|
||||
extension, cli_version, requirements=True
|
||||
)
|
||||
if with_req:
|
||||
extensions_gained_requirements.add(with_req)
|
||||
|
||||
extension_file = (
|
||||
Path(repo.working_dir) / "pkgs/by-name/az/azure-cli/extensions-generated.json"
|
||||
@@ -474,9 +484,24 @@ def main() -> None:
|
||||
)
|
||||
updated = set(filter(_filter_updated, updated))
|
||||
|
||||
# An extension reported as removed that still has a compatible version in the
|
||||
# index was not actually removed: its latest version now declares
|
||||
# requirements, so the requirement-less filter drops it. Report these
|
||||
# separately and leave them untouched instead of removing them.
|
||||
gained_by_pname = {ext.pname: ext for ext in extensions_gained_requirements}
|
||||
gained_requirements = {
|
||||
(prev, gained_by_pname[prev.pname])
|
||||
for prev in removed
|
||||
if prev.pname in gained_by_pname
|
||||
}
|
||||
removed = {prev for prev in removed if prev.pname not in gained_by_pname}
|
||||
|
||||
logger.info("initialized extensions:")
|
||||
for ext in init:
|
||||
logger.info(f" {ext.pname} {ext.version}")
|
||||
logger.info("extensions that gained requirements (previously without):")
|
||||
for prev, new in gained_requirements:
|
||||
logger.info(f" {prev.pname} {prev.version} -> {new.version}")
|
||||
logger.info("removed extensions:")
|
||||
for ext in removed:
|
||||
logger.info(f" {ext.pname} {ext.version}")
|
||||
|
||||
@@ -26,14 +26,14 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.88.0";
|
||||
version = "2.89.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "azure-cli-${version}-src";
|
||||
owner = "Azure";
|
||||
repo = "azure-cli";
|
||||
tag = "azure-cli-${version}";
|
||||
hash = "sha256-9lDDzUuON1fkZzvV6oAzUOZcf+t7biDzPFufZIYQrAY=";
|
||||
hash = "sha256-bNKPp/O5YOhne9OOEjextcXVNtGl1TP+vyFUBmOXt7I=";
|
||||
};
|
||||
|
||||
# put packages that needs to be overridden in the py package scope
|
||||
|
||||
@@ -182,16 +182,6 @@ let
|
||||
overrideAzureMgmtPackage super.azure-mgmt-media "9.0.0" "zip"
|
||||
"sha256-TI7l8sSQ2QUgPqiE3Cu/F67Wna+KHbQS3fuIjOb95ZM=";
|
||||
|
||||
# ModuleNotFoundError: No module named 'azure.mgmt.monitor.operations'
|
||||
azure-mgmt-monitor = super.azure-mgmt-monitor.overridePythonAttrs (attrs: rec {
|
||||
version = "7.0.0b1";
|
||||
src = fetchPypi {
|
||||
pname = "azure_mgmt_monitor"; # Different from src.pname in the original package.
|
||||
inherit version;
|
||||
hash = "sha256-WR4YZMw4njklpARkujsRnd6nwTZ8M5vXFcy9AfL9oj4=";
|
||||
};
|
||||
});
|
||||
|
||||
# AttributeError: module 'azure.mgmt.rdbms.postgresql_flexibleservers.operations' has no attribute 'BackupsOperations'
|
||||
azure-mgmt-rdbms =
|
||||
overrideAzureMgmtPackage super.azure-mgmt-rdbms "10.2.0b17" "tar.gz"
|
||||
@@ -232,11 +222,6 @@ let
|
||||
doCheck = false;
|
||||
};
|
||||
|
||||
# ImportError: cannot import name 'IPRule' from 'azure.mgmt.signalr.models'
|
||||
azure-mgmt-signalr =
|
||||
overrideAzureMgmtPackage super.azure-mgmt-signalr "2.0.0b2" "tar.gz"
|
||||
"sha256-05PUV8ouAKq/xhGxVEWIzDop0a7WDTV5mGVSC4sv9P4=";
|
||||
|
||||
# ImportError: cannot import name 'AdvancedThreatProtectionName' from 'azure.mgmt.sql.models'
|
||||
azure-mgmt-sql = super.azure-mgmt-sql.overridePythonAttrs (attrs: rec {
|
||||
version = "4.0.0b22";
|
||||
@@ -247,16 +232,6 @@ let
|
||||
};
|
||||
});
|
||||
|
||||
# ValueError: The operation 'azure.mgmt.sqlvirtualmachine.operations#SqlVirtualMachinesOperations.begin_create_or_update' is invalid.
|
||||
azure-mgmt-sqlvirtualmachine =
|
||||
overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "1.0.0b5" "zip"
|
||||
"sha256-ZFgJflgynRSxo+B+Vso4eX1JheWlDQjfJ9QmupXypMc=";
|
||||
|
||||
# ModuleNotFoundError: No module named 'azure.mgmt.synapse.operations._kusto_pool_attached_database_configurations_operations'
|
||||
azure-mgmt-synapse =
|
||||
overrideAzureMgmtPackage super.azure-mgmt-synapse "2.1.0b5" "zip"
|
||||
"sha256-5E6Yf1GgNyNVjd+SeFDbhDxnOA6fOAG6oojxtCP4m+k=";
|
||||
|
||||
# Attribute virtual_machines does not exist - nixpkgs has 37.x but azure-cli 2.82.0 requires ~=34.1.0
|
||||
azure-mgmt-compute = super.azure-mgmt-compute.overridePythonAttrs (attrs: rec {
|
||||
version = "34.1.0";
|
||||
@@ -267,18 +242,6 @@ let
|
||||
};
|
||||
});
|
||||
|
||||
# ValueError: The operation 'azure.mgmt.mysqlflexibleservers.operations#LongRunningBackupOperations.begin_delete' is invalid.
|
||||
azure-mgmt-mysqlflexibleservers =
|
||||
super.azure-mgmt-mysqlflexibleservers.overridePythonAttrs
|
||||
(attrs: rec {
|
||||
version = "1.1.0b2";
|
||||
src = fetchPypi {
|
||||
pname = "azure_mgmt_mysqlflexibleservers";
|
||||
inherit version;
|
||||
hash = "sha256-yGpEFn9VOP1uSvpUCV/gYW56/5HulsCVx9wc/kWO+Ro=";
|
||||
};
|
||||
});
|
||||
|
||||
# ModuleNotFoundError: No module named 'azure.mgmt.recoveryservicesbackup.activestamp'
|
||||
azure-mgmt-recoveryservicesbackup =
|
||||
super.azure-mgmt-recoveryservicesbackup.overridePythonAttrs
|
||||
|
||||
@@ -129,7 +129,7 @@ stdenv.mkDerivation rec {
|
||||
# guarantee that it will always run in any nix context.
|
||||
#
|
||||
# See also ./bazel_darwin_sandbox.patch in bazel_5. That patch uses
|
||||
# NIX_BUILD_TOP env var to conditionnally disable sleep features inside the
|
||||
# NIX_BUILD_TOP env var to conditionally disable sleep features inside the
|
||||
# sandbox.
|
||||
#
|
||||
# If you want to investigate the sandbox profile path,
|
||||
|
||||
@@ -124,7 +124,7 @@ stdenv.mkDerivation rec {
|
||||
# guarantee that it will always run in any nix context.
|
||||
#
|
||||
# See also ./bazel_darwin_sandbox.patch in bazel_5. That patch uses
|
||||
# NIX_BUILD_TOP env var to conditionnally disable sleep features inside the
|
||||
# NIX_BUILD_TOP env var to conditionally disable sleep features inside the
|
||||
# sandbox.
|
||||
#
|
||||
# If you want to investigate the sandbox profile path,
|
||||
|
||||
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
windows via a hotkey daemon such as sxhkd or expand functionality via
|
||||
shell scripts.
|
||||
- Small, hackable source code.
|
||||
- Extensible themeing options with double borders, title bars, and window
|
||||
- Extensible theming options with double borders, title bars, and window
|
||||
text.
|
||||
- Intuitively place new windows in unoccupied spaces.
|
||||
- Virtual desktops.
|
||||
|
||||
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Translucent Varient of the Material Based Cursor";
|
||||
description = "Translucent Variant of the Material Based Cursor";
|
||||
homepage = "https://github.com/silica-dev/Bibata_Cursor_Translucent";
|
||||
license = lib.licenses.gpl3;
|
||||
platforms = lib.platforms.linux;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
set -eu -o pipefail
|
||||
page="https://www.richwhitehouse.com/jaguar/index.php?content=download"
|
||||
extractor='font:contains("Current Version") strong text{}'
|
||||
lastest_version="$(curl "$page" | pup "$extractor")"
|
||||
latest_version="$(curl "$page" | pup "$extractor")"
|
||||
update-source-version \
|
||||
--ignore-same-version \
|
||||
bigpemu.unwrapped "$lastest_version"
|
||||
bigpemu.unwrapped "$latest_version"
|
||||
|
||||
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove once https://github.com/AGProjects/blink-qt/pull/7 is mereged and tagged
|
||||
# Remove once https://github.com/AGProjects/blink-qt/pull/7 is merged and tagged
|
||||
./fix-none-account.patch
|
||||
];
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/AndroidRoot/BlobTools";
|
||||
description = "Tools for modifiying ASUS Transformer firmware";
|
||||
description = "Tools for modifying ASUS Transformer firmware";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ ungeskriptet ];
|
||||
mainProgram = "blobpack";
|
||||
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/commonsmachinery/blockhash";
|
||||
description = ''
|
||||
This is a perceptual image hash calculation tool based on algorithm
|
||||
descibed in Block Mean Value Based Image Perceptual Hashing by Bian Yang,
|
||||
described in Block Mean Value Based Image Perceptual Hashing by Bian Yang,
|
||||
Fan Gu and Xiamu Niu.
|
||||
'';
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@@ -30,11 +30,11 @@ buildGoModule (finalAttrs: {
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "TUI-based bluetooth connection manager";
|
||||
description = "TUI-based Bluetooth connection manager";
|
||||
longDescription = ''
|
||||
Bluetuith can transfer files via OBEX, perform authenticated pairing,
|
||||
and (dis)connect different bluetooth devices. It interacts with bluetooth
|
||||
adapters and can toogle their power and discovery state. Bluetuith can also
|
||||
and (dis)connect different Bluetooth devices. It interacts with Bluetooth
|
||||
adapters and can toggle their power and discovery state. Bluetuith can also
|
||||
manage Bluetooth-based networking/tethering (PANU/DUN) and remote control
|
||||
devices. The TUI has mouse support.
|
||||
'';
|
||||
|
||||
@@ -78,9 +78,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
playback and capture.
|
||||
|
||||
Some backstory: Bluez 5 removed built-in support for ALSA in favor of a
|
||||
generic interface for 3rd party appliations. Thereafter, PulseAudio
|
||||
generic interface for 3rd party applications. Thereafter, PulseAudio
|
||||
implemented a backend for that interface and became the only way to get
|
||||
Bluetooth audio with Bluez 5. Users prefering ALSA stayed on Bluez 4.
|
||||
Bluetooth audio with Bluez 5. Users preferring ALSA stayed on Bluez 4.
|
||||
However, Bluez 4 eventually became deprecated.
|
||||
|
||||
This package is a rebirth of a direct interface between ALSA and Bluez 5,
|
||||
|
||||
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Command line tool for datetime arithmetic, parsing, formatting and more. Replacment for biff";
|
||||
description = "Command line tool for datetime arithmetic, parsing, formatting and more. Replacement for biff";
|
||||
homepage = "https://github.com/BurntSushi/bttf";
|
||||
changelog = "https://github.com/BurntSushi/bttf/releases/tag/${finalAttrs.src.tag}";
|
||||
license = with lib.licenses; [
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "buildkite-agent";
|
||||
version = "3.129.0";
|
||||
version = "3.135.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buildkite";
|
||||
repo = "agent";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-k1q/7KRaIv5SE7CYFAzV8JB+czmX/bvwBp8JY9t77tI=";
|
||||
hash = "sha256-GldeyE1Km5qM4OXMzGW6CV2yP+3fR5XzmLLsvBUV8ZY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lRh5cAbg2yr+nvIaSRg3tG0tLvl7aDjyIoIjS1BvXNM=";
|
||||
vendorHash = "sha256-I6qcebTFHrF/SjJUvzBHtbYdN1BafRM6XPGGNbBK7Lc=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace clicommand/agent_start.go --replace /bin/bash ${bash}/bin/bash
|
||||
|
||||
@@ -46,7 +46,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Btrfs tool for managing snapshots, balancing filesystems and upgrading the system safetly";
|
||||
description = "Btrfs tool for managing snapshots, balancing filesystems and upgrading the system safely";
|
||||
homepage = "https://github.com/egara/buttermanager";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ t4ccer ];
|
||||
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
texliveBasic
|
||||
];
|
||||
|
||||
# Remove pre-built documentaton artifacts
|
||||
# Remove pre-built documentation artifacts
|
||||
postConfigure = ''
|
||||
make clean
|
||||
'';
|
||||
|
||||
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
# not sure why the -Werror isn't being an issue for the project maintainer
|
||||
# my best guess is it's because the project README specifices
|
||||
# my best guess is it's because the project README specifies
|
||||
# "Debian Bookworm" as a requirement which provides gcc12 by default
|
||||
postPatch = ''
|
||||
sed -i 's|git submodule update.*||' Makefile
|
||||
|
||||
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
# requires an extra dependency, blit
|
||||
"--skip=test_package_in_deps_build"
|
||||
|
||||
# requires criteron, which requires additional dependencies
|
||||
# requires criterion, which requires additional dependencies
|
||||
"--skip=test_cargo_config_rustflags"
|
||||
|
||||
# requires additional dependencies
|
||||
|
||||
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
propagatedBuildInputs =
|
||||
# create meta package providing dist-info for python3Pacakges.catalyst that common cmake build does not do
|
||||
# create meta package providing dist-info for python3Packages.catalyst that common cmake build does not do
|
||||
lib.optional pythonSupport (
|
||||
python3Packages.mkPythonMetaPackage {
|
||||
inherit (finalAttrs) pname version meta;
|
||||
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Small, single-file and POSIX-compatible substituion for systemd-sysusers";
|
||||
description = "Small, single-file and POSIX-compatible substitution for systemd-sysusers";
|
||||
homepage = "https://github.com/eweOS/catnest";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "catnest";
|
||||
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Library for ChezScheme providing the portable hygenic pattern matcher by Alex Shinn";
|
||||
description = "Library for ChezScheme providing the portable hygienic pattern matcher by Alex Shinn";
|
||||
homepage = "https://github.com/fedeinthemix/chez-matchable/";
|
||||
maintainers = [ lib.maintainers.jitwit ];
|
||||
license = lib.licenses.publicDomain;
|
||||
|
||||
@@ -42,7 +42,7 @@ buildGoModule (finalAttrs: {
|
||||
# Box blurb edited from the AUR package circleci-cli
|
||||
description = ''
|
||||
Command to enable you to reproduce the CircleCI environment locally and
|
||||
run jobs as if they were running on the hosted CirleCI application.
|
||||
run jobs as if they were running on the hosted CircleCI application.
|
||||
'';
|
||||
maintainers = [ ];
|
||||
mainProgram = "circleci";
|
||||
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/cjdelisle/cjdns";
|
||||
description = "Tools for cjdns managment";
|
||||
description = "Tools for cjdns management";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
|
||||
@@ -50,7 +50,7 @@ buildGoModule (finalAttrs: {
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Command line utility to interact with a cert-manager instalation on Kubernetes";
|
||||
description = "Command line utility to interact with a cert-manager installation on Kubernetes";
|
||||
mainProgram = "cmctl";
|
||||
longDescription = ''
|
||||
cert-manager adds certificates and certificate issuers as resource types
|
||||
|
||||
@@ -10,6 +10,6 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
npm i --package-lock-only codebuff@"$version"
|
||||
rm -f package.json
|
||||
|
||||
# Update version and hases
|
||||
# Update version and hashes
|
||||
cd -
|
||||
nix-update codebuff --version "$version"
|
||||
|
||||
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Swap endianess of a cram filesystem (cramfs)";
|
||||
description = "Swap endianness of a cram filesystem (cramfs)";
|
||||
mainProgram = "cramfsswap";
|
||||
homepage = "https://packages.debian.org/sid/utils/cramfsswap";
|
||||
license = lib.licenses.gpl2Only;
|
||||
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
longDescription = ''
|
||||
CSA means : Contrôle Signal Audio.
|
||||
It contains the following plugins:
|
||||
Emphazised Limiter, Cellular Leveler, Simple right/left amplifier. Blind Peak Meter.
|
||||
Emphasised Limiter, Cellular Leveler, Simple right/left amplifier. Blind Peak Meter.
|
||||
'';
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [ lib.maintainers.magnetophon ];
|
||||
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
patches = [
|
||||
# conbination of:
|
||||
# combination of:
|
||||
# https://github.com/bmc/daemonize/commit/eaf4746d47e171e7b8655690eb1e91fc216f2866
|
||||
# https://github.com/bmc/daemonize/pull/39
|
||||
./include-write-prototype.patch
|
||||
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Client application for operating Czech government-provided Databox infomation system";
|
||||
description = "Client application for operating Czech government-provided Databox information system";
|
||||
homepage = "https://www.datovka.cz/";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ lib.maintainers.mmahut ];
|
||||
|
||||
@@ -20,7 +20,7 @@ for i in \
|
||||
"aarch64-linux linux-aarch64.tar.gz" \
|
||||
"aarch64-darwin macos-aarch64.dmg"
|
||||
do
|
||||
# shellcheck disable=SC2086 # $i is intentionally splitted to $1 and $2
|
||||
# shellcheck disable=SC2086 # $i is intentionally split to $1 and $2
|
||||
set -- $i
|
||||
prefetch=$(nix-prefetch-url "https://github.com/dbeaver/dbeaver/releases/download/$latestVersion/dbeaver-ce-$latestVersion-$2")
|
||||
hash=$(nix-hash --type sha256 --to-sri "$prefetch")
|
||||
|
||||
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
||||
# copyright messages are not removed, and no monies are exchanged"
|
||||
# + waiver of liability)
|
||||
unfreeRedistributable
|
||||
# lzhuf.* (no copywrite notice, predates standardized licenses,
|
||||
# lzhuf.* (no copyright notice, predates standardized licenses,
|
||||
# widely distributed & intent appears to be free use)
|
||||
# "By necessity, Deark contains knowledge about how to decode various
|
||||
# third-party file formats. This knowledge includes data structures,
|
||||
|
||||
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Noise supression using deep filtering";
|
||||
description = "Noise suppression using deep filtering";
|
||||
homepage = "https://github.com/Rikorose/DeepFilterNet";
|
||||
license = with lib.licenses; [
|
||||
mit
|
||||
|
||||
@@ -96,7 +96,7 @@ buildPythonPackage (finalAttrs: {
|
||||
];
|
||||
|
||||
# root_passwd_hash tries to write to store
|
||||
# TestMirrorIndexThings tries to write to /var through ngnix
|
||||
# TestMirrorIndexThings tries to write to /var through nginx
|
||||
# nginx tests try to write to /var
|
||||
preCheck = ''
|
||||
export PATH=$PATH:$out/bin
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dnscontrol";
|
||||
version = "4.44.1";
|
||||
version = "4.45.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DNSControl";
|
||||
repo = "dnscontrol";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-uilDR4MPc3FO/6i2Gd+sssL+xzVWX4f4yvpnFspKcx0=";
|
||||
hash = "sha256-P3krRUpoNEVNtTREy+YsE8A9pHelaSBbjo/A1mgKIjc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tpkPr6An8CvPFK9/oD0U3TEHc2hRK4vqFN71VZzxpXA=";
|
||||
vendorHash = "sha256-DV0JBu95O6s1xt7v8qo9jZUzqF7tnf0/fBgwVWfVIIU=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ buildGoModule (finalAttrs: {
|
||||
hash = "sha256-aATnNDUogNS4jBoWxUAFYFMa2ZS0+th3XH+1KWqwfWQ=";
|
||||
};
|
||||
vendorHash = "sha256-RH55yfIO9jHLbjtEdUF5QpL5ILV5ctX2hBYBJWutmUA=";
|
||||
doCheck = false; # Uses network, unsuprisingly.
|
||||
doCheck = false; # Uses network, unsurprisingly.
|
||||
meta = {
|
||||
changelog = "https://github.com/dnslink-std/go/releases/tag/v${finalAttrs.version}";
|
||||
description = "Reference implementation for DNSLink in golang";
|
||||
|
||||
@@ -15,9 +15,9 @@
|
||||
}:
|
||||
let
|
||||
hashes = {
|
||||
"x86_64-linux" = "sha256-dwq/f5GxOrqGzHu31Ui44HyBLVoQkyGQXnt9oK0H2Zg=";
|
||||
"aarch64-linux" = "sha256-tV65eOO1Zh3cpnGC+1wz086s/7wlnEw8YUGlRcmyvOw=";
|
||||
"aarch64-darwin" = "sha256-uEb+wFj0z3pDQzQ5EyBsZbDDkWrd6iT82xmj2QyKuI8=";
|
||||
"x86_64-linux" = "sha256-nrzqgx1NJw4lrhd3vxXiR1ar+/h5GtJylHVGgoOO0As=";
|
||||
"aarch64-linux" = "sha256-BR/fg0n4pm20epkOEaMM0dLgE6xsjkLkjAcr/OwGodU=";
|
||||
"aarch64-darwin" = "sha256-Fg0eq0R8IA4vVKIqZIkByoDuhVVyTsALYMK9qsPE6hw=";
|
||||
};
|
||||
platformName = {
|
||||
"x86_64-linux" = "linux-amd64";
|
||||
@@ -27,7 +27,7 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "docker-sbx";
|
||||
version = "0.37.0";
|
||||
version = "0.38.0";
|
||||
src =
|
||||
let
|
||||
throwPlat = throw "Unsupported platform ${stdenvNoCC.hostPlatform.system}";
|
||||
|
||||
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Recursive DNS/DNSCurve server and comandline tool";
|
||||
description = "Recursive DNS/DNSCurve server and commandline tool";
|
||||
homepage = "https://github.com/janmojzis/dq";
|
||||
changelog = "https://github.com/janmojzis/dq/releases/tag/${finalAttrs.version}";
|
||||
license = with lib.licenses; [
|
||||
|
||||
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mainProgram = "dragen-os";
|
||||
longDescription = ''
|
||||
DRAGMAP is an open-source software implementation of the DRAGEN mapper,
|
||||
which the Illumina team created to procude the same results as their
|
||||
which the Illumina team created to produce the same results as their
|
||||
proprietary DRAGEN hardware.
|
||||
'';
|
||||
homepage = "https://github.com/Illumina/DRAGMAP";
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "drupal";
|
||||
version = "11.4.4";
|
||||
version = "11.4.5";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "git.drupalcode.org";
|
||||
owner = "project";
|
||||
repo = "drupal";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-lwD4k4orQQD9gl60/Er9s1JTClN2i7b7JxBFuz5h+4s=";
|
||||
hash = "sha256-G5Kk4EVpMXV9H9LFvRJnh1Y1rqL6fA18WoTJs+lRV10=";
|
||||
};
|
||||
|
||||
composerNoPlugins = false;
|
||||
vendorHash = "sha256-mJwOXz+nn1N7kFKofkuqBcbXJGwJDcgRrhKAhhwydik=";
|
||||
vendorHash = "sha256-P6egjq0lffLGDv3hDJOTvW8Qs3vqR9cT33oURKTfRcQ=";
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
OWNNER="duplicati"
|
||||
OWNER="duplicati"
|
||||
REPO="duplicati"
|
||||
|
||||
SCRIPT_DIR=$(dirname "$(readlink -f "$0")")
|
||||
@@ -12,7 +12,7 @@ TARGET="$SCRIPT_DIR/package.nix"
|
||||
TMP=$(mktemp -d)
|
||||
trap 'rm -rf "$TMP"' EXIT
|
||||
|
||||
TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/$OWNNER/$REPO/tags" |
|
||||
TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/$OWNER/$REPO/tags" |
|
||||
jq -r '.[].name' |
|
||||
grep -E '^v[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+_stable_' |
|
||||
sort -Vr |
|
||||
@@ -22,12 +22,12 @@ VERSION=$(echo "$TAG" | cut -d_ -f1 | sed 's/^v//')
|
||||
CHANNEL=$(echo "$TAG" | cut -d_ -f2)
|
||||
DATE=$(echo "$TAG" | cut -d_ -f3)
|
||||
|
||||
HASH=$(nix-prefetch-github $OWNNER $REPO --rev "$TAG" |
|
||||
HASH=$(nix-prefetch-github $OWNER $REPO --rev "$TAG" |
|
||||
jq -r '.hash')
|
||||
|
||||
curl -sL \
|
||||
-o "$TMP/package.json" \
|
||||
"https://raw.githubusercontent.com/$OWNNER/$REPO/$TAG/Duplicati/Server/webroot/ngclient/package.json"
|
||||
"https://raw.githubusercontent.com/$OWNER/$REPO/$TAG/Duplicati/Server/webroot/ngclient/package.json"
|
||||
|
||||
NGCLIENT_VERSION=$(
|
||||
jq -r '.dependencies["@duplicati/ngclient"]' \
|
||||
@@ -40,13 +40,13 @@ NGCLIENT_REV=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} \
|
||||
jq -r '.items[0].sha')
|
||||
|
||||
NGCLIENT_HASH=$(
|
||||
nix-prefetch-github $OWNNER ngclient --rev "$NGCLIENT_REV" |
|
||||
nix-prefetch-github $OWNER ngclient --rev "$NGCLIENT_REV" |
|
||||
jq -r .hash
|
||||
)
|
||||
|
||||
curl -sL \
|
||||
-o "$TMP/package-lock.json" \
|
||||
"https://raw.githubusercontent.com/$OWNNER/ngclient/$NGCLIENT_REV/package-lock.json"
|
||||
"https://raw.githubusercontent.com/$OWNER/ngclient/$NGCLIENT_REV/package-lock.json"
|
||||
|
||||
NGCLIENT_NPM_DEPS_HASH="$(prefetch-npm-deps "$TMP"/package-lock.json)"
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ buildNpmPackage (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/emacs-eask/cli/blob/${finalAttrs.version}/CHANGELOG.md";
|
||||
description = "CLI for building, runing, testing, and managing your Emacs Lisp dependencies";
|
||||
description = "CLI for building, running, testing, and managing your Emacs Lisp dependencies";
|
||||
homepage = "https://emacs-eask.github.io/";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
mainProgram = "eask";
|
||||
|
||||
@@ -38,7 +38,7 @@ let
|
||||
]
|
||||
);
|
||||
|
||||
# paches are needed to fix build with CMake 4
|
||||
# patches are needed to fix build with CMake 4
|
||||
yaml-cppSrc = applyPatches {
|
||||
inherit (yaml-cpp) src;
|
||||
patches = yaml-cpp.patches or [ ];
|
||||
|
||||
@@ -34,7 +34,7 @@ flutter.buildFlutterApplication rec {
|
||||
|
||||
customSourceBuilders.ente_strings =
|
||||
{ version, src, ... }:
|
||||
# There currently is no covenient way to setup the flutter SDK outside of apps
|
||||
# There currently is no convenient way to setup the flutter SDK outside of apps
|
||||
# and we can't move this to the app's own build phase as it would still reference
|
||||
# the immutable source variant without the generated l10n files.
|
||||
flutter.buildFlutterApplication {
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
wasm-pack,
|
||||
writeScript,
|
||||
extraBuildEnv ? { },
|
||||
# This package contains serveral sub-applications. This specifies which of them you want to build.
|
||||
# This package contains several sub-applications. This specifies which of them you want to build.
|
||||
enteApp ? "photos",
|
||||
# Accessing some apps (such as account) directly will result in a hardcoded redirect to ente.io.
|
||||
# To prevent users from accidentally logging in to ente.io instead of the selfhosted instance, you
|
||||
|
||||
@@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
longDescription = ''
|
||||
A tool aimed at enhancing the experience when playing the game on linux through proton or natively on windows.
|
||||
This tool is based on patching the game executable through hex-edits. However it is done in a safe and non-destructive way,
|
||||
that ensures the patched executable is never run with EAC enabled (unless explicity told to do so). Use at your own risk!
|
||||
that ensures the patched executable is never run with EAC enabled (unless explicitly told to do so). Use at your own risk!
|
||||
'';
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.sigmasquadron ];
|
||||
|
||||
@@ -38,7 +38,7 @@ buildGoModule (finalAttrs: {
|
||||
# > Some binaries contain forbidden references to /build/.
|
||||
#
|
||||
# If we need it in the future, we should consider packaging silkworm and silkworm-go
|
||||
# as depenedencies explicitly.
|
||||
# as dependencies explicitly.
|
||||
"nosilkworm"
|
||||
];
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./use-CC.patch
|
||||
# allow PostScript transparency in epstopdf call
|
||||
./gs-allowpstransparency.patch
|
||||
# fix curly brace escaping in eukleides.texi for newer texinfo compatiblity
|
||||
# fix curly brace escaping in eukleides.texi for newer texinfo compatibility
|
||||
./texinfo-escape.patch
|
||||
(fetchpatch2 {
|
||||
url = "https://salsa.debian.org/georgesk/eukleides/-/raw/debian/1.5.4-6/debian/patches/fixes-for-gcc15.patch";
|
||||
|
||||
@@ -7,16 +7,19 @@
|
||||
libxrandr,
|
||||
libxrender,
|
||||
xorgproto,
|
||||
patches ? [ ],
|
||||
config,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "evilwm";
|
||||
version = "1.5";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.6809.org.uk/evilwm/evilwm-${version}.tar.gz";
|
||||
sha256 = "sha256-YQSFJBPm1QZpNh3K3aWiXTnisrDJWmOEAiyQWVeidA8=";
|
||||
url = "https://www.6809.org.uk/evilwm/evilwm-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-YQSFJBPm1QZpNh3K3aWiXTnisrDJWmOEAiyQWVeidA8=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -33,8 +36,8 @@ stdenv.mkDerivation rec {
|
||||
--replace "CC = gcc" "#CC = gcc"
|
||||
'';
|
||||
|
||||
# Allow users set their own list of patches
|
||||
inherit patches;
|
||||
# Allow users to set their own list of patches
|
||||
patches = config.evilwm.patches or [ ];
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.6809.org.uk/evilwm/";
|
||||
@@ -49,4 +52,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "evilwm";
|
||||
};
|
||||
}
|
||||
})
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user