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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-05-11 12:01:42 +00:00 committed by GitHub
commit 387f5d9a5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
79 changed files with 4655 additions and 851 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
maintainers/maintainer-list.nix
View File

@ -6291,6 +6291,14 @@
github = "higebu";
githubId = 733288;
};
hikari = {
email = "HikariNee@protonmail.com";
github = "HikariNee";
githubId = 72349937;
name = "Hikari";
};
hiljusti = {
name = "J.R. Hill";
email = "hiljusti@so.dang.cool";
@ -6303,6 +6311,7 @@
githubId = 19825977;
name = "Hiren Shah";
};
hiro98 = {
email = "hiro@protagon.space";
github = "vale981";

21
nixos/modules/services/backup/automysqlbackup.nix
View File

@ -3,7 +3,7 @@
let
inherit (lib) concatMapStringsSep concatStringsSep isInt isList literalExpression;
inherit (lib) mapAttrs mapAttrsToList mkDefault mkEnableOption mkIf mkOption optional types;
inherit (lib) mapAttrs mapAttrsToList mkDefault mkEnableOption mkIf mkOption mkRenamedOptionModule optional types;
cfg = config.services.automysqlbackup;
pkg = pkgs.automysqlbackup;
@ -26,6 +26,10 @@ let
in
{
imports = [
(mkRenamedOptionModule [ "services" "automysqlbackup" "config" ] [ "services" "automysqlbackup" "settings" ])
];
# interface
options = {
services.automysqlbackup = {
@ -40,7 +44,7 @@ in
'';
};
config = mkOption {
settings = mkOption {
type = with types; attrsOf (oneOf [ str int bool (listOf str) ]);
default = {};
description = lib.mdDoc ''
@ -112,7 +116,18 @@ in
services.mysql.ensureUsers = optional (config.services.mysql.enable && cfg.config.mysql_dump_host == "localhost") {
name = user;
ensurePermissions = { "*.*" = "SELECT, SHOW VIEW, TRIGGER, LOCK TABLES, EVENT"; };
ensurePermissions = {
"*.*" = "SELECT, SHOW VIEW, TRIGGER, LOCK TABLES, EVENT";
# https://forums.mysql.com/read.php?10,668311,668315#msg-668315
"function sys.extract_table_from_file_name" = "execute";
"function sys.format_path" = "execute";
"function sys.format_statement" = "execute";
"function sys.extract_schema_from_file_name" = "execute";
"function sys.ps_thread_account" = "execute";
"function sys.format_time" = "execute";
"function sys.format_bytes" = "execute";
};
};
};

3
nixos/modules/services/networking/ssh/sshd.nix
View File

@ -365,9 +365,6 @@ in
"hmac-sha2-512-etm@openssh.com"
"hmac-sha2-256-etm@openssh.com"
"umac-128-etm@openssh.com"
"hmac-sha2-512"
"hmac-sha2-256"
"umac-128@openssh.com"
];
description = lib.mdDoc ''
Allowed MACs

4
nixos/tests/mysql/mysql-replication.nix
View File

@ -42,7 +42,7 @@ let
enable = true;
replication.role = "slave";
replication.serverId = 2;
replication.masterHost = nodes.primary.config.networking.hostName;
replication.masterHost = nodes.primary.networking.hostName;
replication.masterUser = replicateUser;
replication.masterPassword = replicatePassword;
};
@ -54,7 +54,7 @@ let
enable = true;
replication.role = "slave";
replication.serverId = 3;
replication.masterHost = nodes.primary.config.networking.hostName;
replication.masterHost = nodes.primary.networking.hostName;
replication.masterUser = replicateUser;
replication.masterPassword = replicatePassword;
};

9
pkgs/applications/maui/mauikit-imagetools.nix
View File

@ -1,5 +1,6 @@
{ lib
, mkDerivation
, fetchpatch
, cmake
, extra-cmake-modules
, kconfig
@ -16,6 +17,14 @@
mkDerivation {
pname = "mauikit-imagetools";
patches = [
(fetchpatch {
name = "remove-unused-method.patch";
url = "https://invent.kde.org/maui/mauikit-imagetools/-/commit/344852044d407b144bca01c41a409ceaa548bec0.patch";
hash = "sha256-Cpq/XzDgrKD8YVex2z9VxGTA+iDI5703+fHwkn0cIWA=";
})
];
nativeBuildInputs = [
cmake
extra-cmake-modules

16
pkgs/applications/misc/blender/wrapper.nix
View File

@ -2,7 +2,7 @@
, lib
, blender
, makeWrapper
, python39Packages
, python3Packages
}:
{ name ? "wrapped"
, packages ? []
@ -12,7 +12,7 @@ stdenv.mkDerivation {
inherit (blender) version;
src = blender;
nativeBuildInputs = [ python39Packages.wrapPython makeWrapper ];
nativeBuildInputs = [ python3Packages.wrapPython makeWrapper ];
installPhase = ''
mkdir $out/{share/applications,bin} -p
sed 's/Exec=blender/Exec=blender-${name}/g' $src/share/applications/blender.desktop > $out/share/applications/blender-${name}.desktop
@ -22,15 +22,9 @@ stdenv.mkDerivation {
buildPythonPath "$pythonPath"
echo '#!/usr/bin/env bash ' >> $out/bin/blender-${name}
for p in $program_PATH; do
echo "export PATH=\$PATH:$p " >> $out/bin/blender-${name}
done
for p in $program_PYTHONPATH; do
echo "export PYTHONPATH=\$PYTHONPATH:$p " >> $out/bin/blender-${name}
done
echo 'exec ${blender}/bin/blender "$@"' >> $out/bin/blender-${name}
chmod +x $out/bin/blender-${name}
makeWrapper ${blender}/bin/blender $out/bin/blender-${name} \
--prefix PATH : $program_PATH \
--prefix PYTHONPATH : $program_PYTHONPATH
'';
pythonPath = packages;

71
pkgs/applications/misc/houdini/default.nix
View File

@ -3,12 +3,59 @@
buildFHSEnv rec {
name = "houdini-${unwrapped.version}";
# houdini spawns hserver (and other license tools) that is supposed to live beyond the lifespan of houdini process
dieWithParent = false;
# houdini needs to communicate with hserver process that it seem to be checking to be present in running processes
unsharePid = false;
targetPkgs = pkgs: with pkgs; [
libGLU libGL alsa-lib fontconfig zlib libpng dbus nss nspr expat pciutils
libxkbcommon libudev0-shim tbb
libGLU
libGL
alsa-lib
fontconfig
zlib
libpng
dbus
nss
nspr
expat
pciutils
libxkbcommon
libudev0-shim
tbb
xwayland
qt5.qtwayland
nettools # needed by licensing tools
bintools # needed for ld and other tools, so ctypes can find/load sos from python
ocl-icd # needed for opencl
numactl # needed by hfs ocl backend
ncurses5 # needed by hfs ocl backend
] ++ (with xorg; [
libICE libSM libXmu libXi libXext libX11 libXrender libXcursor libXfixes
libXrender libXcomposite libXdamage libXtst libxcb libXScrnSaver
libICE
libSM
libXmu
libXi
libXt
libXext
libX11
libXrender
libXcursor
libXfixes
libXrender
libXcomposite
libXdamage
libXtst
libxcb
libXScrnSaver
libXrandr
libxcb
xcbutil
xcbutilimage
xcbutilrenderutil
xcbutilcursor
xcbutilkeysyms
xcbutilwm
]);
passthru = {
@ -16,7 +63,16 @@ buildFHSEnv rec {
};
extraInstallCommands = let
executables = [ "bin/houdini" "bin/hkey" "houdini/sbin/sesinetd" ];
executables = [
"bin/houdini" # houdini flavours
"bin/houdinicore"
"bin/houdinifx"
"bin/hgpuinfo" # houdini ocl config tool
"bin/hotl" # hda/otl manipulation tool
"bin/hython" # hython
"bin/hkey" # license administration
"houdini/sbin/sesinetd"
];
in ''
WRAPPER=$out/bin/${name}
EXECUTABLES="${lib.concatStringsSep " " executables}"
@ -31,6 +87,11 @@ buildFHSEnv rec {
chmod +x $EXECUTABLES
'';
extraBwrapArgs = [
"--ro-bind-try /run/opengl-driver/etc/OpenCL/vendors /etc/OpenCL/vendors" # this is the case of NixOS
"--ro-bind-try /etc/OpenCL/vendors /etc/OpenCL/vendors" # this is the case of not NixOS
];
runScript = writeScript "${name}-wrapper" ''
exec $@
'';

10
pkgs/applications/misc/houdini/runtime.nix
View File

@ -4,11 +4,11 @@ let
license_dir = "~/.config/houdini";
in
stdenv.mkDerivation rec {
version = "18.5.596";
version = "19.5.569";
pname = "houdini-runtime";
src = requireFile rec {
name = "houdini-py3-${version}-linux_x86_64_gcc6.3.tar.gz";
sha256 = "1b1k7rkn7svmciijqdwvi9p00srsf81vkb55grjg6xa7fgyidjx1";
name = "houdini-${version}-linux_x86_64_gcc9.3.tar.gz";
sha256 = "0c2d6a31c24f5e7229498af6c3a7cdf81242501d7a0792e4c33b53a898d4999e";
url = meta.homepage;
};
@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
--no-install-bin-symlink \
--auto-install \
--no-root-check \
--accept-EULA 2020-05-05 \
--accept-EULA 2021-10-13 \
$out
echo "licensingMode = localValidator" >> $out/houdini/Licensing.opt
echo "licensingMode = localValidator" >> $out/houdini/Licensing.opt # does not seem to do anything any more. not sure, official docs do not say anything about it
'';
dontFixup = true;

30
pkgs/applications/misc/privacyidea/default.nix
View File

@ -3,7 +3,7 @@
}:
let
dropDevOutput = { outputs, ... }: {
dropDocOutput = { outputs, ... }: {
outputs = lib.filter (x: x != "doc") outputs;
};
@ -119,7 +119,7 @@ let
flask-babel = (super.flask-babel.override {
sphinxHook = null;
furo = null;
}).overridePythonAttrs (old: (dropDevOutput old) // rec {
}).overridePythonAttrs (old: (dropDocOutput old) // rec {
pname = "Flask-Babel";
version = "2.0.0";
format = "setuptools";
@ -128,21 +128,29 @@ let
inherit version;
hash = "sha256:f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d";
};
disabledTests = [
# AssertionError: assert 'Apr 12, 2010...46:00\u202fPM' == 'Apr 12, 2010, 1:46:00 PM'
# Note the `\u202f` (narrow, no-break space) vs space.
"test_basics"
"test_init_app"
"test_custom_locale_selector"
"test_refreshing"
];
});
psycopg2 = (super.psycopg2.override {
sphinxHook = null;
sphinx-better-theme = null;
}).overridePythonAttrs dropDevOutput;
}).overridePythonAttrs dropDocOutput;
hypothesis = super.hypothesis.override {
enableDocumentation = false;
};
pyjwt = (super.pyjwt.override {
sphinxHook = null;
sphinx-rtd-theme = null;
}).overridePythonAttrs (old: (dropDevOutput old) // { format = "setuptools"; });
}).overridePythonAttrs (old: (dropDocOutput old) // { format = "setuptools"; });
beautifulsoup4 = (super.beautifulsoup4.override {
sphinxHook = null;
}).overridePythonAttrs dropDevOutput;
}).overridePythonAttrs dropDocOutput;
pydash = (super.pydash.override {
sphinx-rtd-theme = null;
}).overridePythonAttrs (old: rec {
@ -155,6 +163,10 @@ let
format = "setuptools";
doCheck = false;
});
pyopenssl = (super.pyopenssl.override {
sphinxHook = null;
sphinx-rtd-theme = null;
}).overridePythonAttrs dropDocOutput;
};
};
in
@ -170,6 +182,14 @@ python3'.pkgs.buildPythonPackage rec {
fetchSubmodules = true;
};
patches = [
# https://github.com/privacyidea/privacyidea/pull/3611
(fetchpatch {
url = "https://github.com/privacyidea/privacyidea/commit/7db6509721726a34e8528437ddbd4210019b11ef.patch";
sha256 = "sha256-ZvtauCs1vWyxzGbA0B2+gG8q5JyUO8DF8nm/3/vcYmE=";
})
];
propagatedBuildInputs = with python3'.pkgs; [
cryptography pyrad pymysql python-dateutil flask-versioned flask_script
defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow

98
pkgs/applications/networking/cluster/temporal-cli/default.nix
View File

@ -1,35 +1,85 @@
{ lib, fetchFromGitHub, buildGoModule, testers, temporal-cli }:
{ lib, fetchFromGitHub, buildGoModule, installShellFiles, symlinkJoin }:
buildGoModule rec {
let
tctl-next = buildGoModule rec {
pname = "tctl-next";
version = "0.8.0";
src = fetchFromGitHub {
owner = "temporalio";
repo = "cli";
rev = "v${version}";
hash = "sha256-yQnFw3uYGKrTevGFVZNgkWwKCCWiGy0qwJJOmnMpTJQ=";
};
vendorHash = "sha256-ld59ADHnlgsCA2mzVhdq6Vb2aa9rApvFxs3NpHiCKxo=";
nativeBuildInputs = [ installShellFiles ];
excludedPackages = [ "./cmd/docgen" ];
ldflags = [
"-s"
"-w"
"-X github.com/temporalio/cli/headers.Version=${version}"
];
preCheck = ''
export HOME=$(mktemp -d)
'';
postInstall = ''
installShellCompletion --cmd temporal \
--bash <($out/bin/temporal completion bash) \
--zsh <($out/bin/temporal completion zsh)
'';
};
tctl = buildGoModule rec {
pname = "tctl";
version = "1.18.0";
src = fetchFromGitHub {
owner = "temporalio";
repo = "tctl";
rev = "v${version}";
hash = "sha256-LcBKkx3mcDOrGT6yJx98CSgxbwskqGPWqOzHWOu6cig=";
};
vendorHash = "sha256-BUYEeC5zli++OxVFgECJGqJkbDwglLppSxgo+4AqOb0=";
nativeBuildInputs = [ installShellFiles ];
excludedPackages = [ "./cmd/copyright" ];
ldflags = [ "-s" "-w" ];
preCheck = ''
export HOME=$(mktemp -d)
'';
postInstall = ''
installShellCompletion --cmd tctl \
--bash <($out/bin/tctl completion bash) \
--zsh <($out/bin/tctl completion zsh)
'';
};
in
symlinkJoin rec {
pname = "temporal-cli";
version = "1.18.0";
inherit (tctl) version;
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "temporalio";
repo = "tctl";
rev = "v${version}";
hash = "sha256-LcBKkx3mcDOrGT6yJx98CSgxbwskqGPWqOzHWOu6cig=";
};
vendorHash = "sha256-BUYEeC5zli++OxVFgECJGqJkbDwglLppSxgo+4AqOb0=";
ldflags = [ "-s" "-w" ];
preCheck = ''
export HOME=$(mktemp -d)
'';
passthru.tests.version = testers.testVersion {
package = temporal-cli;
# the app writes a default config file at startup
command = "HOME=$(mktemp -d) ${meta.mainProgram} --version";
};
paths = [
tctl-next
tctl
];
meta = with lib; {
description = "Temporal CLI";
homepage = "https://temporal.io";
license = licenses.mit;
maintainers = with maintainers; [ aaronjheng ];
mainProgram = "tctl";
mainProgram = "temporal";
};
}

24
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@ -28,13 +28,13 @@
"vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
},
"aiven": {
"hash": "sha256-I8w8hnts3bELUm2e0fRfRcfK9uoS0ZbymZZPEVcizEI=",
"hash": "sha256-WBjtrjhv3DBusE64Gu/XXOwaH4ByHoyS6tGcY6VE2iU=",
"homepage": "https://registry.terraform.io/providers/aiven/aiven",
"owner": "aiven",
"repo": "terraform-provider-aiven",
"rev": "v4.2.1",
"rev": "v4.3.0",
"spdx": "MIT",
"vendorHash": "sha256-nF/efMhmrXfBlF9w9tC4npHxjX2/299OfqTpvPapfMo="
"vendorHash": "sha256-NnWYUVziSWuedgXG1jXrdYF7il8KmA5MQVlK5AEhc+U="
},
"akamai": {
"hash": "sha256-P/5tLtcPqhf48DqqMKKNCOrvT+I60N9rC1W/4RdFXqY=",
@ -665,13 +665,13 @@
"vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg="
},
"linode": {
"hash": "sha256-Z8mllx/TO0EUQNSOGcUhMRAsV7jiUhybzYDPg2ZtUec=",
"hash": "sha256-G6+xplMymxziIVof67ONtVMLAaQc33A0pLscchNi8kc=",
"homepage": "https://registry.terraform.io/providers/linode/linode",
"owner": "linode",
"repo": "terraform-provider-linode",
"rev": "v2.0.0",
"rev": "v2.1.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Xbnf8ejyojd3JD7h580hlM0PC4nD+sjpodV9hr0/F+c="
"vendorHash": "sha256-om6Onp+Go74YfA8J2DALhJy1c+s5GbXYMpUM9a28bdI="
},
"linuxbox": {
"hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=",
@ -810,11 +810,11 @@
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
},
"oci": {
"hash": "sha256-/p/NBw8dPzStLs9LTvvqDUSNJ9oMCG0e4bT+gIsPEGA=",
"hash": "sha256-XHHZpl936xZ4jjk71bmlxm1xilqFamdgL3AdkyRBT5Y=",
"homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle",
"repo": "terraform-provider-oci",
"rev": "v4.119.0",
"rev": "v4.120.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -1008,11 +1008,11 @@
"vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
},
"signalfx": {
"hash": "sha256-VvL5lGPNtcjrtpB/p//7UXuUQxjV/+Deb+R3p+V8GtM=",
"hash": "sha256-H3+2lyn17FwF/zskVAzz0mYnyPkL2/otqoCkgcVFWf4=",
"homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
"owner": "splunk-terraform",
"repo": "terraform-provider-signalfx",
"rev": "v6.23.0",
"rev": "v6.24.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-0fqIaIINBvTAHVHZP/AcS4hNyjXHM+wfHp/0I7xqRhg="
},
@ -1235,11 +1235,11 @@
"vendorHash": "sha256-wKKrBSJkbdqqnDLoS+jhvI26rOzvMWjjsN8wh67Le5U="
},
"vultr": {
"hash": "sha256-4Um4UyDjtamy2s15K3Idm5edZj5BOy13+kr39wl9e0Q=",
"hash": "sha256-h9MQv4BTv9y4A6HSDE3dIV7aKwaIWRYy5EyE2T0mpG4=",
"homepage": "https://registry.terraform.io/providers/vultr/vultr",
"owner": "vultr",
"repo": "terraform-provider-vultr",
"rev": "v2.15.0",
"rev": "v2.15.1",
"spdx": "MPL-2.0",
"vendorHash": null
},

2957
pkgs/applications/office/activitywatch/Cargo.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

16
pkgs/applications/office/activitywatch/commit-hash.patch Normal file
View File

@ -0,0 +1,16 @@
diff --git a/vue.config.js b/vue.config.js
index 02c0699..0c4a014 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,10 +4,7 @@ const CopyWebpackPlugin = require('copy-webpack-plugin');
const { argv } = require('yargs');
// get git info from command line
-const _COMMIT_HASH = require('child_process')
- .execSync('git rev-parse --short HEAD')
- .toString()
- .trim();
+const _COMMIT_HASH = "@commit_hash@";
console.info('Commit hash:', _COMMIT_HASH);
module.exports = {

238
pkgs/applications/office/activitywatch/default.nix Normal file
View File

@ -0,0 +1,238 @@
{ lib
, fetchFromGitHub
, rustPlatform
, makeWrapper
, pkg-config
, perl
, openssl
, python3
, wrapQtAppsHook
, qtbase
, qtsvg
, xdg-utils
, substituteAll
, buildNpmPackage
}:
let
version = "0.12.2";
sources = fetchFromGitHub {
owner = "ActivityWatch";
repo = "activitywatch";
rev = "v${version}";
sha256 = "sha256-IvRXfxTOSgBVlxy4SVij+POr7KgvXTEjGN3lSozhHkY=";
fetchSubmodules = true;
};
in
rec {
aw-watcher-afk = python3.pkgs.buildPythonApplication {
pname = "aw-watcher-afk";
inherit version;
format = "pyproject";
src = "${sources}/aw-watcher-afk";
nativeBuildInputs = [
python3.pkgs.poetry-core
];
propagatedBuildInputs = with python3.pkgs; [
aw-client
xlib
pynput
];
pythonImportsCheck = [ "aw_watcher_afk" ];
meta = with lib; {
description = "Watches keyboard and mouse activity to determine if you are AFK or not (for use with ActivityWatch)";
homepage = "https://github.com/ActivityWatch/aw-watcher-afk";
maintainers = with maintainers; [ huantian ];
license = licenses.mpl20;
};
};
aw-watcher-window = python3.pkgs.buildPythonApplication {
pname = "aw-watcher-window";
inherit version;
format = "pyproject";
src = "${sources}/aw-watcher-window";
nativeBuildInputs = [
python3.pkgs.poetry-core
];
propagatedBuildInputs = with python3.pkgs; [
aw-client
xlib
];
pythonImportsCheck = [ "aw_watcher_window" ];
meta = with lib; {
description = "Cross-platform window watcher (for use with ActivityWatch)";
homepage = "https://github.com/ActivityWatch/aw-watcher-window";
maintainers = with maintainers; [ huantian ];
license = licenses.mpl20;
};
};
aw-qt = python3.pkgs.buildPythonApplication {
pname = "aw-qt";
inherit version;
format = "pyproject";
src = "${sources}/aw-qt";
nativeBuildInputs = [
python3.pkgs.poetry-core
wrapQtAppsHook
];
propagatedBuildInputs = with python3.pkgs; [
aw-core
qtbase
qtsvg # Rendering icons in the trayicon menu
pyqt6
click
];
# Prevent double wrapping
dontWrapQtApps = true;
makeWrapperArgs = [
"--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}"
];
postPatch = ''
sed -E 's#PyQt6 = "6.3.1"#PyQt6 = "^6.4.0"#g' -i pyproject.toml
'';
postInstall = ''
install -D resources/aw-qt.desktop $out/share/applications/aw-qt.desktop
# For the actual tray icon, see
# https://github.com/ActivityWatch/aw-qt/blob/8ec5db941ede0923bfe26631acf241a4a5353108/aw_qt/trayicon.py#L211-L218
install -D media/logo/logo.png $out/${python3.sitePackages}/media/logo/logo.png
# For .desktop file and your desktop environment
install -D media/logo/logo.svg $out/share/icons/hicolor/scalable/apps/activitywatch.svg
install -D media/logo/logo.png $out/share/icons/hicolor/512x512/apps/activitywatch.png
install -D media/logo/logo-128.png $out/share/icons/hicolor/128x128/apps/activitywatch.png
'';
preFixup = ''
makeWrapperArgs+=(
"''${qtWrapperArgs[@]}"
)
'';
pythonImportsCheck = [ "aw_qt" ];
meta = with lib; {
description = "Tray icon that manages ActivityWatch processes, built with Qt";
homepage = "https://github.com/ActivityWatch/aw-qt";
maintainers = with maintainers; [ huantian ];
license = licenses.mpl20;
};
};
aw-server-rust = rustPlatform.buildRustPackage {
pname = "aw-server-rust";
inherit version;
src = "${sources}/aw-server-rust";
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"rocket_cors-0.6.0-alpha1" = "sha256-GuMekgnsyuOg6lMiVvi4TwMba4sAFJ/zkgrdzSeBrv0=";
};
};
# Bypass rust nightly features not being available on rust stable
RUSTC_BOOTSTRAP = 1;
patches = [
# Override version string with hardcoded value as it may be outdated upstream.
(substituteAll {
src = ./override-version.patch;
version = sources.rev;
})
];
nativeBuildInputs = [
makeWrapper
pkg-config
perl
];
buildInputs = [
openssl
];
postFixup = ''
wrapProgram "$out/bin/aw-server" \
--prefix XDG_DATA_DIRS : "$out/share"
mkdir -p "$out/share/aw-server"
ln -s "${aw-webui}" "$out/share/aw-server/static"
'';
preCheck = ''
# Fake home folder for tests that use ~/.cache and ~/.local/share
export HOME="$TMPDIR"
'';
meta = with lib; {
description = "High-performance implementation of the ActivityWatch server, written in Rust";
homepage = "https://github.com/ActivityWatch/aw-server-rust";
maintainers = with maintainers; [ huantian ];
mainProgram = "aw-server";
platforms = platforms.linux;
license = licenses.mpl20;
};
};
aw-webui = buildNpmPackage {
pname = "aw-webui";
inherit version;
src = "${sources}/aw-server-rust/aw-webui";
npmDepsHash = "sha256-yds2P2PKfTB6yUGnc+P73InV5+MZP9kmz2ZS4CRqlmA=";
patches = [
# Hardcode version to avoid the need to have the Git repo available at build time.
(substituteAll {
src = ./commit-hash.patch;
commit_hash = sources.rev;
})
];
installPhase = ''
runHook preInstall
mv dist $out
cp media/logo/logo.{png,svg} $out/static/
runHook postInstall
'';
doCheck = true;
checkPhase = ''
runHook preCheck
npm test
runHook postCheck
'';
meta = with lib; {
description = "A web-based UI for ActivityWatch, built with Vue.js";
homepage = "https://github.com/ActivityWatch/aw-webui/";
maintainers = with maintainers; [ huantian ];
license = licenses.mpl20;
};
};
}

17
pkgs/applications/office/activitywatch/override-version.patch Normal file
View File

@ -0,0 +1,17 @@
diff --git a/aw-server/src/endpoints/mod.rs b/aw-server/src/endpoints/mod.rs
index a080d2a..0411d1e 100644
--- a/aw-server/src/endpoints/mod.rs
+++ b/aw-server/src/endpoints/mod.rs
@@ -76,11 +76,10 @@ async fn root_favicon(state: &State<ServerState>) -> Option<NamedFile> {
fn server_info(config: &State<AWConfig>, state: &State<ServerState>) -> Json<Info> {
#[allow(clippy::or_fun_call)]
let hostname = gethostname().into_string().unwrap_or("unknown".to_string());
- const VERSION: Option<&'static str> = option_env!("CARGO_PKG_VERSION");
Json(Info {
hostname,
- version: format!("v{} (rust)", VERSION.unwrap_or("(unknown)")),
+ version: String::from("@version@ (rust)"),
testing: config.testing,
device_id: state.device_id.clone(),
})

18
pkgs/applications/office/activitywatch/wrapper.nix Normal file
View File

@ -0,0 +1,18 @@
{ lib
, symlinkJoin
, aw-server-rust
, aw-qt
, aw-watcher-afk
, aw-watcher-window
, extraWatchers ? [ ]
}:
symlinkJoin {
name = "activitywatch-${aw-server-rust.version}";
paths = [
aw-server-rust.out
aw-qt.out
aw-watcher-afk.out
aw-watcher-window.out
] ++ (lib.forEach extraWatchers (p: p.out));
}

27
pkgs/applications/version-management/gittyup/default.nix
View File

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "gittyup";
version = "1.2.2";
version = "1.3.0";
src = fetchFromGitHub {
owner = "Murmele";
repo = "Gittyup";
rev = "gittyup_v${version}";
hash = "sha256-JJ20vls/NGkm0xV+vDguvuW5yqhOQf83TMvnn5Kx4IE=";
hash = "sha256-/8Uipz2R/LuA3KUcFsROOmldIKnCVLfIpIQ9YLpPA+k=";
fetchSubmodules = true;
};
@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
"-DUSE_SYSTEM_LIBSSH2=ON"
"-DUSE_SYSTEM_LUA=ON"
"-DUSE_SYSTEM_OPENSSL=ON"
"-DENABLE_UPDATE_OVER_GUI=OFF"
];
nativeBuildInputs = [
@ -62,28 +63,8 @@ stdenv.mkDerivation rec {
]);
postInstall = ''
mkdir -p $out/bin
# Move binaries to the proper place
# TODO: Tweak in the next release: https://github.com/Murmele/Gittyup/commit/5b93e7e514b887fafb00a8158be5986e6c12b2e3
mv $out/Gittyup $out/bin/gittyup
mv $out/{indexer,relauncher} $out/bin
# Those are not program libs, just some Qt5 libs that the build system leaks for some reason
rm -f $out/*.so.*
rm -rf $out/{include,lib,Plugins,Resources}
'' + lib.optionalString stdenv.isLinux ''
# Install icons
install -Dm0644 ${src}/rsrc/Gittyup.iconset/gittyup_logo.svg $out/share/icons/hicolor/scalable/apps/gittyup.svg
for res in 16x16 32x32 64x64 128x128 256x256 512x512; do
install -Dm0644 ${src}/rsrc/Gittyup.iconset/icon_$res.png $out/share/icons/hicolor/$res/apps/gittyup.png
done
# Install desktop file
install -Dm0644 ${src}/rsrc/linux/com.github.Murmele.Gittyup.desktop $out/share/applications/gittyup.desktop
# TODO: Remove in the next release: https://github.com/Murmele/Gittyup/commit/5b93e7e514b887fafb00a8158be5986e6c12b2e3
substituteInPlace $out/share/applications/gittyup.desktop \
--replace "Exec=Gittyup" "Exec=gittyup"
rm -rf $out/{include,lib}
'';
meta = with lib; {

13
pkgs/applications/video/popcorntime/default.nix
View File

@ -49,6 +49,17 @@ stdenv.mkDerivation rec {
"--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}"
];
desktopItem = makeDesktopItem {
name = pname;
exec = pname;
icon = pname;
comment = meta.description;
genericName = meta.description;
type = "Application";
desktopName = "Popcorn-Time";
categories = [ "Video" "AudioVideo" ];
};
# Extract and copy executable in $out/bin
installPhase = ''
mkdir -p $out/share/applications $out/bin $out/opt/bin $out/share/icons/hicolor/scalable/apps/
@ -60,6 +71,8 @@ stdenv.mkDerivation rec {
ln -s $out/opt/popcorntime/Popcorn-Time $out/bin/popcorntime
ln -s $out/opt/popcorntime/src/app/images/icon.png $out/share/icons/hicolor/scalable/apps/popcorntime.png
ln -s ${desktopItem}/share/applications/popcorntime.desktop $out/share/applications/popcorntime.desktop
'';
# GSETTINGS_SCHEMAS_PATH is not set in installPhase

7
pkgs/build-support/build-bazel-package/default.nix
View File

@ -67,7 +67,6 @@ let
--output_user_root="$bazelUserRoot" \
${cmd} \
--curses=no \
-j $NIX_BUILD_CORES \
"''${copts[@]}" \
"''${host_copts[@]}" \
"''${linkopts[@]}" \
@ -131,7 +130,7 @@ stdenv.mkDerivation (fBuildAttrs // {
# https://github.com/bazelbuild/bazel/issues/6502
"--loading_phase_threads=1"
"$bazelFetchFlags"
];
] ++ (if fetchConfigured then ["--jobs" "$NIX_BUILD_CORES"] else []);
targets = fFetchAttrs.bazelTargets ++ fFetchAttrs.bazelTestTargets;
}
}
@ -252,14 +251,14 @@ stdenv.mkDerivation (fBuildAttrs // {
bazelCmd {
cmd = "test";
additionalFlags =
["--test_output=errors"] ++ fBuildAttrs.bazelTestFlags;
["--test_output=errors"] ++ fBuildAttrs.bazelTestFlags ++ ["--jobs" "$NIX_BUILD_CORES"];
targets = fBuildAttrs.bazelTestTargets;
}
}
${
bazelCmd {
cmd = "build";
additionalFlags = fBuildAttrs.bazelBuildFlags;
additionalFlags = fBuildAttrs.bazelBuildFlags ++ ["--jobs" "$NIX_BUILD_CORES"];
targets = fBuildAttrs.bazelTargets;
}
}

42
pkgs/data/themes/lightly-boehs/default.nix Normal file
View File

@ -0,0 +1,42 @@
{ mkDerivation
, lib
, kdecoration
, fetchFromGitHub
, cmake
, extra-cmake-modules
, plasma-workspace
, qtbase
, qt5
}:
mkDerivation rec {
pname = "lightly-boehs";
version = "0.4.1";
src = fetchFromGitHub {
owner = "boehs";
repo = "Lightly";
rev = "1a831f7ff19ce93c04489faec74e389a216fdf11";
sha256 = "Icw+xVmuCB59ltyZJKyIeHI/yGfM2SbPrVzTVLqHWd4=";
};
buildInputs = [
kdecoration
plasma-workspace
qtbase
qt5.qtx11extras
];
nativeBuildInputs = [
cmake
extra-cmake-modules
];
meta = with lib; {
description = "A fork of the Lightly breeze theme style that aims to be visually modern and minimalistic";
homepage = "https://github.com/boehs/Lightly";
license = licenses.gpl2Plus;
maintainers = [ maintainers.hikari ];
platforms = platforms.all;
};
}

43
pkgs/development/libraries/libcpr/default.nix Normal file
View File

@ -0,0 +1,43 @@
{ lib, stdenv, fetchFromGitHub, cmake, curl }:
let version = "1.10.2"; in
stdenv.mkDerivation {
pname = "libcpr";
inherit version;
outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "libcpr";
repo = "cpr";
rev = "1.10.2";
hash = "sha256-F+ZIyFwWHn2AcVnKOaRlB7DjZzfmn8Iat/m3uknC8uA=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ curl ];
cmakeFlags = [
"-DCPR_USE_SYSTEM_CURL=ON"
];
postPatch = ''
# Linking with stdc++fs is no longer necessary.
sed -i '/stdc++fs/d' include/CMakeLists.txt
'';
postInstall = ''
substituteInPlace "$out/lib/cmake/cpr/cprTargets.cmake" \
--replace "_IMPORT_PREFIX \"$out\"" \
"_IMPORT_PREFIX \"$dev\""
'';
meta = with lib; {
description = "C++ wrapper around libcurl";
homepage = "https://docs.libcpr.org/";
license = licenses.mit;
maintainers = with maintainers; [ rycee ];
platforms = platforms.all;
};
}

2
pkgs/development/libraries/openvino/default.nix
View File

@ -140,6 +140,8 @@ stdenv.mkDerivation rec {
"-DENABLE_SAMPLES:BOOL=OFF"
];
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-Wno-narrowing";
autoPatchelfIgnoreMissingDeps = [
"libngraph_backend.so"
];

2
pkgs/development/ocaml-modules/charInfo_width/default.nix
View File

@ -3,7 +3,7 @@
buildDunePackage rec {
pname = "charInfo_width";
version = "1.1.0";
useDune2 = true;
duneVersion = "3";
src = fetchzip {
url = "https://bitbucket.org/zandoye/charinfo_width/get/${version}.tar.bz2";
sha256 = "19mnq9a1yr16srqs8n6hddahr4f9d2gbpmld62pvlw1ps7nfrp9w";

4
pkgs/development/ocaml-modules/yojson/default.nix
View File

@ -2,11 +2,11 @@
buildDunePackage rec {
pname = "yojson";
version = "2.0.2";
version = "2.1.0";
src = fetchurl {
url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz";
sha256 = "sha256-h2u284r3OoSilDij2jXkhXxgoUVWpgZSWxSMb9vlRhs=";
sha256 = "sha256-n8sf8ttYqyWfkih5awraR5Tq6XF3sYMzcTgMTk+QsV0=";
};
nativeBuildInputs = [ cppo ];

6
pkgs/development/ocaml-modules/zed/default.nix
View File

@ -7,14 +7,12 @@ let
{
version = "3.2.0";
sha256 = "sha256-6yKHE30nVFXo8hGdCx+GO4VYYGbi802aMdN2XuYMJ7w=";
duneVersion = "3";
propagatedBuildInputs = [ react result uchar uutf uucp uuseg ];
}
else
{
version = "3.1.0";
sha256 = "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p";
duneVersion = "2";
propagatedBuildInputs = [ charInfo_width react ];
};
in
@ -22,7 +20,9 @@ in
buildDunePackage rec {
pname = "zed";
inherit (switch) version duneVersion propagatedBuildInputs;
inherit (switch) version propagatedBuildInputs;
duneVersion = "3";
src = fetchFromGitHub {
owner = "ocaml-community";

4
pkgs/development/php-packages/phpstan/default.nix
View File

@ -2,14 +2,14 @@
let
pname = "phpstan";
version = "1.9.4";
version = "1.10.15";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
sha256 = "sha256-A+F/ZoL6dLYx4MWN0eWXtQnmWJPYBqEcSgY4A1oR3mo=";
sha256 = "sha256-zGrAgQttAvGdRpuOB3V/GprMzc2NMya4d3MY1SIfYOQ=";
};
dontUnpack = true;

65
pkgs/development/python-modules/aw-client/default.nix Normal file
View File

@ -0,0 +1,65 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, poetry-core
, aw-core
, requests
, persist-queue
, click
, tabulate
, typing-extensions
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "aw-client";
version = "0.5.11";
format = "pyproject";
# pypi distribution doesn't include tests, so build from source instead
src = fetchFromGitHub {
owner = "ActivityWatch";
repo = "aw-client";
rev = "v${version}";
sha256 = "sha256-5WKGRoZGY+QnnB1Jzlju5OmCJreYMD8am2kW3Wcjhlw=";
};
disabled = pythonOlder "3.8";
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aw-core
requests
persist-queue
click
tabulate
typing-extensions
];
nativeCheckInputs = [
pytestCheckHook
];
# Only run this test, the others are integration tests that require
# an instance of aw-server running in order to function.
pytestFlagsArray = [ "tests/test_requestqueue.py" ];
preCheck = ''
# Fake home folder for tests that write to $HOME
export HOME="$TMPDIR"
'';
pythonImportsCheck = [ "aw_client" ];
meta = with lib; {
description = "Client library for ActivityWatch";
homepage = "https://github.com/ActivityWatch/aw-client";
maintainers = with maintainers; [ huantian ];
license = licenses.mpl20;
};
}

69
pkgs/development/python-modules/aw-core/default.nix Normal file
View File

@ -0,0 +1,69 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, poetry-core
, jsonschema
, peewee
, appdirs
, iso8601
, rfc3339-validator
, takethetime
, strict-rfc3339
, tomlkit
, deprecation
, timeslot
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "aw-core";
version = "0.5.12";
format = "pyproject";
# pypi distribution doesn't include tests, so build from source instead
src = fetchFromGitHub {
owner = "ActivityWatch";
repo = "aw-core";
rev = "v${version}";
sha256 = "sha256-DbugVMaQHlHpfbFEsM6kfpDL2VzRs0TDn9klWjAwz64=";
};
disabled = pythonOlder "3.8";
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
jsonschema
peewee
appdirs
iso8601
rfc3339-validator
takethetime
strict-rfc3339
tomlkit
deprecation
timeslot
];
nativeCheckInputs = [
pytestCheckHook
];
preCheck = ''
# Fake home folder for tests that write to $HOME
export HOME="$TMPDIR"
'';
pythonImportsCheck = [ "aw_core" ];
meta = with lib; {
description = "Core library for ActivityWatch";
homepage = "https://github.com/ActivityWatch/aw-core";
maintainers = with maintainers; [ huantian ];
license = licenses.mpl20;
};
}

15
pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
View File

@ -6,17 +6,20 @@
, azure-common
, azure-mgmt-core
, azure-mgmt-nspkg
, isPy3k
, pythonOlder
}:
buildPythonPackage rec {
pname = "azure-mgmt-containerinstance";
version = "10.0.0";
version = "10.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
extension = "zip";
hash = "sha256-TDGrC7YO05Ywa8uEINqqw4Wxag65aklIUwS+2aVMHwA=";
hash = "sha256-eNQ3rbKFdPRIyDjtXwH5ztN4GWCYBh3rWdn3AxcEwX4=";
};
propagatedBuildInputs = [
@ -24,14 +27,14 @@ buildPythonPackage rec {
msrestazure
azure-common
azure-mgmt-core
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
# has no tests
doCheck = false;
pythonImportsCheck = [ "azure.mgmt.containerinstance" ];
pythonImportsCheck = [
"azure.mgmt.containerinstance"
];
meta = with lib; {
description = "This is the Microsoft Azure Container Instance Client Library";

4
pkgs/development/python-modules/bc-detect-secrets/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "bc-detect-secrets";
version = "1.4.26";
version = "1.4.27";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "bridgecrewio";
repo = "detect-secrets";
rev = "refs/tags/${version}";
hash = "sha256-rkyeG0xZZVO7SkfFyxq07c373YElblIUqJpwWc1nF58=";
hash = "sha256-iQNMU77nTv6KY9LJb1fiBUVs5LkpX732UpJAYdUWNyc=";
};
propagatedBuildInputs = [

7
pkgs/development/python-modules/beartype/default.nix
View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "beartype";
version = "0.13.1";
version = "0.14.0";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-KQOUeooetgMCZOMBCKpyyxqAXPyQUMD0AUxK7ToXoAs=";
hash = "sha256-VG5ujc3aHW2fkG6k6xUYqgHJxfWkQOSVkXstr1PL1Zg=";
};
nativeCheckInputs = [
@ -28,6 +28,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Fast runtime type checking for Python";
homepage = "https://github.com/beartype/beartype";
changelog = "https://github.com/beartype/beartype/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ bcdarwin ];
};

12
pkgs/development/python-modules/bpycv/bpycv-test.py
View File

@ -5,8 +5,11 @@ import bpycv
import os
import glob
import random
from pathlib import Path
example_data_dir = os.environ['BPY_EXAMPLE_DATA']
out_dir = Path(os.environ['out'])
out_dir.mkdir(parents=True, exist_ok=True)
models = sorted(glob.glob(os.path.join(example_data_dir, "model", "*", "*.obj")))
cat_id_to_model_path = dict(enumerate(sorted(models), 1))
@ -19,6 +22,7 @@ bpy.context.scene.render.engine = "CYCLES"
bpy.context.scene.cycles.samples = 32
bpy.context.scene.render.resolution_y = 1024
bpy.context.scene.render.resolution_x = 1024
bpy.context.view_layer.cycles.denoising_store_passes = False
# A transparency stage for holding rigid body
stage = bpycv.add_stage(transparency=True)
@ -69,8 +73,8 @@ for i in range(20):
# render image, instance annoatation and depth in one line code
result = bpycv.render_data()
dataset_dir = "./dataset"
result.save(dataset_dir=dataset_dir, fname="0", save_blend=True)
print(f'Save to "{dataset_dir}"')
print(f'Open "{dataset_dir}/vis/" to see visualize result.')
result.save(dataset_dir=str(out_dir.resolve()), fname="0", save_blend=True)
print(f'Save to "{out_dir}"')
print(f'Open "{out_dir}/vis/" to see visualize result.')

66
pkgs/development/python-modules/bpycv/default.nix
View File

@ -1,16 +1,21 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, fetchurl
, writeText
, blender
, minexr
{ stdenv
, lib
, beautifulsoup4
, zcs
, requests
, opencv3
, blender
, blender-with-packages
, boxx
, bpycv
, buildPythonPackage
, fetchFromGitHub
, fetchPypi
, fetchurl
, minexr
, opencv3
, python3Packages
, requests
, runCommand
, writeText
, zcs
}:
buildPythonPackage rec {
@ -37,27 +42,32 @@ buildPythonPackage rec {
'';
# pythonImportsCheck = [ "bpycv" ]; # this import depends on bpy that is only available inside blender
nativeCheckInputs = [ blender ];
checkPhase = let
bpycv_example_data = fetchFromGitHub {
owner = "DIYer22";
repo = "bpycv_example_data";
hash = "sha256-dGb6KvbXTGTu5f4AqhA+i4AwTqBoR5SdXk0vsMEcD3Q=";
rev = "6ce0e65c107d572011394da16ffdf851e988dbb4";
};
in ''
TEMPDIR=$(mktemp -d)
pushd $TEMPDIR
cp -r ${bpycv_example_data} example_data
chmod +w -R example_data
BPY_EXAMPLE_DATA=${bpycv_example_data} blender -b -P ${./bpycv-test.py}
popd
'';
doCheck = false;
passthru.tests = {
render = runCommand "bpycv-render-test" {
BPY_EXAMPLE_DATA = fetchFromGitHub {
owner = "DIYer22";
repo = "bpycv_example_data";
hash = "sha256-dGb6KvbXTGTu5f4AqhA+i4AwTqBoR5SdXk0vsMEcD3Q=";
rev = "6ce0e65c107d572011394da16ffdf851e988dbb4";
};
nativeBuildInputs = [
((blender-with-packages.override {inherit blender python3Packages;}) {
packages = [ bpycv ];
})
];
} ''
blender-wrapped -b -P ${./bpycv-test.py}
'';
};
meta = with lib; {
description = "Computer vision utils for Blender";
homepage = "https://github.com/DIYer22/bpycv";
license = licenses.mit;
maintainers = with maintainers; [ lucasew ];
maintainers = [ maintainers.lucasew ];
broken = stdenv.isAarch64;
inherit (blender.meta) platforms;
};
}

4
pkgs/development/python-modules/cexprtk/default.nix
View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "cexprtk";
version = "0.4.0";
version = "0.4.1";
src = fetchPypi {
inherit pname version;
hash = "sha256-c7QXB+oXzkRveiPpNrW/HY8pMtpZx/RtDpJMVE7fY/A=";
hash = "sha256-QhftIybufVPO/YbLFycR4qYEAtQMcRPP5jKS6o6dFZg=";
};
nativeCheckInputs = [ pytestCheckHook ];

9
pkgs/development/python-modules/flake8-future-import/default.nix
View File

@ -33,12 +33,21 @@ buildPythonPackage rec {
./skip-test.patch
];
postPatch = ''
substituteInPlace "test_flake8_future_import.py" \
--replace "'flake8'" "'${lib.getExe flake8}'"
'';
propagatedBuildInputs = [ flake8 ];
nativeCheckInputs = [ six ];
checkPhase = ''
runHook preCheck
${python.interpreter} -m test_flake8_future_import
runHook postCheck
'';
meta = with lib; {

4
pkgs/development/python-modules/globus-sdk/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "globus-sdk";
version = "3.16.0";
version = "3.19.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "globus";
repo = "globus-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-zl5+22r0KMqdBKIlBe+8xxgh6h9am34USc1dLy+VGyY=";
hash = "sha256-xdzDKzlqQRBrKT/j6PWSgDu33XlVHKsHfv5AgrT6SB8=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/invocations/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "invocations";
version = "3.0.2";
version = "3.1.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "pyinvoke";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-sXMxTOi0iCz7Zq0lXkpproUtkId5p/GCqP1TvgqYlME=";
hash = "sha256-NlYoikv43oD5+Iz2CeeCGG3Fm648UgA3YZQFOfWSy58=";
};
postPatch = ''

4
pkgs/development/python-modules/jaxlib/default.nix
View File

@ -243,9 +243,9 @@ let
sha256 =
if cudaSupport then
"sha256-cgsiloW77p4+TKRrYequZ/UwKwfO2jsHKtZ+aA30H7E="
"sha256-O6bM7Lc8eaFyO4Xzl5/hvBrbPioI+Yeqx9yNC97fvKk="
else
"sha256-D7WYG3YUaWq+4APYx8WpA191VVtoHG0fth3uEHXOeos=";
"sha256-gLMJfJSQIdGGY2Ivx4IgDWg0hc+mxzlqY11CUkSWcjI=";
};
buildAttrs = {

61
pkgs/development/python-modules/lmfit/default.nix Normal file
View File

@ -0,0 +1,61 @@
{ lib,
buildPythonPackage,
fetchPypi,
setuptools,
setuptools-scm,
asteval,
numpy,
scipy,
uncertainties,
pytestCheckHook,
pandas,
matplotlib,
}:
buildPythonPackage rec {
pname = "lmfit";
version = "1.2.1";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-AM71vRRb+BtzYwt4kmrySyTxgFQh5iEcpYVYiqfMQVs=";
};
postPatch = ''
substituteInPlace setup.cfg --replace "--cov=lmfit --cov-report html" ""
'';
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
asteval
numpy
scipy
uncertainties
];
nativeCheckInputs = [
pytestCheckHook
pandas
matplotlib
];
disabledTests = [
# https://github.com/lmfit/lmfit-py/issues/878
"test_emcee_multiprocessing"
"test_explicit_independent_vars"
"test_result_eval_custom_x"
];
meta = with lib; {
description = "Least-Squares Minimization with Bounds and Constraints";
homepage = "https://lmfit-py.readthedocs.io/";
license = licenses.bsd3;
maintainers = with maintainers; [ nomeata ];
};
}

2
pkgs/development/python-modules/mobly/default.nix
View File

@ -41,6 +41,8 @@ buildPythonPackage rec {
pytz
];
__darwinAllowLocalNetworking = true;
meta = with lib; {
changelog = "https://github.com/google/mobly/blob/${src.rev}/CHANGELOG.md";
description = "Automation framework for special end-to-end test cases";

57
pkgs/development/python-modules/monai-deploy/default.nix Normal file
View File

@ -0,0 +1,57 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, pytestCheckHook
, pytest-lazy-fixture
, numpy
, networkx
, pydicom
, colorama
, typeguard
, versioneer
}:
buildPythonPackage rec {
pname = "monai";
version = "0.5.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Project-MONAI";
repo = "monai-deploy-app-sdk";
rev = "refs/tags/${version}";
hash = "sha256-oaNZ0US0YR/PSwAZ5GfRpAW+HRYVhdCZI83fC00rgok=";
};
nativeBuildInputs = [ versioneer ];
propagatedBuildInputs = [
numpy
networkx
colorama
typeguard
];
nativeCheckInputs = [ pytestCheckHook pytest-lazy-fixture ];
disabledTests = [
# requires Docker daemon:
"test_packager"
];
pythonImportsCheck = [
"monai.deploy"
"monai.deploy.core"
# "monai.deploy.operators" should be imported as well but
# requires some "optional" dependencies
# like highdicom (which is not packaged yet) and pydicom
];
meta = with lib; {
description = "Framework and tools to design, develop and verify AI applications in healthcare imaging";
homepage = "https://monai.io/deploy.html";
license = licenses.asl20;
maintainers = [ maintainers.bcdarwin ];
};
}

8
pkgs/development/python-modules/nitransforms/default.nix
View File

@ -2,9 +2,11 @@
, buildPythonPackage
, fetchPypi
, pythonOlder
, pythonRelaxDepsHook
, h5py
, nibabel
, numpy
, scipy
, setuptools-scm
, toml
}:
@ -19,8 +21,11 @@ buildPythonPackage rec {
hash = "sha256-iV9TEIGogIfbj+fmOGftoQqEdtZiewbHEw3hYlMEP4c=";
};
nativeBuildInputs = [ pythonRelaxDepsHook ];
buildInputs = [ setuptools-scm toml ];
propagatedBuildInputs = [ h5py nibabel numpy ];
propagatedBuildInputs = [ h5py nibabel numpy scipy ];
pythonRelaxDeps = [ "scipy" ];
doCheck = false;
# relies on data repo (https://github.com/nipreps-data/nitransforms-tests);
@ -39,6 +44,7 @@ buildPythonPackage rec {
meta = with lib; {
homepage = "https://nitransforms.readthedocs.io";
description = "Geometric transformations for images and surfaces";
changelog = "https://github.com/nipy/nitransforms/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ bcdarwin ];
};

13
pkgs/development/python-modules/paramz/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, numpy, scipy, six, decorator, nose }:
{ lib, buildPythonPackage, fetchpatch, fetchPypi, numpy, scipy, six, decorator, nose }:
buildPythonPackage rec {
pname = "paramz";
@ -9,10 +9,19 @@ buildPythonPackage rec {
sha256 = "0917211c0f083f344e7f1bc997e0d713dbc147b6380bc19f606119394f820b9a";
};
patches = [
(fetchpatch {
name = "remove-deprecated-numpy-uses";
url = "https://github.com/sods/paramz/pull/38/commits/a5a0be15b12c5864b438d870b519ad17cc72cd12.patch";
hash = "sha256-vj/amEXL9QJ7VdqJmyhv/lj8n+yuiZEARQBYWw6lgBA=";
})
];
propagatedBuildInputs = [ numpy scipy six decorator ];
nativeCheckInputs = [ nose ];
# Ran 113 tests in 3.082s
pythonImportsCheck = [ "paramz" ];
checkPhase = ''
nosetests -v paramz/tests
'';

44
pkgs/development/python-modules/persist-queue/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, msgpack
, nose2
}:
buildPythonPackage rec {
pname = "persist-queue";
version = "0.8.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-vapNz8SyCpzh9cttoxFrbLj+N1J9mR/SQoVu8szNIY4=";
};
disabled = pythonOlder "3.6";
nativeCheckInputs = [
msgpack
nose2
];
checkPhase = ''
runHook preCheck
# Don't run MySQL tests, as they require a MySQL server running
rm persistqueue/tests/test_mysqlqueue.py
nose2
runHook postCheck
'';
pythonImportsCheck = [ "persistqueue" ];
meta = with lib; {
description = "Thread-safe disk based persistent queue in Python";
homepage = "https://github.com/peter-wangxu/persist-queue";
license = licenses.bsd3;
maintainers = with maintainers; [ huantian ];
};
}

522
pkgs/development/python-modules/py-sr25519-bindings/Cargo.lock generated
View File

@ -1,522 +0,0 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "arrayref"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
[[package]]
name = "arrayvec"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
[[package]]
name = "autocfg"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "bitflags"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "block-buffer"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
dependencies = [
"generic-array",
]
[[package]]
name = "byteorder"
version = "1.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "cpufeatures"
version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
dependencies = [
"libc",
]
[[package]]
name = "ctor"
version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
dependencies = [
"quote",
"syn",
]
[[package]]
name = "curve25519-dalek-ng"
version = "4.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8"
dependencies = [
"byteorder",
"digest",
"rand_core",
"subtle-ng",
"zeroize",
]
[[package]]
name = "digest"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
dependencies = [
"generic-array",
]
[[package]]
name = "generic-array"
version = "0.14.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
dependencies = [
"typenum",
"version_check",
]
[[package]]
name = "getrandom"
version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
dependencies = [
"cfg-if",
"libc",
"wasi",
]
[[package]]
name = "ghost"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41973d4c45f7a35af8753ba3457cc99d406d863941fd7f52663cff54a5ab99b3"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "hex-literal"
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
[[package]]
name = "indoc"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8"
dependencies = [
"indoc-impl",
"proc-macro-hack",
]
[[package]]
name = "indoc-impl"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0"
dependencies = [
"proc-macro-hack",
"proc-macro2",
"quote",
"syn",
"unindent",
]
[[package]]
name = "instant"
version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
dependencies = [
"cfg-if",
]
[[package]]
name = "inventory"
version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0eb5160c60ba1e809707918ee329adb99d222888155835c6feedba19f6c3fd4"
dependencies = [
"ctor",
"ghost",
"inventory-impl",
]
[[package]]
name = "inventory-impl"
version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e41b53715c6f0c4be49510bb82dee2c1e51c8586d885abe65396e82ed518548"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "keccak"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768"
dependencies = [
"cpufeatures",
]
[[package]]
name = "libc"
version = "0.2.139"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
[[package]]
name = "lock_api"
version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
dependencies = [
"autocfg",
"scopeguard",
]
[[package]]
name = "merlin"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d"
dependencies = [
"byteorder",
"keccak",
"rand_core",
"zeroize",
]
[[package]]
name = "opaque-debug"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "parking_lot"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
dependencies = [
"instant",
"lock_api",
"parking_lot_core",
]
[[package]]
name = "parking_lot_core"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
dependencies = [
"cfg-if",
"instant",
"libc",
"redox_syscall",
"smallvec",
"winapi",
]
[[package]]
name = "paste"
version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880"
dependencies = [
"paste-impl",
"proc-macro-hack",
]
[[package]]
name = "paste-impl"
version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6"
dependencies = [
"proc-macro-hack",
]
[[package]]
name = "proc-macro-hack"
version = "0.5.20+deprecated"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]]
name = "proc-macro2"
version = "1.0.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2"
dependencies = [
"unicode-ident",
]
[[package]]
name = "py-sr25519-bindings"
version = "0.2.0"
dependencies = [
"hex-literal",
"pyo3",
"schnorrkel",
]
[[package]]
name = "pyo3"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ca8710ffa8211c9a62a8a3863c4267c710dc42a82a7fd29c97de465d7ea6b7d"
dependencies = [
"ctor",
"indoc",
"inventory",
"libc",
"parking_lot",
"paste",
"pyo3cls",
"unindent",
]
[[package]]
name = "pyo3-derive-backend"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58ad070bf6967b0d29ea74931ffcf9c6bbe8402a726e9afbeafadc0a287cc2b3"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "pyo3cls"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3fa17e1ea569d0bf3b7c00f2a9eea831ca05e55dd76f1794c541abba1c64baa"
dependencies = [
"pyo3-derive-backend",
"quote",
"syn",
]
[[package]]
name = "quote"
version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
dependencies = [
"proc-macro2",
]
[[package]]
name = "rand_core"
version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
"getrandom",
]
[[package]]
name = "redox_syscall"
version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
dependencies = [
"bitflags",
]
[[package]]
name = "schnorrkel"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "844b7645371e6ecdf61ff246ba1958c29e802881a749ae3fb1993675d210d28d"
dependencies = [
"arrayref",
"arrayvec",
"curve25519-dalek-ng",
"merlin",
"rand_core",
"serde_bytes",
"sha2",
"subtle-ng",
"zeroize",
]
[[package]]
name = "scopeguard"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "serde"
version = "1.0.152"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
[[package]]
name = "serde_bytes"
version = "0.11.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "718dc5fff5b36f99093fc49b280cfc96ce6fc824317783bff5a1fed0c7a64819"
dependencies = [
"serde",
]
[[package]]
name = "sha2"
version = "0.9.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
dependencies = [
"block-buffer",
"cfg-if",
"cpufeatures",
"digest",
"opaque-debug",
]
[[package]]
name = "smallvec"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
[[package]]
name = "subtle-ng"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142"
[[package]]
name = "syn"
version = "1.0.107"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "synstructure"
version = "0.12.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
dependencies = [
"proc-macro2",
"quote",
"syn",
"unicode-xid",
]
[[package]]
name = "typenum"
version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
[[package]]
name = "unicode-ident"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
[[package]]
name = "unicode-xid"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
[[package]]
name = "unindent"
version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c"
[[package]]
name = "version_check"
version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "wasi"
version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "winapi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
dependencies = [
"winapi-i686-pc-windows-gnu",
"winapi-x86_64-pc-windows-gnu",
]
[[package]]
name = "winapi-i686-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "zeroize"
version = "1.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f"
dependencies = [
"zeroize_derive",
]
[[package]]
name = "zeroize_derive"
version = "1.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c"
dependencies = [
"proc-macro2",
"quote",
"syn",
"synstructure",
]

16
pkgs/development/python-modules/py-sr25519-bindings/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "py-sr25519-bindings";
version = "0.2.0";
version = "unstable-2023-03-15";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -19,18 +19,16 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "polkascan";
repo = "py-sr25519-bindings";
rev = "refs/tags/v${version}";
hash = "sha256-Lu3J0+YeQHHKItOZTT24DlQAUJuE9fd+py6Eb46/MSE=";
rev = "9127501235bf291d7f14f00ec373d0a5000a32cb";
hash = "sha256-mxNmiFvMbV9WQhGNIQXxTkOcJHYs0vyOPM6Nd5367RE=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-7fDlEYWOiRVpG3q0n3ZSS1dfNCOh0/4pX/PbcDBvoMI=";
};
postPatch = ''
cp ${./Cargo.lock} Cargo.lock
'';
nativeBuildInputs = with rustPlatform; [
cargoSetupHook
maturinBuildHook

21
pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix
View File

@ -1,5 +1,4 @@
{ lib
, stdenv
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
@ -10,24 +9,31 @@
buildPythonPackage rec {
pname = "pylibjpeg-libjpeg";
version = "1.3.3";
version = "1.3.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "pydicom";
repo = pname;
rev = "refs/tags/v.${version}";
hash = "sha256-fv3zX+P2DWMdxPKsvSPhPCV8cDX3tAMO/h5coMHBHN8=";
rev = "refs/tags/v${version}";
hash = "sha256-VmqeoMU8riLpWyC+yKqq56TkruxOie6pjbg+ozivpBk=";
fetchSubmodules = true;
};
nativeBuildInputs = [ cython];
nativeBuildInputs = [
cython
];
propagatedBuildInputs = [ numpy ];
propagatedBuildInputs = [
numpy
];
nativeCheckInputs = [
pytestCheckHook
];
doCheck = false; # tests try to import 'libjpeg.data', which errors
pythonImportsCheck = [
@ -37,7 +43,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "A JPEG, JPEG-LS and JPEG XT plugin for pylibjpeg";
homepage = "https://github.com/pydicom/pylibjpeg-libjpeg";
license = licenses.gpl3;
changelog = "https://github.com/pydicom/pylibjpeg-libjpeg/releases/tag/v${version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ bcdarwin ];
};
}

4
pkgs/development/python-modules/pysensibo/default.nix
View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "pysensibo";
version = "1.0.25";
version = "1.0.28";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-AZpqV/CQ8TLKjaee9b0Zbu6WfnGNenKIvot+TTTSikg=";
hash = "sha256-7mYYsJCiJZedbmO9fv/Zr+QZOaSE6d6ld94yWUhUmUQ=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pytorch-metric-learning/default.nix
View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pytorch-metric-learning";
version = "2.1.0";
version = "2.1.1";
disabled = isPy27;
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "KevinMusgrave";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-9MIwNsiuWobgBaD2kXHz5nwBy04dxmxpF+7qfZ2l77M=";
hash = "sha256-XQ7lHhtcsqANuNVmjNMRjVdvwVo5hIVqTeNrnMF80uE=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix
View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "sphinxcontrib-plantuml";
version = "0.24.1";
version = "0.25";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-OdLkvEDV4JMSYSmhRPVrbuFfWM+lBItZSOY6Ea/ztYY=";
hash = "sha256-j95THZLRz8KBf+Nkez8tB+dmgsSoSInASlPoMffFRDI=";
};
propagatedBuildInputs = [

41
pkgs/development/python-modules/takethetime/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, pytestCheckHook
}:
buildPythonPackage {
pname = "takethetime";
version = "0.3.1";
# pypi distribution doesn't include tests, so build from source instead
src = fetchFromGitHub {
owner = "ErikBjare";
repo = "TakeTheTime";
rev = "b0042ac5b1cc9d3b70ef59167b094469ceb660dd";
sha256 = "sha256-DwsMnP6G3BzOnINttaSC6QKkIKK5qyhUz+lN1DSvkw0=";
};
disabled = pythonOlder "3.6";
nativeCheckInputs = [ pytestCheckHook ];
pytestFlagsArray = [ "tests/tests.py" ];
pythonImportsCheck = [ "takethetime" ];
# Latest release is v0.3.1 on pypi, but this version was not bumped in
# the setup.py, causing packages that depend on v0.3.1 to fail to build.
postPatch = ''
substituteInPlace setup.py \
--replace "version='0.3'" "version='0.3.1'"
'';
meta = with lib; {
description = "Simple time taking library using context managers";
homepage = "https://github.com/ErikBjare/TakeTheTime";
maintainers = with maintainers; [ huantian ];
license = licenses.mit;
};
}

10
pkgs/development/python-modules/tensorflow/default.nix
View File

@ -394,11 +394,11 @@ let
fetchAttrs = {
sha256 = {
x86_64-linux = if cudaSupport
then "sha256-rcTPOMoBfmKFuuCanMlhmtFtOQzOICfEXTZey/rQEdM="
else "sha256-JGLH64F81xwSUl9RCWJhBLNRBQandImsVafEF5s+ap0=";
aarch64-linux = "sha256-g6JUZQQalCTSjvAarkI7+gq13cPhFg/O9LPQDGNvrII=";
x86_64-darwin = "sha256-7O0zPs+damAjWXZn5C5SSWBp35C8QX3y4kCM7tYkM7s=";
aarch64-darwin = "sha256-US7uunEBDo2NKI9UHvgThbQ7rA05HjQlUthw0gIINaI=";
then "sha256-lURiR0Ra4kynDXyfuONG+A7CpxnAsfKzIdFTExKzp1o="
else "sha256-lDvRgj+UlaneRGZOO9UVCb6uyxcbRJfUhABf/sgKPi0=";
aarch64-linux = "sha256-z2d45fqHz5HW+qkv3fR9hMg3sEwUzJfxF54vng85bHk=";
x86_64-darwin = "sha256-AAvuz8o6ZRkaSYMgaep74lDDQcxOupDCX4vRaK/jnCU=";
aarch64-darwin = "sha256-kexRSvfQqb92ZRuUqAO070RnUUBidAqghiA7Y8do9vc=";
}.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
};

48
pkgs/development/python-modules/timeslot/default.nix Normal file
View File

@ -0,0 +1,48 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, poetry-core
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "timeslot";
version = "0.1.2";
# pypi distribution doesn't include tests, so build from source instead
src = fetchFromGitHub {
owner = "ErikBjare";
repo = pname;
rev = "af35445e96cbb2f3fb671a75aac6aa93e4e7e7a6";
sha256 = "sha256-GEhg2iMsYMfalT7L9TCd1KHU6oa/wTl5m3mRC0zOH9Q=";
};
format = "pyproject";
disabled = pythonOlder "3.6";
nativeBuildInputs = [
poetry-core
];
nativeCheckInputs = [
pytestCheckHook
];
pytestFlagsArray = [
# The pyproject.toml specifies the flag `--cov=timeslot`,
# This causes an error when running without pytest-cov,
# so use this flag to override that option, as we don't need coverage.
"--override-ini addopts=''"
];
pythonImportsCheck = [ "timeslot" ];
meta = with lib; {
description = "Data type for representing time slots with a start and end";
homepage = "https://github.com/ErikBjare/timeslot";
maintainers = with maintainers; [ huantian ];
license = licenses.mit;
};
}

18
pkgs/development/python-modules/transforms3d/default.nix
View File

@ -1,8 +1,8 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, isPy27
, pytest
, pythonOlder
, pytestCheckHook
, numpy
, scipy
, sympy
@ -10,22 +10,22 @@
buildPythonPackage rec {
pname = "transforms3d";
version = "unstable-2019-12-17";
version = "0.4.1";
format = "setuptools";
disabled = isPy27;
disabled = pythonOlder "3.7";
# no Git tag or PyPI release in some time
src = fetchFromGitHub {
owner = "matthew-brett";
repo = pname;
rev = "6b20250c610249914ca5e3a3a2964c36ca35c19a";
sha256 = "1z789hgk71a6rj6mqp9srpzamg06g58hs2p1l1p344cfnkj5a4kc";
rev = "refs/tags/${version}";
hash = "sha256-GgnjvwAfyxnDfBGvgMFIPPbR88BWFiNGrScVORygq94=";
};
propagatedBuildInputs = [ numpy sympy ];
nativeCheckInputs = [ pytest scipy ];
checkPhase = "pytest transforms3d";
nativeCheckInputs = [ pytestCheckHook scipy ];
pythonImportsCheck = [ "transforms3d" ];
meta = with lib; {
homepage = "https://matthew-brett.github.io/transforms3d";

50
pkgs/development/python-modules/xnatpy/default.nix Normal file
View File

@ -0,0 +1,50 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, setuptools
, click
, isodate
, progressbar2
, pydicom
, requests
}:
buildPythonPackage rec {
pname = "xnatpy";
version = "0.5.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "xnat";
inherit version;
hash = "sha256-iOw9cVWP5Am4S9JQ0NTmtew38KZiKmau+19K2KG2aKQ=";
};
nativeBuildInputs = [ setuptools ];
propagatedBuildInputs = [
click
isodate
progressbar2
pydicom
requests
];
# tests missing in PyPI dist and require network access and Docker container
doCheck = false;
pythonImportsCheck = [ "xnat" ];
meta = with lib; {
homepage = "https://xnat.readthedocs.io";
description =
"A new XNAT client (distinct from pyxnat) that exposes XNAT objects/functions as Python objects/functions";
changelog = "https://gitlab.com/radiology/infrastructure/xnatpy/-/blob/${version}/CHANGELOG?ref_type=tags";
license = licenses.asl20;
maintainers = with maintainers; [ bcdarwin ];
mainProgram = "xnat";
};
}

4
pkgs/development/tools/analysis/checkov/default.nix
View File

@ -22,14 +22,14 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.3.234";
version = "2.3.237";
format = "setuptools";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-PLeqYD9aIv/nmFvfW2QjDz1xDD2PIFUvr9lkQ2Rh6k8=";
hash = "sha256-7ugTfWv6CRj5vsrT1DvfaR39Ytct3tse+2210WBHP9g=";
};
patches = [

10
pkgs/development/tools/analysis/frama-c/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, makeWrapper, writeText
{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, writeText
, graphviz, doxygen
, ocamlPackages, ltl2ba, coq, why3
, gdk-pixbuf, wrapGAppsHook
@ -53,6 +53,14 @@ stdenv.mkDerivation rec {
hash = "sha256-UT7ajIyu8e5vzrz2oBKDDrtZqUacgUP/TRi0/kz9Qkg=";
};
patches = [
(fetchpatch {
name = "fixes-yojson-2_1-support.patch";
url = "https://git.frama-c.com/pub/frama-c/-/commit/647eace02ed8dac46e75452898c3470f82576818.patch";
hash = "sha256-XfLi4kW1Y2MCLjHHQZAD8DvXvfZuDH3OKd9hlTV0XCw=";
})
];
postConfigure = "patchShebangs src/plugins/eva/gen-api.sh";
strictDeps = true;

2
pkgs/development/tools/bazel-watcher/default.nix
View File

@ -82,7 +82,7 @@ buildBazelPackage rec {
rm -rf $bazelOut/external/com_google_protobuf
'';
sha256 = "sha256-le8IepS+IGVX45Gj1aicPjYOkuUA+VVUy/PEeKLNYss=";
sha256 = "sha256-lC9e5Z2cxLAeWXkiFGmcB6aOaurMvwrP/k5jl3gCfAc=";
};
buildAttrs = {

16
pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
View File

@ -24,16 +24,19 @@
}:
let
version = "5.4.0";
version = "5.4.1";
sourceRoot = ".";
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
hash = "sha256-ocYtm8tOAxBt3wt72WGWuiRuHJt6k12vjZvtqLvcuKE=";
hash = "sha256-3P9pNXVqp6yk/Fabsr0m4VN/Cx9tG9pfKyAPqDXMUH8=";
};
# Update with `eval $(nix-build -A bazel_5.updater)`,
# then add new dependencies from the dict in ./src-deps.json as required.
# Update with
# 1. export BAZEL_SELF=$(nix-build -A bazel_5)
# 2. update version and hash for sources above
# 3. `eval $(nix-build -A bazel_5.updater)`
# 4. add new dependencies from the dict in ./src-deps.json if required by failing build
srcDeps = lib.attrsets.attrValues srcDepsSet;
srcDepsSet =
let
@ -324,8 +327,8 @@ stdenv.mkDerivation rec {
#!${runtimeShell}
(cd "${src_for_updater}" &&
BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \
"${bazel_self}"/bin/bazel \
query 'kind(http_archive, //external:all) + kind(http_file, //external:all) + kind(distdir_tar, //external:all) + kind(git_repository, //external:all)' \
"$BAZEL_SELF"/bin/bazel \
query 'kind(http_archive, //external:*) + kind(http_file, //external:*) + kind(distdir_tar, //external:*) + kind(git_repository, //external:*)' \
--loading_phase_threads=1 \
--output build) \
| "${python3}"/bin/python3 "${./update-srcDeps.py}" \
@ -619,6 +622,7 @@ stdenv.mkDerivation rec {
}
cd ./bazel_src
rm .bazelversion # this doesn't necessarily match the version we built
# test whether $WORKSPACE_ROOT/tools/bazel works

6
pkgs/development/tools/build-managers/bazel/bazel_5/no-arc.patch
View File

@ -6,9 +6,9 @@ index 990afe3e8c..cd5b7b1b7a 100644
])
DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """
- /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -fobjc-arc -framework CoreServices \
- /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices \
- -framework Foundation -arch arm64 -arch x86_64 -Wl,-no_adhoc_codesign -Wl,-no_uuid -o $@ $< && \
+ /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -framework CoreServices \
+ /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -framework CoreServices \
+ -framework Foundation -arch @multiBinPatch@ -Wl,-no_uuid -o $@ $< && \
env -i codesign --identifier $@ --force --sign - $@
"""
@ -20,7 +20,7 @@ index 2b819f07ec..a98ce37673 100644
@@ -127,7 +127,6 @@ def run_xcode_locator(repository_ctx, xcode_locator_src_label):
"macosx",
"clang",
"-mmacosx-version-min=10.9",
"-mmacosx-version-min=10.13",
- "-fobjc-arc",
"-framework",
"CoreServices",

222
pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json
View File

@ -1150,14 +1150,24 @@
"https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip"
]
},
"remote_java_tools": {
"generator_function": "maybe",
"generator_name": "remote_java_tools",
"name": "remote_java_tools",
"sha256": "2eede49b2d80135e0ea22180f63df26db2ed4b795c1c041b25cc653d6019fbec",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools-v11.7.1.zip",
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools-v11.7.1.zip"
]
},
"remote_java_tools_darwin": {
"generator_function": "maybe",
"generator_name": "remote_java_tools_darwin",
"name": "remote_java_tools_darwin",
"sha256": "d15b05d2061382748f779dc566537ea567a46bcba6fa34b56d7cb6e6d668adab",
"sha256": "4d6d388b54ad3b9aa35b30dd67af8d71c4c240df8cfb5000bbec67bdd5c53a73",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_darwin-v10.6.zip",
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_darwin-v10.6.zip"
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_darwin-v11.7.1.zip",
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_darwin-v11.7.1.zip"
]
},
"remote_java_tools_darwin_for_testing": {
@ -1200,10 +1210,10 @@
"generator_function": "maybe",
"generator_name": "remote_java_tools_linux",
"name": "remote_java_tools_linux",
"sha256": "085c0ba53ba764e81d4c195524f3c596085cbf9cdc01dd8e6d2ae677e726af35",
"sha256": "f78077f0c043d0d13c82de0ee4a99753e66bb18ec46e3601fa2a10e7f26798a8",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_linux-v10.6.zip",
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_linux-v10.6.zip"
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_linux-v11.7.1.zip",
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_linux-v11.7.1.zip"
]
},
"remote_java_tools_linux_for_testing": {
@ -1300,10 +1310,10 @@
"generator_function": "maybe",
"generator_name": "remote_java_tools_windows",
"name": "remote_java_tools_windows",
"sha256": "873f1e53d1fa9c8e46b717673816cd822bb7acc474a194a18ff849fd8fa6ff00",
"sha256": "a7086734866505292ee4c206328c73c6af127e69bd51b98c9c186ae4b9b6d2db",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_windows-v10.6.zip",
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_windows-v10.6.zip"
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_windows-v11.7.1.zip",
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_windows-v11.7.1.zip"
]
},
"remote_java_tools_windows_for_testing": {
@ -1329,10 +1339,10 @@
"generator_function": "maybe",
"generator_name": "remotejdk11_linux",
"name": "remotejdk11_linux",
"sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1",
"strip_prefix": "zulu11.37.17-ca-jdk11.0.6-linux_x64",
"sha256": "b8e8a63b79bc312aa90f3558edbea59e71495ef1a9c340e38900dd28a1c579f3",
"strip_prefix": "zulu11.50.19-ca-jdk11.0.12-linux_x64",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz"
"https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-linux_x64.tar.gz"
]
},
"remotejdk11_linux_aarch64": {
@ -1340,10 +1350,10 @@
"generator_function": "maybe",
"generator_name": "remotejdk11_linux_aarch64",
"name": "remotejdk11_linux_aarch64",
"sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4",
"strip_prefix": "zulu11.37.48-ca-jdk11.0.6-linux_aarch64",
"sha256": "61254688067454d3ccf0ef25993b5dcab7b56c8129e53b73566c28a8dd4d48fb",
"strip_prefix": "zulu11.50.19-ca-jdk11.0.12-linux_aarch64",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz"
"https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-linux_aarch64.tar.gz"
]
},
"remotejdk11_linux_aarch64_for_testing": {
@ -1445,10 +1455,10 @@
"generator_function": "maybe",
"generator_name": "remotejdk11_macos",
"name": "remotejdk11_macos",
"sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f",
"strip_prefix": "zulu11.37.17-ca-jdk11.0.6-macosx_x64",
"sha256": "0b8c8b7cf89c7c55b7e2239b47201d704e8d2170884875b00f3103cf0662d6d7",
"strip_prefix": "zulu11.50.19-ca-jdk11.0.12-macosx_x64",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz"
"https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-macosx_x64.tar.gz"
]
},
"remotejdk11_macos_aarch64": {
@ -1456,11 +1466,11 @@
"generator_function": "maybe",
"generator_name": "remotejdk11_macos_aarch64",
"name": "remotejdk11_macos_aarch64",
"sha256": "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a",
"strip_prefix": "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64",
"sha256": "e908a0b4c0da08d41c3e19230f819b364ff2e5f1dafd62d2cf991a85a34d3a17",
"strip_prefix": "zulu11.50.19-ca-jdk11.0.12-macosx_aarch64",
"urls": [
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz",
"https://cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz"
"https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-macosx_aarch64.tar.gz",
"https://cdn.azul.com/zulu/bin/zulu11.50.19-ca-jdk11.0.12-macosx_aarch64.tar.gz"
]
},
"remotejdk11_macos_aarch64_for_testing": {
@ -1503,10 +1513,21 @@
"generator_function": "maybe",
"generator_name": "remotejdk11_win",
"name": "remotejdk11_win",
"sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18",
"strip_prefix": "zulu11.37.17-ca-jdk11.0.6-win_x64",
"sha256": "42ae65e75d615a3f06a674978e1fa85fdf078cad94e553fee3e779b2b42bb015",
"strip_prefix": "zulu11.50.19-ca-jdk11.0.12-win_x64",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip"
"https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-win_x64.zip"
]
},
"remotejdk11_win_arm64": {
"build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
"generator_function": "maybe",
"generator_name": "remotejdk11_win_arm64",
"name": "remotejdk11_win_arm64",
"sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2",
"strip_prefix": "jdk-11.0.13+8",
"urls": [
"https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip"
]
},
"remotejdk11_win_arm64_for_testing": {
@ -1545,39 +1566,6 @@
"https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-win_x64.zip"
]
},
"remotejdk14_linux": {
"build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
"generator_function": "maybe",
"generator_name": "remotejdk14_linux",
"name": "remotejdk14_linux",
"sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa",
"strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64",
"urls": [
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz"
]
},
"remotejdk14_macos": {
"build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
"generator_function": "maybe",
"generator_name": "remotejdk14_macos",
"name": "remotejdk14_macos",
"sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd",
"strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64",
"urls": [
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz"
]
},
"remotejdk14_win": {
"build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
"generator_function": "maybe",
"generator_name": "remotejdk14_win",
"name": "remotejdk14_win",
"sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284",
"strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64",
"urls": [
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip"
]
},
"remotejdk15_linux": {
"build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
"generator_function": "maybe",
@ -1698,6 +1686,18 @@
"https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip"
]
},
"remotejdk16_linux": {
"build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
"generator_function": "maybe",
"generator_name": "remotejdk16_linux",
"name": "remotejdk16_linux",
"sha256": "236b5ea97aff3cb312e743848d7efa77faf305170e41371a732ca93c1b797665",
"strip_prefix": "zulu16.28.11-ca-jdk16.0.0-linux_x64",
"urls": [
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-linux_x64.tar.gz",
"https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-linux_x64.tar.gz"
]
},
"remotejdk16_linux_for_testing": {
"build_file": "@local_jdk//:BUILD.bazel",
"name": "remotejdk16_linux_for_testing",
@ -1716,6 +1716,30 @@
"https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-linux_x64.tar.gz"
]
},
"remotejdk16_macos": {
"build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
"generator_function": "maybe",
"generator_name": "remotejdk16_macos",
"name": "remotejdk16_macos",
"sha256": "6d47ef22dc56ce1f5a102ed39e21d9a97320f0bb786818e2c686393109d79bc5",
"strip_prefix": "zulu16.28.11-ca-jdk16.0.0-macosx_x64",
"urls": [
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_x64.tar.gz",
"https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_x64.tar.gz"
]
},
"remotejdk16_macos_aarch64": {
"build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
"generator_function": "maybe",
"generator_name": "remotejdk16_macos_aarch64",
"name": "remotejdk16_macos_aarch64",
"sha256": "c92131e83bc71474850e667bc4e05fca33662b8feb009a0547aa14e76b40e890",
"strip_prefix": "zulu16.28.11-ca-jdk16.0.0-macosx_aarch64",
"urls": [
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_aarch64.tar.gz",
"https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_aarch64.tar.gz"
]
},
"remotejdk16_macos_aarch64_for_testing": {
"build_file": "@local_jdk//:BUILD.bazel",
"name": "remotejdk16_macos_aarch64_for_testing",
@ -1752,6 +1776,18 @@
"https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_x64.tar.gz"
]
},
"remotejdk16_win": {
"build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
"generator_function": "maybe",
"generator_name": "remotejdk16_win",
"name": "remotejdk16_win",
"sha256": "6cbf98ada27476526a5f6dff79fd5f2c15e2f671818e503bdf741eb6c8fed3d4",
"strip_prefix": "zulu16.28.11-ca-jdk16.0.0-win_x64",
"urls": [
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-win_x64.zip",
"https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-win_x64.zip"
]
},
"remotejdk16_win_for_testing": {
"build_file": "@local_jdk//:BUILD.bazel",
"name": "remotejdk16_win_for_testing",
@ -1770,6 +1806,18 @@
"https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-win_x64.zip"
]
},
"remotejdk17_linux": {
"build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
"generator_function": "maybe",
"generator_name": "remotejdk17_linux",
"name": "remotejdk17_linux",
"sha256": "37c4f8e48536cceae8c6c20250d6c385e176972532fd35759fa7d6015c965f56",
"strip_prefix": "zulu17.28.13-ca-jdk17.0.0-linux_x64",
"urls": [
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-linux_x64.tar.gz",
"https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-linux_x64.tar.gz"
]
},
"remotejdk17_linux_for_testing": {
"build_file": "@local_jdk//:BUILD.bazel",
"name": "remotejdk17_linux_for_testing",
@ -1788,6 +1836,30 @@
"https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-linux_x64.tar.gz"
]
},
"remotejdk17_macos": {
"build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
"generator_function": "maybe",
"generator_name": "remotejdk17_macos",
"name": "remotejdk17_macos",
"sha256": "6029b1fe6853cecad22ab99ac0b3bb4fb8c903dd2edefa91c3abc89755bbd47d",
"strip_prefix": "zulu17.28.13-ca-jdk17.0.0-macosx_x64",
"urls": [
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_x64.tar.gz",
"https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_x64.tar.gz"
]
},
"remotejdk17_macos_aarch64": {
"build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
"generator_function": "maybe",
"generator_name": "remotejdk17_macos_aarch64",
"name": "remotejdk17_macos_aarch64",
"sha256": "6b17f01f767ee7abf4704149ca4d86423aab9b16b68697b7d36e9b616846a8b0",
"strip_prefix": "zulu17.28.13-ca-jdk17.0.0-macosx_aarch64",
"urls": [
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_aarch64.tar.gz",
"https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_aarch64.tar.gz"
]
},
"remotejdk17_macos_aarch64_for_testing": {
"build_file": "@local_jdk//:BUILD.bazel",
"name": "remotejdk17_macos_aarch64_for_testing",
@ -1824,6 +1896,30 @@
"https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_x64.tar.gz"
]
},
"remotejdk17_win": {
"build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
"generator_function": "maybe",
"generator_name": "remotejdk17_win",
"name": "remotejdk17_win",
"sha256": "f4437011239f3f0031c794bb91c02a6350bc941d4196bdd19c9f157b491815a3",
"strip_prefix": "zulu17.28.13-ca-jdk17.0.0-win_x64",
"urls": [
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-win_x64.zip",
"https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-win_x64.zip"
]
},
"remotejdk17_win_arm64": {
"build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
"generator_function": "maybe",
"generator_name": "remotejdk17_win_arm64",
"name": "remotejdk17_win_arm64",
"sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877",
"strip_prefix": "zulu17.30.15-ca-jdk17.0.1-win_aarch64",
"urls": [
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip",
"https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip"
]
},
"remotejdk17_win_arm64_for_testing": {
"build_file": "@local_jdk//:BUILD.bazel",
"generator_function": "dist_http_archive",
@ -1863,17 +1959,7 @@
]
},
"rules_cc": {
"generator_function": "dist_http_archive",
"generator_name": "rules_cc",
"name": "rules_cc",
"patch_cmds": [
"test -f BUILD && chmod u+w BUILD || true",
"echo >> BUILD",
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
],
"patch_cmds_win": [
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
],
"sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd",
"strip_prefix": "rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d",
"urls": [

4
pkgs/development/tools/k6/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "k6";
version = "0.44.0";
version = "0.44.1";
src = fetchFromGitHub {
owner = "grafana";
repo = pname;
rev = "v${version}";
sha256 = "sha256-U7/PJzjIKIKKC3Ao7HtiSDaRK1L7ZGUz/KP2SIoZXfo=";
sha256 = "sha256-BfzB6Qt0Hg9ryU4zeTi40jByOgqr9mveq5ZGkO8bA9U=";
};
subPackages = [ "./" ];

4
pkgs/development/tools/misc/strace/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "strace";
version = "6.2";
version = "6.3";
src = fetchurl {
url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-DH04pElBYmjTAEApoiChWnfCIGoDzIgSDzf0bpSRd+g=";
sha256 = "sha256-4Xh44wFQbBzDAWERGK0U7+5/i872Oyes5dKQrM57tzE=";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];

40
pkgs/development/tools/rust/cargo-risczero/default.nix Normal file
View File

@ -0,0 +1,40 @@
{ lib
, stdenv
, fetchCrate
, rustPlatform
, pkg-config
, openssl
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-risczero";
version = "0.14.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-uZz0jJ3klaOrqzJ0BUVDHxl7lv6vt0GT6RgQuJeyeyk=";
};
cargoSha256 = "sha256-t++3+Ijn1ykjMcMsdoe/1xfaji+DQvhyiFe6M/Bpbt0=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
openssl
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
# The tests require network access which is not available in sandboxed Nix builds.
doCheck = false;
meta = with lib; {
description = "Cargo extension to help create, manage, and test RISC Zero projects.";
homepage = "https://risczero.com";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ cameronfyfe ];
};
}

102
pkgs/development/web/publii/default.nix Normal file
View File

@ -0,0 +1,102 @@
{ stdenv
, lib
, fetchurl
, autoPatchelfHook
, makeShellWrapper
, wrapGAppsHook
, alsa-lib
, at-spi2-atk
, at-spi2-core
, atk
, cairo
, cups
, dbus
, expat
, glib
, gtk3
, libsecret
, mesa
, nss
, pango
, udev
, xdg-utils
, xorg
}:
stdenv.mkDerivation rec {
pname = "publii";
version = "0.42.1";
src = fetchurl {
url = "https://getpublii.com/download/Publii-${version}.deb";
hash = "sha256-GHGXu/z2L4aJG1O1THPIxnRBdPJOIVuQsZP0zhjTZlo=";
};
dontConfigure = true;
dontBuild = true;
dontWrapGApps = true;
nativeBuildInputs = [
autoPatchelfHook
makeShellWrapper
wrapGAppsHook
];
buildInputs = [
alsa-lib
at-spi2-atk
at-spi2-core
atk
cairo
cups
dbus
expat
glib
gtk3
libsecret
mesa
nss
pango
xorg.libX11
xorg.libxcb
];
unpackPhase = ''
ar p $src data.tar.xz | tar xJ
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
mv usr/share $out
substituteInPlace $out/share/applications/Publii.desktop \
--replace 'Exec=/opt/Publii/Publii' 'Exec=Publii'
mv opt $out
runHook postInstall
'';
preFixup = ''
makeWrapper $out/opt/Publii/Publii $out/bin/Publii \
"''${gappsWrapperArgs[@]}" \
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}
'';
meta = with lib; {
description = "Static Site CMS with GUI to build privacy-focused SEO-friendly website.";
longDescription = ''
Creating a website doesn't have to be complicated or expensive. With Publii, the most
intuitive static site CMS, you can create a beautiful, safe, and privacy-friendly website
quickly and easily; perfect for anyone who wants a fast, secure website in a flash.
'';
homepage = "https://getpublii.com";
changelog = "https://github.com/getpublii/publii/releases/tag/v${version}";
license = licenses.gpl3Only;
maintainers = with lib.maintainers; [ urandom sebtm ];
platforms = [ "x86_64-linux" ];
};
}

57
pkgs/games/wireworld/default.nix Normal file
View File

@ -0,0 +1,57 @@
{ lib
, stdenv
, fetchFromGitLab
, zip
, love
, makeWrapper
, makeDesktopItem
, copyDesktopItems
}:
stdenv.mkDerivation rec {
pname = "wireworld";
version = "unstable-2023-05-09";
src = fetchFromGitLab {
owner = "blinry";
repo = pname;
rev = "03b82bf5d604d6d4ad3c07b224583de6c396fd17";
hash = "sha256-8BshnGLuA8lmG9g7FU349DWKP/fZvlvjrQBau/LSJ4E=";
};
nativeBuildInputs = [ makeWrapper copyDesktopItems zip ];
desktopItems = [
(makeDesktopItem {
name = "Wireworld";
exec = pname;
comment = "";
desktopName = "Wireworld";
genericName = "Wireworld";
categories = [ "Game" ];
})
];
installPhase = ''
runHook preInstall
zip -9 -r Wireworld.love ./*
install -Dm444 -t $out/share/games/lovegames/ Wireworld.love
makeWrapper ${love}/bin/love $out/bin/Wireworld \
--add-flags $out/share/games/lovegames/Wireworld.love
runHook postInstall
'';
meta = with lib; {
description = "Fascinating electronics logic puzzles, game where you'll learn how to build clocks, diodes, and logic gates";
license = with licenses; [
mit
ofl
blueOak100
cc-by-sa-30
cc-by-sa-40
];
downloadPage = "https://ldjam.com/events/ludum-dare/53/wireworld";
maintainers = with lib.maintainers; [ janik ];
};
}

4
pkgs/servers/home-automation/evcc/default.nix
View File

@ -16,13 +16,13 @@
buildGoModule rec {
pname = "evcc";
version = "0.117.1";
version = "0.117.2";
src = fetchFromGitHub {
owner = "evcc-io";
repo = pname;
rev = version;
hash = "sha256-y8hc/5z92mkIio8+UFan2PDLPyewty5GuFyIKO2IEo8=";
hash = "sha256-GRwh5sBp3GlR9cMqRAKI0wuAFV9hB+ek3VRijceh+AU=";
};
vendorHash = "sha256-3EHdjRCzrty7BnaSG4TAf52jRl0AVS6baSl2XhYUH0A=";

4
pkgs/servers/http/envoy/default.nix
View File

@ -80,8 +80,8 @@ buildBazelPackage rec {
fetchAttrs = {
sha256 = {
x86_64-linux = "sha256-H2s8sTbmKF+yRfSzLsZAT2ckFuunFwh/FMSKj+GYyPM=";
aarch64-linux = "sha256-1/z7sZYMiuB4Re2itDZydsFVEel2NOYmi6vRmBGVO/4=";
x86_64-linux = "sha256-koz08NWUq5Fkca++1G7WEmg24G6FuMQOgRN3+HBtNIk=";
aarch64-linux = "sha256-oSybAw58yK0BUhS8MU2Y9hRo0mU/7xT7VKU3tDW4xN0=";
}.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
dontUseCmakeConfigure = true;
dontUseGnConfigure = true;

38
pkgs/servers/sql/mariadb/default.nix
View File

@ -243,50 +243,36 @@ in
# see https://mariadb.org/about/#maintenance-policy for EOLs
mariadb_104 = self.callPackage generic {
# Supported until 2024-06-18
version = "10.4.28";
hash = "sha256-AD/SPzxu5RYXbhtisLQ822zdPc1OMPhVwcWrK6r1qGw=";
version = "10.4.29";
hash = "sha256-Wy0zh5LnnmjWpUXisVYDu792GMc55fgg9XsdayIJITA=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
};
mariadb_105 = self.callPackage generic {
# Supported until 2025-06-24
version = "10.5.19";
hash = "sha256-JExKJCSQZBBmI8uEqm3lFN3xeH3oZmQHUoK7qOxXV/Q=";
version = "10.5.20";
hash = "sha256-sY+Q8NAR74e71VmtBDLN4Qfs21jqKCcQg7SJvf0e79s=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
};
mariadb_106 = self.callPackage generic {
# Supported until 2026-07-06
version = "10.6.12";
hash = "sha256-PtLrdCnC+uVCPKVcZhdC0QfjUkbxqwwQcJbwxLg5Rjo=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
};
mariadb_108 = self.callPackage generic {
# Supported until 2023-05-20. TODO: remove ahead of 23.05 branchoff
version = "10.8.7";
hash = "sha256-A6uqsKMvNTjqZZFbrUBBWf2mHEJE9HZJpC6xdUIGuAI=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
};
mariadb_109 = self.callPackage generic {
# Supported until 2023-08-22. TODO: remove ahead of 23.05 branchoff?
version = "10.9.5";
hash = "sha256-CXYrdcZEuUEukV0w4bJm3tc5ZRf8L9hrvmf+zDcGWtw=";
version = "10.6.13";
hash = "sha256-8IXzec9Z7S02VkT8XNhVj4gqiG7JZAcNZaKFMN27dbo=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
};
mariadb_1010 = self.callPackage generic {
# Supported until 2023-11-17
version = "10.10.3";
hash = "sha256-DQxF/oUFnY0mxuIp8wQQqLj3KC7C1WVg/JqJMOFO130=";
# Supported until 2023-11-17. TODO: remove ahead of 23.11 branchoff
version = "10.10.4";
hash = "sha256-IX2Z47Ami5MizyicGEMnqHiYs/aGvS6eS5JpXqYRixk=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
};
mariadb_1011 = self.callPackage generic {
# Supported until 2028-02-16
version = "10.11.2";
hash = "sha256-HIne4MrtD2i8Kh0gPrmKEjFQ5qF59u4PH8C6Pwjccdw=";
# Supported until 2028-02-16. TODO: make this the default, at some point
version = "10.11.3";
hash = "sha256-sGWw8ypun9R55Wb9ZnFFA3mIbY3aLZp++TCvHlwmwMc=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
};

4
pkgs/servers/tang/default.nix
View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "tang";
version = "12";
version = "13";
src = fetchFromGitHub {
owner = "latchset";
repo = "tang";
rev = "refs/tags/v${version}";
hash = "sha256-wfZFOJrVzjtysh0VKdw5O+DJybYkV9bYJNnaku6YctE=";
hash = "sha256-SOdgMUWavTaDUiVvpEyE9ac+9aDmZs74n7ObugksBcc=";
};
nativeBuildInputs = [

18
pkgs/tools/audio/yabridge/default.nix
View File

@ -18,7 +18,7 @@ let
owner = "chriskohlhoff";
repo = "asio";
rev = "refs/tags/asio-1-22-1";
sha256 = "sha256-UDLhx2yI6Txg0wP5H4oNIhgKIB2eMxUGCyT2x/7GgVg=";
hash = "sha256-UDLhx2yI6Txg0wP5H4oNIhgKIB2eMxUGCyT2x/7GgVg=";
};
# Derived from subprojects/bitsery.wrap
@ -26,7 +26,7 @@ let
owner = "fraillt";
repo = "bitsery";
rev = "refs/tags/v5.2.2";
sha256 = "sha256-VwzVtxt+E/SVcxqIJw8BKPO2q7bu/hkhY+nB7FHrZpY=";
hash = "sha256-VwzVtxt+E/SVcxqIJw8BKPO2q7bu/hkhY+nB7FHrZpY=";
};
# Derived from subprojects/clap.wrap
@ -34,7 +34,7 @@ let
owner = "free-audio";
repo = "clap";
rev = "refs/tags/1.1.7";
sha256 = "sha256-WcMTxE+QCzlp4lhFdghZI8UI/5mdVeRvrl24Xynd0qk=";
hash = "sha256-WcMTxE+QCzlp4lhFdghZI8UI/5mdVeRvrl24Xynd0qk=";
};
# Derived from subprojects/function2.wrap
@ -42,7 +42,7 @@ let
owner = "Naios";
repo = "function2";
rev = "refs/tags/4.2.0";
sha256 = "sha256-wrt+fCcM6YD4ZRZYvqqB+fNakCNmltdPZKlNkPLtgMs=";
hash = "sha256-wrt+fCcM6YD4ZRZYvqqB+fNakCNmltdPZKlNkPLtgMs=";
};
# Derived from subprojects/ghc_filesystem.wrap
@ -50,7 +50,7 @@ let
owner = "gulrak";
repo = "filesystem";
rev = "refs/tags/v1.5.12";
sha256 = "sha256-j4RE5Ach7C7Kef4+H9AHSXa2L8OVyJljDwBduKcC4eE=";
hash = "sha256-j4RE5Ach7C7Kef4+H9AHSXa2L8OVyJljDwBduKcC4eE=";
};
# Derived from subprojects/tomlplusplus.wrap
@ -58,7 +58,7 @@ let
owner = "marzer";
repo = "tomlplusplus";
rev = "refs/tags/v3.3.0";
sha256 = "sha256-INX8TOEumz4B5coSxhiV7opc3rYJuQXT2k1BJ3Aje1M=";
hash = "sha256-INX8TOEumz4B5coSxhiV7opc3rYJuQXT2k1BJ3Aje1M=";
};
# Derived from vst3.wrap
@ -67,19 +67,19 @@ let
repo = "vst3sdk";
rev = "refs/tags/v3.7.7_build_19-patched";
fetchSubmodules = true;
sha256 = "sha256-LsPHPoAL21XOKmF1Wl/tvLJGzjaCLjaDAcUtDvXdXSU=";
hash = "sha256-LsPHPoAL21XOKmF1Wl/tvLJGzjaCLjaDAcUtDvXdXSU=";
};
in
multiStdenv.mkDerivation (finalAttrs: {
pname = "yabridge";
version = "5.0.4";
version = "5.0.5";
# NOTE: Also update yabridgectl's cargoHash when this is updated
src = fetchFromGitHub {
owner = "robbert-vdh";
repo = "yabridge";
rev = "refs/tags/${finalAttrs.version}";
sha256 = "sha256-15WTCXMvghoU5TkE8yuQJrxj9cwVjczDKGKWjoUS6SI=";
hash = "sha256-SB2/zKxj9GDOOb3Zn4kWj7dXhDg/wbx6nPKYbQ041Cs=";
};
# Unpack subproject sources

6
pkgs/tools/audio/yabridge/hardcode-dependencies.patch
View File

@ -1,5 +1,5 @@
diff --git a/meson.build b/meson.build
index f76f5acf..045e9d40 100644
index d8d9135b..717280d9 100644
--- a/meson.build
+++ b/meson.build
@@ -221,7 +221,7 @@ if is_64bit_system
@ -12,10 +12,10 @@ index f76f5acf..045e9d40 100644
# These are all headers-only libraries, and thus won't require separate 32-bit
diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp
index 8d6236ad..ea5c1396 100644
index 4a52b6c1..abbb1ec8 100644
--- a/src/plugin/utils.cpp
+++ b/src/plugin/utils.cpp
@@ -93,7 +93,7 @@ std::string PluginInfo::wine_version() const {
@@ -101,7 +101,7 @@ std::string PluginInfo::wine_version() const {
// The '*.exe' scripts generated by winegcc allow you to override the binary
// used to run Wine, so will will handle this in the same way for our Wine
// version detection. We'll be using `execvpe`

2
pkgs/tools/audio/yabridgectl/Cargo.lock generated
View File

@ -835,7 +835,7 @@ dependencies = [
[[package]]
name = "yabridgectl"
version = "5.0.4"
version = "5.0.5"
dependencies = [
"anyhow",
"clap",

4
pkgs/tools/misc/calamares-nixos-extensions/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "calamares-nixos-extensions";
version = "0.3.11";
version = "0.3.12";
src = fetchFromGitHub {
owner = "NixOS";
repo = "calamares-nixos-extensions";
rev = version;
sha256 = "NAHUU0tQLu8c2dke1V0aM3mHrNgM8ekHSB2Fo9dQUk8=";
sha256 = "qNRlUz4+xxNNzyswKHOjbkaLx0qi8fiAly94fMOlryE=";
};
installPhase = ''

40
pkgs/tools/networking/netassert/default.nix Normal file
View File

@ -0,0 +1,40 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "netassert";
version = "2.0.1";
src = fetchFromGitHub {
owner = "controlplaneio";
repo = "netassert";
rev = "v${version}";
hash = "sha256-bKfqSyG6YXrkHqja8f9R+49mdwOKM5NJuRrcKj7QDj8=";
};
vendorHash = "sha256-nDnSJOfEn9KieDwdNeIGFcI4m8rVU+Yaxwa+dKyNSHM=";
ldflags = [
"-s"
"-w"
"-X main.version=${src.rev}"
];
postBuild = ''
mv $GOPATH/bin/{cli,netassert}
'';
meta = with lib; {
homepage = "https://github.com/controlplaneio/netassert";
changelog = "https://github.com/controlplaneio/netassert/blob/${src.rev}/CHANGELOG.md";
description = "A command line utility to test network connectivity between kubernetes objects";
longDescription = ''
NetAssert is a command line utility to test network connectivity between kubernetes objects.
It currently supports Deployment, Pod, Statefulset and Daemonset.
You can check the traffic flow between these objects or from these objects to a remote host or an IP address.
'';
license = licenses.asl20;
maintainers = with maintainers; [ jk ];
};
}

2
pkgs/tools/networking/nuttcp/default.nix
View File

@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
installShellFiles
];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
installPhase = ''
mkdir -p $out/bin
cp nuttcp-${version} $out/bin/nuttcp

2
pkgs/top-level/aliases.nix
View File

@ -1008,6 +1008,8 @@ mapAliases ({
manul = throw "manul has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-01
manpages = throw "'manpages' has been renamed to/replaced by 'man-pages'"; # Converted to throw 2022-02-22
marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15
mariadb_108 = throw "mariadb_108 has been removed from nixpkgs, please switch to another version like mariadb_1010"; # Added 2022-05-10
mariadb_109 = throw "mariadb_109 has been removed from nixpkgs, please switch to another version like mariadb_1010"; # Added 2022-05-10
mariadb-client = hiPrio mariadb.client; #added 2019.07.28
marp = throw "marp has been removed from nixpkgs, as it's unmaintained and has security issues"; # Added 2022-06-04
matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09

22
pkgs/top-level/all-packages.nix
View File

@ -10259,6 +10259,8 @@ with pkgs;
ndisc6 = callPackage ../tools/networking/ndisc6 { };
netassert = callPackage ../tools/networking/netassert { };
netboot = callPackage ../tools/networking/netboot { };
netbootxyz-efi = callPackage ../tools/misc/netbootxyz-efi { };
@ -16292,6 +16294,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-readme = callPackage ../development/tools/rust/cargo-readme { };
cargo-risczero = callPackage ../development/tools/rust/cargo-risczero { };
cargo-semver-checks = callPackage ../development/tools/rust/cargo-semver-checks { };
cargo-show-asm = callPackage ../development/tools/rust/cargo-show-asm { };
@ -17357,6 +17360,8 @@ with pkgs;
protege-distribution = callPackage ../development/web/protege-distribution { };
publii = callPackage ../development/web/publii {};
umr = callPackage ../development/misc/umr {
llvmPackages = llvmPackages_14;
};
@ -21408,6 +21413,8 @@ with pkgs;
libcollectdclient = callPackage ../development/libraries/libcollectdclient { };
libcpr = callPackage ../development/libraries/libcpr { };
libcredis = callPackage ../development/libraries/libcredis { };
libctb = callPackage ../development/libraries/libctb { };
@ -25656,8 +25663,6 @@ with pkgs;
mariadb_104
mariadb_105
mariadb_106
mariadb_108
mariadb_109
mariadb_1010
mariadb_1011
;
@ -28229,6 +28234,8 @@ with pkgs;
lightly-qt = libsForQt5.callPackage ../data/themes/lightly-qt { };
lightly-boehs = libsForQt5.callPackage ../data/themes/lightly-boehs { };
linden-hill = callPackage ../data/fonts/linden-hill { };
line-awesome = callPackage ../data/fonts/line-awesome { };
@ -28949,6 +28956,14 @@ with pkgs;
acorn = callPackage ../applications/networking/cluster/acorn { };
inherit (qt6Packages.callPackage ../applications/office/activitywatch { })
aw-qt
aw-server-rust
aw-watcher-afk
aw-watcher-window;
activitywatch = callPackage ../applications/office/activitywatch/wrapper.nix { };
adobe-reader = pkgsi686Linux.callPackage ../applications/misc/adobe-reader { };
adl = callPackage ../applications/video/adl { };
@ -40053,6 +40068,9 @@ with pkgs;
wiremock = callPackage ../tools/networking/wiremock { };
wireworld = callPackage ../games/wireworld { };
teseq = callPackage ../applications/misc/teseq { };
ape = callPackage ../applications/misc/ape { };

16
pkgs/top-level/python-packages.nix
View File

@ -853,6 +853,10 @@ self: super: with self; {
avro-python3 = callPackage ../development/python-modules/avro-python3 { };
aw-client = callPackage ../development/python-modules/aw-client { };
aw-core = callPackage ../development/python-modules/aw-core { };
awacs = callPackage ../development/python-modules/awacs { };
awesome-slugify = callPackage ../development/python-modules/awesome-slugify { };
@ -5777,6 +5781,8 @@ self: super: with self; {
inherit (pkgs) lmdb;
};
lmfit = callPackage ../development/python-modules/lmfit { };
lml = callPackage ../development/python-modules/lml { };
lmnotify = callPackage ../development/python-modules/lmnotify { };
@ -6289,6 +6295,8 @@ self: super: with self; {
monai = callPackage ../development/python-modules/monai { };
monai-deploy = callPackage ../development/python-modules/monai-deploy { };
monero = callPackage ../development/python-modules/monero { };
mongomock = callPackage ../development/python-modules/mongomock { };
@ -7346,6 +7354,8 @@ self: super: with self; {
persim = callPackage ../development/python-modules/persim { };
persist-queue = callPackage ../development/python-modules/persist-queue { };
persistent = callPackage ../development/python-modules/persistent { };
persisting-theory = callPackage ../development/python-modules/persisting-theory { };
@ -11719,6 +11729,8 @@ self: super: with self; {
tailscale = callPackage ../development/python-modules/tailscale { };
takethetime = callPackage ../development/python-modules/takethetime { };
tank-utility = callPackage ../development/python-modules/tank-utility { };
tappy = callPackage ../development/python-modules/tappy { };
@ -11989,6 +12001,8 @@ self: super: with self; {
timeout-decorator = callPackage ../development/python-modules/timeout-decorator { };
timeslot = callPackage ../development/python-modules/timeslot { };
timetagger = callPackage ../development/python-modules/timetagger { };
timezonefinder = callPackage ../development/python-modules/timezonefinder { };
@ -13016,6 +13030,8 @@ self: super: with self; {
xmodem = callPackage ../development/python-modules/xmodem { };
xnatpy = callPackage ../development/python-modules/xnatpy { };
xnd = callPackage ../development/python-modules/xnd { };
xpath-expressions = callPackage ../development/python-modules/xpath-expressions { };