movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 14:10:33 +03:00
Code Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2024-12-01 12:05:29 +00:00 • committed by GitHub
commit ede548fffd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
93 changed files with 1165 additions and 460 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/check-nix-format.yml vendored
View file

@ -85,6 +85,7 @@ jobs:
echo "Some new/changed Nix files are not properly formatted"
echo "Please go to the Nixpkgs root directory, run \`nix-shell\`, then:"
echo "nixfmt ${unformattedFiles[*]@Q}"
echo "Make sure your branch is up to date with master, rebase if not."
echo "If you're having trouble, please ping @NixOS/nix-formatting"
exit 1
fi

73
lib/filesystem.nix
View file

@ -18,7 +18,10 @@ let
;
inherit (lib.filesystem)
pathIsDirectory
pathIsRegularFile
pathType
packagesFromDirectoryRecursive
;
inherit (lib.strings)
@ -360,52 +363,30 @@ in
directory,
...
}:
assert pathIsDirectory directory;
let
# Determine if a directory entry from `readDir` indicates a package or
# directory of packages.
directoryEntryIsPackage = basename: type:
type == "directory" || hasSuffix ".nix" basename;
# List directory entries that indicate packages in the given `path`.
packageDirectoryEntries = path:
filterAttrs directoryEntryIsPackage (readDir path);
# Transform a directory entry (a `basename` and `type` pair) into a
# package.
directoryEntryToAttrPair = subdirectory: basename: type:
let
path = subdirectory + "/${basename}";
in
if type == "regular"
then
{
name = removeSuffix ".nix" basename;
value = callPackage path { };
}
else
if type == "directory"
then
{
name = basename;
value = packagesFromDirectory path;
}
else
throw
''
lib.filesystem.packagesFromDirectoryRecursive: Unsupported file type ${type} at path ${toString subdirectory}
'';
# Transform a directory into a package (if there's a `package.nix`) or
# set of packages (otherwise).
packagesFromDirectory = path:
let
defaultPackagePath = path + "/package.nix";
in
if pathExists defaultPackagePath
then callPackage defaultPackagePath { }
else mapAttrs'
(directoryEntryToAttrPair path)
(packageDirectoryEntries path);
inherit (lib.path) append;
defaultPath = append directory "package.nix";
in
packagesFromDirectory directory;
if pathIsRegularFile defaultPath then
# if `${directory}/package.nix` exists, call it directly
callPackage defaultPath {}
else lib.concatMapAttrs (name: type:
# otherwise, for each directory entry
let path = append directory name; in
if type == "directory" then {
# recurse into directories
"${name}" = packagesFromDirectoryRecursive {
inherit callPackage;
directory = path;
};
} else if type == "regular" && hasSuffix ".nix" name then {
# call .nix files
"${lib.removeSuffix ".nix" name}" = callPackage path {};
} else if type == "regular" then {
# ignore non-nix files
} else throw ''
lib.filesystem.packagesFromDirectoryRecursive: Unsupported file type ${type} at path ${toString path}
''
) (builtins.readDir directory);
}

7
maintainers/maintainer-list.nix
View file

@ -19460,6 +19460,13 @@
name = "Maxwell Beck";
keys = [ { fingerprint = "D260 79E3 C2BC 2E43 905B D057 BB3E FA30 3760 A0DB"; } ];
};
rytswd = {
email = "rytswd@gmail.com";
github = "rytswd";
githubId = 23435099;
name = "Ryota";
keys = [ { fingerprint = "537E 712F 0EC3 91C2 B47F 56E2 EB5D 1A84 5333 43BB"; } ];
};
ryze = {
name = "Ryze";
github = "ryze312";

8
nixos/modules/misc/documentation.nix
View file

@ -367,7 +367,13 @@ in
})
(mkIf cfg.doc.enable {
environment.pathsToLink = [ "/share/doc" ];
environment.pathsToLink = [
"/share/doc"
# Legacy paths used by gtk-doc & adjacent tools.
"/share/gtk-doc"
"/share/devhelp"
];
environment.extraOutputsToInstall = [ "doc" ] ++ optional cfg.dev.enable "devdoc";
})

31
nixos/modules/services/networking/aria2.nix
View file

@ -64,6 +64,34 @@ in
Read https://aria2.github.io/manual/en/html/aria2c.html#rpc-auth to know how this option value is used.
'';
};
downloadDirPermission = lib.mkOption {
type = lib.types.str;
default = "0770";
description = ''
The permission for `settings.dir`.
The default is 0770, which denies access for users not in the `aria2`
group.
You may want to adjust `serviceUMask` as well, which further restricts
the file permission for newly created files (i.e. the downloads).
'';
};
serviceUMask = lib.mkOption {
type = lib.types.str;
default = "0022";
example = "0002";
description = ''
The file mode creation mask for Aria2 service.
The default is 0022 for compatibility reason, as this is the default
used by systemd. However, this results in file permission 0644 for new
files, and denies `aria2` group member from modifying the file.
You may want to set this value to `0002` so you can manage the file
more easily.
'';
};
settings = lib.mkOption {
description = ''
Generates the `aria2.conf` file. Refer to [the documentation][0] for
@ -141,7 +169,7 @@ in
systemd.tmpfiles.rules = [
"d '${homeDir}' 0770 aria2 aria2 - -"
"d '${config.services.aria2.settings.dir}' 0770 aria2 aria2 - -"
"d '${config.services.aria2.settings.dir}' ${config.services.aria2.downloadDirPermission} aria2 aria2 - -"
];
systemd.services.aria2 = {
@ -165,6 +193,7 @@ in
User = "aria2";
Group = "aria2";
LoadCredential = "rpcSecretFile:${cfg.rpcSecretFile}";
UMask = cfg.serviceUMask;
};
};
};

2
nixos/modules/services/web-apps/firefly-iii-data-importer.nix
View file

@ -29,7 +29,7 @@ let
)}
set +a
${artisan} package:discover
${artisan} cache:clear
rm ${cfg.dataDir}/cache/*.php
${artisan} config:cache
'';

281
nixos/modules/services/web-apps/firefly-iii.nix
View file

@ -1,12 +1,11 @@
{ pkgs, config, lib, ... }:
{
pkgs,
config,
lib,
...
}:
let
inherit (lib) optionalString mkDefault mkIf mkOption mkEnableOption literalExpression;
inherit (lib.types) nullOr attrsOf oneOf str int bool path package enum submodule;
inherit (lib.strings) concatLines removePrefix toShellVars removeSuffix hasSuffix;
inherit (lib.attrsets) mapAttrsToList attrValues genAttrs filterAttrs mapAttrs' nameValuePair;
inherit (builtins) isInt isString toString typeOf;
cfg = config.services.firefly-iii;
user = cfg.user;
@ -17,23 +16,22 @@ let
artisan = "${cfg.package}/artisan";
env-file-values = mapAttrs' (n: v: nameValuePair (removeSuffix "_FILE" n) v)
(filterAttrs (n: v: hasSuffix "_FILE" n) cfg.settings);
env-nonfile-values = filterAttrs (n: v: ! hasSuffix "_FILE" n) cfg.settings;
fileenv-func = ''
set -a
${toShellVars env-nonfile-values}
${concatLines (mapAttrsToList (n: v: "${n}=\"$(< ${v})\"") env-file-values)}
set +a
'';
env-file-values = lib.attrsets.mapAttrs' (
n: v: lib.attrsets.nameValuePair (lib.strings.removeSuffix "_FILE" n) v
) (lib.attrsets.filterAttrs (n: v: lib.strings.hasSuffix "_FILE" n) cfg.settings);
env-nonfile-values = lib.attrsets.filterAttrs (n: v: !lib.strings.hasSuffix "_FILE" n) cfg.settings;
firefly-iii-maintenance = pkgs.writeShellScript "firefly-iii-maintenance.sh" ''
${fileenv-func}
${optionalString (cfg.settings.DB_CONNECTION == "sqlite")
"touch ${cfg.dataDir}/storage/database/database.sqlite"}
${artisan} cache:clear
set -a
${lib.strings.toShellVars env-nonfile-values}
${lib.strings.concatLines (
lib.attrsets.mapAttrsToList (n: v: "${n}=\"$(< ${v})\"") env-file-values
)}
set +a
${lib.optionalString (
cfg.settings.DB_CONNECTION == "sqlite"
) "touch ${cfg.dataDir}/storage/database/database.sqlite"}
rm ${cfg.dataDir}/cache/*.php
${artisan} package:discover
${artisan} firefly-iii:upgrade-database
${artisan} firefly-iii:laravel-passport-keys
@ -47,7 +45,7 @@ let
User = user;
Group = group;
StateDirectory = "firefly-iii";
ReadWritePaths = [cfg.dataDir];
ReadWritePaths = [ cfg.dataDir ];
WorkingDirectory = cfg.package;
PrivateTmp = true;
PrivateDevices = true;
@ -79,20 +77,21 @@ let
PrivateUsers = true;
};
in {
in
{
options.services.firefly-iii = {
enable = mkEnableOption "Firefly III: A free and open source personal finance manager";
enable = lib.mkEnableOption "Firefly III: A free and open source personal finance manager";
user = mkOption {
type = str;
user = lib.mkOption {
type = lib.types.str;
default = defaultUser;
description = "User account under which firefly-iii runs.";
};
group = mkOption {
type = str;
group = lib.mkOption {
type = lib.types.str;
default = if cfg.enableNginx then "nginx" else defaultGroup;
defaultText = "If `services.firefly-iii.enableNginx` is true then `nginx` else ${defaultGroup}";
description = ''
@ -101,31 +100,26 @@ in {
'';
};
dataDir = mkOption {
type = path;
dataDir = lib.mkOption {
type = lib.types.path;
default = "/var/lib/firefly-iii";
description = ''
The place where firefly-iii stores its state.
'';
};
package = mkOption {
type = package;
default = pkgs.firefly-iii;
defaultText = literalExpression "pkgs.firefly-iii";
description = ''
The firefly-iii package served by php-fpm and the webserver of choice.
This option can be used to point the webserver to the correct root. It
may also be used to set the package to a different version, say a
development version.
'';
apply = firefly-iii : firefly-iii.override (prev: {
dataDir = cfg.dataDir;
});
};
package =
lib.mkPackageOption pkgs "firefly-iii" { }
// lib.mkOption {
apply =
firefly-iii:
firefly-iii.override (prev: {
dataDir = cfg.dataDir;
});
};
enableNginx = mkOption {
type = bool;
enableNginx = lib.mkOption {
type = lib.types.bool;
default = false;
description = ''
Whether to enable nginx or not. If enabled, an nginx virtual host will
@ -135,8 +129,8 @@ in {
'';
};
virtualHost = mkOption {
type = str;
virtualHost = lib.mkOption {
type = lib.types.str;
default = "localhost";
description = ''
The hostname at which you wish firefly-iii to be served. If you have
@ -145,24 +139,33 @@ in {
'';
};
poolConfig = mkOption {
type = attrsOf (oneOf [ str int bool ]);
default = {
"pm" = "dynamic";
"pm.max_children" = 32;
"pm.start_servers" = 2;
"pm.min_spare_servers" = 2;
"pm.max_spare_servers" = 4;
"pm.max_requests" = 500;
};
poolConfig = lib.mkOption {
type = lib.types.attrsOf (
lib.types.oneOf [
lib.types.str
lib.types.int
lib.types.bool
]
);
default = { };
defaultText = ''
{
"pm" = "dynamic";
"pm.max_children" = 32;
"pm.start_servers" = 2;
"pm.min_spare_servers" = 2;
"pm.max_spare_servers" = 4;
"pm.max_requests" = 500;
}
'';
description = ''
Options for the Firefly III PHP pool. See the documentation on <literal>php-fpm.conf</literal>
for details on configuration directives.
'';
};
settings = mkOption {
default = {};
settings = lib.mkOption {
default = { };
description = ''
Options for firefly-iii configuration. Refer to
<https://github.com/firefly-iii/firefly-iii/blob/main/.env.example> for
@ -172,7 +175,7 @@ in {
APP_URL will be the same as `services.firefly-iii.virtualHost` if the
former is unset in `services.firefly-iii.settings`.
'';
example = literalExpression ''
example = lib.literalExpression ''
{
APP_ENV = "production";
APP_KEY_FILE = "/var/secrets/firefly-iii-app-key.txt";
@ -185,11 +188,21 @@ in {
DB_PASSWORD_FILE = "/var/secrets/firefly-iii-mysql-password.txt;
}
'';
type = submodule {
freeformType = attrsOf (oneOf [str int bool]);
type = lib.types.submodule {
freeformType = lib.types.attrsOf (
lib.types.oneOf [
lib.types.str
lib.types.int
lib.types.bool
]
);
options = {
DB_CONNECTION = mkOption {
type = enum [ "sqlite" "pgsql" "mysql" ];
DB_CONNECTION = lib.mkOption {
type = lib.types.enum [
"sqlite"
"pgsql"
"mysql"
];
default = "sqlite";
example = "pgsql";
description = ''
@ -197,8 +210,12 @@ in {
"mysql" or "pgsql".
'';
};
APP_ENV = mkOption {
type = enum [ "local" "production" "testing" ];
APP_ENV = lib.mkOption {
type = lib.types.enum [
"local"
"production"
"testing"
];
default = "local";
example = "production";
description = ''
@ -206,11 +223,15 @@ in {
Possible values are "local", "production" and "testing"
'';
};
DB_PORT = mkOption {
type = nullOr int;
default = if cfg.settings.DB_CONNECTION == "pgsql" then 5432
else if cfg.settings.DB_CONNECTION == "mysql" then 3306
else null;
DB_PORT = lib.mkOption {
type = lib.types.nullOr lib.types.int;
default =
if cfg.settings.DB_CONNECTION == "pgsql" then
5432
else if cfg.settings.DB_CONNECTION == "mysql" then
3306
else
null;
defaultText = ''
`null` if DB_CONNECTION is "sqlite", `3306` if "mysql", `5432` if "pgsql"
'';
@ -219,10 +240,9 @@ in {
this value to be filled.
'';
};
DB_HOST = mkOption {
type = str;
default = if cfg.settings.DB_CONNECTION == "pgsql" then "/run/postgresql"
else "localhost";
DB_HOST = lib.mkOption {
type = lib.types.str;
default = if cfg.settings.DB_CONNECTION == "pgsql" then "/run/postgresql" else "localhost";
defaultText = ''
"localhost" if DB_CONNECTION is "sqlite" or "mysql", "/run/postgresql" if "pgsql".
'';
@ -234,18 +254,21 @@ in {
This option does not affect "sqlite".
'';
};
APP_KEY_FILE = mkOption {
type = path;
APP_KEY_FILE = lib.mkOption {
type = lib.types.path;
description = ''
The path to your appkey. The file should contain a 32 character
random app key. This may be set using `echo "base64:$(head -c 32
/dev/urandom | base64)" > /path/to/key-file`.
'';
};
APP_URL = mkOption {
type = str;
default = if cfg.virtualHost == "localhost" then "http://${cfg.virtualHost}"
else "https://${cfg.virtualHost}";
APP_URL = lib.mkOption {
type = lib.types.str;
default =
if cfg.virtualHost == "localhost" then
"http://${cfg.virtualHost}"
else
"https://${cfg.virtualHost}";
defaultText = ''
http(s)://''${config.services.firefly-iii.virtualHost}
'';
@ -261,7 +284,7 @@ in {
};
};
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
services.phpfpm.pools.firefly-iii = {
inherit user group;
@ -270,15 +293,23 @@ in {
log_errors = on
'';
settings = {
"listen.mode" = "0660";
"listen.owner" = user;
"listen.group" = group;
"clear_env" = "no";
"listen.mode" = lib.mkDefault "0660";
"listen.owner" = lib.mkDefault user;
"listen.group" = lib.mkDefault group;
"pm" = lib.mkDefault "dynamic";
"pm.max_children" = lib.mkDefault 32;
"pm.start_servers" = lib.mkDefault 2;
"pm.min_spare_servers" = lib.mkDefault 2;
"pm.max_spare_servers" = lib.mkDefault 4;
"pm.max_requests" = lib.mkDefault 500;
} // cfg.poolConfig;
};
systemd.services.firefly-iii-setup = {
after = [ "postgresql.service" "mysql.service" ];
after = [
"postgresql.service"
"mysql.service"
];
requiredBy = [ "phpfpm-firefly-iii.service" ];
before = [ "phpfpm-firefly-iii.service" ];
serviceConfig = {
@ -290,7 +321,11 @@ in {
};
systemd.services.firefly-iii-cron = {
after = [ "firefly-iii-setup.service" "postgresql.service" "mysql.service" ];
after = [
"firefly-iii-setup.service"
"postgresql.service"
"mysql.service"
];
wants = [ "firefly-iii-setup.service" ];
description = "Daily Firefly III cron job";
serviceConfig = {
@ -309,11 +344,11 @@ in {
restartTriggers = [ cfg.package ];
};
services.nginx = mkIf cfg.enableNginx {
services.nginx = lib.mkIf cfg.enableNginx {
enable = true;
recommendedTlsSettings = mkDefault true;
recommendedOptimisation = mkDefault true;
recommendedGzipSettings = mkDefault true;
recommendedTlsSettings = lib.mkDefault true;
recommendedOptimisation = lib.mkDefault true;
recommendedGzipSettings = lib.mkDefault true;
virtualHosts.${cfg.virtualHost} = {
root = "${cfg.package}/public";
locations = {
@ -336,34 +371,38 @@ in {
};
};
systemd.tmpfiles.settings."10-firefly-iii" = genAttrs [
"${cfg.dataDir}/storage"
"${cfg.dataDir}/storage/app"
"${cfg.dataDir}/storage/database"
"${cfg.dataDir}/storage/export"
"${cfg.dataDir}/storage/framework"
"${cfg.dataDir}/storage/framework/cache"
"${cfg.dataDir}/storage/framework/sessions"
"${cfg.dataDir}/storage/framework/views"
"${cfg.dataDir}/storage/logs"
"${cfg.dataDir}/storage/upload"
"${cfg.dataDir}/cache"
] (n: {
d = {
group = group;
mode = "0700";
user = user;
systemd.tmpfiles.settings."10-firefly-iii" =
lib.attrsets.genAttrs
[
"${cfg.dataDir}/storage"
"${cfg.dataDir}/storage/app"
"${cfg.dataDir}/storage/database"
"${cfg.dataDir}/storage/export"
"${cfg.dataDir}/storage/framework"
"${cfg.dataDir}/storage/framework/cache"
"${cfg.dataDir}/storage/framework/sessions"
"${cfg.dataDir}/storage/framework/views"
"${cfg.dataDir}/storage/logs"
"${cfg.dataDir}/storage/upload"
"${cfg.dataDir}/cache"
]
(n: {
d = {
group = group;
mode = "0700";
user = user;
};
})
// {
"${cfg.dataDir}".d = {
group = group;
mode = "0710";
user = user;
};
};
}) // {
"${cfg.dataDir}".d = {
group = group;
mode = "0710";
user = user;
};
};
users = {
users = mkIf (user == defaultUser) {
users = lib.mkIf (user == defaultUser) {
${defaultUser} = {
description = "Firefly-iii service user";
inherit group;
@ -371,9 +410,7 @@ in {
home = cfg.dataDir;
};
};
groups = mkIf (group == defaultGroup) {
${defaultGroup} = {};
};
groups = lib.mkIf (group == defaultGroup) { ${defaultGroup} = { }; };
};
};
}

4
nixos/modules/services/web-apps/privatebin.nix
View file

@ -74,8 +74,8 @@ in
default = false;
description = ''
Whether to enable nginx or not. If enabled, an nginx virtual host will
be created for access to firefly-iii. If not enabled, then you may use
`''${config.services.firefly-iii.package}` as your document root in
be created for access to privatebin. If not enabled, then you may use
`''${config.services.privatebin.package}` as your document root in
whichever webserver you wish to setup.
'';
};

6
pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
View file

@ -28,13 +28,13 @@
}:
stdenv.mkDerivation rec {
pname = "bitwig-studio";
version = "5.2.5";
pname = "bitwig-studio-unwrapped";
version = "5.2.7";
src = fetchurl {
name = "bitwig-studio-${version}.deb";
url = "https://www.bitwig.com/dl/Bitwig%20Studio/${version}/installer_linux/";
hash = "sha256-x6Uw6o+a3nArMm1Ev5ytGtLDGQ3r872WqlC022zT8Hk=";
hash = "sha256-Tyi7qYhTQ5i6fRHhrmz4yHXSdicd4P4iuF9FRKRhkMI=";
};
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ];

44
pkgs/applications/audio/bitwig-studio/bitwig-wrapper.nix Normal file
View file

@ -0,0 +1,44 @@
{
stdenv,
bubblewrap,
mktemp,
writeShellScript,
bitwig-studio-unwrapped,
}:
stdenv.mkDerivation {
inherit (bitwig-studio-unwrapped) version;
pname = "bitwig-studio";
dontUnpack = true;
dontConfigure = true;
dontBuild = true;
dontPatchELF = true;
dontStrip = true;
installPhase =
let
wrapper = writeShellScript "bitwig-studio" ''
set -e
echo "Creating temporary directory"
TMPDIR=$(${mktemp}/bin/mktemp --directory)
echo "Temporary directory: $TMPDIR"
echo "Copying default Vamp Plugin settings"
cp -r ${bitwig-studio-unwrapped}/libexec/resources/VampTransforms $TMPDIR
echo "Changing permissions to be writable"
chmod -R u+w $TMPDIR/VampTransforms
echo "Starting Bitwig Studio in Bubblewrap Environment"
${bubblewrap}/bin/bwrap --bind / / --bind $TMPDIR/VampTransforms ${bitwig-studio-unwrapped}/libexec/resources/VampTransforms ${bitwig-studio-unwrapped}/bin/bitwig-studio || true
echo "Bitwig exited, removing temporary directory"
rm -rf $TMPDIR
'';
in
''
mkdir -p $out/bin
cp ${wrapper} $out/bin/bitwig-studio
cp -r ${bitwig-studio-unwrapped}/share $out
'';
}

9
pkgs/applications/editors/vim/plugins/overrides.nix
View file

@ -496,15 +496,18 @@ in
'';
doCheck = true;
checkInputs = [ jq ];
checkInputs = [
jq
codeium'
];
checkPhase = ''
runHook preCheck
expected_codeium_version=$(jq -r '.version' lua/codeium/versions.json)
actual_codeium_version=$(${codeium'}/bin/codeium_language_server --version)
actual_codeium_version=$(codeium_language_server --version)
expected_codeium_stamp=$(jq -r '.stamp' lua/codeium/versions.json)
actual_codeium_stamp=$(${codeium'}/bin/codeium_language_server --stamp | grep STABLE_BUILD_SCM_REVISION | cut -d' ' -f2)
actual_codeium_stamp=$(codeium_language_server --stamp | grep STABLE_BUILD_SCM_REVISION | cut -d' ' -f2)
if [ "$actual_codeium_stamp" != "$expected_codeium_stamp" ]; then
echo "

4
pkgs/applications/networking/irc/weechat/default.nix
View file

@ -36,14 +36,14 @@ let
in
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec {
version = "4.4.3";
version = "4.4.4";
pname = "weechat";
hardeningEnable = [ "pie" ];
src = fetchurl {
url = "https://weechat.org/files/src/weechat-${version}.tar.xz";
hash = "sha256-KVYS+NwkryjJGCV9MBTrUzQqXQd9Xj2aPq3zA72P6/o=";
hash = "sha256-qPS7dow9asPqHrTm3Hp7su4ZtzSnLMWOBjR22ujz0Hc=";
};
# Why is this needed? https://github.com/weechat/weechat/issues/2031

3
pkgs/applications/science/electronics/bitscope/common.nix
View file

@ -57,6 +57,7 @@ let
'';
});
in buildFHSEnv {
name = "${attrs.toolName}-${attrs.version}";
pname = attrs.toolName;
inherit (attrs) version;
runScript = "${pkg.outPath}/bin/${attrs.toolName}";
} // { inherit (pkg) meta name; }

2
pkgs/applications/terminal-emulators/st/mcaimi-st.nix
View file

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
description = "Suckless Terminal fork";
mainProgram = "st";
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}

8
pkgs/applications/video/vokoscreen-ng/default.nix
View file

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "vokoscreen-ng";
version = "4.0.0";
version = "4.2.0";
src = fetchFromGitHub {
owner = "vkohaupt";
repo = "vokoscreenNG";
rev = version;
hash = "sha256-Y6+R18Gf3ShqhsmZ4Okx02fSOOyilS6iKU5FW9wpxvY=";
hash = "sha256-PLgKOdSx0Kdobex5KaeCxWcindHEN9p4+xaVN/gr7Pk=";
};
qmakeFlags = [ "src/vokoscreenNG.pro" ];
@ -48,6 +48,10 @@ stdenv.mkDerivation rec {
--replace lrelease-qt5 lrelease
'';
preBuild = ''
lrelease src/language/*.ts
'';
postInstall = ''
mkdir -p $out/bin $out/share/applications $out/share/icons
cp ./vokoscreenNG $out/bin/

2
pkgs/applications/window-managers/hyprwm/hypr/default.nix
View file

@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
inherit (finalAttrs.src.meta) homepage;
description = "Tiling X11 window manager written in modern C++";
license = licenses.bsd3;
maintainers = with maintainers; [ AndersonTorres ];
maintainers = with maintainers; [ ];
inherit (libX11.meta) platforms;
mainProgram = "Hypr";
};

8
pkgs/build-support/fetchurl/mirrors.nix
View file

@ -123,14 +123,8 @@
"ftp://ftp.sunet.se/mirror/imagemagick.org/ftp/" # also contains older versions removed from most mirrors
];
# Mirrors from https://download.kde.org/ls-lR.mirrorlist
kde = [
"https://cdn.download.kde.org/"
"https://download.kde.org/download.php?url="
"https://ftp.gwdg.de/pub/linux/kde/"
"https://mirrors.ocf.berkeley.edu/kde/"
"https://mirrors.mit.edu/kde/"
"https://mirrors.ustc.edu.cn/kde/"
"https://download.kde.org/"
"https://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/"
];

2
pkgs/build-support/node/fetch-yarn-deps/fixup.js
View file

@ -23,7 +23,7 @@ const fixupYarnLock = async (lockContents, verbose) => {
}
const [ url, hash ] = pkg.resolved.split("#", 2)
if (hash || url.startsWith("https://codeload.github.com")) {
if (hash || url.startsWith("https://codeload.github.com/")) {
if (verbose) console.log(`Removing integrity for git dependency ${dep}`)
delete pkg.integrity
}

2
pkgs/by-name/al/alsa-tools/package.nix
View file

@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "http://www.alsa-project.org/";
description = "ALSA Tools";
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.AndersonTorres ];
maintainers = [ ];
platforms = lib.platforms.linux;
};
})

2
pkgs/by-name/al/alsa-utils/package.nix
View file

@ -65,6 +65,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.AndersonTorres ];
maintainers = [ ];
};
}

2
pkgs/by-name/ap/apt-offline/package.nix
View file

@ -48,7 +48,7 @@ python3Packages.buildPythonApplication {
description = "Offline APT package manager";
license = with lib.licenses; [ gpl3Plus ];
mainProgram = "apt-offline";
maintainers = with lib.maintainers; [ AndersonTorres ];
maintainers = with lib.maintainers; [ ];
};
}
# TODO: verify GUI and pkexec

2
pkgs/by-name/ap/apt/package.nix
View file

@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
changelog = "https://salsa.debian.org/apt-team/apt/-/raw/${finalAttrs.version}/debian/changelog";
license = with lib.licenses; [ gpl2Plus ];
mainProgram = "apt";
maintainers = with lib.maintainers; [ AndersonTorres ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
})

6
pkgs/by-name/ar/ariang/package.nix
View file

@ -6,16 +6,16 @@
buildNpmPackage rec {
pname = "ariang";
version = "1.3.7";
version = "1.3.8";
src = fetchFromGitHub {
owner = "mayswind";
repo = "AriaNg";
rev = version;
hash = "sha256-p9EwlmI/xO3dX5ZpbDVVxajQySGYcJj5G57F84zYAD0=";
hash = "sha256-B7gyBVryRn1SwUIqzxc1MYDS8l/mxMfJtE1/ZrBjC1E=";
};
npmDepsHash = "sha256-xX8hD303CWlpsYoCfwHWgOuEFSp1A+M1S53H+4pyAUQ=";
npmDepsHash = "sha256-DmACToIdXfAqiXe13vevWrpWDY1YgRWVaTfdlk5uhPg=";
makeCacheWritable = true;

2
pkgs/by-name/au/audit/package.nix
View file

@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Audit Library";
changelog = "https://github.com/linux-audit/audit-userspace/releases/tag/v${finalAttrs.version}";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ AndersonTorres ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
})

28
pkgs/by-name/bi/binwalk/package.nix
View file

@ -5,6 +5,7 @@
pkg-config,
fontconfig,
bzip2,
stdenv,
}:
rustPlatform.buildRustPackage rec {
@ -30,12 +31,27 @@ rustPlatform.buildRustPackage rec {
];
# skip broken tests
checkFlags = [
"--skip=binwalk::Binwalk"
"--skip=binwalk::Binwalk::analyze"
"--skip=binwalk::Binwalk::extract"
"--skip=binwalk::Binwalk::scan"
];
checkFlags =
[
"--skip=binwalk::Binwalk"
"--skip=binwalk::Binwalk::scan"
]
++ lib.optionals stdenv.hostPlatform.isLinux [
"--skip=binwalk::Binwalk::analyze"
"--skip=binwalk::Binwalk::extract"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
"--skip=extractors::common::Chroot::append_to_file"
"--skip=extractors::common::Chroot::carve_file"
"--skip=extractors::common::Chroot::create_block_device"
"--skip=extractors::common::Chroot::create_character_device"
"--skip=extractors::common::Chroot::create_directory"
"--skip=extractors::common::Chroot::create_fifo"
"--skip=extractors::common::Chroot::create_file"
"--skip=extractors::common::Chroot::create_socket"
"--skip=extractors::common::Chroot::create_symlink"
"--skip=extractors::common::Chroot::make_executable"
];
meta = {
description = "Firmware Analysis Tool";

2
pkgs/by-name/bl/bluez-tools/package.nix
View file

@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Set of tools to manage bluetooth devices for linux";
license = with lib.licenses; [ gpl2Plus ];
mainProgram = "bt-agent";
maintainers = with lib.maintainers; [ AndersonTorres ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
})

2
pkgs/by-name/ce/cereal_1_3_0/package.nix
View file

@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Header-only C++11 serialization library";
changelog = "https://github.com/USCiLab/cereal/releases/tag/v${finalAttrs.version}";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ AndersonTorres ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.all;
};
})

2
pkgs/by-name/ce/cereal_1_3_2/package.nix
View file

@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Header-only C++11 serialization library";
changelog = "https://github.com/USCiLab/cereal/releases/tag/v${finalAttrs.version}";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ AndersonTorres ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.all;
};
})

53
pkgs/by-name/co/codeium/package.nix
View file

@ -1,23 +1,34 @@
{ stdenv, lib, fetchurl, gzip, autoPatchelfHook }:
{
stdenv,
lib,
fetchurl,
gzip,
autoPatchelfHook,
versionCheckHook,
}:
let
inherit (stdenv.hostPlatform) system;
throwSystem = throw "Unsupported system: ${system}";
plat = {
x86_64-linux = "linux_x64";
aarch64-linux = "linux_arm";
x86_64-darwin = "macos_x64";
aarch64-darwin = "macos_arm";
plat =
{
x86_64-linux = "linux_x64";
aarch64-linux = "linux_arm";
x86_64-darwin = "macos_x64";
aarch64-darwin = "macos_arm";
}.${system} or throwSystem;
}
.${system} or throwSystem;
hash = {
x86_64-linux = "sha256-fxwFomtgkOCtZCmXjxlCqa+9hxBiVNbM2IFdAGQ8Nlw=";
aarch64-linux = "sha256-hTxpszPXVU2FpB690tfZzrV9tUH/EqfjyEZQ8gPFmas=";
x86_64-darwin = "sha256-RiSCz4xNMFDdsAttovjXys7MeXRQgmi6YOi2LwvRoGE=";
aarch64-darwin = "sha256-G3j3Ds5ycGs0n5+KcaRa2MG86/1LdcZhgNdgeRIyfa4=";
}.${system} or throwSystem;
hash =
{
x86_64-linux = "sha256-fxwFomtgkOCtZCmXjxlCqa+9hxBiVNbM2IFdAGQ8Nlw=";
aarch64-linux = "sha256-hTxpszPXVU2FpB690tfZzrV9tUH/EqfjyEZQ8gPFmas=";
x86_64-darwin = "sha256-RiSCz4xNMFDdsAttovjXys7MeXRQgmi6YOi2LwvRoGE=";
aarch64-darwin = "sha256-G3j3Ds5ycGs0n5+KcaRa2MG86/1LdcZhgNdgeRIyfa4=";
}
.${system} or throwSystem;
bin = "$out/bin/codeium_language_server";
@ -45,6 +56,13 @@ stdenv.mkDerivation (finalAttrs: {
runHook postInstall
'';
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgram = "${placeholder "out"}/bin/codeium_language_server";
versionCheckProgramArg = [ "--version" ];
doInstallCheck = true;
passthru.updateScript = ./update.sh;
meta = rec {
@ -62,8 +80,13 @@ stdenv.mkDerivation (finalAttrs: {
changelog = homepage;
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ anpin ];
mainProgram = "codeium";
platforms = [ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ];
mainProgram = "codeium_language_server";
platforms = [
"aarch64-darwin"
"aarch64-linux"
"x86_64-linux"
"x86_64-darwin"
];
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
};
})

6
pkgs/by-name/da/darklua/package.nix
View file

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "darklua";
version = "0.13.1";
version = "0.14.1";
src = fetchFromGitHub {
owner = "seaofvoices";
repo = "darklua";
rev = "v${version}";
hash = "sha256-cabYENU4U+KisfXbiXcWojQM/nwzcVvM3QpYWOX7NtQ=";
hash = "sha256-Q0kNt+4Nu7zVniiTRzGu7pNfWiXkxGaYkzgelaECn9U=";
};
cargoHash = "sha256-fYx+SQdQMnNSygr0/Y4zEPtqfQPZYmQUq3ndi1HlXuE=";
cargoHash = "sha256-G3XvfDQjx1wbALnTQbSHOvBWc5JTKzwJFwNABtK12sM=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.CoreServices

2
pkgs/by-name/dd/ddsmt/package.nix
View file

@ -30,6 +30,6 @@ python3Packages.buildPythonApplication {
description = "Delta debugger for SMT benchmarks in SMT-LIB v2";
homepage = "https://ddsmt.readthedocs.io/";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ AndersonTorres ];
maintainers = with lib.maintainers; [ ];
};
}

22
pkgs/by-name/fi/firefly-iii-data-importer/package.nix
View file

@ -11,20 +11,16 @@
dataDir ? "/var/lib/firefly-iii-data-importer",
}:
let
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "firefly-iii-data-importer";
version = "1.5.6";
version = "1.5.7";
src = fetchFromGitHub {
owner = "firefly-iii";
repo = "data-importer";
rev = "v${version}";
hash = "sha256-IIlcOGulcBJsYz7Yx3YWV/c6yvb8+82AvFghQ05dUcI=";
rev = "v${finalAttrs.version}";
hash = "sha256-CKDAPpDTTrBXPhfSQiBl/M42hOQi2KwpWDtEnlDwpuU=";
};
in
stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname src version;
buildInputs = [ php83 ];
@ -42,12 +38,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
composerStrictValidation = true;
strictDeps = true;
vendorHash = "sha256-j1rCcHt5E1aFwgnOKZZccaGPs5JfpBtN05edeSvId94=";
vendorHash = "sha256-larFTf64oPJi+XLMK6ZuLEN4P/CkGLojUJDE/gvu8UU=";
npmDeps = fetchNpmDeps {
inherit src;
name = "${pname}-npm-deps";
hash = "sha256-mdBQubfV5Bgk9NxsWokTS6zA4r3gggWVSwhrfKPUi5s=";
inherit (finalAttrs) src;
name = "${finalAttrs.pname}-npm-deps";
hash = "sha256-0xY9F/Bok2RQ1YWRr5fnENk3zB1WubnpT0Ldy+i618g=";
};
composerRepository = php83.mkComposerRepository {
@ -82,7 +78,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
'';
meta = {
changelog = "https://github.com/firefly-iii/data-importer/releases/tag/v${version}";
changelog = "https://github.com/firefly-iii/data-importer/releases/tag/v${finalAttrs.version}";
description = "Firefly III Data Importer can import data into Firefly III.";
homepage = "https://github.com/firefly-iii/data-importer";
license = lib.licenses.agpl3Only;

34
pkgs/by-name/fi/firefly-iii/package.nix
View file

@ -10,31 +10,25 @@
, dataDir ? "/var/lib/firefly-iii"
}:
let
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "firefly-iii";
version = "6.1.21";
phpPackage = php83;
npmDepsHash = "sha256-N4o7FKdya6bGakNKNq2QUV8HKRfuov5ahvbjR/rsimU=";
version = "6.1.24";
src = fetchFromGitHub {
owner = "firefly-iii";
repo = "firefly-iii";
rev = "v${version}";
hash = "sha256-jadxzUhOb3G/DwJk8IV4IcwjmxgrrriVMVwj1cYFHEA=";
rev = "v${finalAttrs.version}";
hash = "sha256-ZB0yaGHL1AI67i2ixUzuWyiBjXJNlDV4APBahDuNObI=";
};
in
stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname src version;
buildInputs = [ phpPackage ];
buildInputs = [ php83 ];
nativeBuildInputs = [
nodejs
nodejs.python
buildPackages.npmHooks.npmConfigHook
phpPackage.composerHooks.composerInstallHook
phpPackage.packages.composer-local-repo-plugin
php83.composerHooks.composerInstallHook
php83.packages.composer-local-repo-plugin
];
composerNoDev = true;
@ -43,15 +37,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
composerStrictValidation = true;
strictDeps = true;
vendorHash = "sha256-d5WwrVOVG9ZRZEsG2iKcbp2fk27laHvcJPJUwY3YgDg=";
vendorHash = "sha256-6sOmW+CFuNEBVHpZwh/wjrIINPdcPJUvosmdLaCvZlw=";
npmDeps = fetchNpmDeps {
inherit src;
name = "${pname}-npm-deps";
hash = npmDepsHash;
inherit (finalAttrs) src;
name = "${finalAttrs.pname}-npm-deps";
hash = "sha256-W3lV0LbmOPfIwStNf4IwBVorSFHIlpyuIk+17/V/Y2Y=";
};
composerRepository = phpPackage.mkComposerRepository {
composerRepository = php83.mkComposerRepository {
inherit (finalAttrs)
pname
src
@ -70,7 +64,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
'';
passthru = {
inherit phpPackage;
phpPackage = php83;
tests = nixosTests.firefly-iii;
updateScript = nix-update-script { };
};
@ -83,7 +77,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
'';
meta = {
changelog = "https://github.com/firefly-iii/firefly-iii/releases/tag/v${version}";
changelog = "https://github.com/firefly-iii/firefly-iii/releases/tag/v${finalAttrs.version}";
description = "Firefly III: a personal finances manager";
homepage = "https://github.com/firefly-iii/firefly-iii";
license = lib.licenses.agpl3Only;

4
pkgs/by-name/fr/frog-protocols/package.nix
View file

@ -15,8 +15,8 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "misyltoad";
repo = "frog-protocols";
rev = "17be81da707722b4f907c5287def442351b219b0";
hash = "sha256-N8a+o5I7CRoONCvjMHVmPkJTVncczuFVRHEtMFzMzss=";
rev = "38db7e30e62a988f701a2751447e0adffd68bb3f";
hash = "sha256-daWGw6mRmiz6f81JkMacPipXppRxbjL6gS1VqYlfec8=";
};
nativeBuildInputs = [

2
pkgs/by-name/gt/gtklp/package.nix
View file

@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "GTK-based graphical frontend for CUPS";
license = with lib.licenses; [ gpl2Only ];
mainProgram = "gtklp";
maintainers = with lib.maintainers; [ AndersonTorres ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.unix;
};
})

2
pkgs/by-name/gu/guile-commonmark/package.nix
View file

@ -38,7 +38,7 @@ stdenv.mkDerivation {
homepage = "https://github.com/OrangeShark/guile-commonmark";
description = "Implementation of CommonMark for Guile";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
maintainers = with maintainers; [ ];
platforms = guile.meta.platforms;
};
}

2
pkgs/by-name/gu/guile-reader/package.nix
View file

@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
R5RS-derived document syntax.
'';
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
maintainers = with maintainers; [ ];
platforms = guile.meta.platforms;
};
}

2
pkgs/by-name/gu/guile-sqlite3/package.nix
View file

@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://notabug.org/guile-sqlite3/guile-sqlite3";
description = "Guile bindings for the SQLite3 database engine";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ AndersonTorres ];
maintainers = with lib.maintainers; [ ];
inherit (guile.meta) platforms;
};
})

95
pkgs/by-name/ha/hardinfo2/package.nix Normal file
View file

@ -0,0 +1,95 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
pkg-config,
libsForQt5,
wrapGAppsHook4,
gtk3,
json-glib,
lerc,
libdatrie,
libepoxy,
libnghttp2,
libpsl,
libselinux,
libsepol,
libsoup_3,
libsysprof-capture,
libthai,
libxkbcommon,
pcre2,
sqlite,
util-linux,
libXdmcp,
libXtst,
}:
stdenv.mkDerivation (finalAtrs: {
pname = "hardinfo2";
version = "2.2.4";
src = fetchFromGitHub {
owner = "hardinfo2";
repo = "hardinfo2";
rev = "refs/tags/release-${finalAtrs.version}";
hash = "sha256-UgVryuUkD9o2SvwA9VbX/kCaAo3+Osf6FxlYyaRX1Ag=";
};
nativeBuildInputs = [
cmake
pkg-config
wrapGAppsHook4
libsForQt5.wrapQtAppsHook
];
preFixup = ''
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
'';
dontWrapQtApps = true;
buildInputs = [
gtk3
json-glib
lerc
libdatrie
libepoxy
libnghttp2
libpsl
libselinux
libsepol
libsoup_3
libsysprof-capture
libthai
libxkbcommon
pcre2
sqlite
util-linux
libXdmcp
libXtst
];
hardeningDisable = [ "fortify" ];
cmakeFlags = [
(lib.cmakeFeature "CMAKE_INSTALL_DATAROOTDIR" "${placeholder "out"}/share")
(lib.cmakeFeature "CMAKE_INSTALL_SERVICEDIR" "${placeholder "out"}/lib")
];
meta = {
homepage = "http://www.hardinfo2.org";
description = "System information and benchmarks for Linux systems";
license = with lib.licenses; [
gpl2Plus
gpl3Plus
lgpl2Plus
];
maintainers = with lib.maintainers; [ sigmanificient ];
platforms = lib.platforms.linux;
mainProgram = "hardinfo";
};
})

70
pkgs/by-name/ii/iio-oscilloscope/package.nix Normal file
View file

@ -0,0 +1,70 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
pkg-config,
wrapGAppsHook3,
libiio,
glib,
gtk3,
gtkdatabox,
matio,
fftw,
libxml2,
curl,
jansson,
enable9361 ? true,
libad9361,
# enable9166 ? true,
# libad9166,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "iio-oscilloscope";
version = "0.17";
src = fetchFromGitHub {
owner = "analogdevicesinc";
repo = finalAttrs.pname;
rev = "v${finalAttrs.version}-master";
hash = "sha256-wCeOLAkrytrBaXzUbNu8z2Ayz44M+b+mbyaRoWHpZYU=";
};
postPatch = ''
# error: 'idx' may be used uninitialized
substituteInPlace plugins/lidar.c --replace-fail "int i, j, idx;" "int i, j, idx = 0;"
'';
nativeBuildInputs = [
cmake
pkg-config
wrapGAppsHook3
];
buildInputs = [
libiio
glib
gtk3
gtkdatabox
matio
fftw
libxml2
curl
jansson
] ++ lib.optional enable9361 libad9361;
cmakeFlags = [
"-DCMAKE_POLKIT_PREFIX=${placeholder "out"}"
];
meta = {
description = "GTK+ based oscilloscope application for interfacing with various IIO devices";
homepage = "https://wiki.analog.com/resources/tools-software/linux-software/iio_oscilloscope";
mainProgram = "osc";
license = lib.licenses.gpl2Only;
changelog = "https://github.com/analogdevicesinc/iio-oscilloscope/releases/tag/v${finalAttrs.version}-master";
maintainers = with lib.maintainers; [ chuangzhu ];
platforms = lib.platforms.linux;
};
})

12
pkgs/by-name/in/influxdb-cxx/package.nix
View file

@ -2,23 +2,15 @@
stdenv.mkDerivation (finalAttrs: {
pname = "influxdb-cxx";
version = "0.7.2";
version = "0.7.3";
src = fetchFromGitHub {
owner = "offa";
repo = "influxdb-cxx";
rev = "v${finalAttrs.version}";
hash = "sha256-DFslPrbgqS3JGx62oWlsC+AN5J2CsFjGcDaDRCadw7E=";
hash = "sha256-UlCmaw2mWAL5PuNXXGQa602Qxlf5BCr7ZIiShffG74o=";
};
patches = [
# Fix unclosed test case tag
(fetchpatch {
url = "https://github.com/offa/influxdb-cxx/commit/b31f94982fd1d50e89ce04f66c694bec108bf470.patch";
hash = "sha256-oSdpNlWV744VpzfiWzp0ziNKaReLTlyfJ+SF2qyH+TU=";
})
];
postPatch = ''
substituteInPlace CMakeLists.txt --replace "-Werror" ""
'';

2
pkgs/by-name/ja/jasper/package.nix
View file

@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
license = with lib.licenses; [ mit ];
mainProgram = "jasper";
maintainers = with lib.maintainers; [ AndersonTorres ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.unix;
};
})

68
pkgs/by-name/ku/kubernetes-kcp/package.nix Normal file
View file

@ -0,0 +1,68 @@
{
lib,
stdenv,
buildGoModule,
fetchFromGitHub,
installShellFiles,
testers,
}:
buildGoModule rec {
pname = "kubernetes-kcp";
version = "0.26.0";
src = fetchFromGitHub {
owner = "kcp-dev";
repo = "kcp";
rev = "refs/tags/v${version}";
hash = "sha256-ZEgDeILo2weSAZgBsfR2EQyzym/I/+3P99b47E5Tfrw=";
};
vendorHash = "sha256-IONbTih48LKAiEPFNFdBkJDMI2sjHWxiqVbEJCskyio=";
subPackages = [ "cmd/kcp" ];
# TODO: The upstream has the additional version information pulled from go.mod
# dependencies.
ldflags = [
"-X k8s.io/client-go/pkg/version.gitCommit=unknown"
"-X k8s.io/client-go/pkg/version.gitTreeState=clean"
"-X k8s.io/client-go/pkg/version.gitVersion=v${version}"
# "-X k8s.io/client-go/pkg/version.gitMajor=${KUBE_MAJOR_VERSION}"
# "-X k8s.io/client-go/pkg/version.gitMinor=${KUBE_MINOR_VERSION}"
"-X k8s.io/client-go/pkg/version.buildDate=unknown"
"-X k8s.io/component-base/version.gitCommit=unknown"
"-X k8s.io/component-base/version.gitTreeState=clean"
"-X k8s.io/component-base/version.gitVersion=v${version}"
# "-X k8s.io/component-base/version.gitMajor=${KUBE_MAJOR_VERSION}"
# "-X k8s.io/component-base/version.gitMinor=${KUBE_MINOR_VERSION}"
"-X k8s.io/component-base/version.buildDate=unknown"
];
# TODO: Check if this is necessary.
# __darwinAllowLocalNetworking = true;
nativeBuildInputs = [ installShellFiles ];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
$out/bin/kcp completion bash > kcp.bash
$out/bin/kcp completion zsh > kcp.zsh
$out/bin/kcp completion fish > kcp.fish
installShellCompletion kcp.{bash,zsh,fish}
'';
passthru.tests.version = testers.testVersion {
command = "kcp --version";
# NOTE: Once the go.mod version is pulled in, the version info here needs
# to be also updated.
version = "v${version}";
};
meta = {
homepage = "https://kcp.io";
description = "Kubernetes-like control planes for form-factors and use-cases beyond Kubernetes and container workloads";
mainProgram = "kcp";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
rytswd
];
};
}

1
pkgs/by-name/le/less/package.nix
View file

@ -66,7 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.gpl3Plus;
mainProgram = "less";
maintainers = with lib.maintainers; [
AndersonTorres
# not active
dtzWill
];

2
pkgs/by-name/li/libast/package.nix
View file

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
description = "Library of Assorted Spiffy Things";
mainProgram = "libast-config";
license = licenses.bsd2;
maintainers = [ maintainers.AndersonTorres ];
maintainers = [ ];
platforms = platforms.unix;
};
}

4
pkgs/by-name/li/libcpr/package.nix
View file

@ -8,7 +8,7 @@
}:
let
version = "1.11.0";
version = "1.11.1";
in
stdenv.mkDerivation {
pname = "libcpr";
@ -23,7 +23,7 @@ stdenv.mkDerivation {
owner = "libcpr";
repo = "cpr";
rev = version;
hash = "sha256-jWyss0krj8MVFqU1LAig+4UbXO5pdcWIT+hCs9DxemM=";
hash = "sha256-RIRqkb2Id3cyz35LM4bYftMv1NGyDyFP4fL4L5mHV8A=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/by-name/li/limine/package.nix
View file

@ -18,7 +18,7 @@ let
llvmPackages = llvmPackages_18;
stdenv = llvmPackages.stdenv;
version = "8.0.14";
version = "8.4.0";
hasI686 =
(if targets == [ ] then stdenv.hostPlatform.isx86_32 else (builtins.elem "i686" targets))
@ -64,7 +64,7 @@ stdenv.mkDerivation {
# Packaging that in Nix is very cumbersome.
src = fetchurl {
url = "https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz";
hash = "sha256-tj8wFUFveGp10Ls4xWIqqdY6fUHWy3jxsVeJRTz7/9Q=";
hash = "sha256-MSKUXfwnLw/tVAfhUoKYNGUeMYb7Ka4UWAtx9R1eSR8=";
};
hardeningDisable = [

43
pkgs/by-name/mq/mqtt-exporter/package.nix Normal file
View file

@ -0,0 +1,43 @@
{
lib,
python3,
fetchFromGitHub,
}:
python3.pkgs.buildPythonApplication rec {
pname = "mqtt-exporter";
version = "1.5.0";
pyproject = true;
src = fetchFromGitHub {
owner = "kpetremann";
repo = "mqtt-exporter";
rev = "refs/tags/v${version}";
hash = "sha256-3gUAiujfBXJpVailx8cMmSJS7l69XpE4UGK/aebcQqY=";
};
pythonRelaxDeps = [ "prometheus-client" ];
build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
paho-mqtt_2
prometheus-client
];
nativeCheckInputs = with python3.pkgs; [
pytest-mock
pytestCheckHook
];
pythonImportsCheck = [ "mqtt_exporter" ];
meta = {
description = "Generic MQTT Prometheus exporter for IoT";
homepage = "https://github.com/kpetremann/mqtt-exporter";
changelog = "https://github.com/kpetremann/mqtt-exporter/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "mqtt-exporter";
};
}

6
pkgs/by-name/ni/nix-janitor/package.nix
View file

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "nix-janitor";
version = "0.3.1";
version = "0.3.2";
src = fetchFromGitHub {
owner = "nobbz";
repo = "nix-janitor";
rev = "refs/tags/${version}";
hash = "sha256-xoVByI17rt2SCY3ULg12S8QsoXGhQWZlOpPpK2mfcPY=";
hash = "sha256-MRhTkxPl0tlObbXO7/0cD2pbd9/uQCeRKV3DStGvZMQ=";
};
cargoHash = "sha256-QG2hHM4KBSU6+droew2WnOFxWRTpk9griIPMD8MLSbw=";
cargoHash = "sha256-XFO4ec++lT04JpwqGtD3kWX4vmgmeBPSULxZENddYm0=";
nativeBuildInputs = [ installShellFiles ];

2
pkgs/by-name/nw/nwg-drawer/package.nix
View file

@ -59,7 +59,7 @@ buildGoModule {
changelog = "https://github.com/nwg-piotr/nwg-drawer/releases/tag/${src.rev}";
license = with lib.licenses; [ mit ];
mainProgram = "nwg-drawer";
maintainers = with lib.maintainers; [ AndersonTorres ];
maintainers = with lib.maintainers; [ ];
platforms = with lib.platforms; linux;
};
}

2
pkgs/by-name/on/onscripter-en/package.nix
View file

@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Japanese visual novel scripting engine";
license = lib.licenses.gpl2Plus;
mainProgram = "onscripter-en";
maintainers = with lib.maintainers; [ AndersonTorres ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.unix;
broken = stdenv.hostPlatform.isDarwin;
};

6
pkgs/by-name/op/open-webui/package.nix
View file

@ -7,19 +7,19 @@
}:
let
pname = "open-webui";
version = "0.4.6";
version = "0.4.7";
src = fetchFromGitHub {
owner = "open-webui";
repo = "open-webui";
rev = "refs/tags/v${version}";
hash = "sha256-Zzytv2OLy3RENNWzRjjDh7xnJyX+H9/dh1Xj2HIsn6I=";
hash = "sha256-LQFedDcECmS142tGH9+/7ic+wKTeMuysK2fjGmvYPYQ=";
};
frontend = buildNpmPackage {
inherit pname version src;
npmDepsHash = "sha256-36GdyqKcqhOYi1kRwXe0YTOtwbVUcEvLPPYy/A0IgE0=";
npmDepsHash = "sha256-KeHMt51QvF5qfHKQpEbM0ukGm34xo3TFcXKeZ3CrmHM=";
# Disabling `pyodide:fetch` as it downloads packages during `buildPhase`
# Until this is solved, running python packages from the browser will not work.

43
pkgs/by-name/op/ophis/package.nix Normal file
View file

@ -0,0 +1,43 @@
{
lib,
fetchFromGitHub,
python3Packages,
unstableGitUpdater,
}:
let
self = python3Packages.buildPythonApplication {
pname = "ophis";
version = "2.2-unstable-2024-07-28";
pyproject = true;
src = fetchFromGitHub {
owner = "michaelcmartin";
repo = "Ophis";
rev = "6a5e5a586832e828b598e8162457e673a6c38275";
hash = "sha256-cxgSgAypS02AO9vjYjNWDY/cx7kxLt1Bdw8HGgGGBhU=";
};
build-system = [ python3Packages.setuptools ];
passthru = {
updateScript = unstableGitUpdater { };
};
meta = {
homepage = "http://michaelcmartin.github.io/Ophis/";
description = "Cross-assembler for the 6502 series of microprocessors";
longDescription = ''
Ophis is an assembler for the 6502 microprocessor - the famous chip used
in the vast majority of the classic 8-bit computers and consoles. Its
primary design goals are code readability and output flexibility - Ophis
has successfully been used to create programs for the Nintendo
Entertainment System, the Atari 2600, and the Commodore 64.
'';
license = lib.licenses.mit;
mainProgram = "ophis";
maintainers = with lib.maintainers; [ ];
};
};
in
self

2
pkgs/by-name/or/orca-slicer/package.nix
View file

@ -28,6 +28,8 @@ bambu-studio.overrideAttrs (
)
'';
cmakeFlags = lib.remove "-DFLATPAK=1" previousAttrs.cmakeFlags or [ ];
# needed to prevent collisions between the LICENSE.txt files of
# bambu-studio and orca-slicer.
postInstall = ''

8
pkgs/by-name/qu/quilt/package.nix
View file

@ -42,6 +42,14 @@ stdenv.mkDerivation rec {
unixtools.getopt
];
strictDeps = true;
configureFlags = [
# configure only looks in $PATH by default,
# which does not include buildInputs if strictDeps is true
"--with-perl=${lib.getExe perl}"
];
postInstall = ''
wrapProgram $out/bin/quilt --prefix PATH : ${lib.makeBinPath buildInputs}
'';

2
pkgs/by-name/re/resorter/package.nix
View file

@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/hiAndrewQuinn/resorter";
license = with lib.licenses; [ cc0 ];
mainProgram = "resorter";
maintainers = with lib.maintainers; [ AndersonTorres ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.all;
};
})

56
pkgs/by-name/ru/rucola/package.nix Normal file
View file

@ -0,0 +1,56 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
oniguruma,
stdenv,
apple-sdk_11,
darwinMinVersionHook,
}:
rustPlatform.buildRustPackage rec {
pname = "rucola";
version = "0.4.1";
src = fetchFromGitHub {
owner = "Linus-Mussmaecher";
repo = "rucola";
rev = "v${version}";
hash = "sha256-FeQPf9sCEqypvB8VrGa1nnXmxlqo6K4fpLkJakbysvI=";
};
cargoHash = "sha256-5TvJ8h/kmXG9G7dl5/gIYhVgvmqmm24BmOJzdKVJ+uY=";
nativeBuildInputs = [
pkg-config
];
buildInputs =
[
oniguruma
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
(darwinMinVersionHook "10.13")
];
env = {
RUSTONIG_SYSTEM_LIBONIG = true;
};
# Fails on Darwin
checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [
"--skip=io::file_tracker::tests::test_watcher_rename"
];
meta = {
description = "Terminal-based markdown note manager";
homepage = "https://github.com/Linus-Mussmaecher/rucola";
changelog = "https://github.com/Linus-Mussmaecher/rucola/blob/${src.rev}/CHANGELOG.md";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ donovanglover ];
mainProgram = "rucola";
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
}

4
pkgs/by-name/si/simdutf/package.nix
View file

@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "simdutf";
version = "5.6.0";
version = "5.6.3";
src = fetchFromGitHub {
owner = "simdutf";
repo = "simdutf";
rev = "v${finalAttrs.version}";
hash = "sha256-DJCr+QoCmN0wJiXH+mv4g/zJYFfgJDGw0l6pzPriBVs=";
hash = "sha256-V5Z1EZRm5FaNFz1GSgTYD3ONF4CSE594FLa1e/DETms=";
};
# Fix build on darwin

2
pkgs/by-name/sw/swayest-workstyle/package.nix
View file

@ -27,7 +27,7 @@ rustPlatform.buildRustPackage {
homepage = "https://github.com/Lyr-7D1h/swayest_workstyle";
license = lib.licenses.mit;
mainProgram = "sworkstyle";
maintainers = with lib.maintainers; [ AndersonTorres ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
}

2
pkgs/by-name/ti/tinyalsa/package.nix
View file

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/tinyalsa/tinyalsa";
description = "Tiny library to interface with ALSA in the Linux kernel";
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
maintainers = with maintainers; [ ];
platforms = with platforms; linux;
};
}

2
pkgs/by-name/vk/vkd3d-proton/package.nix
View file

@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/HansKristian-Work/vkd3d-proton";
description = "A fork of VKD3D, which aims to implement the full Direct3D 12 API on top of Vulkan";
license = with lib.licenses; [ lgpl21Plus ];
maintainers = with lib.maintainers; [ AndersonTorres ];
maintainers = with lib.maintainers; [ ];
inherit (wine.meta) platforms;
};
})

2
pkgs/by-name/vk/vkd3d/package.nix
View file

@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
license = with lib.licenses; [ lgpl21Plus ];
mainProgram = "vkd3d-compiler";
maintainers = with lib.maintainers; [ AndersonTorres ];
maintainers = with lib.maintainers; [ ];
inherit (wine.meta) platforms;
};
})

2
pkgs/by-name/wb/wbg/package.nix
View file

@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
homepage = "https://codeberg.org/dnkl/wbg";
changelog = "https://codeberg.org/dnkl/wbg/releases/tag/${version}";
license = licenses.isc;
maintainers = with maintainers; [ AndersonTorres ];
maintainers = with maintainers; [ ];
platforms = with platforms; linux;
mainProgram = "wbg";
};

4
pkgs/by-name/yo/youtrack/package.nix
View file

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "youtrack";
version = "2024.3.47197";
version = "2024.3.52635";
src = fetchzip {
url = "https://download.jetbrains.com/charisma/youtrack-${finalAttrs.version}.zip";
hash = "sha256-/XTZERUPA7AEvWQsnjDXDVVkmiEn+0D8qgQkOzTJFaA=";
hash = "sha256-aCNKlZmOdIJsyYrh6c6dg21X3H+r6nThrw1HUg8iTqk=";
};
nativeBuildInputs = [ makeBinaryWrapper ];

30
pkgs/development/compilers/ophis/default.nix
View file

@ -1,30 +0,0 @@
{ lib, buildPythonApplication, fetchFromGitHub }:
buildPythonApplication rec {
pname = "ophis";
version = "unstable-2019-04-13";
src = fetchFromGitHub {
owner = "michaelcmartin";
repo = "Ophis";
rev = "99f074da278d4ec80689c0e22e20c5552ea12512";
sha256 = "2x8vwLTSngqQqmVrVh/mM4peATgaRqOSwrfm5XCkg/g=";
};
sourceRoot = "${src.name}/src";
meta = with lib; {
homepage = "http://michaelcmartin.github.io/Ophis/";
description = "Cross-assembler for the 6502 series of microprocessors";
mainProgram = "ophis";
longDescription = ''
Ophis is an assembler for the 6502 microprocessor - the famous chip used
in the vast majority of the classic 8-bit computers and consoles. Its
primary design goals are code readability and output flexibility - Ophis
has successfully been used to create programs for the Nintendo
Entertainment System, the Atari 2600, and the Commodore 64.
'';
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
};
}

2
pkgs/development/libraries/libunique/3.x.nix
View file

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
homepage = "https://gitlab.gnome.org/Archive/unique";
description = "Library for writing single instance applications";
license = lib.licenses.lgpl21;
maintainers = [ lib.maintainers.AndersonTorres ];
maintainers = [ ];
platforms = lib.platforms.linux;
};
}

2
pkgs/development/libraries/wxSVG/default.nix
View file

@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
Graphics (SVG) files with the wxWidgets toolkit.
'';
license = licenses.gpl2Plus;
maintainers = [ maintainers.AndersonTorres ];
maintainers = [ ];
inherit (wxGTK.meta) platforms;
};
}

4
pkgs/development/python-modules/aiortm/default.nix
View file

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "aiortm";
version = "0.9.36";
version = "0.9.37";
pyproject = true;
disabled = pythonOlder "3.12";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "MartinHjelmare";
repo = "aiortm";
rev = "refs/tags/v${version}";
hash = "sha256-oeFJ1xfFV6PDCuQwmUfSJBU1nOdLWW6ChBH2GQ6NiXE=";
hash = "sha256-ZjpuUjUNcAw9G911q3koYB17iFhsylA+RuqpOGUSAEQ=";
};
pythonRelaxDeps = [ "typer" ];

63
pkgs/development/python-modules/azure-kusto-data/default.nix
View file

@ -1,17 +1,20 @@
{
lib,
buildPythonPackage,
fetchPypi,
setuptools,
python-dateutil,
requests,
azure-identity,
msal,
ijson,
azure-core,
asgiref,
aiohttp,
asgiref,
azure-core,
azure-identity,
buildPythonPackage,
fetchFromGitHub,
ijson,
msal,
pandas,
pytest-asyncio,
pytestCheckHook,
python-dateutil,
pythonOlder,
requests,
setuptools,
}:
buildPythonPackage rec {
@ -19,40 +22,54 @@ buildPythonPackage rec {
version = "4.6.1";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-tfOnb6rFjTzg4af26gK5gk1185mejAiaDvetE/r4L0Q=";
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-kusto-python";
rev = "refs/tags/v${version}";
hash = "sha256-rm8G3/WAUlK1/80uk3uiTqDA5hUIr+VVZEmPe0mYBjI=";
};
sourceRoot = "${src.name}/${pname}";
build-system = [ setuptools ];
dependencies = [
azure-core
azure-identity
ijson
msal
python-dateutil
requests
azure-identity
msal
ijson
azure-core
];
optional-dependencies = {
pandas = [ pandas ];
aio = [
aiohttp
asgiref
];
pandas = [ pandas ];
};
# Tests require secret connection strings
# and a network connection.
doCheck = false;
nativeCheckInputs = [
pytest-asyncio
pytestCheckHook
] ++ lib.flatten (builtins.attrValues optional-dependencies);
pythonImportsCheck = [ "azure.kusto.data" ];
disabledTestPaths = [
# Tests require network access
"tests/aio/test_async_token_providers.py"
"tests/test_token_providers.py"
"tests/test_e2e_data.py"
];
meta = {
changelog = "https://github.com/Azure/azure-kusto-python/releases/tag/v${version}";
description = "Kusto Data Client";
homepage = "https://github.com/Azure/azure-kusto-python";
homepage = "https://pypi.org/project/azure-kusto-data/";
changelog = "https://github.com/Azure/azure-kusto-python/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ pyrox0 ];
};

35
pkgs/development/python-modules/azure-kusto-ingest/default.nix
View file

@ -1,13 +1,18 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
aiohttp,
azure-kusto-data,
azure-storage-blob,
azure-storage-queue,
tenacity,
buildPythonPackage,
fetchFromGitHub,
pandas,
pytest-asyncio,
pytestCheckHook,
pythonOlder,
responses,
setuptools,
tenacity,
}:
buildPythonPackage rec {
@ -15,6 +20,8 @@ buildPythonPackage rec {
version = "4.6.1";
pyproject = true;
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-kusto-python";
@ -22,7 +29,7 @@ buildPythonPackage rec {
hash = "sha256-rm8G3/WAUlK1/80uk3uiTqDA5hUIr+VVZEmPe0mYBjI=";
};
sourceRoot = "${src.name}/azure-kusto-ingest";
sourceRoot = "${src.name}/${pname}";
build-system = [ setuptools ];
@ -37,16 +44,24 @@ buildPythonPackage rec {
pandas = [ pandas ];
};
# Tests require secret connection strings
# and a network connection.
doCheck = false;
nativeCheckInputs = [
aiohttp
pytest-asyncio
pytestCheckHook
responses
] ++ lib.flatten (builtins.attrValues optional-dependencies);
pythonImportsCheck = [ "azure.kusto.ingest" ];
disabledTestPaths = [
# Tests require network access
"tests/test_e2e_ingest.py"
];
meta = {
description = "Module for Kusto Ingest";
homepage = "https://github.com/Azure/azure-kusto-python/tree/master/azure-kusto-ingest";
changelog = "https://github.com/Azure/azure-kusto-python/releases/tag/v${version}";
description = "Kusto Ingest Client";
homepage = "https://github.com/Azure/azure-kusto-python";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ pyrox0 ];
};

40
pkgs/development/python-modules/cache/default.nix vendored Normal file
View file

@ -0,0 +1,40 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "cache";
version = "1.0.3";
pyproject = true;
src = fetchFromGitHub {
owner = "jneen";
repo = "python-cache";
rev = "refs/tags/v${version}";
hash = "sha256-vfVNo2B9fnjyjgR7cGrcsi9srWcTs3s8fhmvNF8okN0=";
};
build-system = [ setuptools ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "cache" ];
disabledTests = [
# Tests are out-dated
"test_arguments"
"test_hash_arguments"
];
meta = {
description = "Module for caching";
homepage = "https://github.com/jneen/python-cache";
changelog = "https://github.com/jneen/python-cache/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/cyclopts/default.nix
View file

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "cyclopts";
version = "3.1.1";
version = "3.1.2";
pyproject = true;
disabled = pythonOlder "3.8";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "BrianPugh";
repo = "cyclopts";
rev = "refs/tags/v${version}";
hash = "sha256-iTNxD9PehYYcWlZTfIMGoon2goPac/UvCaxTrbHy+5s=";
hash = "sha256-5LJSo7DlzId0gd8Egv+JAbLk59tSl2HbwjyGm0qy5nI=";
};
build-system = [

2
pkgs/development/python-modules/cython/default.nix
View file

@ -118,7 +118,7 @@ buildPythonPackage rec {
changelog = "https://github.com/cython/cython/blob/${version}/CHANGES.rst";
license = lib.licenses.asl20;
mainProgram = "cython";
maintainers = with lib.maintainers; [ AndersonTorres ];
maintainers = with lib.maintainers; [ ];
};
}
# TODO: investigate recursive loop when doCheck is true

2
pkgs/development/python-modules/docutils/default.nix
View file

@ -58,7 +58,7 @@ let
psfl
gpl3Plus
];
maintainers = with maintainers; [ AndersonTorres ];
maintainers = with maintainers; [ ];
};
};
in

2
pkgs/development/python-modules/dotty-dict/default.nix
View file

@ -22,6 +22,6 @@ buildPythonPackage rec {
description = "Dictionary wrapper for quick access to deeply nested keys";
homepage = "https://dotty-dict.readthedocs.io";
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
maintainers = with maintainers; [ ];
};
}

2
pkgs/development/python-modules/gistyc/default.nix
View file

@ -37,6 +37,6 @@ buildPythonPackage rec {
blocks.
'';
license = licenses.gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
maintainers = with maintainers; [ ];
};
}

2
pkgs/development/python-modules/hid/default.nix
View file

@ -34,6 +34,6 @@ buildPythonPackage rec {
description = "hidapi bindings in ctypes";
homepage = "https://github.com/apmorton/pyhidapi";
license = with licenses; [ mit ];
maintainers = with maintainers; [ AndersonTorres ];
maintainers = with maintainers; [ ];
};
}

1
pkgs/development/python-modules/importlib-metadata/default.nix
View file

@ -51,7 +51,6 @@ buildPythonPackage rec {
license = licenses.asl20;
maintainers = with maintainers; [
fab
AndersonTorres
];
};
}

2
pkgs/development/python-modules/localimport/default.nix
View file

@ -20,6 +20,6 @@ buildPythonPackage rec {
homepage = "https://github.com/NiklasRosenstein/py-localimport";
description = "Isolated import of Python modules";
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
maintainers = with maintainers; [ ];
};
}

2
pkgs/development/python-modules/m2r/default.nix
View file

@ -43,7 +43,7 @@ buildPythonPackage rec {
homepage = "https://github.com/miyakogi/m2r";
description = "Markdown to reStructuredText converter";
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
maintainers = with maintainers; [ ];
# https://github.com/miyakogi/m2r/issues/66
broken = versionAtLeast mistune.version "2";
};

122
pkgs/development/python-modules/msticpy/default.nix Normal file
View file

@ -0,0 +1,122 @@
{
lib,
attrs,
azure-common,
azure-core,
azure-identity,
azure-keyvault-secrets,
azure-kusto-data,
azure-mgmt-keyvault,
azure-mgmt-subscription,
azure-monitor-query,
beautifulsoup4,
bokeh,
buildPythonPackage,
cache,
cryptography,
deprecated,
dnspython,
fetchFromGitHub,
folium,
geoip2,
html5lib,
httpx,
importlib-resources,
ipython,
ipywidgets,
keyring,
lxml,
markdown,
msal-extensions,
msal,
msrest,
msrestazure,
nest-asyncio,
networkx,
packaging,
pandas,
pydantic,
pygments,
pyjwt,
pythonOlder,
pyyaml,
setuptools,
tldextract,
tqdm,
typing-extensions,
urllib3,
}:
buildPythonPackage rec {
pname = "msticpy";
version = "2.14.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "microsoft";
repo = "msticpy";
rev = "refs/tags/v${version}";
hash = "sha256-9qTcXcgUxjSLbsWT7O9ilYuRRPPyN0v9NzUkbd4cIn0=";
};
pythonRelaxDeps = [ "bokeh" ];
build-system = [ setuptools ];
dependencies = [
attrs
azure-common
azure-core
azure-identity
azure-keyvault-secrets
azure-kusto-data
azure-mgmt-keyvault
azure-mgmt-subscription
azure-monitor-query
beautifulsoup4
bokeh
cryptography
deprecated
dnspython
folium
geoip2
html5lib
httpx
importlib-resources
ipython
ipywidgets
keyring
lxml
msal
msal-extensions
msrest
msrestazure
nest-asyncio
networkx
packaging
pandas
pydantic
pygments
pyjwt
pyyaml
tldextract
tqdm
typing-extensions
urllib3
];
# Test requires network access
doCheck = false;
pythonImportsCheck = [ "msticpy" ];
meta = {
description = "Microsoft Threat Intelligence Security Tools";
homepage = "https://github.com/microsoft/msticpy";
changelog = "https://github.com/microsoft/msticpy/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
};
}

2
pkgs/development/python-modules/nodepy-runtime/default.nix
View file

@ -42,6 +42,6 @@ buildPythonPackage rec {
extra.
'';
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
maintainers = with maintainers; [ ];
};
}

4
pkgs/development/python-modules/qdrant-client/default.nix
View file

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "qdrant-client";
version = "1.11.3";
version = "1.12.1";
pyproject = true;
disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "qdrant";
repo = "qdrant-client";
rev = "refs/tags/v${version}";
hash = "sha256-1tBlWwD2GaphwupWUWRYwYrqGV9cTfG4k1L9N5mub/Q=";
hash = "sha256-rElbGIXnhkHaAvtneEMhyyhySFlT4UT/vhhIlRD3xT0=";
};
build-system = [ poetry-core ];

148
pkgs/development/python-modules/tensorflow/bin.nix
View file

@ -54,7 +54,7 @@ let
isCudaJetson = cudaSupport && cudaPackages.cudaFlags.isJetsonBuild;
isCudaX64 = cudaSupport && stdenv.hostPlatform.isx86_64;
in
buildPythonPackage {
buildPythonPackage rec {
pname = "tensorflow" + lib.optionalString cudaSupport "-gpu";
version = packages."${"version" + lib.optionalString isCudaJetson "_jetson"}";
format = "wheel";
@ -141,73 +141,97 @@ buildPythonPackage {
popd
'';
# Note that we need to run *after* the fixup phase because the
# libraries are loaded at runtime. If we run in preFixup then
# patchelf --shrink-rpath will remove the cuda libraries.
postFixup =
let
# rpaths we only need to add if CUDA is enabled.
cudapaths = lib.optionals cudaSupport [
cudatoolkit.out
cudatoolkit.lib
cudnn
];
# When using the cpu-only wheel, the final package will be named `tensorflow_cpu`.
# Then, in each package requiring `tensorflow`, our pythonRuntimeDepsCheck will fail with:
# importlib.metadata.PackageNotFoundError: No package metadata was found for tensorflow
# Hence, we manually rename the package to `tensorflow`.
lib.optionalString ((builtins.match ".*tensorflow_cpu.*" src.url) != null) ''
(
cd $out/${python.sitePackages}
libpaths = [
(lib.getLib stdenv.cc.cc)
zlib
];
dest="tensorflow-${version}.dist-info"
rpath = lib.makeLibraryPath (libpaths ++ cudapaths);
in
lib.optionalString stdenv.hostPlatform.isLinux ''
# This is an array containing all the directories in the tensorflow2
# package that contain .so files.
#
# TODO: Create this list programmatically, and remove paths that aren't
# actually needed.
rrPathArr=(
"$out/${python.sitePackages}/tensorflow/"
"$out/${python.sitePackages}/tensorflow/core/kernels"
"$out/${python.sitePackages}/tensorflow/compiler/mlir/stablehlo/"
"$out/${python.sitePackages}/tensorflow/compiler/tf2tensorrt/"
"$out/${python.sitePackages}/tensorflow/compiler/tf2xla/ops/"
"$out/${python.sitePackages}/tensorflow/include/external/ml_dtypes/"
"$out/${python.sitePackages}/tensorflow/lite/experimental/microfrontend/python/ops/"
"$out/${python.sitePackages}/tensorflow/lite/python/analyzer_wrapper/"
"$out/${python.sitePackages}/tensorflow/lite/python/interpreter_wrapper/"
"$out/${python.sitePackages}/tensorflow/lite/python/metrics/"
"$out/${python.sitePackages}/tensorflow/lite/python/optimize/"
"$out/${python.sitePackages}/tensorflow/python/"
"$out/${python.sitePackages}/tensorflow/python/autograph/impl/testing"
"$out/${python.sitePackages}/tensorflow/python/client"
"$out/${python.sitePackages}/tensorflow/python/data/experimental/service"
"$out/${python.sitePackages}/tensorflow/python/framework"
"$out/${python.sitePackages}/tensorflow/python/grappler"
"$out/${python.sitePackages}/tensorflow/python/lib/core"
"$out/${python.sitePackages}/tensorflow/python/lib/io"
"$out/${python.sitePackages}/tensorflow/python/platform"
"$out/${python.sitePackages}/tensorflow/python/profiler/internal"
"$out/${python.sitePackages}/tensorflow/python/saved_model"
"$out/${python.sitePackages}/tensorflow/python/util"
"$out/${python.sitePackages}/tensorflow/tsl/python/lib/core"
"$out/${python.sitePackages}/tensorflow.libs/"
"${rpath}"
mv tensorflow_cpu-${version}.dist-info "$dest"
(
cd "$dest"
substituteInPlace METADATA \
--replace-fail "tensorflow_cpu" "tensorflow"
substituteInPlace RECORD \
--replace-fail "tensorflow_cpu" "tensorflow"
)
)
''
# Note that we need to run *after* the fixup phase because the
# libraries are loaded at runtime. If we run in preFixup then
# patchelf --shrink-rpath will remove the cuda libraries.
+ (
let
# rpaths we only need to add if CUDA is enabled.
cudapaths = lib.optionals cudaSupport [
cudatoolkit.out
cudatoolkit.lib
cudnn
];
# The the bash array into a colon-separated list of RPATHs.
rrPath=$(IFS=$':'; echo "''${rrPathArr[*]}")
echo "about to run patchelf with the following rpath: $rrPath"
libpaths = [
(lib.getLib stdenv.cc.cc)
zlib
];
find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
echo "about to patchelf $lib..."
chmod a+rx "$lib"
patchelf --set-rpath "$rrPath" "$lib"
${lib.optionalString cudaSupport ''
addDriverRunpath "$lib"
''}
done
'';
rpath = lib.makeLibraryPath (libpaths ++ cudapaths);
in
lib.optionalString stdenv.hostPlatform.isLinux ''
# This is an array containing all the directories in the tensorflow2
# package that contain .so files.
#
# TODO: Create this list programmatically, and remove paths that aren't
# actually needed.
rrPathArr=(
"$out/${python.sitePackages}/tensorflow/"
"$out/${python.sitePackages}/tensorflow/core/kernels"
"$out/${python.sitePackages}/tensorflow/compiler/mlir/stablehlo/"
"$out/${python.sitePackages}/tensorflow/compiler/tf2tensorrt/"
"$out/${python.sitePackages}/tensorflow/compiler/tf2xla/ops/"
"$out/${python.sitePackages}/tensorflow/include/external/ml_dtypes/"
"$out/${python.sitePackages}/tensorflow/lite/experimental/microfrontend/python/ops/"
"$out/${python.sitePackages}/tensorflow/lite/python/analyzer_wrapper/"
"$out/${python.sitePackages}/tensorflow/lite/python/interpreter_wrapper/"
"$out/${python.sitePackages}/tensorflow/lite/python/metrics/"
"$out/${python.sitePackages}/tensorflow/lite/python/optimize/"
"$out/${python.sitePackages}/tensorflow/python/"
"$out/${python.sitePackages}/tensorflow/python/autograph/impl/testing"
"$out/${python.sitePackages}/tensorflow/python/client"
"$out/${python.sitePackages}/tensorflow/python/data/experimental/service"
"$out/${python.sitePackages}/tensorflow/python/framework"
"$out/${python.sitePackages}/tensorflow/python/grappler"
"$out/${python.sitePackages}/tensorflow/python/lib/core"
"$out/${python.sitePackages}/tensorflow/python/lib/io"
"$out/${python.sitePackages}/tensorflow/python/platform"
"$out/${python.sitePackages}/tensorflow/python/profiler/internal"
"$out/${python.sitePackages}/tensorflow/python/saved_model"
"$out/${python.sitePackages}/tensorflow/python/util"
"$out/${python.sitePackages}/tensorflow/tsl/python/lib/core"
"$out/${python.sitePackages}/tensorflow.libs/"
"${rpath}"
)
# The the bash array into a colon-separated list of RPATHs.
rrPath=$(IFS=$':'; echo "''${rrPathArr[*]}")
echo "about to run patchelf with the following rpath: $rrPath"
find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
echo "about to patchelf $lib..."
chmod a+rx "$lib"
patchelf --set-rpath "$rrPath" "$lib"
${lib.optionalString cudaSupport ''
addDriverRunpath "$lib"
''}
done
''
);
# Upstream has a pip hack that results in bin/tensorboard being in both tensorflow
# and the propagated input tensorboard, which causes environment collisions.

2
pkgs/development/tools/electron/update.py
View file

@ -396,7 +396,7 @@ def repo_from_dep(dep: dict) -> Optional[Repo]:
if search_object:
return GitHubRepo(search_object.group(1), search_object.group(2), rev)
if re.match(r"https://.+.googlesource.com", url):
if re.match(r"https://.+\.googlesource.com", url):
return GitilesRepo(url, rev)
return GitRepo(url, rev)

2
pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/fixPkgAddMissingSha1.js
View file

@ -46,7 +46,7 @@ async function fixPkgAddMissingSha1(pkg) {
const [url, sha1] = pkg.resolved.split("#", 2);
if (sha1 || url.startsWith("https://codeload.github.com")) {
if (sha1 || url.startsWith("https://codeload.github.com/")) {
return pkg;
}

2
pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
View file

@ -141,7 +141,7 @@ while [ "$#" -gt 0 ]; do
fi
if [ "$1" != system ]; then
profile="/nix/var/nix/profiles/system-profiles/$1"
mkdir -p -m 0755 "$(dirname "$profile")"
(umask 022 && mkdir -p "$(dirname "$profile")")
fi
shift 1
;;

6
pkgs/tools/misc/broot/default.nix
View file

@ -19,16 +19,16 @@
rustPlatform.buildRustPackage rec {
pname = "broot";
version = "1.44.1";
version = "1.44.2";
src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "v${version}";
hash = "sha256-Qyc4R5hvSal82/qywriH7agluu6miAC4Y7UUM3VATCo=";
hash = "sha256-rMAGnC1CcHYPLh199a+aKgVdm/xheUQIRSvF+HqeZQE=";
};
cargoHash = "sha256-fsmwjr7EpzR/KKrGWoTeCOI7jmrlTYtjIksc205kRs8=";
cargoHash = "sha256-DVH7dKJEkyBnjNtLK/xfO+Hlw+rr3wTKqyooj5JM2is=";
nativeBuildInputs = [
installShellFiles

2
pkgs/tools/networking/maubot/plugins/update.py
View file

@ -73,7 +73,7 @@ def process_repo(path: str, official: bool):
'description': desc,
'homepage': origurl,
}
if domain.endswith('github.com'):
if domain == 'github.com':
owner, repo = query.split('/')
ret['github'] = {
'owner': owner,

6
pkgs/tools/security/ggshield/default.nix
View file

@ -7,19 +7,19 @@
python3.pkgs.buildPythonApplication rec {
pname = "ggshield";
version = "1.33.0";
version = "1.34.0";
pyproject = true;
src = fetchFromGitHub {
owner = "GitGuardian";
repo = "ggshield";
rev = "refs/tags/v${version}";
hash = "sha256-qvvCBJ56wC56p6tOCb5hh+J7Y/Hec/YgDKNmDbbWNig=";
hash = "sha256-RNQD862m1p8ooFbV8k7yDW9GzP5vPQ8hgerMpvDdXAs=";
};
pythonRelaxDeps = true;
build-system = with python3.pkgs; [ setuptools ];
build-system = with python3.pkgs; [ pdm-backend ];
dependencies = with python3.pkgs; [

2
pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
View file

@ -203,7 +203,7 @@ let
# This is set primarily to help find-tarballs.nix to do its job
requiredTeXPackages = builtins.filter lib.isDerivation (pkgList.bin ++ pkgList.nonbin
++ lib.optionals (! __fromCombineWrapper)
(lib.concatMap (n: (pkgList.otherOutputs.${n} or [ ] ++ pkgList.specifiedOutputs.${n} or [ ]))) pkgList.nonEnvOutputs);
(lib.concatMap (n: (pkgList.otherOutputs.${n} or [ ] ++ pkgList.specifiedOutputs.${n} or [ ])) pkgList.nonEnvOutputs));
# useful for inclusion in the `fonts.packages` nixos option or for use in devshells
fonts = "${texmfroot}/texmf-dist/fonts";
# support variants attrs, (prev: attrs)

8
pkgs/top-level/all-packages.nix
View file

@ -4645,8 +4645,6 @@ with pkgs;
ophcrack-cli = ophcrack.override { enableGui = false; };
ophis = python3Packages.callPackage ../development/compilers/ophis { };
open-interpreter = with python3Packages; toPythonApplication open-interpreter;
openhantek6022 = libsForQt5.callPackage ../applications/science/electronics/openhantek6022 { };
@ -13371,10 +13369,14 @@ with pkgs;
bitwig-studio4 = callPackage ../applications/audio/bitwig-studio/bitwig-studio4.nix {
libjpeg = libjpeg8;
};
bitwig-studio5 = callPackage ../applications/audio/bitwig-studio/bitwig-studio5.nix {
bitwig-studio5-unwrapped = callPackage ../applications/audio/bitwig-studio/bitwig-studio5.nix {
libjpeg = libjpeg8;
};
bitwig-studio5 = callPackage ../applications/audio/bitwig-studio/bitwig-wrapper.nix {
bitwig-studio-unwrapped = bitwig-studio5-unwrapped;
};
bitwig-studio = bitwig-studio5;
blackbox = callPackage ../applications/version-management/blackbox {

4
pkgs/top-level/python-packages.nix
View file

@ -1974,6 +1974,8 @@ self: super: with self; {
bz2file = callPackage ../development/python-modules/bz2file { };
cache = callPackage ../development/python-modules/cache { };
cachecontrol = callPackage ../development/python-modules/cachecontrol { };
cached-ipaddress = callPackage ../development/python-modules/cached-ipaddress { };
@ -8443,6 +8445,8 @@ self: super: with self; {
mss = callPackage ../development/python-modules/mss { };
msticpy = callPackage ../development/python-modules/msticpy { };
msrestazure = callPackage ../development/python-modules/msrestazure { };
msrest = callPackage ../development/python-modules/msrest { };