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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2024-11-06 12:06:19 +00:00
committed by GitHub
parent f77d73045c 5a82e7abb4
commit 46e09172e0
56 changed files with 5269 additions and 2911 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/README.md
+1 -1
View File
@@ -174,4 +174,4 @@ are available under `./scripts/`. See its [README](./scripts/README.md)
for further information.
# nixpkgs-merge-bot
To streamline autoupdates, leverage the nixpkgs-merge-bot by simply commenting `@NixOS/nixpkgs-merge-bot merge` if the package resides in pkgs-by-name and the commenter is among the package maintainers. The bot ensures that all ofborg checks, except for darwin, are successfully completed before merging the pull request. Should the checks still be underway, the bot patiently waits for ofborg to finish before attempting the merge again.
To streamline autoupdates, leverage the nixpkgs-merge-bot by commenting `@NixOS/nixpkgs-merge-bot merge` if the package resides in pkgs-by-name and the commenter is among the package maintainers. The bot ensures that all ofborg checks, except for darwin, are successfully completed before merging the pull request. Should the checks still be underway, the bot patiently waits for ofborg to finish before attempting the merge again.
nixos/modules/misc/ids.nix
+36 -2
View File
@@ -356,7 +356,24 @@ in
localtimed = 325;
automatic-timezoned = 326;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
# When adding a uid, make sure it doesn't match an existing gid.
#
# !!! Don't use uids above "399"! !!!
#
# The reason behind this restriction is that, NixOS by default allocates
# system user UIDs/GIDs in the range of `400..999`. System users/groups
# created using command like `useradd` will have UID and GID in this range[1].
#
# If a newly added ID goes beyond "399", it may conflict with existing
# system user or group of the same id in someone else's NixOS.
# This could break their system and make that person upset for a whole day.
#
# Sidenote: the default is defined in `shadow` module[2], and the relavent change
# was made way back in 2014[3].
#
# [1]: https://man7.org/linux/man-pages/man5/login.defs.5.html#:~:text=SYS_UID_MAX%20(number)%2C%20SYS_UID_MIN%20(number)
# [2]: <nixos/modules/programs/shadow.nix>
# [3]: https://github.com/NixOS/nixpkgs/commit/0e23a175de3687df8232fe118cbe87f04228ff28
nixbld = 30000; # start of range of uids
nobody = 65534;
@@ -669,7 +686,24 @@ in
# When adding a gid, make sure it doesn't match an existing
# uid. Users and groups with the same name should have equal
# uids and gids. Also, don't use gids above 399!
# uids and gids.
#
# !!! Don't use gids above "399"! !!!
#
# The reason behind this restriction is that, NixOS by default allocates
# system user UIDs/GIDs in the range of `400..999`. System users/groups
# created using command like `useradd` will have UID and GID in this range[1].
#
# If a newly added ID goes beyond "399", it may conflict with existing
# system user or group of the same id in someone else's NixOS.
# This could break their system and make that person upset for a whole day.
#
# Sidenote: the default is defined in `shadow` module[2], and the relavent change
# was made way back in 2014[3].
#
# [1]: https://man7.org/linux/man-pages/man5/login.defs.5.html#:~:text=SYS_UID_MAX%20(number)%2C%20SYS_UID_MIN%20(number)
# [2]: <nixos/modules/programs/shadow.nix>
# [3]: https://github.com/NixOS/nixpkgs/commit/0e23a175de3687df8232fe118cbe87f04228ff28
# For exceptional cases where you really need a gid above 399, leave a
# comment stating why.
nixos/modules/services/hardware/amdvlk.nix
-2
View File
@@ -37,8 +37,6 @@ in {
extraPackages32 = [ cfg.support32Bit.package ];
};
services.xserver.videoDrivers = [ "amdgpu" ];
environment.sessionVariables = lib.mkIf cfg.supportExperimental.enable {
AMDVLK_ENABLE_DEVELOPING_EXT = "all";
};
nixos/modules/services/misc/mollysocket.nix
+2 -6
View File
@@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:
let
inherit (lib) getExe mkIf mkOption mkEnableOption optionals types;
inherit (lib) getExe mkIf mkOption mkEnableOption types;
cfg = config.services.mollysocket;
configuration = format.generate "mollysocket.conf" cfg.settings;
@@ -85,9 +85,7 @@ in {
after = [ "network-online.target" ];
wants = [ "network-online.target" ];
environment.RUST_LOG = cfg.logLevel;
serviceConfig = let
capabilities = [ "" ] ++ optionals (cfg.settings.port < 1024) [ "CAP_NET_BIND_SERVICE" ];
in {
serviceConfig = {
EnvironmentFile = cfg.environmentFile;
ExecStart = "${getExe package} server";
KillSignal = "SIGINT";
@@ -97,8 +95,6 @@ in {
WorkingDirectory = "/var/lib/mollysocket";
# hardening
AmbientCapabilities = capabilities;
CapabilityBoundingSet = capabilities;
DevicePolicy = "closed";
DynamicUser = true;
LockPersonality = true;
nixos/modules/services/misc/paperless.nix
-3
View File
@@ -372,9 +372,6 @@ in
SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "@setuid mbind" ];
# Needs to serve web page
PrivateNetwork = false;
} // lib.optionalAttrs (cfg.port < 1024) {
AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
};
environment = env // {
PYTHONPATH = "${cfg.package.python.pkgs.makePythonPath cfg.package.propagatedBuildInputs}:${cfg.package}/lib/paperless-ngx/src";
nixos/modules/services/misc/tandoor-recipes.nix
-3
View File
@@ -119,9 +119,6 @@ in
# gunicorn needs setuid
SystemCallFilter = [ "@system-service" "~@privileged" "@resources" "@setuid" "@keyring" ];
UMask = "0066";
} // lib.optionalAttrs (cfg.port < 1024) {
AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
};
wantedBy = [ "multi-user.target" ];
nixos/modules/services/misc/transfer-sh.nix
-1
View File
@@ -69,7 +69,6 @@ in
wantedBy = [ "multi-user.target" ];
environment = mapAttrs (_: v: if isBool v then boolToString v else toString v) cfg.settings;
serviceConfig = {
CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
DevicePolicy = "closed";
DynamicUser = true;
ExecStart = "${getExe cfg.package} --provider ${cfg.provider}";
nixos/modules/services/misc/wastebin.nix
-1
View File
@@ -126,7 +126,6 @@ in
wantedBy = [ "multi-user.target" ];
environment = mapAttrs (_: v: if isBool v then boolToString v else toString v) cfg.settings;
serviceConfig = {
CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
DevicePolicy = "closed";
DynamicUser = true;
ExecStart = "${getExe cfg.package}";
nixos/modules/services/monitoring/prometheus/default.nix
-2
View File
@@ -1834,8 +1834,6 @@ in
StateDirectory = cfg.stateDir;
StateDirectoryMode = "0700";
# Hardening
AmbientCapabilities = lib.mkIf (cfg.port < 1024) [ "CAP_NET_BIND_SERVICE" ];
CapabilityBoundingSet = if (cfg.port < 1024) then [ "CAP_NET_BIND_SERVICE" ] else [ "" ];
DeviceAllow = [ "/dev/null rw" ];
DevicePolicy = "strict";
LockPersonality = true;
nixos/modules/services/networking/iwd.nix
+1 -1
View File
@@ -36,7 +36,7 @@ in
description = ''
Options passed to iwd.
See [here](https://iwd.wiki.kernel.org/networkconfigurationsettings) for supported options.
See {manpage}`iwd.config(5)` for supported options.
'';
};
};
nixos/modules/services/web-apps/dex.nix
-2
View File
@@ -80,7 +80,6 @@ in
];
RuntimeDirectory = "dex";
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
BindReadOnlyPaths = [
"/nix/store"
"-/etc/dex"
@@ -91,7 +90,6 @@ in
"-/etc/ssl/certs/ca-certificates.crt"
];
BindPaths = optional (cfg.settings.storage.type == "postgres") "/var/run/postgresql";
CapabilityBoundingSet = "CAP_NET_BIND_SERVICE";
# ProtectClock= adds DeviceAllow=char-rtc r
DeviceAllow = "";
DynamicUser = true;
nixos/modules/services/web-apps/freshrss.nix
-1
View File
@@ -164,7 +164,6 @@ in
let
defaultServiceConfig = {
ReadWritePaths = "${cfg.dataDir}";
CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
DeviceAllow = "";
LockPersonality = true;
NoNewPrivileges = true;
nixos/modules/services/web-apps/microbin.nix
-1
View File
@@ -61,7 +61,6 @@ in
wantedBy = [ "multi-user.target" ];
environment = lib.mapAttrs (_: v: if lib.isBool v then lib.boolToString v else toString v) cfg.settings;
serviceConfig = {
CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
DevicePolicy = "closed";
DynamicUser = true;
EnvironmentFile = lib.optional (cfg.passwordFile != null) cfg.passwordFile;
nixos/modules/services/web-apps/photoprism.nix
-4
View File
@@ -109,7 +109,6 @@ in
LoadCredential = lib.optionalString (cfg.passwordFile != null)
"PHOTOPRISM_ADMIN_PASSWORD:${cfg.passwordFile}";
CapabilityBoundingSet = "";
LockPersonality = true;
PrivateDevices = true;
PrivateUsers = true;
@@ -126,9 +125,6 @@ in
SystemCallArchitectures = "native";
SystemCallFilter = [ "@system-service" "~@setuid @keyring" ];
UMask = "0066";
} // lib.optionalAttrs (cfg.port < 1024) {
AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
};
wantedBy = [ "multi-user.target" ];
nixos/modules/services/web-apps/powerdns-admin.nix
-2
View File
@@ -87,7 +87,6 @@ in
User = "powerdnsadmin";
Group = "powerdnsadmin";
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
BindReadOnlyPaths = [
"/nix/store"
"-/etc/resolv.conf"
@@ -97,7 +96,6 @@ in
]
++ (optional (cfg.secretKeyFile != null) cfg.secretKeyFile)
++ (optional (cfg.saltFile != null) cfg.saltFile);
CapabilityBoundingSet = "CAP_NET_BIND_SERVICE";
# ProtectClock= adds DeviceAllow=char-rtc r
DeviceAllow = "";
# Implies ProtectSystem=strict, which re-mounts all paths
nixos/modules/services/web-apps/shiori.nix
-1
View File
@@ -90,7 +90,6 @@ in {
"/var/run/mysqld";
CapabilityBoundingSet = "";
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
DeviceAllow = "";
nixos/tests/all-tests.nix
+1 -1
View File
@@ -870,7 +870,7 @@ in {
realm = handleTest ./realm.nix {};
redis = handleTest ./redis.nix {};
redlib = handleTest ./redlib.nix {};
redmine = handleTest ./redmine.nix {};
redmine = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./redmine.nix {};
renovate = handleTest ./renovate.nix {};
replace-dependencies = handleTest ./replace-dependencies {};
restartByActivationScript = handleTest ./restart-by-activation-script.nix {};
pkgs/applications/editors/vim/plugins/generated.nix
+490 -490
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+114 -92
View File
@@ -94,12 +94,12 @@
};
awk = buildGrammar {
language = "awk";
version = "0.0.0+rev=553fdc4";
version = "0.0.0+rev=34bbdc7";
src = fetchFromGitHub {
owner = "Beaglefoot";
repo = "tree-sitter-awk";
rev = "553fdc4afb3b603332c3f4baf50c711506f4e797";
hash = "sha256-LJ+jRomCepFH8QbHTgecaDZ3dlO1kgjs5i71kIWi1bg=";
rev = "34bbdc7cce8e803096f47b625979e34c1be38127";
hash = "sha256-MDfAtG6ZC0KttJ5bdW71Jgts+SAJitRnwu8xQ26N9K0=";
};
meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk";
};
@@ -127,12 +127,12 @@
};
beancount = buildGrammar {
language = "beancount";
version = "0.0.0+rev=01c0da2";
version = "0.0.0+rev=9bc460a";
src = fetchFromGitHub {
owner = "polarmutex";
repo = "tree-sitter-beancount";
rev = "01c0da29e0fc7130420a09d939ecc524e09b6ba6";
hash = "sha256-obIGlAXe+Y1vffXTGgFRpiqof+F9bSRLq9NJGZcvhVE=";
rev = "9bc460a05b5f096d69568b5fb36105032ff4ff97";
hash = "sha256-MSLM7Or1SZeqj0WzJ26o5cmYa5vWcSbMhDzMkqWRJgE=";
};
meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount";
};
@@ -193,12 +193,12 @@
};
c = buildGrammar {
language = "c";
version = "0.0.0+rev=79284a1";
version = "0.0.0+rev=6c7f459";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-c";
rev = "79284a14a0d7e4495b095b38acdd8a27acbe870e";
hash = "sha256-dmvh+k+G0KrR8/bQxJOA/a+uZSrMQfZrNx3ZJQt2MZ4=";
rev = "6c7f459ddc0bcf78b615d3a3f4e8fed87b8b3b1b";
hash = "sha256-lEaHOiA4BohmxOrcBy5TlV+x5aqD7e5n5beuVpqAM0M=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c";
};
@@ -379,6 +379,17 @@
};
meta.homepage = "https://github.com/eonpatapon/tree-sitter-cue";
};
cylc = buildGrammar {
language = "cylc";
version = "0.0.0+rev=8b895c2";
src = fetchFromGitHub {
owner = "elliotfontaine";
repo = "tree-sitter-cylc";
rev = "8b895c278f98d05e67997f5e3a43fb5531933023";
hash = "sha256-+Afoxp+1hJZfRsekpz9WAEw/i/7uoXb0wl7/b6tlPro=";
};
meta.homepage = "https://github.com/elliotfontaine/tree-sitter-cylc";
};
d = buildGrammar {
language = "d";
version = "0.0.0+rev=45e5f1e";
@@ -392,45 +403,45 @@
};
dart = buildGrammar {
language = "dart";
version = "0.0.0+rev=9ac03bb";
version = "0.0.0+rev=a7496b9";
src = fetchFromGitHub {
owner = "UserNobody14";
repo = "tree-sitter-dart";
rev = "9ac03bb2154316624fb4c41fe0f372a5f1597b43";
hash = "sha256-8bSlsDi1QU0Z9sLxrTfqOi6aB1fe+jP9lHuIjIGNx1o=";
rev = "a7496b9d562be91e6588eecd5d7045832f575cd0";
hash = "sha256-HEeg1Jovvg65NLyjICd4Gi/+e1QapxuEF2tqhh4B0dA=";
};
meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart";
};
desktop = buildGrammar {
language = "desktop";
version = "0.0.0+rev=0d8b8cf";
version = "0.0.0+rev=de93cdb";
src = fetchFromGitHub {
owner = "ValdezFOmar";
repo = "tree-sitter-desktop";
rev = "0d8b8cf7c9311fe3f1730df8e193d836f6dd9d1b";
hash = "sha256-tDZB6gkQyVF1wN4343Qft0tRkTDDm49AFzhbIz+LK40=";
rev = "de93cdbd1cba965c102ce8b659d79f5759b933bd";
hash = "sha256-aBdF9s1Km5vrb+kXnwdcxuhUJyzQCpGlQ/EE0h2kT0U=";
};
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-desktop";
};
devicetree = buildGrammar {
language = "devicetree";
version = "0.0.0+rev=16c9cb9";
version = "0.0.0+rev=16f640f";
src = fetchFromGitHub {
owner = "joelspadin";
repo = "tree-sitter-devicetree";
rev = "16c9cb959675bc9bc4f4e5bebe473d511a12a06d";
hash = "sha256-UVxLF4IKRXexz+PbSlypS/1QsWXkS/iYVbgmFCgjvZM=";
rev = "16f640f3c59117c9e749d581634afdb00e004f4c";
hash = "sha256-0J1Q25JEWVAlBHAgWRtHAwIIDNoSLYrEdMC45/jf7Uc=";
};
meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree";
};
dhall = buildGrammar {
language = "dhall";
version = "0.0.0+rev=affb6ee";
version = "0.0.0+rev=4a6c08a";
src = fetchFromGitHub {
owner = "jbellerb";
repo = "tree-sitter-dhall";
rev = "affb6ee38d629c9296749767ab832d69bb0d9ea8";
hash = "sha256-q9OkKmp0Nor+YkFc8pBVAOoXoWzwjjzg9lBUKAUnjmQ=";
rev = "4a6c08abfb54827db4e722d6cdca81b093898988";
hash = "sha256-EP6eL04ltnnP2ypNsq6rLrG3F4bVg7QtnK3k0KP2/MY=";
};
meta.homepage = "https://github.com/jbellerb/tree-sitter-dhall";
};
@@ -537,12 +548,12 @@
};
editorconfig = buildGrammar {
language = "editorconfig";
version = "0.0.0+rev=38cf8d0";
version = "0.0.0+rev=5eca41a";
src = fetchFromGitHub {
owner = "ValdezFOmar";
repo = "tree-sitter-editorconfig";
rev = "38cf8d0af6049025de0e5486a40881dac06285b4";
hash = "sha256-ndZ/oGquSMkxsEHUPh5/qDEUVfhyZbI4mcQKtLHVBOU=";
rev = "5eca41a689dc03534e9c459b066d116f8befb4ef";
hash = "sha256-bsefC7SCJvSPy83BeIYxmFe+0Zt96QNs49Tlh/Vbx5s=";
};
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig";
};
@@ -724,12 +735,12 @@
};
fortran = buildGrammar {
language = "fortran";
version = "0.0.0+rev=cb4cb11";
version = "0.0.0+rev=e9fbb3a";
src = fetchFromGitHub {
owner = "stadelmanma";
repo = "tree-sitter-fortran";
rev = "cb4cb11ca2dced205fb54005684a44e2ceb813c1";
hash = "sha256-c15BxiXhmQeOz0G5v2R9fpBUbhmcibm15ax6hbWQOnI=";
rev = "e9fbb3acbfc62b051616e53b17ab97b9823e8617";
hash = "sha256-G7tsnI22k7Ndur3fLnfr2xk4fUaJ4kIy3Dw0GuqHSqg=";
};
meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
};
@@ -879,12 +890,12 @@
};
gleam = buildGrammar {
language = "gleam";
version = "0.0.0+rev=57c9951";
version = "0.0.0+rev=2702fe8";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = "tree-sitter-gleam";
rev = "57c9951b290c8084d7c60b0aee7a2b30986ea031";
hash = "sha256-ieOvtZvOUwiJwJN6AtHVK91GTh+RKge9FMo+mYCtisk=";
rev = "2702fe84b986e4403a071bcb112d48e3dcde0ca4";
hash = "sha256-DY79MOnZqb145DtmUyhma0WZ5PksDeqVvhwGuvFXGjM=";
};
meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam";
};
@@ -1066,12 +1077,12 @@
};
groovy = buildGrammar {
language = "groovy";
version = "0.0.0+rev=0d88845";
version = "0.0.0+rev=b53a8cc";
src = fetchFromGitHub {
owner = "murtaza64";
repo = "tree-sitter-groovy";
rev = "0d8884514fe10c4fa47527d9a0284d207f38ddea";
hash = "sha256-Dv7FxfHA+2VM60iFZGaytmDVCUEoCJY3bpOJrw5Q8ik=";
rev = "b53a8cc1075e056b8223b86f3bb392e0d57ae101";
hash = "sha256-yLl3/4qla45tsjCd2EFutcNqVrDjyMUjnSpUUHwaIyE=";
};
meta.homepage = "https://github.com/murtaza64/tree-sitter-groovy";
};
@@ -1143,12 +1154,12 @@
};
heex = buildGrammar {
language = "heex";
version = "0.0.0+rev=6dd0303";
version = "0.0.0+rev=9359017";
src = fetchFromGitHub {
owner = "connorlay";
repo = "tree-sitter-heex";
rev = "6dd0303acf7138dd2b9b432a229e16539581c701";
hash = "sha256-VakMZtWQ/h7dNy5ehk2Bh14a5s878AUgwY3Ipq8tPec=";
rev = "9359017bd0dc6b023044713aa215544885663637";
hash = "sha256-4DEfL/RxZk7cvP5qUHNohJlfAIW+ks34rdMd/uCvsvA=";
};
meta.homepage = "https://github.com/connorlay/tree-sitter-heex";
};
@@ -1276,12 +1287,12 @@
};
idl = buildGrammar {
language = "idl";
version = "0.0.0+rev=5573b29";
version = "0.0.0+rev=9ac6fdd";
src = fetchFromGitHub {
owner = "cathaysia";
repo = "tree-sitter-idl";
rev = "5573b295410201ed22771776b34d636900eba368";
hash = "sha256-Pf9Wtmza6bKQsZ54EzVhSnUFkEcHuTgPGNZuH8jh42o=";
rev = "9ac6fdd7840b5c0f271fe11b4ab656634dc2074a";
hash = "sha256-cedxIEfqyvnVdJOqPbXnsKoajMXwejVu9BV3qLCuYR8=";
};
meta.homepage = "https://github.com/cathaysia/tree-sitter-idl";
};
@@ -1474,12 +1485,12 @@
};
koto = buildGrammar {
language = "koto";
version = "0.0.0+rev=9e5ab09";
version = "0.0.0+rev=0017388";
src = fetchFromGitHub {
owner = "koto-lang";
repo = "tree-sitter-koto";
rev = "9e5ab09710b9f035efdcef1eecaadbf261af7ec3";
hash = "sha256-xlU3iOjwYcoCf6kdkxTX/zASY0+n+TwAn8GBfACYr1k=";
rev = "0017388765b8b9d89febfe08b5f82805b4e173a5";
hash = "sha256-L8IK4dvejZ1yfEkPGufkNArxm3hTStpk15HFNkSQdv0=";
};
meta.homepage = "https://github.com/koto-lang/tree-sitter-koto";
};
@@ -1808,12 +1819,12 @@
};
nix = buildGrammar {
language = "nix";
version = "0.0.0+rev=456b14a";
version = "0.0.0+rev=1b26cb6";
src = fetchFromGitHub {
owner = "cstrahan";
repo = "tree-sitter-nix";
rev = "456b14a2fa6315abc7e02fcffaf4a1f35d4955d3";
hash = "sha256-eY+e48XFHvTRlew4LvndGHQog3d/RKDLlIrGr7QOWBY=";
rev = "1b26cb63284287344bc3820804cea18419b3edec";
hash = "sha256-tkGOSi0NqtKl6w473+G66mWwbXwpmRySMLH8DEEcEXQ=";
};
meta.homepage = "https://github.com/cstrahan/tree-sitter-nix";
};
@@ -1839,6 +1850,17 @@
};
meta.homepage = "https://github.com/amaanq/tree-sitter-nqc";
};
nu = buildGrammar {
language = "nu";
version = "0.0.0+rev=082a7c7";
src = fetchFromGitHub {
owner = "nushell";
repo = "tree-sitter-nu";
rev = "082a7c7df7db460da6b280c9f902bf2b19a2f423";
hash = "sha256-BUOadkcQAXqMI8qpDcPN8NwNI+LScPKl/GsGvhfUmhw=";
};
meta.homepage = "https://github.com/nushell/tree-sitter-nu";
};
objc = buildGrammar {
language = "objc";
version = "0.0.0+rev=62e61b6";
@@ -2066,12 +2088,12 @@
};
printf = buildGrammar {
language = "printf";
version = "0.0.0+rev=0e0acea";
version = "0.0.0+rev=94b84fb";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-printf";
rev = "0e0aceabbf607ea09e03562f5d8a56f048ddea3d";
hash = "sha256-y/7CDnHpT3D6hL0f+52mReCphn+lvElfQQKJwY4fr9c=";
rev = "94b84fbc4768a7cbdeadfe5e489a45a6a8af400e";
hash = "sha256-Ax23Y2arS+8g45F1NuffTq0ZlPZ2NBz0aHuQJyEVy2Y=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-printf";
};
@@ -2344,12 +2366,12 @@
};
regex = buildGrammar {
language = "regex";
version = "0.0.0+rev=58f4caf";
version = "0.0.0+rev=b518ad4";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-regex";
rev = "58f4caf9db12db3b38b81c77d274aa73c9e85aca";
hash = "sha256-IeAp2fEdxVf8r/f8B85ex5Y5DL8Z1ZOqovjVyMBIOKM=";
rev = "b518ad4bbee3ad59672b1826ca4dc62825983533";
hash = "sha256-gApL+F03m24ibIrLMcirk1s+uJRM0vv7J34YRHkO78U=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-regex";
};
@@ -2386,17 +2408,6 @@
};
meta.homepage = "https://github.com/rescript-lang/tree-sitter-rescript";
};
river = buildGrammar {
language = "river";
version = "0.0.0+rev=eafcdc5";
src = fetchFromGitHub {
owner = "grafana";
repo = "tree-sitter-river";
rev = "eafcdc5147f985fea120feb670f1df7babb2f79e";
hash = "sha256-fhuIO++hLr5DqqwgFXgg8QGmcheTpYaYLMo7117rjyk=";
};
meta.homepage = "https://github.com/grafana/tree-sitter-river";
};
rnoweb = buildGrammar {
language = "rnoweb";
version = "0.0.0+rev=1a74dc0";
@@ -2465,12 +2476,12 @@
};
ruby = buildGrammar {
language = "ruby";
version = "0.0.0+rev=83aec5f";
version = "0.0.0+rev=557ec01";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-ruby";
rev = "83aec5f7d1659aaa79e6f24b406a9cd49b87e8e8";
hash = "sha256-LmZ2CmsAtxVcR/FuEZXunOHbGR9w8IL5DmLINFWqBAE=";
rev = "557ec01403bd1fcfea50f1805641ca773cbaaa42";
hash = "sha256-3MzlgYW65MSpukd8Nt9ooUC39g7ZigLjqXIaNB0sNEg=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ruby";
};
@@ -2678,12 +2689,12 @@
};
ssh_config = buildGrammar {
language = "ssh_config";
version = "0.0.0+rev=77450e8";
version = "0.0.0+rev=dd32616";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-ssh-config";
rev = "77450e8bce8853921512348f83c73c168c71fdfb";
hash = "sha256-V7JI1o30+mzGA4X1oh+pyu3rSWOfHFKfCUbYaFPLOmM=";
rev = "dd32616275c6e9d7800c58f40c16a09ad1c7c238";
hash = "sha256-BOvCOnt76f00+hqjEmJ8VLiwqSPd3p/yScTXsuNdexY=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-ssh-config";
};
@@ -2711,12 +2722,12 @@
};
styled = buildGrammar {
language = "styled";
version = "0.0.0+rev=764af55";
version = "0.0.0+rev=2e0e623";
src = fetchFromGitHub {
owner = "mskelton";
repo = "tree-sitter-styled";
rev = "764af55fc6b8e5ae177eb272f5c5de6238db23e6";
hash = "sha256-Zh35KWOYQbtsG3/F7g68dniBu5UZTA6ZuiX2GA0E2ww=";
rev = "2e0e6231348d8cb0a82406490771825b8ac80422";
hash = "sha256-RwhHCWK1ckXdPgIVZ4NC5zCBna91NBYub2MlrIwHeGk=";
};
meta.homepage = "https://github.com/mskelton/tree-sitter-styled";
};
@@ -2733,12 +2744,12 @@
};
superhtml = buildGrammar {
language = "superhtml";
version = "0.0.0+rev=e561df3";
version = "0.0.0+rev=7d61ccc";
src = fetchFromGitHub {
owner = "kristoff-it";
repo = "superhtml";
rev = "e561df3b5ce94e598a4c3d0ee4abd9635bad63b3";
hash = "sha256-sF5uAEYV32HROnqvM3oltvpwtBydx2au8SIJCAMmpMY=";
rev = "7d61cccdb865b2028301a0597b55ac8b225af6cf";
hash = "sha256-rO7HS07nSqwOq6345q/SOL2imoD0cKV16QJcVVr6mHw=";
};
location = "tree-sitter-superhtml";
meta.homepage = "https://github.com/kristoff-it/superhtml";
@@ -2765,6 +2776,17 @@
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-svelte";
};
sway = buildGrammar {
language = "sway";
version = "0.0.0+rev=03d97aa";
src = fetchFromGitHub {
owner = "FuelLabs";
repo = "tree-sitter-sway";
rev = "03d97aad336ecc6b302f23bdd9b695ddc937160b";
hash = "sha256-Y08vgnlxOSjvI3NURU8VUyaGjKt+q4IiCaV18C5co0s=";
};
meta.homepage = "https://github.com/FuelLabs/tree-sitter-sway.git";
};
swift = buildGrammar {
language = "swift";
version = "0.0.0+rev=5098007";
@@ -2913,12 +2935,12 @@
};
tlaplus = buildGrammar {
language = "tlaplus";
version = "0.0.0+rev=ffb6c4b";
version = "0.0.0+rev=d711f24";
src = fetchFromGitHub {
owner = "tlaplus-community";
repo = "tree-sitter-tlaplus";
rev = "ffb6c4b91862a03af767d6b0e627d3d20539b79a";
hash = "sha256-eKHpiAtOYn9fFhR35m1d1jLNwLeXL1GT5cAWWoYZI/k=";
rev = "d711f24c93221cdfc9a9b4dbb0998f528fc982ac";
hash = "sha256-CHoqOY990/30GqLkxee/xexQ9uni7VTdW0iZ+inunoc=";
};
meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus";
};
@@ -3116,12 +3138,12 @@
};
vala = buildGrammar {
language = "vala";
version = "0.0.0+rev=8f690bf";
version = "0.0.0+rev=97e6db3";
src = fetchFromGitHub {
owner = "vala-lang";
repo = "tree-sitter-vala";
rev = "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b";
hash = "sha256-YZTE3PkBPCEkMXnLC0HSQ86v5+3/J7/ETDQp8eguFW8=";
rev = "97e6db3c8c73b15a9541a458d8e797a07f588ef4";
hash = "sha256-hAekweZGDHVrWVd04RrN+9Jz0D2kode+DpceTlUXii0=";
};
meta.homepage = "https://github.com/vala-lang/tree-sitter-vala";
};
@@ -3149,12 +3171,12 @@
};
vhdl = buildGrammar {
language = "vhdl";
version = "0.0.0+rev=d6e8301";
version = "0.0.0+rev=606cc72";
src = fetchFromGitHub {
owner = "jpt13653903";
repo = "tree-sitter-vhdl";
rev = "d6e8301999336b47d663052d43f983c3edeb01dd";
hash = "sha256-vQIsWcmm5szh7L8iSDDHenSJDqJrXcTDn0A/0WJYWGc=";
rev = "606cc728e7d55bbcecfa37b20d7313a609af1361";
hash = "sha256-H8BApOAcRIFNI5Ke8DtCDZUDptKNeS8wTMHQp6xZZBM=";
};
meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl";
};
@@ -3282,12 +3304,12 @@
};
xresources = buildGrammar {
language = "xresources";
version = "0.0.0+rev=630af80";
version = "0.0.0+rev=d36d356";
src = fetchFromGitHub {
owner = "ValdezFOmar";
repo = "tree-sitter-xresources";
rev = "630af80f563ede09a652a808277950c36306e3a3";
hash = "sha256-kQmswwZgevQFayhU0Q+UnLh+lnjgvr+m48FtYWUv3Bw=";
rev = "d36d356624af4b46d3fc815d0701ebf72654473c";
hash = "sha256-h3rS89e+eZTCxCNJVJdBbgCFEMDXQ884Lkmol0Gcq5k=";
};
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources";
};
@@ -3348,24 +3370,24 @@
};
ziggy = buildGrammar {
language = "ziggy";
version = "0.0.0+rev=42b6f5d";
version = "0.0.0+rev=fe73bee";
src = fetchFromGitHub {
owner = "kristoff-it";
repo = "ziggy";
rev = "42b6f5d7320340bc5903c4c29d34065e8517a549";
hash = "sha256-08y6Km7tO9YhJBmWXvPVjiku1QRRNcmJ2h2EbMa6Q/g=";
rev = "fe73beef9f52f04048d8b19016fc4fbc66b4596f";
hash = "sha256-GSiVrl3GMp5Y8DF/gxdl1ToUoN5s3RQxNKxmab5tSHs=";
};
location = "tree-sitter-ziggy";
meta.homepage = "https://github.com/kristoff-it/ziggy";
};
ziggy_schema = buildGrammar {
language = "ziggy_schema";
version = "0.0.0+rev=42b6f5d";
version = "0.0.0+rev=fe73bee";
src = fetchFromGitHub {
owner = "kristoff-it";
repo = "ziggy";
rev = "42b6f5d7320340bc5903c4c29d34065e8517a549";
hash = "sha256-08y6Km7tO9YhJBmWXvPVjiku1QRRNcmJ2h2EbMa6Q/g=";
rev = "fe73beef9f52f04048d8b19016fc4fbc66b4596f";
hash = "sha256-GSiVrl3GMp5Y8DF/gxdl1ToUoN5s3RQxNKxmab5tSHs=";
};
location = "tree-sitter-ziggy-schema";
meta.homepage = "https://github.com/kristoff-it/ziggy";
pkgs/applications/editors/vim/plugins/overrides.nix
+1 -1
View File
@@ -173,7 +173,7 @@ in
pname = "avante-nvim-lib";
inherit (oldAttrs) version src;
cargoHash = "sha256-Hh7qAmGtxfWtkBBsNq0iVTruUSe0duE4tXaajDIt8zQ=";
cargoHash = "sha256-X8JqUoPjm9emJjmwCh7+0bfdtPXLwOg6IRfQHaYlH90=";
nativeBuildInputs = [
pkg-config
pkgs/applications/networking/seafile-client/default.nix
+2 -2
View File
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "seafile-client";
version = "9.0.8";
version = "9.0.9";
src = fetchFromGitHub {
owner = "haiwen";
repo = "seafile-client";
rev = "v${version}";
sha256 = "sha256-1E/PgQEg8lQntKpafCubPNUIF/L3kjA/rp1xAL8vFfs=";
sha256 = "sha256-dy5EXDEyxtV88Fgbao/J3fNwO5AO/ES0IJLIeRenO8I=";
};
nativeBuildInputs = [
pkgs/by-name/ac/actionlint/package.nix
+3 -3
View File
@@ -10,7 +10,7 @@
}:
let
version = "1.7.3";
version = "1.7.4";
in
buildGoModule {
pname = "actionlint";
@@ -22,10 +22,10 @@ buildGoModule {
owner = "rhysd";
repo = "actionlint";
rev = "v${version}";
hash = "sha256-IwkTiuQ3eTZMn1y0NG1jo9UrX7AmEUBRSGQ/vq/0YL8=";
hash = "sha256-NPlDD74vrVXsVgdoMHD0F3SYebH1p/RH9h1qVgLQMRw=";
};
vendorHash = "sha256-SIY79SjYYXW2slUQr2Bm9dLH8K2wE3l/TL3QP0m8GLs=";
vendorHash = "sha256-pKmN5duaSp5EuQ8L2SWduh3g1gbQq2jrUaKsQuEuy98=";
nativeBuildInputs = [
makeWrapper
pkgs/by-name/ar/argo-expr/package.nix
+36
View File
@@ -0,0 +1,36 @@
{
lib,
buildGoModule,
fetchFromGitHub,
versionCheckHook,
}:
buildGoModule rec {
pname = "argo-expr";
version = "1.1.3";
src = fetchFromGitHub {
owner = "blacha";
repo = "argo-expr";
rev = "v${version}";
hash = "sha256-XQnPFzT3PRmKeAQXLzBE5R2VvXotzxmsq+u9u5iE1QA=";
};
vendorHash = "sha256-HGmJVxmAj9ijsWX+qJ7J9l3uO7WvXtRU2gvx2G7N7/M=";
ldflags = [ "-X main.Version=v${version}" ];
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
meta = {
description = "Argo expression tester";
homepage = "https://github.com/blacha/argo-expr";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ l0b0 ];
mainProgram = "argo-expr";
};
}
pkgs/by-name/bu/butterfly/package.nix
+77
View File
@@ -0,0 +1,77 @@
{
lib,
fetchFromGitHub,
flutter,
stdenv,
fetchzip,
}:
let
pname = "butterfly";
version = "2.2.1";
src = fetchFromGitHub {
owner = "LinwoodDev";
repo = "Butterfly";
rev = "v${version}";
hash = "sha256-TV7C0v3y9G44Df/x1ST8D0c0QqNBuuhzPBMKUyf/iwo=";
};
pdfium-binaries = fetchzip {
url = "https://github.com/bblanchon/pdfium-binaries/releases/download/chromium/5200/pdfium-linux-x64.tgz";
hash = "sha256-AJop6gKjF/DPgItuPQsWpgngxiqVNeqBbhHZz3aQ1n0=";
stripRoot = false;
};
in
flutter.buildFlutterApplication {
inherit pname version src;
pubspecLock = lib.importJSON ./pubspec.lock.json;
sourceRoot = "${src.name}/app";
customSourceBuilders = {
printing =
{ version, src, ... }:
stdenv.mkDerivation rec {
pname = "printing";
inherit version src;
inherit (src) passthru;
patches = [ ./printing.patch ];
installPhase = ''
runHook preInstall
mkdir $out
cp -a ./* $out/
runHook postInstall
'';
};
};
env.PDFIUM_DIR = "${pdfium-binaries}";
gitHashes = {
dart_leap = "sha256-eEyUqdVToybQoDwdmz47H0f3/5zRdJzmPv1d/5mTOgA=";
lw_file_system = "sha256-CPBwaDTK57SKcaD4IzjIL4cWixEDK9sv3zCDeNfFpw0=";
flutter_secure_storage_web = "sha256-ULYXcFjz9gKMjw1Q1KAmX2J7EcE8CbW0MN/EnwmaoQY=";
networker = "sha256-8ol5YRim4dLpgR30DXbgHzq+VDk1sPLIi+AxUtwOls8=";
lw_file_system_api = "sha256-OOLbqKLvgHUJf3LiiQoHJS6kngnWtHPhswM69sX5fwE=";
lw_sysapi = "sha256-9hCAYB5tqYKQPHGa7+Zma6fE8Ei08RvyL9d65FMuI+I=";
flex_color_scheme = "sha256-MYEiiltevfz0gDag3yS/ZjeVaJyl1JMS8zvgI0k4Y0k=";
material_leap = "sha256-pQ+OvecHaav5QI+Hf7+DDcXYM3JMwogseMzce1ULveY=";
networker_socket = "sha256-+h5FXqPhB6VJ269WPoqKk+/1cE+p7UbLvDwnXrJh+CE=";
perfect_freehand = "sha256-dMJ8CyhoQWbBRvUQyzPc7vdAhCzcAl1X7CcaT3u6dWo=";
};
postInstall = ''
cp -r linux/debian/usr/share $out/share
'';
meta = {
description = "Powerful, minimalistic, cross-platform, opensource note-taking app";
homepage = "https://github.com/LinwoodDev/Butterfly";
mainProgram = "butterfly";
license = with lib.licenses; [
agpl3Plus
cc-by-sa-40
];
maintainers = with lib.maintainers; [ aucub ];
platforms = [ "x86_64-linux" ];
};
}
pkgs/by-name/bu/butterfly/printing.patch
+45
View File
@@ -0,0 +1,45 @@
--- old/linux/CMakeLists.txt 2024-07-16 18:45:19.000000000 +0800
+++ new/linux/CMakeLists.txt 2024-10-01 01:49:05.544910894 +0800
@@ -16,6 +16,7 @@
set(PROJECT_NAME "printing")
project(${PROJECT_NAME} LANGUAGES CXX)
+set(PDFIUM_DIR $ENV{PDFIUM_DIR})
set(PDFIUM_VERSION "5200" CACHE STRING "Version of pdfium used")
string(REPLACE "linux-" "" TARGET_ARCH ${FLUTTER_TARGET_PLATFORM})
set(PDFIUM_ARCH ${TARGET_ARCH} CACHE STRING "Architecture of pdfium used")
@@ -32,18 +33,11 @@
)
endif()
-# Download pdfium
-include(../windows/DownloadProject.cmake)
-download_project(PROJ
- pdfium
- URL
- ${PDFIUM_URL})
-
# This value is used when generating builds using this plugin, so it must not be
# changed
set(PLUGIN_NAME "printing_plugin")
-include(${pdfium_SOURCE_DIR}/PDFiumConfig.cmake)
+include(${PDFIUM_DIR}/PDFiumConfig.cmake)
# System-level dependencies.
find_package(PkgConfig REQUIRED)
@@ -67,7 +61,7 @@
target_link_libraries(${PLUGIN_NAME}
PRIVATE PkgConfig::GTK PkgConfig::GTKUnixPrint)
target_link_libraries(${PLUGIN_NAME} PRIVATE pdfium)
-get_filename_component(PDFium_lib_path "${PDFium_LIBRARY}" DIRECTORY)
+set(PDFium_lib_path "${PDFIUM_DIR}/lib")
set_target_properties(${PLUGIN_NAME}
PROPERTIES SKIP_BUILD_RPATH
FALSE
@@ -77,4 +71,4 @@
"$ORIGIN:${PDFium_lib_path}")
# List of absolute paths to libraries that should be bundled with the plugin
-set(printing_bundled_libraries "${PDFium_LIBRARY}" PARENT_SCOPE)
+set(printing_bundled_libraries "${PDFIUM_DIR}/lib/libpdfium.so" PARENT_SCOPE)
pkgs/by-name/bu/butterfly/pubspec.lock.json
+2050
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/co/cosmic-wallpapers/package.nix
+12 -5
View File
@@ -8,7 +8,7 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "cosmic-wallpapers";
version = "1.0.0-alpha.2";
version = "1.0.0-alpha.3";
src = fetchFromGitHub {
owner = "pop-os";
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
rev = "epoch-${finalAttrs.version}";
forceFetchGit = true;
fetchLFS = true;
hash = "sha256-9abkb9dECE7qVq547DkpIUvaYLXLGfkRlTgLCbQtSPw=";
hash = "sha256-Exrps3DicL/G/g0kbSsCvoFhiJn1k3v8I09GhW7EwNM=";
};
patches = [
@@ -39,9 +39,16 @@ stdenvNoCC.mkDerivation (finalAttrs: {
description = "Wallpapers for the COSMIC Desktop Environment";
homepage = "https://system76.com/cosmic";
license = with lib.licenses; [
unfree # https://github.com/pop-os/cosmic-wallpapers/issues/1 https://github.com/pop-os/cosmic-wallpapers/issues/3
cc-by-40 # https://www.esa.int/ESA_Multimedia/Images/2017/06/A_stormy_stellar_nursery (A_stormy_stellar_nursery_esa_379309.jpg)
publicDomain # https://earthobservatory.nasa.gov/image-use-policy (otherworldly_earth_nasa_ISS064-E-29444.jpg, phytoplankton_bloom_nasa_oli2_20240121.jpg); https://hubblesite.org/copyright (orion_nebula_nasa_heic0601a.jpg); https://webbtelescope.org/copyright (tarantula_nebula_nasa_PIA23646.jpg); https://www.planetary.org/space-images/the-solar-systems-round-moons (round_moons_nasa.jpg)
# A_stormy_stellar_nursery_esa_379309.jpg: https://www.esa.int/ESA_Multimedia/Images/2017/06/A_stormy_stellar_nursery
# webb-inspired-wallpaper-system76.jpg
cc-by-40
# otherworldly_earth_nasa_ISS064-E-29444.jpg: https://earthobservatory.nasa.gov/image-use-policy
# phytoplankton_bloom_nasa_oli2_20240121.jpg: https://earthobservatory.nasa.gov/image-use-policy
# orion_nebula_nasa_heic0601a.jpg: https://hubblesite.org/copyright
# tarantula_nebula_nasa_PIA23646.jpg: https://webbtelescope.org/copyright
# round_moons_nasa.jpg: https://www.planetary.org/space-images/the-solar-systems-round-moons
publicDomain
];
maintainers = with lib.maintainers; [ pandapip1 ];
platforms = lib.platforms.unix;
pkgs/by-name/em/empty-epsilon/package.nix
+4 -4
View File
@@ -2,8 +2,8 @@
let
version = {
seriousproton = "2024.06.20";
emptyepsilon = "2024.06.20";
seriousproton = "2024.08.09";
emptyepsilon = "2024.08.09";
basis-universal = "v1_15_update2";
};
@@ -22,7 +22,7 @@ let
owner = "daid";
repo = "SeriousProton";
rev = "EE-${version.seriousproton}";
hash = "sha256-byLk4ukpj+s74+3K+1wzRTXhe4pKkH0pOSYeVs94muc=";
hash = "sha256-B7BUe5rtN/eABJwkuSyn+h1lIHuV/tZUNcGXTyaWIr4=";
};
nativeBuildInputs = [ cmake ];
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
owner = "daid";
repo = "EmptyEpsilon";
rev = "EE-${version.emptyepsilon}";
hash = "sha256-YTZliu1o3LFab43DqmSk/cifxRWZMPxdV4gNoNy8LEk=";
hash = "sha256-DxaasUyJa8n0ha8RqAfEnqCVELs5Or0zvIOgcK75TnU=";
};
nativeBuildInputs = [ cmake ];
pkgs/by-name/fa/fahrplan/package.nix
+36
View File
@@ -0,0 +1,36 @@
{
lib,
python3,
fetchFromGitHub,
}:
python3.pkgs.buildPythonApplication rec {
pname = "fahrplan";
version = "1.1.2";
pyproject = true;
src = fetchFromGitHub {
owner = "dbrgn";
repo = "fahrplan";
rev = "refs/tags/v${version}";
hash = "sha256-2QVaA2zqqFuxjkKbDXo+SNzkrDCxXiSYMUOftQ++wO4=";
};
build-system = with python3.pkgs; [
setuptools
];
dependencies = with python3.pkgs; [
python-dateutil
requests
texttable
];
meta = {
description = "Command line access to the SBB/CFF/FFS timetable with human readable argument parsing";
homepage = "https://github.com/dbrgn/fahrplan";
changelog = "https://github.com/dbrgn/fahrplan/blob/${src.rev}/CHANGELOG.md";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ p-h ];
mainProgram = "fahrplan";
};
}
pkgs/by-name/ic/icloudpd/package.nix
+6 -3
View File
@@ -9,7 +9,7 @@
python3Packages.buildPythonApplication rec {
pname = "icloudpd";
version = "1.24.0";
version = "1.24.3";
pyproject = true;
src = fetchFromGitHub {
@@ -72,8 +72,11 @@ python3Packages.buildPythonApplication rec {
preBuild = ''
substituteInPlace pyproject.toml \
--replace "setuptools==69.0.2" "setuptools" \
--replace "wheel==0.42.0" "wheel"
--replace-fail "setuptools==69.0.2" "setuptools" \
--replace-fail "wheel==0.42.0" "wheel"
substituteInPlace src/foundation/__init__.py \
--replace-fail "0.0.1" "${version}"
'';
meta = with lib; {
pkgs/by-name/ju/junest/package.nix
+6
View File
@@ -14,11 +14,17 @@ stdenvNoCC.mkDerivation rec {
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/bin
mkdir -p $out/lib
cp -r $src/bin/ $out/
cp -r $src/lib/ $out/
# cp -r $src/VERSION $out/
substituteInPlace $out/bin/junest --replace-fail '$(cat "$JUNEST_BASE"/VERSION)' ${version}
substituteInPlace $out/lib/core/common.sh --replace-fail "wget" ${lib.getExe wget}
runHook postInstall
'';
meta = {
pkgs/by-name/ma/manicode/package-lock.json
Generated
+878
View File
@@ -0,0 +1,878 @@
{
"name": "manicode",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"dependencies": {
"manicode": "^1.0.94"
}
},
"node_modules/@types/diff": {
"version": "5.2.1",
"resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.2.1.tgz",
"integrity": "sha512-uxpcuwWJGhe2AR1g8hD9F5OYGCqjqWnBUQFD8gMZsDbv8oPHzxJF6iMO6n8Tk0AdzlxoaaoQhOYlIg/PukVU8g==",
"license": "MIT"
},
"node_modules/asynckit": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
"license": "MIT"
},
"node_modules/axios": {
"version": "1.7.4",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
"integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
"license": "MIT",
"dependencies": {
"follow-redirects": "^1.15.6",
"form-data": "^4.0.0",
"proxy-from-env": "^1.1.0"
}
},
"node_modules/boolbase": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
"integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
"license": "ISC"
},
"node_modules/cheerio": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0.tgz",
"integrity": "sha512-quS9HgjQpdaXOvsZz82Oz7uxtXiy6UIsIQcpBj7HRw2M63Skasm9qlDocAM7jNuaxdhpPU7c4kJN+gA5MCu4ww==",
"license": "MIT",
"dependencies": {
"cheerio-select": "^2.1.0",
"dom-serializer": "^2.0.0",
"domhandler": "^5.0.3",
"domutils": "^3.1.0",
"encoding-sniffer": "^0.2.0",
"htmlparser2": "^9.1.0",
"parse5": "^7.1.2",
"parse5-htmlparser2-tree-adapter": "^7.0.0",
"parse5-parser-stream": "^7.1.2",
"undici": "^6.19.5",
"whatwg-mimetype": "^4.0.0"
},
"engines": {
"node": ">=18.17"
},
"funding": {
"url": "https://github.com/cheeriojs/cheerio?sponsor=1"
}
},
"node_modules/cheerio-select": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-2.1.0.tgz",
"integrity": "sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==",
"license": "BSD-2-Clause",
"dependencies": {
"boolbase": "^1.0.0",
"css-select": "^5.1.0",
"css-what": "^6.1.0",
"domelementtype": "^2.3.0",
"domhandler": "^5.0.3",
"domutils": "^3.0.1"
},
"funding": {
"url": "https://github.com/sponsors/fb55"
}
},
"node_modules/combined-stream": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
"license": "MIT",
"dependencies": {
"delayed-stream": "~1.0.0"
},
"engines": {
"node": ">= 0.8"
}
},
"node_modules/commander": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
"integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
"license": "MIT",
"engines": {
"node": ">= 6"
}
},
"node_modules/cross-spawn": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
"license": "MIT",
"dependencies": {
"path-key": "^3.1.0",
"shebang-command": "^2.0.0",
"which": "^2.0.1"
},
"engines": {
"node": ">= 8"
}
},
"node_modules/css-select": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
"integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
"license": "BSD-2-Clause",
"dependencies": {
"boolbase": "^1.0.0",
"css-what": "^6.1.0",
"domhandler": "^5.0.2",
"domutils": "^3.0.1",
"nth-check": "^2.0.1"
},
"funding": {
"url": "https://github.com/sponsors/fb55"
}
},
"node_modules/css-what": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
"integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
"license": "BSD-2-Clause",
"engines": {
"node": ">= 6"
},
"funding": {
"url": "https://github.com/sponsors/fb55"
}
},
"node_modules/delayed-stream": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
"integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
"license": "MIT",
"engines": {
"node": ">=0.4.0"
}
},
"node_modules/diff": {
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
"integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==",
"license": "BSD-3-Clause",
"engines": {
"node": ">=0.3.1"
}
},
"node_modules/dom-serializer": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
"integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
"license": "MIT",
"dependencies": {
"domelementtype": "^2.3.0",
"domhandler": "^5.0.2",
"entities": "^4.2.0"
},
"funding": {
"url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
}
},
"node_modules/domelementtype": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/fb55"
}
],
"license": "BSD-2-Clause"
},
"node_modules/domhandler": {
"version": "5.0.3",
"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
"integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
"license": "BSD-2-Clause",
"dependencies": {
"domelementtype": "^2.3.0"
},
"engines": {
"node": ">= 4"
},
"funding": {
"url": "https://github.com/fb55/domhandler?sponsor=1"
}
},
"node_modules/domutils": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
"integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
"license": "BSD-2-Clause",
"dependencies": {
"dom-serializer": "^2.0.0",
"domelementtype": "^2.3.0",
"domhandler": "^5.0.3"
},
"funding": {
"url": "https://github.com/fb55/domutils?sponsor=1"
}
},
"node_modules/encoding-sniffer": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/encoding-sniffer/-/encoding-sniffer-0.2.0.tgz",
"integrity": "sha512-ju7Wq1kg04I3HtiYIOrUrdfdDvkyO9s5XM8QAj/bN61Yo/Vb4vgJxy5vi4Yxk01gWHbrofpPtpxM8bKger9jhg==",
"license": "MIT",
"dependencies": {
"iconv-lite": "^0.6.3",
"whatwg-encoding": "^3.1.1"
},
"funding": {
"url": "https://github.com/fb55/encoding-sniffer?sponsor=1"
}
},
"node_modules/entities": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
"integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
"license": "BSD-2-Clause",
"engines": {
"node": ">=0.12"
},
"funding": {
"url": "https://github.com/fb55/entities?sponsor=1"
}
},
"node_modules/env-cmd": {
"version": "10.1.0",
"resolved": "https://registry.npmjs.org/env-cmd/-/env-cmd-10.1.0.tgz",
"integrity": "sha512-mMdWTT9XKN7yNth/6N6g2GuKuJTsKMDHlQFUDacb/heQRRWOTIZ42t1rMHnQu4jYxU1ajdTeJM+9eEETlqToMA==",
"license": "MIT",
"dependencies": {
"commander": "^4.0.0",
"cross-spawn": "^7.0.0"
},
"bin": {
"env-cmd": "bin/env-cmd.js"
},
"engines": {
"node": ">=8.0.0"
}
},
"node_modules/follow-redirects": {
"version": "1.15.9",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
"integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
"funding": [
{
"type": "individual",
"url": "https://github.com/sponsors/RubenVerborgh"
}
],
"license": "MIT",
"engines": {
"node": ">=4.0"
},
"peerDependenciesMeta": {
"debug": {
"optional": true
}
}
},
"node_modules/form-data": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",
"integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
"license": "MIT",
"dependencies": {
"asynckit": "^0.4.0",
"combined-stream": "^1.0.8",
"mime-types": "^2.1.12"
},
"engines": {
"node": ">= 6"
}
},
"node_modules/globals": {
"version": "15.11.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-15.11.0.tgz",
"integrity": "sha512-yeyNSjdbyVaWurlwCpcA6XNBrHTMIeDdj0/hnvX/OLJ9ekOXYbLsLinH/MucQyGvNnXhidTdNhTtJaffL2sMfw==",
"license": "MIT",
"engines": {
"node": ">=18"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/htmlparser2": {
"version": "9.1.0",
"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz",
"integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==",
"funding": [
"https://github.com/fb55/htmlparser2?sponsor=1",
{
"type": "github",
"url": "https://github.com/sponsors/fb55"
}
],
"license": "MIT",
"dependencies": {
"domelementtype": "^2.3.0",
"domhandler": "^5.0.3",
"domutils": "^3.1.0",
"entities": "^4.5.0"
}
},
"node_modules/iconv-lite": {
"version": "0.6.3",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
"license": "MIT",
"dependencies": {
"safer-buffer": ">= 2.1.2 < 3.0.0"
},
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/ignore": {
"version": "5.3.2",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
"integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
"license": "MIT",
"engines": {
"node": ">= 4"
}
},
"node_modules/isexe": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
"license": "ISC"
},
"node_modules/lodash": {
"version": "4.17.21",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
"license": "MIT"
},
"node_modules/manicode": {
"version": "1.0.94",
"resolved": "https://registry.npmjs.org/manicode/-/manicode-1.0.94.tgz",
"integrity": "sha512-61mCaweUCEpD6fvM898wOa0dReRDR1NaQwX3KKfml8OV2RYMXFb7ulo+rWVqQKzhRh/XYJyIUk0SEy4tNgMoFA==",
"license": "MIT",
"dependencies": {
"@types/diff": "5.2.1",
"axios": "1.7.4",
"cheerio": "1.0.0",
"diff": "5.2.0",
"env-cmd": "^10.1.0",
"ignore": "5.3.2",
"lodash": "*",
"nanoid": "5.0.7",
"picocolors": "1.1.0",
"systeminformation": "5.23.4",
"tree-sitter": "0.21.1",
"tree-sitter-c": "0.23.0",
"tree-sitter-c-sharp": "0.23.0",
"tree-sitter-cpp": "0.23.0",
"tree-sitter-go": "0.23.1",
"tree-sitter-java": "0.23.2",
"tree-sitter-javascript": "0.23.0",
"tree-sitter-php": "0.23.2",
"tree-sitter-python": "0.23.2",
"tree-sitter-ruby": "0.23.0",
"tree-sitter-rust": "0.23.0",
"tree-sitter-typescript": "0.23.0",
"ts-pattern": "5.3.1",
"ws": "8.18.0",
"zod": "3.23.8"
},
"bin": {
"manicode": "dist/index.js"
}
},
"node_modules/mime-db": {
"version": "1.52.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
"license": "MIT",
"engines": {
"node": ">= 0.6"
}
},
"node_modules/mime-types": {
"version": "2.1.35",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
"license": "MIT",
"dependencies": {
"mime-db": "1.52.0"
},
"engines": {
"node": ">= 0.6"
}
},
"node_modules/nanoid": {
"version": "5.0.7",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.0.7.tgz",
"integrity": "sha512-oLxFY2gd2IqnjcYyOXD8XGCftpGtZP2AbHbOkthDkvRywH5ayNtPVy9YlOPcHckXzbLTCHpkb7FB+yuxKV13pQ==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/ai"
}
],
"license": "MIT",
"bin": {
"nanoid": "bin/nanoid.js"
},
"engines": {
"node": "^18 || >=20"
}
},
"node_modules/node-addon-api": {
"version": "8.2.1",
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.2.1.tgz",
"integrity": "sha512-vmEOvxwiH8tlOcv4SyE8RH34rI5/nWVaigUeAUPawC6f0+HoDthwI0vkMu4tbtsZrXq6QXFfrkhjofzKEs5tpA==",
"license": "MIT",
"engines": {
"node": "^18 || ^20 || >= 21"
}
},
"node_modules/node-gyp-build": {
"version": "4.8.2",
"resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz",
"integrity": "sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw==",
"license": "MIT",
"bin": {
"node-gyp-build": "bin.js",
"node-gyp-build-optional": "optional.js",
"node-gyp-build-test": "build-test.js"
}
},
"node_modules/nth-check": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
"integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
"license": "BSD-2-Clause",
"dependencies": {
"boolbase": "^1.0.0"
},
"funding": {
"url": "https://github.com/fb55/nth-check?sponsor=1"
}
},
"node_modules/parse5": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.0.tgz",
"integrity": "sha512-ZkDsAOcxsUMZ4Lz5fVciOehNcJ+Gb8gTzcA4yl3wnc273BAybYWrQ+Ks/OjCjSEpjvQkDSeZbybK9qj2VHHdGA==",
"license": "MIT",
"dependencies": {
"entities": "^4.5.0"
},
"funding": {
"url": "https://github.com/inikulin/parse5?sponsor=1"
}
},
"node_modules/parse5-htmlparser2-tree-adapter": {
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.1.0.tgz",
"integrity": "sha512-ruw5xyKs6lrpo9x9rCZqZZnIUntICjQAd0Wsmp396Ul9lN/h+ifgVV1x1gZHi8euej6wTfpqX8j+BFQxF0NS/g==",
"license": "MIT",
"dependencies": {
"domhandler": "^5.0.3",
"parse5": "^7.0.0"
},
"funding": {
"url": "https://github.com/inikulin/parse5?sponsor=1"
}
},
"node_modules/parse5-parser-stream": {
"version": "7.1.2",
"resolved": "https://registry.npmjs.org/parse5-parser-stream/-/parse5-parser-stream-7.1.2.tgz",
"integrity": "sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==",
"license": "MIT",
"dependencies": {
"parse5": "^7.0.0"
},
"funding": {
"url": "https://github.com/inikulin/parse5?sponsor=1"
}
},
"node_modules/path-key": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
"license": "MIT",
"engines": {
"node": ">=8"
}
},
"node_modules/picocolors": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
"integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
"license": "ISC"
},
"node_modules/proxy-from-env": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
"license": "MIT"
},
"node_modules/safer-buffer": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
"license": "MIT"
},
"node_modules/shebang-command": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
"license": "MIT",
"dependencies": {
"shebang-regex": "^3.0.0"
},
"engines": {
"node": ">=8"
}
},
"node_modules/shebang-regex": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
"license": "MIT",
"engines": {
"node": ">=8"
}
},
"node_modules/systeminformation": {
"version": "5.23.4",
"resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.23.4.tgz",
"integrity": "sha512-mD2R9xnOzKOOmIVtxekosf/ghOE/DGLqAPmsEgQMWJK0pMKxBtX19riz1Ss0tN4omcfS2FQ2RDJ4lkxgADxIPw==",
"license": "MIT",
"os": [
"darwin",
"linux",
"win32",
"freebsd",
"openbsd",
"netbsd",
"sunos",
"android"
],
"bin": {
"systeminformation": "lib/cli.js"
},
"engines": {
"node": ">=8.0.0"
},
"funding": {
"type": "Buy me a coffee",
"url": "https://www.buymeacoffee.com/systeminfo"
}
},
"node_modules/tree-sitter": {
"version": "0.21.1",
"resolved": "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.21.1.tgz",
"integrity": "sha512-7dxoA6kYvtgWw80265MyqJlkRl4yawIjO7S5MigytjELkX43fV2WsAXzsNfO7sBpPPCF5Gp0+XzHk0DwLCq3xQ==",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
"node-addon-api": "^8.0.0",
"node-gyp-build": "^4.8.0"
}
},
"node_modules/tree-sitter-c": {
"version": "0.23.0",
"resolved": "https://registry.npmjs.org/tree-sitter-c/-/tree-sitter-c-0.23.0.tgz",
"integrity": "sha512-ZruwnqyMrTFEvDuglqpiN7Rjh8wczh7afNMRJGK/AHdCwmtcmUzZeOiF8ZDskryoWhmAzrMHQdhpV2bj2ohQNg==",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
"node-addon-api": "^8.1.0",
"node-gyp-build": "^4.8.2"
},
"peerDependencies": {
"tree-sitter": "^0.21.0"
},
"peerDependenciesMeta": {
"tree-sitter": {
"optional": true
}
}
},
"node_modules/tree-sitter-c-sharp": {
"version": "0.23.0",
"resolved": "https://registry.npmjs.org/tree-sitter-c-sharp/-/tree-sitter-c-sharp-0.23.0.tgz",
"integrity": "sha512-ielPI6vnwW9VEH19TRCNKzkcRQ++rVwmLncPxmhMeJNporXBnXjj28U98NlGzV75arVlZmNsbMXTqBkAFNeKtw==",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
"node-addon-api": "^8.0.0",
"node-gyp-build": "^4.8.1"
},
"peerDependencies": {
"tree-sitter": "^0.21.0"
},
"peerDependenciesMeta": {
"tree_sitter": {
"optional": true
}
}
},
"node_modules/tree-sitter-cpp": {
"version": "0.23.0",
"resolved": "https://registry.npmjs.org/tree-sitter-cpp/-/tree-sitter-cpp-0.23.0.tgz",
"integrity": "sha512-SpPEijWCKzC92soaQlomrq9+1/U64OqqFD1n/QxYXMAXVqgcAVijHJ8Lrs4v1YzDq+MFmIj8GgO3Ve4Ub0EAQw==",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
"node-addon-api": "^8.1.0",
"node-gyp-build": "^4.8.2"
},
"peerDependencies": {
"tree-sitter": "^0.21.1"
},
"peerDependenciesMeta": {
"tree-sitter": {
"optional": true
}
}
},
"node_modules/tree-sitter-go": {
"version": "0.23.1",
"resolved": "https://registry.npmjs.org/tree-sitter-go/-/tree-sitter-go-0.23.1.tgz",
"integrity": "sha512-WfDdd/OVwzShWkhBoh2f3nE2VBhffOGpOrTHEI7z80Yjh3TcdPp3OCryYOStYwaDdSK4+f5ZUO9dMtpXsYRRoA==",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
"node-addon-api": "^8.1.0",
"node-gyp-build": "^4.8.2"
},
"peerDependencies": {
"tree-sitter": "^0.21.0"
},
"peerDependenciesMeta": {
"tree_sitter": {
"optional": true
}
}
},
"node_modules/tree-sitter-java": {
"version": "0.23.2",
"resolved": "https://registry.npmjs.org/tree-sitter-java/-/tree-sitter-java-0.23.2.tgz",
"integrity": "sha512-JI54R2Geqz0mW0Et+R2XZwWXBG2bYA95HGd2e46dbHglmZIgRvf3TVXUzdlO5RFvRMItnK8POlXjKcwKtsDjzw==",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
"node-addon-api": "^8.1.0",
"node-gyp-build": "^4.8.2"
},
"peerDependencies": {
"tree-sitter": "^0.21.1"
},
"peerDependenciesMeta": {
"tree-sitter": {
"optional": true
}
}
},
"node_modules/tree-sitter-javascript": {
"version": "0.23.0",
"resolved": "https://registry.npmjs.org/tree-sitter-javascript/-/tree-sitter-javascript-0.23.0.tgz",
"integrity": "sha512-xw0nc8P/u+uhoRuKmalcv/3OGGLtaeVWx/NpqAHXPvJsdSPdkx+IoRod4W4hw1zDNj1V6xzJgdATk0IPNUNy3w==",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
"node-addon-api": "^8.1.0",
"node-gyp-build": "^4.8.2"
},
"peerDependencies": {
"tree-sitter": "^0.21.1"
},
"peerDependenciesMeta": {
"tree-sitter": {
"optional": true
}
}
},
"node_modules/tree-sitter-php": {
"version": "0.23.2",
"resolved": "https://registry.npmjs.org/tree-sitter-php/-/tree-sitter-php-0.23.2.tgz",
"integrity": "sha512-ocmpnfo7jtWFkHeWnPIs1QhSdOP8eSuhaS6DM1OYHUBJTzlJAlFQ7uECnwv9FqlTzclNrJidysQlXyiluUIyhw==",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
"globals": "^15.9.0",
"node-addon-api": "^8.1.0",
"node-gyp-build": "^4.8.2"
},
"peerDependencies": {
"tree-sitter": "^0.21.1"
},
"peerDependenciesMeta": {
"tree-sitter": {
"optional": true
}
}
},
"node_modules/tree-sitter-python": {
"version": "0.23.2",
"resolved": "https://registry.npmjs.org/tree-sitter-python/-/tree-sitter-python-0.23.2.tgz",
"integrity": "sha512-QD9PbfIhlFZX3+hh5HPD8MGLIbV+CBxviyDpLRLceNCxI2ClPv8glu9TmLKaVoaWGMfDtBrU9UikRAbJ/4litA==",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
"node-addon-api": "^8.1.0",
"node-gyp-build": "^4.8.2"
},
"peerDependencies": {
"tree-sitter": "^0.21.0"
},
"peerDependenciesMeta": {
"tree-sitter": {
"optional": true
}
}
},
"node_modules/tree-sitter-ruby": {
"version": "0.23.0",
"resolved": "https://registry.npmjs.org/tree-sitter-ruby/-/tree-sitter-ruby-0.23.0.tgz",
"integrity": "sha512-ArVDutVHjDxsnpEx+afdD4l2+WOpr7OCSVIrnm0JW/vpNVU/ywQQ90dmn7rw8vRHDNiUUWGq25OerOo6PCuEGw==",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
"node-addon-api": "^8.1.0",
"node-gyp-build": "^4.8.2"
},
"peerDependencies": {
"tree-sitter": "^0.21.0"
},
"peerDependenciesMeta": {
"tree-sitter": {
"optional": true
}
}
},
"node_modules/tree-sitter-rust": {
"version": "0.23.0",
"resolved": "https://registry.npmjs.org/tree-sitter-rust/-/tree-sitter-rust-0.23.0.tgz",
"integrity": "sha512-vbb5ESloUtrRZMFA5EOgR56DMq6Ijb22PdG2zwsw8pdByYGLo0DxOmLp5KQce5rwNoZgEEp5/IiCN243TxQKIg==",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
"node-addon-api": "^8.1.0",
"node-gyp-build": "^4.8.2"
},
"peerDependencies": {
"tree-sitter": "^0.21.1"
},
"peerDependenciesMeta": {
"tree-sitter": {
"optional": true
}
}
},
"node_modules/tree-sitter-typescript": {
"version": "0.23.0",
"resolved": "https://registry.npmjs.org/tree-sitter-typescript/-/tree-sitter-typescript-0.23.0.tgz",
"integrity": "sha512-hRy5O9d+9ON4HxIWWxkI4zonrw2v/WNN1JoiGW5HkXfC9K2R3p53ugMvs6Vs4T7ASCwggsoQ75LNdgpExC/zgQ==",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
"node-addon-api": "^8.1.0",
"node-gyp-build": "^4.8.2"
},
"peerDependencies": {
"tree-sitter": "^0.21.0"
},
"peerDependenciesMeta": {
"tree_sitter": {
"optional": true
}
}
},
"node_modules/ts-pattern": {
"version": "5.3.1",
"resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-5.3.1.tgz",
"integrity": "sha512-1RUMKa8jYQdNfmnK4jyzBK3/PS/tnjcZ1CW0v1vWDeYe5RBklc/nquw03MEoB66hVBm4BnlCfmOqDVxHyT1DpA==",
"license": "MIT"
},
"node_modules/undici": {
"version": "6.20.1",
"resolved": "https://registry.npmjs.org/undici/-/undici-6.20.1.tgz",
"integrity": "sha512-AjQF1QsmqfJys+LXfGTNum+qw4S88CojRInG/6t31W/1fk6G59s92bnAvGz5Cmur+kQv2SURXEvvudLmbrE8QA==",
"license": "MIT",
"engines": {
"node": ">=18.17"
}
},
"node_modules/whatwg-encoding": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
"integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==",
"license": "MIT",
"dependencies": {
"iconv-lite": "0.6.3"
},
"engines": {
"node": ">=18"
}
},
"node_modules/whatwg-mimetype": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
"integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==",
"license": "MIT",
"engines": {
"node": ">=18"
}
},
"node_modules/which": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
"license": "ISC",
"dependencies": {
"isexe": "^2.0.0"
},
"bin": {
"node-which": "bin/node-which"
},
"engines": {
"node": ">= 8"
}
},
"node_modules/ws": {
"version": "8.18.0",
"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
"integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
"license": "MIT",
"engines": {
"node": ">=10.0.0"
},
"peerDependencies": {
"bufferutil": "^4.0.1",
"utf-8-validate": ">=5.0.2"
},
"peerDependenciesMeta": {
"bufferutil": {
"optional": true
},
"utf-8-validate": {
"optional": true
}
}
},
"node_modules/zod": {
"version": "3.23.8",
"resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz",
"integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==",
"license": "MIT",
"funding": {
"url": "https://github.com/sponsors/colinhacks"
}
}
}
}
pkgs/by-name/ma/manicode/package.nix
+34
View File
@@ -0,0 +1,34 @@
{
lib,
buildNpmPackage,
fetchzip,
}:
buildNpmPackage rec {
pname = "manicode";
version = "1.0.94";
src = fetchzip {
url = "https://registry.npmjs.org/manicode/-/manicode-${version}.tgz";
hash = "sha256-mn3bxZashP4zgCO7pB9yqjZ7uLglTC+pa3ifxlIW4BY=";
};
npmDepsHash = "sha256-PnySdTtlgZ9J0qIegwgiDoGuqa7/KyUxUpiZ8yepuZI=";
postPatch = ''
cp ${./package-lock.json} package-lock.json
'';
dontNpmBuild = true;
passthru.updateScript = ./update.sh;
meta = {
description = "Use natural language to edit your codebase and run commands from your terminal faster";
homepage = "https://manicode.ai";
downloadPage = "https://www.npmjs.com/package/manicode";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.malo ];
mainProgram = "manicode";
};
}
pkgs/by-name/ma/manicode/update.sh
Executable
+15
View File
@@ -0,0 +1,15 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p nodePackages.npm nix-update
set -euo pipefail
version=$(npm view manicode version)
# Generate updated lock file
cd "$(dirname "${BASH_SOURCE[0]}")"
npm i --package-lock-only manicode@$version
rm -f package.json
# Update version and hases
cd -
nix-update manicode --version "$version"
pkgs/by-name/pi/pik/package.nix
+35
View File
@@ -0,0 +1,35 @@
{
lib,
rustPlatform,
fetchFromGitHub,
testers,
pik,
}:
rustPlatform.buildRustPackage rec {
pname = "pik";
version = "0.9.0";
src = fetchFromGitHub {
owner = "jacek-kurlit";
repo = "pik";
rev = version;
hash = "sha256-YAnMSVQu/E+OyhHX3vugfBocyi++aGwG9vF6zL8T2RU=";
};
cargoHash = "sha256-a7mqtxZMJl8zR8oCfuGNAiT5MEAmNpbDLSgi8A6FfPA=";
passthru.tests.version = testers.testVersion { package = pik; };
meta = {
description = "Process Interactive Kill";
longDescription = ''
Process Interactive Kill is a command line tool that helps to find and kill process.
It works like pkill command but search is interactive.
'';
homepage = "https://github.com/jacek-kurlit/pik";
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [ bew ];
mainProgram = "pik";
};
}
pkgs/by-name/tr/trunk-recorder/package.nix
+72
View File
@@ -0,0 +1,72 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
git,
makeWrapper,
pkg-config,
boost,
curl,
gmp,
gnuradio,
gnuradioPackages,
hackrf,
mpir,
openssl,
spdlog,
uhd,
volk,
fdk-aac-encoder,
sox,
hackrfSupport ? true,
}:
stdenv.mkDerivation rec {
pname = "trunk-recorder";
version = "5.0.1";
src = fetchFromGitHub {
owner = "robotastic";
repo = "trunk-recorder";
rev = "v${version}";
hash = "sha256-d2iBCSLR3kr6rnLXO3MeGVdi6+8pqXZqW/yhxAvA1cY=";
};
cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ];
nativeBuildInputs = [
cmake
git
pkg-config
makeWrapper
];
buildInputs = [
boost
curl
gmp
gnuradio
gnuradioPackages.osmosdr
openssl
spdlog
uhd
volk
] ++ lib.optionals hackrfSupport [ hackrf ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ mpir ];
postFixup = ''
wrapProgram $out/bin/trunk-recorder --prefix PATH : ${
lib.makeBinPath [
sox
fdk-aac-encoder
]
}
'';
meta = {
description = "Record calls from trunked radio systems";
homepage = "https://trunkrecorder.com/";
changelog = "https://github.com/robotastic/trunk-recorder/releases/tag/v${version}";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ PapayaJackal ];
mainProgram = "trunk-recorder";
};
}
pkgs/development/coq-modules/mathcomp-analysis/default.nix
+4 -3
View File
@@ -54,7 +54,7 @@ let
packages = {
"classical" = [];
"reals" = [ "classical" ];
"altreals" = [ "reals" ];
"experimental-reals" = [ "reals" ];
"analysis" = [ "reals" ];
"reals-stdlib" = [ "reals" ];
"analysis-stdlib" = [ "analysis" "reals-stdlib" ];
@@ -62,12 +62,13 @@ let
mathcomp_ = package: let
classical-deps = [ mathcomp.algebra mathcomp-finmap ];
altreals-deps = [ mathcomp-bigenough ];
experimental-reals-deps = [ mathcomp-bigenough ];
analysis-deps = [ mathcomp.field mathcomp-bigenough ];
intra-deps = lib.optionals (package != "single") (map mathcomp_ packages.${package});
pkgpath = lib.switch package [
{ case = "single"; out = "."; }
{ case = "analysis"; out = "theories"; }
{ case = "experimental-reals"; out = "experimental_reals"; }
{ case = "reals-stdlib"; out = "reals_stdlib"; }
{ case = "analysis-stdlib"; out = "analysis_stdlib"; }
] package;
@@ -81,7 +82,7 @@ let
propagatedBuildInputs =
intra-deps
++ lib.optionals (lib.elem package [ "classical" "single" ]) classical-deps
++ lib.optionals (lib.elem package [ "altreals" "single" ]) altreals-deps
++ lib.optionals (lib.elem package [ "experimental-reals" "single" ]) experimental-reals-deps
++ lib.optionals (lib.elem package [ "analysis" "single" ]) analysis-deps;
preBuild = ''
pkgs/development/python-modules/dm-control/default.nix
+2 -2
View File
@@ -29,14 +29,14 @@
buildPythonPackage rec {
pname = "dm-control";
version = "1.0.24";
version = "1.0.25";
pyproject = true;
src = fetchFromGitHub {
owner = "google-deepmind";
repo = "dm_control";
rev = "refs/tags/${version}";
hash = "sha256-DnU3u7h/sPCjKLTFppAuPcY8CC0PNdFIlmeGd4xgy3M=";
hash = "sha256-eP85aKECvIu8nxPcSjc3PcCR9sWeTmaVJ7gBtVis0PY=";
};
build-system = [
pkgs/development/python-modules/humanize/default.nix
+3 -3
View File
@@ -13,16 +13,16 @@
buildPythonPackage rec {
pname = "humanize";
version = "4.10.0";
version = "4.11.0";
format = "pyproject";
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "python-humanize";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-zzasFAaWH284IEnWwWKvCL1lt/ItNfdbWhq1K30gSPU=";
hash = "sha256-C6u7t7RedInHJtN4yHli22Wc7llnrxn4YeKssyQ+hS4=";
};
nativeBuildInputs = [
pkgs/development/python-modules/markdownify/default.nix
+6 -4
View File
@@ -2,7 +2,7 @@
lib,
beautifulsoup4,
buildPythonPackage,
fetchPypi,
fetchFromGitHub,
pytestCheckHook,
pythonOlder,
setuptools,
@@ -17,9 +17,11 @@ buildPythonPackage rec {
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-qyV/nmvUB1EYgoooydAvikv+t0IfVYg0qnmy3+syoJg=";
src = fetchFromGitHub {
owner = "matthewwithanm";
repo = "python-markdownify";
rev = "refs/tags/${version}";
hash = "sha256-EqQ4DKIGaMNivw9cWCSP/Mh+1YxyTaHGPYRjGxPFOnA=";
};
build-system = [
pkgs/development/python-modules/multiscale-spatial-image/default.nix
+2 -4
View File
@@ -9,7 +9,6 @@
python-dateutil,
spatial-image,
xarray,
xarray-datatree,
zarr,
dask-image,
fsspec,
@@ -23,7 +22,7 @@
buildPythonPackage rec {
pname = "multiscale-spatial-image";
version = "1.0.1";
version = "2.0.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -32,7 +31,7 @@ buildPythonPackage rec {
owner = "spatial-image";
repo = "multiscale-spatial-image";
rev = "refs/tags/v${version}";
hash = "sha256-s/88N8IVkj+9MZYAtEJSpmmDdjIxf4S6U5gYr86Ikrw=";
hash = "sha256-SNAbkFgShb1FSM4tXoyf2L27LmpWznMThgAVfJwI00A=";
};
build-system = [ hatchling ];
@@ -43,7 +42,6 @@ buildPythonPackage rec {
python-dateutil
spatial-image
xarray
xarray-datatree
zarr
];
pkgs/development/python-modules/srp/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "srp";
version = "1.0.21";
version = "1.0.22";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-hmgTvPUhGJoVY+bKMRK29U/fclpBCi2+u28NhLgqHx0=";
hash = "sha256-8zDQ7HOH4qyFd0h7FkljFV1KAxvKbiAk8bCTDrkrql0=";
};
propagatedBuildInputs = [ six ];
pkgs/development/python-modules/tokenizers/Cargo.lock
Generated
-1126
View File
File diff suppressed because it is too large Load Diff
pkgs/development/python-modules/tokenizers/default.nix
+11 -3
View File
@@ -74,17 +74,25 @@ let
in
buildPythonPackage rec {
pname = "tokenizers";
version = "0.20.2";
version = "0.20.3";
pyproject = true;
src = fetchFromGitHub {
owner = "huggingface";
repo = "tokenizers";
rev = "refs/tags/v${version}";
hash = "sha256-6uUlDLL1dMg5/6/z8AuB7ibqSJ7IUVexHDTkLx35wFY=";
hash = "sha256-NPH++kPPaSPR3jm6mfh+4aep6stj0I4bA24kFtaJSKU=";
};
cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; };
cargoDeps = rustPlatform.fetchCargoTarball {
inherit
pname
version
src
sourceRoot
;
hash = "sha256-S2AfsKBtitEfprp9vjTyCl772IBe/wqwqYVnnAEK3LE=";
};
sourceRoot = "${src.name}/bindings/python";
maturinBuildFlags = [ "--interpreter ${python.executable}" ];
pkgs/development/python-modules/xarray-datatree/default.nix
-59
View File
@@ -1,59 +0,0 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
check-manifest,
setuptools,
setuptools-scm,
packaging,
pytestCheckHook,
xarray,
zarr,
}:
buildPythonPackage rec {
pname = "datatree";
version = "0.0.14";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "xarray-contrib";
repo = "datatree";
rev = "refs/tags/v${version}";
hash = "sha256-C6+WcHc2+sftJ5Yyh/9TTIHhAEwhAqSsSkaDwtq7J90=";
};
build-system = [
check-manifest
setuptools
setuptools-scm
];
dependencies = [
packaging
xarray
];
nativeCheckInputs = [
pytestCheckHook
zarr
];
pythonImportsCheck = [ "datatree" ];
disabledTests = [
# output formatting issue, likely due to underlying library version difference:
"test_diff_node_data"
];
meta = with lib; {
description = "Tree-like hierarchical data structure for xarray";
homepage = "https://xarray-datatree.readthedocs.io";
changelog = "https://github.com/xarray-contrib/datatree/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ bcdarwin ];
};
}
pkgs/development/python-modules/xarray/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "xarray";
version = "2024.09.0";
version = "2024.10.0";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "pydata";
repo = "xarray";
rev = "refs/tags/v${version}";
hash = "sha256-ZrqdpzcNjZMxET355PRWQaUPjvFm+m2y71F7qt8DCjg=";
hash = "sha256-s5MvHp2OkomD3xNYzj9oKlVLMgHZDQRBJM6vgOAv1jQ=";
};
build-system = [
pkgs/development/tools/rain/default.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "rain";
version = "1.16.1";
version = "1.19.0";
src = fetchFromGitHub {
owner = "aws-cloudformation";
repo = pname;
rev = "v${version}";
sha256 = "sha256-J0ZRJ05MDO92Oa/82FPM69Xrge1ATHF4kgNUd5YISFc=";
sha256 = "sha256-I5h09XbBDrMXQczpNoUENkOp3b4NxBR5Hr58nNVh1JM=";
};
vendorHash = "sha256-M5LbB71fcEhXoDFd17TSruzl9y9tqiQpREwV/ZgvdQ4=";
vendorHash = "sha256-6xSWaLnE9pD2d49OVjg2IIbhgdJ5R2I0fuRZ4wFudoI=";
subPackages = [ "cmd/rain" ];
pkgs/servers/ldap/lldap/Cargo.lock
Generated
+1253 -1034
View File
File diff suppressed because it is too large Load Diff
pkgs/servers/ldap/lldap/default.nix
+5 -11
View File
@@ -12,28 +12,22 @@
let
wasm-bindgen-84 = wasm-bindgen-cli.override {
version = "0.2.84";
hash = "sha256-0rK+Yx4/Jy44Fw5VwJ3tG243ZsyOIBBehYU54XP/JGk=";
cargoHash = "sha256-vcpxcRlW1OKoD64owFF6mkxSqmNrvY+y3Ckn5UwEQ50=";
};
commonDerivationAttrs = {
pname = "lldap";
version = "0.5.1-unstable-2024-08-09";
version = "0.5.1-unstable-2024-10-30";
src = fetchFromGitHub {
owner = "lldap";
repo = "lldap";
rev = "4138963bee15f5423629c081ec88805d43b8235c";
hash = "sha256-g/Y+StSQQiA+1O0yh2xIhBHO9/MjM4QW1DNQIABTHdI=";
rev = "143eb70bee92e8225028ea00b69735a28e8c088d";
hash = "sha256-6XGKz/OKHd80yX9a4rlvc9RZjBB6ao+jiO5Vlcc0ohE=";
};
# `Cargo.lock` has git dependencies, meaning can't use `cargoHash`
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"lber-0.4.1" = "sha256-2rGTpg8puIAXggX9rEbXPdirfetNOHWfFc80xqzPMT4=";
"lber-0.4.3" = "sha256-ff0C4uOAohbwHIFt6c0iGQwPDUTJhO3vHlSUDK/yEbY=";
"opaque-ke-0.6.1" = "sha256-99gaDv7eIcYChmvOKQ4yXuaGVzo2Q6BcgSQOzsLF+fM=";
"yew_form-0.1.8" = "sha256-1n9C7NiFfTjbmc9B5bDEnz7ZpYJo9ZT8/dioRXJ65hc=";
};
@@ -45,7 +39,7 @@ let
pname = commonDerivationAttrs.pname + "-frontend";
nativeBuildInputs = [
wasm-pack wasm-bindgen-84 binaryen which rustc rustc.llvmPackages.lld
wasm-pack wasm-bindgen-cli binaryen which rustc rustc.llvmPackages.lld
];
buildPhase = ''
pkgs/tools/misc/calamares-nixos-extensions/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "calamares-nixos-extensions";
version = "0.3.18";
version = "0.3.19";
src = fetchFromGitHub {
owner = "NixOS";
repo = "calamares-nixos-extensions";
rev = finalAttrs.version;
hash = "sha256-j+9iZtw9QIKHLo5sr9nkCVoZS7QQCnDDyTGFXD+R+WU=";
hash = "sha256-/WdSMqtF8DKplsDx00l8HYijYvOUBb55Opv3Z8+T6QU=";
};
installPhase = ''
pkgs/tools/misc/calamares/0004-Adds-unfree-qml-to-packagechooserq.patch
+1 -1
View File
@@ -78,7 +78,7 @@ index 000000000..5e36d77d9
+ width: 600
+ height: 150
+ anchors.centerIn: parent
+ text: qsTr("NixOS is fully open source, but it also provides software packages with unfree licenses. By default unfree packages are not allowed, but you can enable it here. If you check this box, software installed might have additional End User License Agreements (EULAs) attached. If not enabled, some hardware might not work fully when no suitable open source drivers are available.<br/>")
+ text: qsTr("NixOS is fully open source, but it also provides optional software packages that do not respect users' freedom to run, copy, distribute, study, change and improve the software, and are commonly not open source. By default such "unfree" packages are not allowed, but you can enable it here. If you check this box, you agree that unfree software may be installed which might have additional End User License Agreements (EULAs) that you need to agree to. If not enabled, some hardware (notably Nvidia GPUs and some WiFi chips) might not work or not work optimally.<br/>")
+ font.pointSize: 12
+ wrapMode: Text.WordWrap
+ }
pkgs/tools/misc/calamares/0007-Fix-setting-the-kayboard-layout-on-GNOME-wayland.patch
+12 -13
View File
@@ -1,23 +1,22 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Victor Fuentes <vmfuentes64@gmail.com>
Date: Thu, 1 Aug 2024 16:03:14 -0400
Date: Thu, 31 Oct 2024 10:34:25 -0700
Subject: [PATCH] Fix setting the kayboard layout on GNOME wayland.
By default the module uses the setxkbmap, which will not change the
keyboard
---
src/modules/keyboard/Config.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
src/modules/keyboard/Config.cpp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index ad6bee6f7..4d43abe53 100644
index 54ee7649c..60fe2d7d0 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -307,7 +307,10 @@ Config::xkbApply()
xkbmap_layout_args( { m_additionalLayoutInfo.additionalLayout, m_selectedLayout },
{ m_additionalLayoutInfo.additionalVariant, m_selectedVariant },
m_additionalLayoutInfo.groupSwitcher ) );
-
@@ -306,6 +306,10 @@ Config::applyXkb()
m_additionalLayoutInfo.groupSwitcher ) );
QProcess::execute( "setxkbmap", basicArguments );
+ QString xkbmap = QString( "[('xkb','%1\%2'),('xkb','%3\%4')]").arg(
+ m_selectedLayout, ((!m_selectedVariant.isEmpty()) ? "+" + m_selectedVariant : ""),
+ m_additionalLayoutInfo.additionalLayout, ((!m_additionalLayoutInfo.additionalVariant.isEmpty()) ? "+" + m_additionalLayoutInfo.additionalVariant : ""));
@@ -25,12 +24,12 @@ index ad6bee6f7..4d43abe53 100644
cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant << "(added "
<< m_additionalLayoutInfo.additionalLayout << "-" << m_additionalLayoutInfo.additionalVariant
<< " since current layout is not ASCII-capable)";
@@ -315,6 +318,8 @@ Config::xkbApply()
else
@@ -314,6 +318,8 @@ Config::applyXkb()
{
QProcess::execute( "setxkbmap", xkbmap_layout_args( m_selectedLayout, m_selectedVariant ) );
basicArguments.append( xkbmap_layout_args( m_selectedLayout, m_selectedVariant ) );
QProcess::execute( "setxkbmap", basicArguments );
+ QString xkbmap = QString( "[('xkb','%1\%2')]").arg( m_selectedLayout, ((!m_selectedVariant.isEmpty()) ? "+" + m_selectedVariant : "") );
+ QProcess::execute( "sh", { "-c", "if command -v gsettings; then gsettings set org.gnome.desktop.input-sources sources \"$0\"; fi", xkbmap });
cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant;
}
m_setxkbmapTimer.disconnect( this );
m_applyTimer.stop();
pkgs/tools/misc/calamares/default.nix
+2 -2
View File
@@ -7,12 +7,12 @@
mkDerivation rec {
pname = "calamares";
version = "3.3.9";
version = "3.3.10";
# release including submodule
src = fetchurl {
url = "https://github.com/calamares/calamares/releases/download/v${version}/calamares-${version}.tar.gz";
sha256 = "sha256-2PcPpoLKcy9EjHAz5mxdT3RxYQMfdPRneOIHKM7/a0U=";
sha256 = "sha256-iBf8APBLNOpntyn+9WQWl+j8oQ4iR3pOwbcZlK86g5Q=";
};
# On major changes, or when otherwise required, you *must* :
pkgs/top-level/coq-packages.nix
+1 -1
View File
@@ -99,12 +99,12 @@ let
mathcomp-character = self.mathcomp.character;
mathcomp-abel = callPackage ../development/coq-modules/mathcomp-abel {};
mathcomp-algebra-tactics = callPackage ../development/coq-modules/mathcomp-algebra-tactics {};
mathcomp-altreals = self.mathcomp-analysis.altreals;
mathcomp-analysis = callPackage ../development/coq-modules/mathcomp-analysis {};
mathcomp-analysis-stdlib = self.mathcomp-analysis.analysis-stdlib;
mathcomp-apery = callPackage ../development/coq-modules/mathcomp-apery {};
mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough {};
mathcomp-classical = self.mathcomp-analysis.classical;
mathcomp-experimental-reals = self.mathcomp-analysis.experimental-reals;
mathcomp-finmap = callPackage ../development/coq-modules/mathcomp-finmap {};
mathcomp-infotheo = callPackage ../development/coq-modules/mathcomp-infotheo {};
mathcomp-real-closed = callPackage ../development/coq-modules/mathcomp-real-closed {};
pkgs/top-level/python-aliases.nix
+1
View File
@@ -703,6 +703,7 @@ mapAliases ({
WSME = wsme; # added 2023-02-19
x11_hash = x11-hash; # added 2023-11-05
xapp = python-xapp; # added 2024-07-19
xarray-datatree = throw "Datatree has been merged upstream into pydata/xarray, and released as of xarray version 2024.10.0."; # added 2024-11-02
xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31
XlsxWriter = xlsxwriter; # added 2023-02-19
xsser = "xsser has been removed because it was unmaintained and relies on a archived project"; # added 2024-07-27
pkgs/top-level/python-packages.nix
-2
View File
@@ -17775,8 +17775,6 @@ self: super: with self; {
xarray-dataclasses = callPackage ../development/python-modules/xarray-dataclasses { };
xarray-datatree = callPackage ../development/python-modules/xarray-datatree { };
xarray-einstats = callPackage ../development/python-modules/xarray-einstats { };
xattr = callPackage ../development/python-modules/xattr { };