Merge staging-next into staging

Changed files
+1082 -246
maintainers
nixos
modules
services
matrix
tests
pkgs
applications
accessibility
squeekboard
editors
graphics
displaycal
misc
shell-genie
networking
cloudflared
instant-messengers
viber
kubo
office
ledger
data
icons
papirus-icon-theme
development
compilers
gleam
graalvm
community-edition
libraries
science
math
openblas
mobile
python-modules
aiolifx-themes
asyncwhois
ctap-keyring-device
datasets
google-cloud-bigquery-storage
google-cloud-datastore
google-cloud-secret-manager
guessit
okta
openai
pint-pandas
pontos
pybigwig
pybravia
pytest-recording
viv-utils
weconnect
weconnect-mqtt
quickemu
os-specific
servers
endlessh-go
pleroma
shells
tools
admin
gimme-aws-creds
google-cloud-sdk
trivy
misc
octosql
networking
godns
shadowsocks-v2ray-plugin
top-level
+7
maintainers/maintainer-list.nix
···
githubId = 62989;
name = "Demyan Rogozhin";
};
+
dennajort = {
+
email = "gosselinjb@gmail.com";
+
matrix = "@dennajort:matrix.org";
+
github = "dennajort";
+
githubId = 1536838;
+
name = "Jean-Baptiste Gosselin";
+
};
derchris = {
email = "derchris@me.com";
github = "derchrisuk";
+2 -2
nixos/modules/services/matrix/dendrite.nix
···
LimitNOFILE = 65535;
EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
LoadCredential = cfg.loadCredential;
-
ExecStartPre = ''
+
ExecStartPre = [''
${pkgs.envsubst}/bin/envsubst \
-i ${configurationYaml} \
-o /run/dendrite/dendrite.yaml
-
'';
+
''];
ExecStart = lib.strings.concatStringsSep " " ([
"${pkgs.dendrite}/bin/dendrite-monolith-server"
"--config /run/dendrite/dendrite.yaml"
+2 -2
nixos/tests/pleroma.nix
···
'';
hosts = nodes: ''
-
${nodes.pleroma.config.networking.primaryIPAddress} pleroma.nixos.test
-
${nodes.client.config.networking.primaryIPAddress} client.nixos.test
+
${nodes.pleroma.networking.primaryIPAddress} pleroma.nixos.test
+
${nodes.client.networking.primaryIPAddress} client.nixos.test
'';
in {
name = "pleroma";
+5 -3
pkgs/applications/accessibility/squeekboard/default.nix
···
, gtk3
, wayland
, wayland-protocols
+
, libbsd
, libxml2
, libxkbcommon
, rustPlatform
···
stdenv.mkDerivation rec {
pname = "squeekboard";
-
version = "1.20.0";
+
version = "1.21.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
···
owner = "Phosh";
repo = pname;
rev = "v${version}";
-
sha256 = "sha256-wx3fKRX/SPYGAFuR9u03JAvVRhtYIPUvW8mAsCdx83I=";
+
hash = "sha256-Mn0E+R/UzBLHPvarQHlEN4JBpf4VAaXdKdWLsFEyQE4=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
···
cp Cargo.lock.newer Cargo.lock
'';
name = "${pname}-${version}";
-
sha256 = "sha256-BbNkapqnqEW/NglrCse10Tm80SXYVQWWrOC5dTN6oi0=";
+
hash = "sha256-F2mef0HvD9WZRx05DEpQ1AO1skMwcchHZzJa74AHmsM=";
};
mesonFlags = [
···
gnome-desktop
wayland
wayland-protocols
+
libbsd
libxml2
libxkbcommon
feedbackd
+2 -2
pkgs/applications/editors/cudatext/default.nix
···
in
stdenv.mkDerivation rec {
pname = "cudatext";
-
version = "1.186.0";
+
version = "1.186.2";
src = fetchFromGitHub {
owner = "Alexey-T";
repo = "CudaText";
rev = version;
-
hash = "sha256-CzCPz/Bny57nkxR21ACXjhAoplVVm4TVSbH6De+fKfI=";
+
hash = "sha256-qpxYzman93e+u0BHxdhBUyfnZOR4hjQpTuNikGDNQCA=";
};
postPatch = ''
+2 -2
pkgs/applications/editors/cudatext/deps.json
···
},
"ATSynEdit": {
"owner": "Alexey-T",
-
"rev": "2023.02.25",
-
"hash": "sha256-iTdb+eI1alS6chCn2rEbUAy9iVAgVvsNGURxds/2f7s="
+
"rev": "2023.03.02",
+
"hash": "sha256-rZzcWED8c68wtejUho71kbPtLyDyOlXpS/eg8Ti0r2A="
},
"ATSynEdit_Cmp": {
"owner": "Alexey-T",
+68
pkgs/applications/graphics/displaycal/default.nix
···
+
{ lib
+
, python3
+
, xorg
+
, argyllcms
+
, wrapGAppsHook
+
, gtk3
+
, librsvg
+
}:
+
+
python3.pkgs.buildPythonApplication rec {
+
pname = "displaycal";
+
version = "3.9.10";
+
format = "setuptools";
+
+
src = python3.pkgs.fetchPypi {
+
pname = "DisplayCAL";
+
inherit version;
+
hash = "sha256-oDHDVb0zuAC49yPfmNe7xuFKaA1BRZGr75XwsLqugHs=";
+
};
+
+
nativeBuildInputs = [
+
wrapGAppsHook
+
gtk3
+
];
+
+
propagatedBuildInputs = with python3.pkgs; [
+
build
+
certifi
+
wxPython_4_2
+
dbus-python
+
distro
+
PyChromecast
+
send2trash
+
];
+
+
buildInputs = [
+
gtk3
+
librsvg
+
] ++ (with xorg; [
+
libX11
+
libXxf86vm
+
libXext
+
libXinerama
+
libXrandr
+
]);
+
+
doCheck = false; # Tests try to access an X11 session and dbus in weird locations.
+
+
pythonImportsCheck = [ "DisplayCAL" ];
+
+
dontWrapGApps = true;
+
+
preFixup = ''
+
makeWrapperArgs+=(
+
''${gappsWrapperArgs[@]}
+
--prefix PATH : ${lib.makeBinPath [ argyllcms ]}
+
--prefix PYTHONPATH : $PYTHONPATH
+
)
+
'';
+
+
meta = with lib; {
+
description = "Display calibration and characterization powered by Argyll CMS (Migrated to Python 3)";
+
homepage = "https://github.com/eoyilmaz/displaycal-py3";
+
license = licenses.gpl3Plus;
+
platforms = platforms.linux;
+
maintainers = with maintainers; [ toastal ];
+
};
+
}
+10 -7
pkgs/applications/misc/shell-genie/default.nix
···
buildPythonPackage rec {
pname = "shell-genie";
-
version = "unstable-2023-01-27";
+
version = "0.2.6";
format = "pyproject";
-
src = fetchFromGitHub {
-
owner = "dylanjcastillo";
-
repo = pname;
-
rev = "d6da42a4426e6058a0b5ae07837d8c003cd1239e";
-
hash = "sha256-MGhQaTcl3KjAJXorOmMRec07LxH02T81rNbV2mYEpRA=";
+
src = fetchPypi {
+
pname = "shell_genie";
+
inherit version;
+
hash = "sha256-MgQFHsBXrihfWBB/cz45ITf8oJG2gSenf1wzdbrAbjw=";
};
nativeBuildInputs = [
-
poetry
poetry-core
];
···
# No tests available
doCheck = false;
+
pythonImportsCheck = [
+
"shell_genie"
+
];
+
meta = with lib; {
description = "Describe your shell commands in natural language";
homepage = "https://github.com/dylanjcastillo/shell-genie";
+
# https://github.com/dylanjcastillo/shell-genie/issues/3
license = licenses.unfree;
maintainers = with maintainers; [ onny ];
};
+2 -2
pkgs/applications/networking/cloudflared/default.nix
···
buildGoModule rec {
pname = "cloudflared";
-
version = "2023.2.2";
+
version = "2023.3.0";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflared";
rev = "refs/tags/${version}";
-
hash = "sha256-qZ3h8KZLGSH+sqUs0wof5arKvcps1DdqBnT+coWEiys=";
+
hash = "sha256-LEK809MswDVwPJ6CuC13Fxb7fvliugixS/NOKBajqKM=";
};
vendorSha256 = null;
+1 -1
pkgs/applications/networking/instant-messengers/viber/default.nix
···
{fetchurl, lib, stdenv, dpkg, makeWrapper,
alsa-lib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1,
harfbuzz, libcap, libGL, libGLU, libpulseaudio, libxkbcommon, libxml2, libxslt,
-
nspr, nss, openssl, systemd, wayland, xorg, zlib, ...
+
nspr, nss, openssl_1_1, systemd, wayland, xorg, zlib, ...
}:
stdenv.mkDerivation {
+4 -4
pkgs/applications/networking/kubo/default.nix
···
buildGoModule rec {
pname = "kubo";
-
version = "0.17.0"; # When updating, also check if the repo version changed and adjust repoVersion below
+
version = "0.18.1"; # When updating, also check if the repo version changed and adjust repoVersion below
rev = "v${version}";
-
passthru.repoVersion = "12"; # Also update kubo-migrator when changing the repo version
+
passthru.repoVersion = "13"; # Also update kubo-migrator when changing the repo version
# Kubo makes changes to it's source tarball that don't match the git source.
src = fetchurl {
url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz";
-
hash = "sha256-Ls46Dds8lRP2KTOkjiVWtqB8aqPW5jdQ/xwBcQYIwbQ=";
+
hash = "sha256-xAOx4QOdD5MfFLqKTQRGMOnTZt14H523/quOLY5gBMk=";
};
# tarball contains multiple files/directories
···
'';
meta = with lib; {
-
description = "A global, versioned, peer-to-peer filesystem";
+
description = "An IPFS implementation in Go";
homepage = "https://ipfs.io/";
license = licenses.mit;
platforms = platforms.unix;
+2 -2
pkgs/applications/office/ledger/default.nix
···
stdenv.mkDerivation rec {
pname = "ledger";
-
version = "3.3.0";
+
version = "3.3.1";
src = fetchFromGitHub {
owner = "ledger";
repo = "ledger";
rev = "v${version}";
-
hash = "sha256-0hN6Hpmgwb3naV2K1fxX0OyH0IyCQAh1nZ9TMNAutic=";
+
hash = "sha256-CnMzsFKBNiXmatgY7aiK8UCqIL6qifA4KbV6BJaza40=";
};
outputs = [ "out" "dev" ] ++ lib.optionals usePython [ "py" ];
+2 -2
pkgs/data/icons/papirus-icon-theme/default.nix
···
stdenvNoCC.mkDerivation rec {
pname = "papirus-icon-theme";
-
version = "20230104";
+
version = "20230301";
src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam";
repo = pname;
rev = version;
-
sha256 = "sha256-BejsAlHnq2oxVQIFA4/ZOTFxz7vZmssrlJNqRZHBGuI=";
+
sha256 = "sha256-iIvynt8Qg9PmR2q7JsLtRlYxfHGaShMD8kbbPL89DzE=";
};
nativeBuildInputs = [ gtk3 papirus-folders ];
+3 -3
pkgs/development/compilers/gleam/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "gleam";
-
version = "0.26.2";
+
version = "0.27.0";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = pname;
rev = "refs/tags/v${version}";
-
hash = "sha256-NLUAKNWbKPAf81ce1OWTy/pnDcF2LfF12825DfE8AWw=";
+
hash = "sha256-RkpHmrxKiMtXOPKd8qBREike2sJ3NZcrc7RIxG08eyI=";
};
nativeBuildInputs = [ git pkg-config ];
···
buildInputs = [ openssl ] ++
lib.optionals stdenv.isDarwin [ Security libiconv ];
-
cargoSha256 = "sha256-IOZEdoQ5cqXjhgqNzOg4h5t8i3JDxfjamLFdesEy9Z8=";
+
cargoSha256 = "sha256-QluOPKEkofRRE+UxNe60f+sA8Ov3um25kl2F/pt19js=";
meta = with lib; {
description = "A statically typed language for the Erlang VM";
+72
pkgs/development/compilers/graalvm/community-edition/default.nix
···
version = "22.3.1";
src = fetchurl (source "wasm-installable-svm" javaVersion);
};
+
+
### Java 19 ###
+
+
# Mostly available for build purposes, not to be exposed at the top level
+
graalvm19-ce-bare = buildGraalvm rec {
+
version = "22.3.1";
+
javaVersion = "19";
+
src = fetchurl (source "graalvm-ce" javaVersion);
+
meta.platforms = builtins.attrNames javaPlatform;
+
products = [ ];
+
};
+
+
graalvm19-ce = graalvm19-ce-bare.override {
+
products = [ native-image-installable-svm-java19 ];
+
};
+
+
# Mostly available for testing, not to be exposed at the top level
+
graalvm19-ce-full = graalvm19-ce-bare.override {
+
products = [
+
js-installable-svm-java19
+
llvm-installable-svm-java19
+
native-image-installable-svm-java19
+
nodejs-installable-svm-java19
+
python-installable-svm-java19
+
ruby-installable-svm-java19
+
wasm-installable-svm-java19
+
];
+
};
+
+
js-installable-svm-java19 = callPackage ./js-installable-svm.nix rec {
+
javaVersion = "19";
+
version = "22.3.1";
+
src = fetchurl (source "js-installable-svm" javaVersion);
+
};
+
+
llvm-installable-svm-java19 = callPackage ./llvm-installable-svm.nix rec {
+
javaVersion = "19";
+
version = "22.3.1";
+
src = fetchurl (source "llvm-installable-svm" javaVersion);
+
};
+
+
native-image-installable-svm-java19 = callPackage ./native-image-installable-svm.nix rec {
+
javaVersion = "19";
+
version = "22.3.1";
+
src = fetchurl (source "native-image-installable-svm" javaVersion);
+
};
+
+
nodejs-installable-svm-java19 = callPackage ./nodejs-installable-svm.nix rec {
+
javaVersion = "19";
+
version = "22.3.1";
+
src = fetchurl (source "nodejs-installable-svm" javaVersion);
+
graalvm-ce = graalvm19-ce-bare;
+
};
+
+
python-installable-svm-java19 = callPackage ./python-installable-svm.nix rec {
+
javaVersion = "19";
+
version = "22.3.1";
+
src = fetchurl (source "python-installable-svm" javaVersion);
+
};
+
+
ruby-installable-svm-java19 = callPackage ./ruby-installable-svm.nix rec {
+
javaVersion = "19";
+
version = "22.3.1";
+
src = fetchurl (source "ruby-installable-svm" javaVersion);
+
llvm-installable-svm = llvm-installable-svm-java19;
+
};
+
+
wasm-installable-svm-java19 = callPackage ./wasm-installable-svm.nix rec {
+
javaVersion = "19";
+
version = "22.3.1";
+
src = fetchurl (source "wasm-installable-svm" javaVersion);
+
};
}
+124
pkgs/development/compilers/graalvm/community-edition/hashes.nix
···
sha256 = "1zww45z7m3mvzg47fwc3jgqz3hkra220isf4ih8sv6kjg1jc4y14";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-linux-aarch64-22.3.1.jar";
};
+
"19-linux-aarch64" = {
+
sha256 = "13gg5hqg3pzn3qprl76i2wpmfagf5zw4w9hl18993ing21k5d0kq";
+
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java19-linux-aarch64-22.3.1.jar";
+
};
"11-linux-amd64" = {
sha256 = "133m9vg9rlp2xkndh3d6b8ybq8vwch99rj1b50xr6bz8r6306ara";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java11-linux-amd64-22.3.1.jar";
···
"17-linux-amd64" = {
sha256 = "0nz09idp8wawm3yinsplzvxhld8yav06l1nqj02gxrc1kxd5nsr1";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-linux-amd64-22.3.1.jar";
+
};
+
"19-linux-amd64" = {
+
sha256 = "1b5jsazjxkqlswl0h5yx7nx16zjjlvw967i6kypp4js80zg79s8m";
+
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java19-linux-amd64-22.3.1.jar";
};
"11-darwin-aarch64" = {
sha256 = "0ngcm3ara7g1xz4kh515igpyrjhr1k5z9nf4vsaw4lpa5sqljv7z";
···
sha256 = "1lr8kk82c3l9hx7wc5hqmpqfgvpk72xg1h07b6cgibry1bm6baj6";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-darwin-aarch64-22.3.1.jar";
};
+
"19-darwin-aarch64" = {
+
sha256 = "0mdiiag4hkddfgjamqn8y63s7xrfhq1wjvc7rw2sldykg7x0813i";
+
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java19-darwin-aarch64-22.3.1.jar";
+
};
"11-darwin-amd64" = {
sha256 = "058pzrd90xx4yi7mm2fvs2npqcdkb2nzhqfwfz5v202038igi61g";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java11-darwin-amd64-22.3.1.jar";
···
"17-darwin-amd64" = {
sha256 = "10rfz8ddq82zpf6cy2y0gx1bx0zhjzm3gwwdb1j7mll0hvwp84sg";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-darwin-amd64-22.3.1.jar";
+
};
+
"19-darwin-amd64" = {
+
sha256 = "0h5sf99ypwz0bafq4jm71ynszfgsrlnhmcjh0kl6sy5g1q8ij0jf";
+
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java19-darwin-amd64-22.3.1.jar";
};
};
"nodejs-installable-svm" = {
···
sha256 = "1ldivy5hmq2mxmzh40hglzngylahnzyqh9rav73nicl5mz8hk4l2";
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-linux-aarch64-22.3.1.jar";
};
+
"19-linux-aarch64" = {
+
sha256 = "12chjbfz530kyp46bya8wcwciwlhp873hc6mvsjcf5swa3g7cwcl";
+
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java19-linux-aarch64-22.3.1.jar";
+
};
"11-linux-amd64" = {
sha256 = "1p1y52b4lky2fbkml5vqy7dn9vqzj19jq5f3c90mgsfk4c7xhi66";
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-linux-amd64-22.3.1.jar";
···
"17-linux-amd64" = {
sha256 = "0j1gkpszklzm069bccm6wgq8iq0k41bcrca0kf8pbl2y11hwywpc";
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-linux-amd64-22.3.1.jar";
+
};
+
"19-linux-amd64" = {
+
sha256 = "1gdkn0srkh8bn7c81f8s7ykd12pnz5r75rif76zhzdllhx63nn5v";
+
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java19-linux-amd64-22.3.1.jar";
};
"11-darwin-aarch64" = {
sha256 = "1fbqc3a7i91as1sbwg2yr1zx0wz4jsaxcz9pfqy8a0z88m8vivbs";
···
sha256 = "1swzkp0imcv30fxfwblgad57fvpsvhfpv93s8zj1lwrbarggl2y3";
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-darwin-aarch64-22.3.1.jar";
};
+
"19-darwin-aarch64" = {
+
sha256 = "11kpgd6vxc8dm9z5ihkwbjbbspk53m3k9b550zf0zs3as9yjbp22";
+
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java19-darwin-aarch64-22.3.1.jar";
+
};
"11-darwin-amd64" = {
sha256 = "0n3hm8dd0ya86hxbxv07sfp22y02vhhzahkxk2j2162n9hcdmkwk";
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-darwin-amd64-22.3.1.jar";
···
sha256 = "0xkjqcch22bm32mczj6xs8rzsl2n6vy9hmzwfy9a71w1kpkbjn3a";
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-darwin-amd64-22.3.1.jar";
};
+
"19-darwin-amd64" = {
+
sha256 = "1yrh6iahai3aw7lpz89mrq782b1bysqqr9vkqdgcv00by1a7yd10";
+
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java19-darwin-amd64-22.3.1.jar";
+
};
};
"wasm-installable-svm" = {
"11-linux-aarch64" = {
···
sha256 = "1cg9zxyjirfl0afr9cppg2h17j8qdidi4llbal2g5w1p2v9zq78b";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java17-linux-aarch64-22.3.1.jar";
};
+
"19-linux-aarch64" = {
+
sha256 = "1vaqf3ilp3kg280adynww4l07sbcd5hih86akpd25rbxn45khz9s";
+
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java19-linux-aarch64-22.3.1.jar";
+
};
"11-linux-amd64" = {
sha256 = "19v7jqhvijmzzb0i9q6hbvrmqnmmzbyvai3il9f357qvv6r6lylb";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java11-linux-amd64-22.3.1.jar";
···
sha256 = "0sfnsy0r4qf7ni9mh437dad1d8sidajcra2azsmy5qdmh091zhj5";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java17-linux-amd64-22.3.1.jar";
};
+
"19-linux-amd64" = {
+
sha256 = "1k7jqsh5wg7c7a6mhqgxghn20qwx70bky49p2a6imcsygnilqgim";
+
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java19-linux-amd64-22.3.1.jar";
+
};
"11-darwin-amd64" = {
sha256 = "0764d97mla5cii4iyvyb43v62dk8ff3plqjmdc69qqxx8mdzpwqv";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java11-darwin-amd64-22.3.1.jar";
···
sha256 = "1ip6ybm7p28bs2lifxqhq6fyvfm3wmacv6dqziyl2v7v7yl0iw4i";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java17-darwin-amd64-22.3.1.jar";
};
+
"19-darwin-amd64" = {
+
sha256 = "14d3djmacj81rj5sqf30z060iywndn6kw1n58kg12jvmgipbm3iq";
+
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java19-darwin-amd64-22.3.1.jar";
+
};
};
"js-installable-svm" = {
"11-linux-aarch64" = {
···
sha256 = "1kcy3mjk908zs7f3k95awp6294cwr06hand4cbw1lsnfvp0qwhk7";
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-linux-aarch64-22.3.1.jar";
};
+
"19-linux-aarch64" = {
+
sha256 = "1mk8qzdfsbjhfx0ds8rk9jm2g6g2lv8bppmnwpgrkm232c8i0dgw";
+
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java19-linux-aarch64-22.3.1.jar";
+
};
"11-linux-amd64" = {
sha256 = "0sq80a4nnvik560whgv5vwlsszi8z02idvpd92p0caf03bra9x2b";
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java11-linux-amd64-22.3.1.jar";
···
sha256 = "0fd160yxsi09m97z7vqh5kwf1g0p0hn4niy48glj9jhirfqzzw0c";
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-linux-amd64-22.3.1.jar";
};
+
"19-linux-amd64" = {
+
sha256 = "0ghx41aldb30yjd0sdrfm89i7d6q0aca18bm7j1qyg9gnmkvxnmn";
+
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java19-linux-amd64-22.3.1.jar";
+
};
"11-darwin-aarch64" = {
sha256 = "18g0xixzk45yrxv3zfs7qrdyj0b3ksp59jhbcis0vwy9gx8094wq";
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java11-darwin-aarch64-22.3.1.jar";
···
sha256 = "0cf4iivkniilvbqyniqxcz1qf49cs4lxi0axjsk9sz1zmxcq0bnk";
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-darwin-aarch64-22.3.1.jar";
};
+
"19-darwin-aarch64" = {
+
sha256 = "03wxaim069rp69njh4gdchsm3b9s7crxihbk1arvz2cpgy9x1zvc";
+
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java19-darwin-aarch64-22.3.1.jar";
+
};
"11-darwin-amd64" = {
sha256 = "0ibcz6ivx068ndf45j9pghm8qwq287glqxf0xx08kjxnhms67p52";
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java11-darwin-amd64-22.3.1.jar";
···
sha256 = "16q7whnvdrk8lb4fp96qr3p567kggyk9q5iqcn081qk8xjkbx0zv";
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-darwin-amd64-22.3.1.jar";
};
+
"19-darwin-amd64" = {
+
sha256 = "13nx6kwcx100166ba4h7h97ravw4hyiqnvhszqbdffn54y0x5dwl";
+
url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java19-darwin-amd64-22.3.1.jar";
+
};
};
"python-installable-svm" = {
"11-linux-aarch64" = {
···
sha256 = "0ggx5rwz3qnnxgz407r8yx12556pcbirhnc44972l77r320rdmqc";
url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-linux-aarch64-22.3.1.jar";
};
+
"19-linux-aarch64" = {
+
sha256 = "1d0a7didgzgn45q7zg4iidmy2gckhaf796mbraqz5hjlig4vscr7";
+
url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java19-linux-aarch64-22.3.1.jar";
+
};
"11-linux-amd64" = {
sha256 = "11c19a20v3ff83dxzs9hf1z89kh0qich41b03gx8mancf12jfwnl";
url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java11-linux-amd64-22.3.1.jar";
···
sha256 = "0pga44whhvm98d8j2v2bpl9rkbvr9bv947rc4imlbf01cyxjwl71";
url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-linux-amd64-22.3.1.jar";
};
+
"19-linux-amd64" = {
+
sha256 = "0nwa1nrclh3p12cacp98wbx9p3zhs44b8srbr27vqgc10z78c1wz";
+
url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java19-linux-amd64-22.3.1.jar";
+
};
"11-darwin-aarch64" = {
sha256 = "0qnh8i9nazrv25jhn13wp7qqm9wwhcz4kpp2ygvsdmf9s3d2f5lf";
url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java11-darwin-aarch64-22.3.1.jar";
···
sha256 = "0j13xvy9d19glipz4wdma2y02g0cnksg1iij4247fjhpqh0axkdz";
url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-darwin-aarch64-22.3.1.jar";
};
+
"19-darwin-aarch64" = {
+
sha256 = "0n7vx5lxbgpjvzv0y1fqsrk0j61vrzjm2ksh0lkdnz1zrr5mqgsh";
+
url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java19-darwin-aarch64-22.3.1.jar";
+
};
"11-darwin-amd64" = {
sha256 = "1ny5664h7pibvskmm51mlxrxkbbj2dvxsv2yqbq6v51a57wm1yzn";
url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java11-darwin-amd64-22.3.1.jar";
···
sha256 = "01jjncx8jm1yrps2nj217vgcmjaqclmpb27rdp3qn7k64w5wzipg";
url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-darwin-amd64-22.3.1.jar";
};
+
"19-darwin-amd64" = {
+
sha256 = "00agpvp1yw884lm6d88d2l8629qpbpdlik2g621yz4vf9y7qki83";
+
url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java19-darwin-amd64-22.3.1.jar";
+
};
};
"native-image-installable-svm" = {
"11-linux-aarch64" = {
···
sha256 = "03v20fc9famlnbrznpasnd5gdl5k9nl4dlj3pp6bad4y6l7rqnx5";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java17-linux-aarch64-22.3.1.jar";
};
+
"19-linux-aarch64" = {
+
sha256 = "13gg1zj7ivzrgwvyvsbwbrchryjqmi00km7jxajjjbr1k7jkdc5v";
+
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java19-linux-aarch64-22.3.1.jar";
+
};
"11-linux-amd64" = {
sha256 = "1yb7kpbs7hrzlysvrqjzgfz678p1hbg6237jzb35zmwdaczav51n";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java11-linux-amd64-22.3.1.jar";
···
sha256 = "00fbyqsj4xj9ay8bki1190lf59bgrzvla8lzzq51p53a1bdrhhmv";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java17-linux-amd64-22.3.1.jar";
};
+
"19-linux-amd64" = {
+
sha256 = "1ayx0ag00i9868xz5xzc9fmwipkhz5qsldfmxk16cxp5vi71yhb1";
+
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java19-linux-amd64-22.3.1.jar";
+
};
"11-darwin-aarch64" = {
sha256 = "1kaqvkbhj3iifq6asyrpy225a89y7klzbh7an1ycnvc2hvqkv4nz";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java11-darwin-aarch64-22.3.1.jar";
···
sha256 = "09l7x4x8yanq55v6y6wpfx94mvsq1bpbnihknjc6dnq3vcrci77n";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java17-darwin-aarch64-22.3.1.jar";
};
+
"19-darwin-aarch64" = {
+
sha256 = "0dfddqgkz9b5akpgfw7sj4sl9wwknmh7qzk3pq2dpvf6892168wb";
+
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java19-darwin-aarch64-22.3.1.jar";
+
};
"11-darwin-amd64" = {
sha256 = "036w9dmdcs46kmjqr3086mg389fgr3h1zysavfq8cbh199x0ibia";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java11-darwin-amd64-22.3.1.jar";
···
sha256 = "1hvjfvcn878bzvi944v3x23sby72hbfvg5s3zzspyc37l5cdpqi3";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java17-darwin-amd64-22.3.1.jar";
};
+
"19-darwin-amd64" = {
+
sha256 = "1829fnyz62gcnj0664hl9w3vjyb3xfc84gpnblhhdx77c9y8gf6b";
+
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java19-darwin-amd64-22.3.1.jar";
+
};
};
"graalvm-ce" = {
"11-linux-aarch64" = {
···
sha256 = "06288dwbql943nii74i9mngzb38h2nzrxzzgs346mgk2965gwm59";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java17-linux-aarch64-22.3.1.tar.gz";
};
+
"19-linux-aarch64" = {
+
sha256 = "03bakx00rl2c0hyvp5skfha57cijlpvmsnfgv2ancn3ypyqx1c4m";
+
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java19-linux-aarch64-22.3.1.tar.gz";
+
};
"11-linux-amd64" = {
sha256 = "1f6xkdnxn6xsm24sqw24rsca72wm7v6q96m23l5fng5ym0jpfm2m";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java11-linux-amd64-22.3.1.tar.gz";
···
sha256 = "0aci9i28rq5nk2qya9dcg5hxr3sgsbv7f5x8679hrjrqmrclmkrs";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java17-linux-amd64-22.3.1.tar.gz";
};
+
"19-linux-amd64" = {
+
sha256 = "0byxf2d4c3vwygjg5rbwwi22k1pv0yqjz03n8m67v2vsbs09vnbw";
+
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java19-linux-amd64-22.3.1.tar.gz";
+
};
"11-darwin-aarch64" = {
sha256 = "0cbcm9d211m4b6g1bkpfksma917lzqkl4kx38vm1nrwjkll357y5";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java11-darwin-aarch64-22.3.1.tar.gz";
···
sha256 = "1qbw3hlmqcrmd70xk56463scdxr50n66z2n3c24h68qlwwlpqc73";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java17-darwin-aarch64-22.3.1.tar.gz";
};
+
"19-darwin-aarch64" = {
+
sha256 = "09n9qz58lfwl2ag8s3n6dm11p5nnbz6gfralfyfj72wwfghcsckc";
+
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java19-darwin-aarch64-22.3.1.tar.gz";
+
};
"11-darwin-amd64" = {
sha256 = "0a12rzf99x5l29f6bwm6myk18dgnrx2c9rwmii2pm864y7azlnij";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java11-darwin-amd64-22.3.1.tar.gz";
···
sha256 = "02lclv2j3v850izh84wdvksi3d3xmgpfl7x85vzifhgsvagm6sz4";
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java17-darwin-amd64-22.3.1.tar.gz";
};
+
"19-darwin-amd64" = {
+
sha256 = "1b3r43jpgip12if1fld41qiigqgn32zqs6992ji206dxq6xwli23";
+
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java19-darwin-amd64-22.3.1.tar.gz";
+
};
};
"ruby-installable-svm" = {
"11-linux-aarch64" = {
···
sha256 = "0kh1w49yp3kpfvhqw19bbx51ay1wgzq80gsrfqax4zm5ixz4wsbz";
url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-linux-aarch64-22.3.1.jar";
};
+
"19-linux-aarch64" = {
+
sha256 = "1c3xw9h85g3p5w12zrlvl036ay3218g5405hkh7qaah00affgx5l";
+
url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java19-linux-aarch64-22.3.1.jar";
+
};
"11-linux-amd64" = {
sha256 = "0avsawgfkqbgqc2hm8zmz37qg9ag3ddni3my8g73kvzfkghsdabh";
url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java11-linux-amd64-22.3.1.jar";
···
sha256 = "1ib00pqdhzl24y97j16mm86qwrijqjnmhjmk3g5vdhyhh099vjp1";
url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-linux-amd64-22.3.1.jar";
};
+
"19-linux-amd64" = {
+
sha256 = "1j42y6gwf84xgjnawwqymxv4702gsy0vriwdfd09nbp600sjzga5";
+
url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java19-linux-amd64-22.3.1.jar";
+
};
"11-darwin-aarch64" = {
sha256 = "1im75qad89xa2nbl80csnwn56k6n11zv5g91xlkqq4xk300v1saj";
url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java11-darwin-aarch64-22.3.1.jar";
···
sha256 = "1pfzsisf4sgzxmk3r1p4apzqkwipjpf8naly3v94i5v3b5gbnczx";
url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-darwin-aarch64-22.3.1.jar";
};
+
"19-darwin-aarch64" = {
+
sha256 = "0xysf43q0zpin3lmffmb3n7y4rsm1zm19ndys1vrn8szz4jcxpsq";
+
url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java19-darwin-aarch64-22.3.1.jar";
+
};
"11-darwin-amd64" = {
sha256 = "1jfls71y92hw09s869v2qw8pypgl1fciqz3m9zcd2602hikysq6c";
url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java11-darwin-amd64-22.3.1.jar";
···
"17-darwin-amd64" = {
sha256 = "03x2h4sw72l05xxg73xj9mzzkxffbjpv8hdi59rgxxljnz0ai6rx";
url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-darwin-amd64-22.3.1.jar";
+
};
+
"19-darwin-amd64" = {
+
sha256 = "02nkjlv306wyms7swibn5rz0w8sx6pwvh1lilgvv4xnbj7wps2q7";
+
url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java19-darwin-amd64-22.3.1.jar";
};
};
}
+4
pkgs/development/compilers/graalvm/community-edition/update.sh
···
readonly platforms=(
"11-linux-aarch64"
"17-linux-aarch64"
+
"19-linux-aarch64"
"11-linux-amd64"
"17-linux-amd64"
+
"19-linux-amd64"
"11-darwin-aarch64"
"17-darwin-aarch64"
+
"19-darwin-aarch64"
"11-darwin-amd64"
"17-darwin-amd64"
+
"19-darwin-amd64"
)
info "Generating '$hashes_nix' file for 'graalvm-ce' $new_version. This will take a while..."
+1 -1
pkgs/development/libraries/science/math/openblas/default.nix
···
description = "Basic Linear Algebra Subprograms";
license = licenses.bsd3;
homepage = "https://github.com/xianyi/OpenBLAS";
-
platforms = platforms.unix;
+
platforms = attrNames configs;
maintainers = with maintainers; [ ttuegel ];
};
}
+1
pkgs/development/mobile/androidenv/.gitignore
···
/xml
local.properties
+
.android
+37 -15
pkgs/development/mobile/androidenv/compose-android-packages.nix
···
system-images = lib.flatten (map (apiVersion:
map (type:
-
map (abiVersion:
-
lib.optionals (lib.hasAttrByPath [apiVersion type abiVersion] system-images-packages) (
-
deployAndroidPackage {
-
inherit os;
-
package = system-images-packages.${apiVersion}.${type}.${abiVersion};
-
# Patch 'google_apis' system images so they're recognized by the sdk.
-
# Without this, `android list targets` shows 'Tag/ABIs : no ABIs' instead
-
# of 'Tag/ABIs : google_apis*/*' and the emulator fails with an ABI-related error.
-
patchInstructions = lib.optionalString (lib.hasPrefix "google_apis" type) ''
+
# Deploy all system images with the same systemImageType in one derivation to avoid the `null` problem below
+
# with avdmanager when trying to create an avd!
+
#
+
# ```
+
# $ yes "" | avdmanager create avd --force --name testAVD --package 'system-images;android-33;google_apis;x86_64'
+
# Error: Package path is not valid. Valid system image paths are:
+
# null
+
# ```
+
let
+
availablePackages = map (abiVersion:
+
system-images-packages.${apiVersion}.${type}.${abiVersion}
+
) (builtins.filter (abiVersion:
+
lib.hasAttrByPath [apiVersion type abiVersion] system-images-packages
+
) abiVersions);
+
+
instructions = builtins.listToAttrs (map (package: {
+
name = package.name;
+
value = lib.optionalString (lib.hasPrefix "google_apis" type) ''
+
# Patch 'google_apis' system images so they're recognized by the sdk.
+
# Without this, `android list targets` shows 'Tag/ABIs : no ABIs' instead
+
# of 'Tag/ABIs : google_apis*/*' and the emulator fails with an ABI-related error.
sed -i '/^Addon.Vendor/d' source.properties
'';
-
}
-
)
-
) abiVersions
+
}) availablePackages
+
);
+
in
+
lib.optionals (availablePackages != [])
+
(deployAndroidPackages {
+
inherit os;
+
packages = availablePackages;
+
patchesInstructions = instructions;
+
})
) systemImageTypes
) platformVersions);
···
${lib.concatMapStrings (system-image: ''
apiVersion=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*))
type=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*/*))
-
mkdir -p system-images/$apiVersion/$type
-
ln -s ${system-image}/libexec/android-sdk/system-images/$apiVersion/$type/* system-images/$apiVersion/$type
+
mkdir -p system-images/$apiVersion
+
ln -s ${system-image}/libexec/android-sdk/system-images/$apiVersion/$type system-images/$apiVersion/$type
'') images}
'';
···
You must accept the following licenses:
${lib.concatMapStringsSep "\n" (str: " - ${str}") licenseNames}
-
by setting nixpkgs config option 'android_sdk.accept_license = true;'.
+
a)
+
by setting nixpkgs config option 'android_sdk.accept_license = true;'.
+
b)
+
by an environment variable for a single invocation of the nix tools.
+
$ export NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE=1
'' else callPackage ./cmdline-tools.nix {
inherit deployAndroidPackage os cmdLineToolsVersion;
+1 -1
pkgs/development/mobile/androidenv/default.nix
···
{ config, pkgs ? import <nixpkgs> {}
-
, licenseAccepted ? config.android_sdk.accept_license or false
+
, licenseAccepted ? config.android_sdk.accept_license or (builtins.getEnv "NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE" == "1")
}:
rec {
+50 -18
pkgs/development/mobile/androidenv/emulate-app.nix
···
{ composeAndroidPackages, stdenv, lib, runtimeShell }:
{ name, app ? null
-
, platformVersion ? "16", abiVersion ? "armeabi-v7a", systemImageType ? "default"
-
, enableGPU ? false, extraAVDFiles ? []
-
, package ? null, activity ? null
-
, avdHomeDir ? null, sdkExtraArgs ? {}
+
, platformVersion ? "33"
+
, abiVersion ? "armeabi-v7a"
+
, systemImageType ? "default"
+
, enableGPU ? false
+
, extraAVDFiles ? []
+
, package ? null
+
, activity ? null
+
, androidUserHome ? null
+
, avdHomeDir ? null # Support old variable with non-standard naming!
+
, androidAvdHome ? avdHomeDir
+
, sdkExtraArgs ? {}
+
, androidAvdFlags ? null
+
, androidEmulatorFlags ? null
}:
let
sdkArgs = {
-
toolsVersion = "26.1.1";
-
platformVersions = [ platformVersion ];
includeEmulator = true;
includeSystemImages = true;
+
} // sdkExtraArgs // {
+
cmdLineToolsVersion = "8.0";
+
platformVersions = [ platformVersion ];
systemImageTypes = [ systemImageType ];
abiVersions = [ abiVersion ];
-
} // sdkExtraArgs;
+
};
sdk = (composeAndroidPackages sdkArgs).androidsdk;
in
···
export TMPDIR=/tmp
fi
-
${if avdHomeDir == null then ''
+
${if androidUserHome == null then ''
# Store the virtual devices somewhere else, instead of polluting a user's HOME directory
-
export ANDROID_SDK_HOME=$(mktemp -d $TMPDIR/nix-android-vm-XXXX)
+
export ANDROID_USER_HOME=$(mktemp -d $TMPDIR/nix-android-user-home-XXXX)
'' else ''
-
mkdir -p "${avdHomeDir}"
-
export ANDROID_SDK_HOME="${avdHomeDir}"
+
mkdir -p "${androidUserHome}"
+
export ANDROID_USER_HOME="${androidUserHome}"
+
''}
+
+
${if androidAvdHome == null then ''
+
export ANDROID_AVD_HOME=$ANDROID_USER_HOME/avd
+
'' else ''
+
mkdir -p "${androidAvdHome}"
+
export ANDROID_AVD_HOME="${androidAvdHome}"
''}
# We need to specify the location of the Android SDK root folder
export ANDROID_SDK_ROOT=${sdk}/libexec/android-sdk
+
${lib.optionalString (androidAvdFlags != null) ''
+
# If NIX_ANDROID_AVD_FLAGS is empty
+
if [[ -z "$NIX_ANDROID_AVD_FLAGS" ]]; then
+
NIX_ANDROID_AVD_FLAGS="${androidAvdFlags}"
+
fi
+
''}
+
+
${lib.optionalString (androidEmulatorFlags != null) ''
+
# If NIX_ANDROID_EMULATOR_FLAGS is empty
+
if [[ -z "$NIX_ANDROID_EMULATOR_FLAGS" ]]; then
+
NIX_ANDROID_EMULATOR_FLAGS="${androidEmulatorFlags}"
+
fi
+
''}
+
# We have to look for a free TCP port
echo "Looking for a free TCP port in range 5554-5584" >&2
for i in $(seq 5554 2 5584)
do
-
if [ -z "$(${sdk}/libexec/android-sdk/platform-tools/adb devices | grep emulator-$i)" ]
+
if [ -z "$(${sdk}/bin/adb devices | grep emulator-$i)" ]
then
port=$i
break
···
export ANDROID_SERIAL="emulator-$port"
# Create a virtual android device for testing if it does not exist
-
${sdk}/libexec/android-sdk/tools/bin/avdmanager list target
+
${sdk}/bin/avdmanager list target
-
if [ "$(${sdk}/libexec/android-sdk/tools/android list avd | grep 'Name: device')" = "" ]
+
if [ "$(${sdk}/bin/avdmanager list avd | grep 'Name: device')" = "" ]
then
# Create a virtual android device
-
yes "" | ${sdk}/libexec/android-sdk/tools/bin/avdmanager create avd -n device -k "system-images;android-${platformVersion};${systemImageType};${abiVersion}" $NIX_ANDROID_AVD_FLAGS
+
yes "" | ${sdk}/bin/avdmanager create avd --force -n device -k "system-images;android-${platformVersion};${systemImageType};${abiVersion}" -p $ANDROID_AVD_HOME $NIX_ANDROID_AVD_FLAGS
${lib.optionalString enableGPU ''
# Enable GPU acceleration
-
echo "hw.gpu.enabled=yes" >> $ANDROID_SDK_HOME/.android/avd/device.avd/config.ini
+
echo "hw.gpu.enabled=yes" >> $ANDROID_AVD_HOME/device.avd/config.ini
''}
${lib.concatMapStrings (extraAVDFile: ''
-
ln -sf ${extraAVDFile} $ANDROID_SDK_HOME/.android/avd/device.avd
+
ln -sf ${extraAVDFile} $ANDROID_AVD_HOME/device.avd
'') extraAVDFiles}
fi
# Launch the emulator
-
${sdk}/libexec/android-sdk/emulator/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS &
+
echo "\nLaunch the emulator"
+
$ANDROID_SDK_ROOT/emulator/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS &
# Wait until the device has completely booted
echo "Waiting until the emulator has booted the device and the package manager is ready..." >&2
+151
pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix
···
+
{
+
# To test your changes in androidEnv run `nix-shell android-sdk-with-emulator-shell.nix`
+
+
# If you copy this example out of nixpkgs, use these lines instead of the next.
+
# This example pins nixpkgs: https://nix.dev/tutorials/towards-reproducibility-pinning-nixpkgs.html
+
/*nixpkgsSource ? (builtins.fetchTarball {
+
name = "nixpkgs-20.09";
+
url = "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz";
+
sha256 = "1wg61h4gndm3vcprdcg7rc4s1v3jkm5xd7lw8r2f67w502y94gcy";
+
}),
+
pkgs ? import nixpkgsSource {
+
config.allowUnfree = true;
+
},
+
*/
+
+
# If you want to use the in-tree version of nixpkgs:
+
pkgs ? import ../../../../.. {
+
config.allowUnfree = true;
+
},
+
+
config ? pkgs.config
+
}:
+
+
# Copy this file to your Android project.
+
let
+
# Declaration of versions for everything. This is useful since these
+
# versions may be used in multiple places in this Nix expression.
+
android = {
+
platforms = [ "33" ];
+
systemImageTypes = [ "google_apis" ];
+
abis = [ "arm64-v8a" "x86_64" ];
+
};
+
+
# If you copy this example out of nixpkgs, something like this will work:
+
/*androidEnvNixpkgs = fetchTarball {
+
name = "androidenv";
+
url = "https://github.com/NixOS/nixpkgs/archive/<fill me in from Git>.tar.gz";
+
sha256 = "<fill me in with nix-prefetch-url --unpack>";
+
};
+
+
androidEnv = pkgs.callPackage "${androidEnvNixpkgs}/pkgs/development/mobile/androidenv" {
+
inherit config pkgs;
+
licenseAccepted = true;
+
};*/
+
+
# Otherwise, just use the in-tree androidenv:
+
androidEnv = pkgs.callPackage ./.. {
+
inherit config pkgs;
+
# You probably need to uncomment below line to express consent.
+
# licenseAccepted = true;
+
};
+
+
sdkArgs = {
+
platformVersions = android.platforms;
+
abiVersions = android.abis;
+
systemImageTypes = android.systemImageTypes;
+
+
includeSystemImages = true;
+
includeEmulator = true;
+
+
# Accepting more licenses declaratively:
+
extraLicenses = [
+
# Already accepted for you with the global accept_license = true or
+
# licenseAccepted = true on androidenv.
+
# "android-sdk-license"
+
+
# These aren't, but are useful for more uncommon setups.
+
"android-sdk-preview-license"
+
"android-googletv-license"
+
"android-sdk-arm-dbt-license"
+
"google-gdk-license"
+
"intel-android-extra-license"
+
"intel-android-sysimage-license"
+
"mips-android-sysimage-license"
+
];
+
};
+
+
androidComposition = androidEnv.composeAndroidPackages sdkArgs;
+
androidEmulator = androidEnv.emulateApp {
+
name = "android-sdk-emulator-demo";
+
sdkExtraArgs = sdkArgs;
+
};
+
androidSdk = androidComposition.androidsdk;
+
platformTools = androidComposition.platform-tools;
+
jdk = pkgs.jdk;
+
in
+
pkgs.mkShell rec {
+
name = "androidenv-demo";
+
packages = [ androidSdk platformTools androidEmulator jdk pkgs.android-studio ];
+
+
LANG = "C.UTF-8";
+
LC_ALL = "C.UTF-8";
+
JAVA_HOME = jdk.home;
+
+
# Note: ANDROID_HOME is deprecated. Use ANDROID_SDK_ROOT.
+
ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk";
+
ANDROID_NDK_ROOT = "${ANDROID_SDK_ROOT}/ndk-bundle";
+
+
shellHook = ''
+
# Write out local.properties for Android Studio.
+
cat <<EOF > local.properties
+
# This file was automatically generated by nix-shell.
+
sdk.dir=$ANDROID_SDK_ROOT
+
ndk.dir=$ANDROID_NDK_ROOT
+
EOF
+
'';
+
+
passthru.tests = {
+
+
shell-with-emulator-sdkmanager-packages-test = pkgs.runCommand "shell-with-emulator-sdkmanager-packages-test" {
+
nativeBuildInputs = [ androidSdk jdk ];
+
} ''
+
output="$(sdkmanager --list)"
+
installed_packages_section=$(echo "''${output%%Available Packages*}" | awk 'NR>4 {print $1}')
+
echo "installed_packages_section: ''${installed_packages_section}"
+
+
packages=(
+
"build-tools;33.0.1" "cmdline-tools;8.0" \
+
"emulator" "patcher;v4" "platform-tools" "platforms;android-33" \
+
"system-images;android-33;google_apis;arm64-v8a" \
+
"system-images;android-33;google_apis;x86_64"
+
)
+
+
for package in "''${packages[@]}"; do
+
if [[ ! $installed_packages_section =~ "$package" ]]; then
+
echo "$package package was not installed."
+
exit 1
+
fi
+
done
+
+
touch "$out"
+
'';
+
+
shell-with-emulator-avdmanager-create-avd-test = pkgs.runCommand "shell-with-emulator-avdmanager-create-avd-test" {
+
nativeBuildInputs = [ androidSdk androidEmulator jdk ];
+
} ''
+
avdmanager delete avd -n testAVD || true
+
echo "" | avdmanager create avd --force --name testAVD --package 'system-images;android-33;google_apis;x86_64'
+
result=$(avdmanager list avd)
+
+
if [[ ! $result =~ "Name: testAVD" ]]; then
+
echo "avdmanager couldn't create the avd! The output is :''${result}"
+
exit 1
+
fi
+
+
avdmanager delete avd -n testAVD || true
+
touch "$out"
+
'';
+
};
+
}
+
+8 -6
pkgs/development/mobile/androidenv/examples/shell.nix
···
# Otherwise, just use the in-tree androidenv:
androidEnv = pkgs.callPackage ./.. {
inherit config pkgs;
-
licenseAccepted = true;
+
# You probably need to uncomment below line to express consent.
+
# licenseAccepted = true;
};
androidComposition = androidEnv.composeAndroidPackages {
···
'';
passthru.tests = {
-
sdkmanager-licenses-test = pkgs.runCommand "sdkmanager-licenses-test" {
-
buildInputs = [ androidSdk jdk ];
+
+
shell-sdkmanager-licenses-test = pkgs.runCommand "shell-sdkmanager-licenses-test" {
+
nativeBuildInputs = [ androidSdk jdk ];
} ''
if [[ ! "$(sdkmanager --licenses)" =~ "All SDK package licenses accepted." ]]; then
echo "At least one of SDK package licenses are not accepted."
···
touch $out
'';
-
sdkmanager-packages-test = pkgs.runCommand "sdkmanager-packages-test" {
-
buildInputs = [ androidSdk jdk ];
+
shell-sdkmanager-packages-test = pkgs.runCommand "shell-sdkmanager-packages-test" {
+
nativeBuildInputs = [ androidSdk jdk ];
} ''
output="$(sdkmanager --list)"
installed_packages_section=$(echo "''${output%%Available Packages*}" | awk 'NR>4 {print $1}')
packages=(
-
"build-tools;30.0.3" "ndk-bundle" "platform-tools" \
+
"build-tools;30.0.3" "platform-tools" \
"platforms;android-23" "platforms;android-24" "platforms;android-25" "platforms;android-26" \
"platforms;android-27" "platforms;android-28" "platforms;android-29" "platforms;android-30" \
"platforms;android-31" "platforms;android-32" "platforms;android-33" \
+9 -6
pkgs/development/mobile/androidenv/test-suite.nix
···
-
{ stdenv, callPackage }:
+
{callPackage, lib, stdenv}:
let
examples-shell = callPackage ./examples/shell.nix {};
+
examples-shell-with-emulator = callPackage ./examples/shell-with-emulator.nix {};
+
all-tests = examples-shell.passthru.tests //
+
examples-shell-with-emulator.passthru.tests;
in
stdenv.mkDerivation {
name = "androidenv-test-suite";
+
buidInputs = lib.mapAttrsToList (name: value: value) all-tests;
-
src = ./.;
+
buildCommand = ''
+
touch $out
+
'';
-
dontConfigure = true;
-
dontBuild = true;
-
-
passthru.tests = { } // examples-shell.passthru.tests;
+
passthru.tests = all-tests;
meta.timeout = 60;
}
+2 -2
pkgs/development/python-modules/aiolifx-themes/default.nix
···
buildPythonPackage rec {
pname = "aiolifx-themes";
-
version = "0.4.1";
+
version = "0.4.2";
format = "pyproject";
disabled = pythonOlder "3.9";
···
owner = "Djelibeybi";
repo = "aiolifx-themes";
rev = "refs/tags/v${version}";
-
hash = "sha256-ND+0jukCU3jB34Sf4qAZg/+pyXVCoIoMqOoBW7srCSQ=";
+
hash = "sha256-6bbhjmtgGEifYmtgXrnsCF36oU+jJDmHMPPEO5a7AKQ=";
};
prePatch = ''
+2 -2
pkgs/development/python-modules/asyncwhois/default.nix
···
buildPythonPackage rec {
pname = "asyncwhois";
-
version = "1.0.3";
+
version = "1.0.4";
format = "setuptools";
disabled = pythonOlder "3.7";
···
owner = "pogzyb";
repo = pname;
rev = "refs/tags/v${version}";
-
hash = "sha256-h2RAUedcVTlX/DmaXewSQfw9gb0rE8NG9hdNe+exqqk=";
+
hash = "sha256-ygpmm0CF+L871CpHZEmzdJQvin1uYZMb7kkilrom1YU=";
};
propagatedBuildInputs = [
+71
pkgs/development/python-modules/ctap-keyring-device/default.nix
···
+
{ lib
+
, buildPythonPackage
+
, fetchPypi
+
, pythonRelaxDepsHook
+
, setuptools-scm
+
# install requirements
+
, fido2
+
, keyring
+
, cryptography
+
# test requirements
+
, pytestCheckHook
+
}:
+
+
let
+
fido2_0 = fido2.overridePythonAttrs (oldAttrs: rec {
+
version = "0.9.3";
+
src = fetchPypi {
+
inherit (oldAttrs) pname;
+
inherit version;
+
hash = "sha256-tF6JphCc/Lfxu1E3dqotZAjpXEgi+DolORi5RAg0Zuw=";
+
};
+
});
+
in
+
buildPythonPackage rec {
+
pname = "ctap-keyring-device";
+
version = "1.0.6";
+
+
src = fetchPypi {
+
inherit version pname;
+
sha256 = "sha256-pEJkuz0wxKt2PkowmLE2YC+HPYa2ZiENK7FAW14Ec/Y=";
+
};
+
+
# removing optional dependency needing pyobjc
+
postPatch = ''
+
substituteInPlace pytest.ini \
+
--replace "--flake8 --black --cov" ""
+
'';
+
+
nativeBuildInputs = [
+
pythonRelaxDepsHook
+
setuptools-scm
+
];
+
+
pythonRemoveDeps = [
+
# This is a darwin requirement missing pyobjc
+
"pyobjc-framework-LocalAuthentication"
+
];
+
+
propagatedBuildInputs = [
+
keyring
+
fido2_0
+
cryptography
+
];
+
+
pythonImportsCheck = [ "ctap_keyring_device" ];
+
+
checkInputs = [ pytestCheckHook ];
+
+
disabledTests = [
+
# Disabled tests that needs pyobjc or windows
+
"touch_id_ctap_user_verifier"
+
"windows_hello_ctap_user_verifier"
+
];
+
+
meta = with lib; {
+
description = "CTAP (client-to-authenticator-protocol) device backed by python's keyring library";
+
homepage = "https://github.com/dany74q/ctap-keyring-device";
+
license = licenses.mit;
+
maintainers = with maintainers; [ dennajort ];
+
};
+
}
+2 -2
pkgs/development/python-modules/datasets/default.nix
···
buildPythonPackage rec {
pname = "datasets";
-
version = "2.10.0";
+
version = "2.10.1";
format = "setuptools";
disabled = pythonOlder "3.7";
···
owner = "huggingface";
repo = pname;
rev = "refs/tags/${version}";
-
hash = "sha256-GEH7uk8M5pxYDKzfTRNMlnI5yrLr5K2PuD7CJV/wbu4=";
+
hash = "sha256-CLzEJchNKmwfN1ZRQfCFusXDSgvHilwnM0KkcX822MI=";
};
postPatch = ''
+2 -2
pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix
···
buildPythonPackage rec {
pname = "google-cloud-bigquery-storage";
-
version = "2.18.1";
+
version = "2.19.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
-
hash = "sha256-XNPeWe8nYGmJr/MVxt0uBZMf0N2QEp5hYge0RJRWUqA=";
+
hash = "sha256-5bsOrT4IIrxOnPIpvR0T1MOPGeUNU6odcKs82aN8B8I=";
};
propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/google-cloud-datastore/default.nix
···
buildPythonPackage rec {
pname = "google-cloud-datastore";
-
version = "2.13.2";
+
version = "2.14.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
-
hash = "sha256-ikstW53KrRr4vnmtbr0AOG8/kHaF8excJFbwclhCA7A=";
+
hash = "sha256-00SlS6iL65Z2N6tgNEaIcQ09WB8Jy8emOwlaZoKjNgA=";
};
propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/google-cloud-secret-manager/default.nix
···
buildPythonPackage rec {
pname = "google-cloud-secret-manager";
-
version = "2.15.1";
+
version = "2.16.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
-
hash = "sha256-0ubTvpHT6HfCg5lfdbzAnP77oWPZw2N78qZs6tGim6M=";
+
hash = "sha256-O1K5qd82o+PnzWZ40GC+0PSgWzZvp5hl7ImFxRgx5Ww=";
};
propagatedBuildInputs = [
+16 -7
pkgs/development/python-modules/guessit/default.nix
···
buildPythonPackage rec {
pname = "guessit";
-
version = "3.5.0";
+
version = "3.7.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
-
hash = "sha256-eiaeOlfMBz5htWJZiT6rPFwC0a2Ky8iuLnjF6DnxELw=";
+
hash = "sha256-LBjZgu5tsw211ZVXrdAySitJvzlAp1KUdRBjKitYo8E=";
};
propagatedBuildInputs = [
rebulk
babelfish
python-dateutil
-
] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
+
] ++ lib.optionals (pythonOlder "3.9") [
+
importlib-resources
+
];
-
nativeCheckInputs = [ py pytestCheckHook pytest-mock pytest-benchmark pyyaml ];
+
nativeCheckInputs = [
+
py
+
pytestCheckHook
+
pytest-mock
+
pytest-benchmark
+
pyyaml
+
];
pytestFlagsArray = [ "--benchmark-disable" ];
pythonImportsCheck = [ "guessit" ];
-
meta = {
-
homepage = "https://doc.guessit.io/";
+
meta = with lib; {
description = "A Python library that extracts as much information as possible from a video filename";
+
homepage = "https://guessit-io.github.io/guessit/";
changelog = "https://github.com/guessit-io/guessit/raw/v${version}/CHANGELOG.md";
-
license = lib.licenses.lgpl3Only;
+
license = licenses.lgpl3Only;
+
maintainers = with maintainers; [ ];
};
}
+74
pkgs/development/python-modules/okta/default.nix
···
+
{ lib
+
, stdenv
+
, buildPythonPackage
+
, fetchPypi
+
# install requirements
+
, pycryptodome
+
, yarl
+
, flatdict
+
, python-jose
+
, aenum
+
, aiohttp
+
, pydash
+
, xmltodict
+
, pyyaml
+
# test requirements
+
, pytestCheckHook
+
, pytest-recording
+
, pytest-asyncio
+
, pytest-mock
+
, pyfakefs
+
}:
+
+
buildPythonPackage rec {
+
pname = "okta";
+
version = "2.8.0";
+
+
src = fetchPypi {
+
inherit pname version;
+
sha256 = "sha256-yIVJoKX9b9Y7Ydl28twHxgPbUa58LJ12Oz3tvpU7CAc=";
+
};
+
+
propagatedBuildInputs = [
+
pycryptodome
+
yarl
+
flatdict
+
python-jose
+
aenum
+
aiohttp
+
pydash
+
xmltodict
+
pyyaml
+
];
+
+
checkInputs = [
+
pytestCheckHook
+
pytest-asyncio
+
pytest-mock
+
pytest-recording
+
pyfakefs
+
];
+
+
pytestFlagsArray = [ "tests/" ];
+
+
disabledTests = [
+
"test_client_raise_exception"
+
];
+
+
pythonImportsCheck = [
+
"okta"
+
"okta.cache"
+
"okta.client"
+
"okta.exceptions"
+
"okta.http_client"
+
"okta.models"
+
"okta.request_executor"
+
];
+
+
meta = with lib; {
+
description = "Python SDK for the Okta Management API";
+
homepage = "https://github.com/okta/okta-sdk-python";
+
license = licenses.asl20;
+
maintainers = with maintainers; [ dennajort ];
+
};
+
}
+4 -3
pkgs/development/python-modules/openai/default.nix
···
buildPythonPackage rec {
pname = "openai";
-
version = "0.26.5";
+
version = "0.27.0";
format = "setuptools";
disabled = pythonOlder "3.7.1";
···
src = fetchFromGitHub {
owner = "openai";
repo = "openai-python";
-
rev = "v${version}";
-
hash = "sha256-eKU+WRFf7f1yH63vcoQ9dVeqhJXBqMJGpk/9AoEgR0M=";
+
rev = "refs/tags/v${version}";
+
hash = "sha256-pXttGvnApYuwkWU7kCDNjw0rjHD5AyUvujfvpDVjgxM=";
};
propagatedBuildInputs = [
···
meta = with lib; {
description = "Python client library for the OpenAI API";
homepage = "https://github.com/openai/openai-python";
+
changelog = "https://github.com/openai/openai-python/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ malo ];
};
+12 -17
pkgs/development/python-modules/pint-pandas/default.nix
···
{ stdenv
, lib
, buildPythonPackage
-
, fetchPypi
+
, fetchFromGitHub
, fetchpatch
-
, setuptools-scm
+
, setuptools
, pint
, pandas
, pytestCheckHook
}:
-
buildPythonPackage rec {
+
buildPythonPackage {
pname = "pint-pandas";
-
version = "0.2";
+
# Latest release contains bugs and failing tests.
+
version = "unstable-2022-11-24";
+
format = "pyproject";
-
src = fetchPypi {
-
pname = "Pint-Pandas";
-
inherit version;
-
sha256 = "sha256-b2DS6ArBAuD5St25IG4PbMpe5C8Lf4kw2MeYAC5B+oc=";
+
src = fetchFromGitHub {
+
owner = "hgrecco";
+
repo = "pint-pandas";
+
rev = "c58a7fcf9123eb65f5e78845077b205e20279b9d";
+
hash = "sha256-gMZNJSJxtSZvgU4o71ws5ZA6tgD2M5c5oOrn62DRyMI=";
};
-
patches = [
-
# Fixes a failing test, see: https://github.com/hgrecco/pint-pandas/issues/107
-
(fetchpatch{
-
url = "https://github.com/hgrecco/pint-pandas/commit/4c31e25609af968665ee60d019b9b5366f328680.patch";
-
sha256 = "vIT0LI4S73D4MBfGI8vtCZAM+Zb4PZ4E3xfpGKNyA4I=";
-
})
-
];
-
nativeBuildInputs = [
-
setuptools-scm
+
setuptools
];
propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/pontos/default.nix
···
buildPythonPackage rec {
pname = "pontos";
-
version = "23.3.1";
+
version = "23.3.3";
format = "pyproject";
disabled = pythonOlder "3.7";
···
owner = "greenbone";
repo = pname;
rev = "refs/tags/v${version}";
-
hash = "sha256-00vIdNiiUmvPevGAUAgaxo8tKICPbAt9byJrSySogPY=";
+
hash = "sha256-Wd02dlRIRBBJ2cKNxIZxOoWjp1aPxqmc37tvUbc/pJk=";
};
nativeBuildInputs = [
+39 -11
pkgs/development/python-modules/pybigwig/default.nix
···
{ lib
, buildPythonPackage
-
, fetchPypi
-
, pytest
+
, fetchFromGitHub
, numpy
+
, pytestCheckHook
+
, pythonOlder
, zlib
}:
buildPythonPackage rec {
-
pname = "pyBigWig";
-
version = "0.3.18";
+
pname = "pybigwig";
+
version = "0.3.20";
+
format = "setuptools";
-
src = fetchPypi {
-
inherit pname version;
-
sha256 = "4c2a8c571b4100ad7c4c318c142eb48558646be52aaab28215a70426f5be31bc";
+
disabled = pythonOlder "3.7";
+
+
src = fetchFromGitHub {
+
owner = "deeptools";
+
repo = "pyBigWig";
+
rev = "refs/tags/${version}";
+
hash = "sha256-uYKxM0HOG4fus5geBFjbfbv6G1kDvMaAwhk0w/e1YII=";
};
-
buildInputs = [ zlib ];
+
buildInputs = [
+
zlib
+
];
-
nativeCheckInputs = [ numpy pytest ];
+
nativeCheckInputs = [
+
numpy
+
pytestCheckHook
+
];
+
+
pythonImportsCheck = [
+
"pyBigWig"
+
];
+
+
pytestFlagsArray = [
+
"pyBigWigTest/test*.py"
+
];
+
+
disabledTests = [
+
# Test file is donwloaded from GitHub
+
"testAll"
+
"testBigBed"
+
"testFoo"
+
"testNumpyValues"
+
];
meta = with lib; {
-
homepage = "https://github.com/deeptools/pyBigWig";
description = "File access to bigBed files, and read and write access to bigWig files";
longDescription = ''
-
A python extension, written in C, for quick access to bigBed files
+
A Python extension, written in C, for quick access to bigBed files
and access to and creation of bigWig files. This extension uses
libBigWig for local and remote file access.
'';
+
homepage = "https://github.com/deeptools/pyBigWig";
+
changelog = "https://github.com/deeptools/pyBigWig/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ scalavision ];
};
+2 -2
pkgs/development/python-modules/pybravia/default.nix
···
buildPythonPackage rec {
pname = "pybravia";
-
version = "0.3.1";
+
version = "0.3.2";
format = "pyproject";
disabled = pythonOlder "3.8";
···
owner = "Drafteed";
repo = pname;
rev = "v${version}";
-
hash = "sha256-aY+G4e2uq2yWUkJ9CXnOhc5S57kkMB36N/x+iQDCivo=";
+
hash = "sha256-4TeUPJlNlmZxf1Tw62m5KjoTNHGt6wCSjKixkJBeGyw=";
};
nativeBuildInputs = [
+64
pkgs/development/python-modules/pytest-recording/default.nix
···
+
{ lib
+
, stdenv
+
, buildPythonPackage
+
, fetchFromGitHub
+
# install dependencies
+
, pytest
+
, vcrpy
+
, attrs
+
# test dependencies
+
, pytestCheckHook
+
, pytest-httpbin
+
, pytest-mock
+
, requests
+
}:
+
+
buildPythonPackage rec {
+
pname = "pytest-recording";
+
version = "0.12.2";
+
+
src = fetchFromGitHub {
+
owner = "kiwicom";
+
repo = "pytest-recording";
+
rev = "v${version}";
+
hash = "sha256-nivwxaW8AIrBtPkzPJYfxlPxWn2NuYcaMry/IrBnnl0=";
+
};
+
+
buildInputs = [
+
pytest
+
];
+
+
propagatedBuildInputs = [
+
vcrpy
+
attrs
+
];
+
+
checkInputs = [
+
pytestCheckHook
+
pytest-httpbin
+
pytest-mock
+
requests
+
];
+
+
disabledTests = [
+
"test_block_network_with_allowed_hosts"
+
] ++ lib.optionals stdenv.isDarwin [
+
# Missing socket.AF_NETLINK
+
"test_other_socket"
+
];
+
+
pytestFlagsArray = [
+
"tests"
+
];
+
+
pythonImportsCheck = [
+
"pytest_recording"
+
];
+
+
meta = with lib; {
+
description = "A pytest plugin that allows you recording of network interactions via VCR.py";
+
homepage = "https://github.com/kiwicom/pytest-recording";
+
license = licenses.mit;
+
maintainers = with maintainers; [ dennajort ];
+
};
+
}
+1
pkgs/development/python-modules/viv-utils/default.nix
···
meta = with lib; {
description = "Utilities for working with vivisect";
homepage = "https://github.com/williballenthin/viv-utils";
+
changelog = "https://github.com/williballenthin/viv-utils/releases/tag/v${version}";
license = licenses.asl20;
maintainers = teams.determinatesystems.members;
};
+2 -2
pkgs/development/python-modules/weconnect-mqtt/default.nix
···
buildPythonPackage rec {
pname = "weconnect-mqtt";
-
version = "0.42.2";
+
version = "0.42.3";
format = "setuptools";
disabled = pythonOlder "3.8";
···
owner = "tillsteinbach";
repo = "WeConnect-mqtt";
rev = "refs/tags/v${version}";
-
hash = "sha256-dPG714a/GPNPs7h/ubLA+KI2hB5gFf5UDNwhhMyqJlc=";
+
hash = "sha256-TEB2UtXH73CCJhbuQjnABcG3XLHB6VybDwjhixnpt0w=";
};
postPatch = ''
+2 -2
pkgs/development/python-modules/weconnect/default.nix
···
buildPythonPackage rec {
pname = "weconnect";
-
version = "0.54.1";
+
version = "0.54.2";
format = "setuptools";
disabled = pythonOlder "3.8";
···
owner = "tillsteinbach";
repo = "WeConnect-python";
rev = "refs/tags/v${version}";
-
hash = "sha256-WNvEcx+Ut4CtL2L81u5fCfmZoi+5hi/CbB9mfrG8Hm4=";
+
hash = "sha256-Zjh4rWnpzzBZFQRZIoceeIn4DYn0/HqLLZFhc57yhLQ=";
};
propagatedBuildInputs = [
+5 -2
pkgs/development/quickemu/default.nix
···
util-linux
unzip
socat
-
spice-gtk
swtpm
wget
xdg-user-dirs
···
install -Dm755 -t "$out/bin" macrecovery quickemu quickget windowskey
+
# spice-gtk needs to be put in suffix so that when virtualisation.spiceUSBRedirection
+
# is enabled, the wrapped spice-client-glib-usb-acl-helper is used
for f in macrecovery quickget quickemu windowskey; do
-
wrapProgram $out/bin/$f --prefix PATH : "${lib.makeBinPath runtimePaths}"
+
wrapProgram $out/bin/$f \
+
--prefix PATH : "${lib.makeBinPath runtimePaths}" \
+
--suffix PATH : "${lib.makeBinPath [ spice-gtk ]}"
done
runHook postInstall
+2 -2
pkgs/os-specific/linux/kernel/linux-4.19.nix
···
with lib;
buildLinux (args // rec {
-
version = "4.19.274";
+
version = "4.19.275";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
···
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-
sha256 = "1a2w6knszfqg7ilnvxrs0kbgcviq90iqw9wp2d6y3qy9jfhnb8k4";
+
sha256 = "02l6f5y1cbjc9997lmcak5j8dllkzr8q47nqscqsyvz2c2hnzsdg";
};
} // (args.argsOverride or {}))
+2 -2
pkgs/os-specific/linux/kernel/linux-5.10.nix
···
with lib;
buildLinux (args // rec {
-
version = "5.10.170";
+
version = "5.10.172";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
···
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-
sha256 = "0pw2jnsnq2yxxvl4dkx6f7a8gczj8l484qpd4ibw737vprv1idd2";
+
sha256 = "1c9757gma0dksd1ch8pljbsmf586bq66gxqpsv53676z8kivl3gj";
};
} // (args.argsOverride or {}))
+2 -2
pkgs/os-specific/linux/kernel/linux-5.15.nix
···
with lib;
buildLinux (args // rec {
-
version = "5.15.96";
+
version = "5.15.97";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
···
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-
sha256 = "167g34xjbqxr5klqp127j2j15pms4jmgs0y7gr8zipiz2i69g39l";
+
sha256 = "1cxk1w43apw2b6w6r8m1magz08qzlljzn8ihn42jgamyn7sddp9c";
};
} // (args.argsOverride or { }))
+2 -2
pkgs/os-specific/linux/kernel/linux-5.4.nix
···
with lib;
buildLinux (args // rec {
-
version = "5.4.233";
+
version = "5.4.234";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
···
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-
sha256 = "09vnp4qcv7kwahbbvjznnv7pxq1cvbn11n0rn5rzx97jnia5f7js";
+
sha256 = "1489jnp4vb8p879hq1nx3xgyzjdwj1zalk3x4vcbnc9f7yrrrixc";
};
} // (args.argsOverride or {}))
+2 -2
pkgs/os-specific/linux/kernel/linux-6.1.nix
···
with lib;
buildLinux (args // rec {
-
version = "6.1.14";
+
version = "6.1.15";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
···
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
-
sha256 = "03c1pszgm0qwwz7l5fnmbr6ank632bsl81pdx48svizy3q0pcw52";
+
sha256 = "1zf48h34cz4chv0n12xlif0n7fdzbri2v8am1nn68bla2vidy5ic";
};
} // (args.argsOverride or { }))
+2 -2
pkgs/os-specific/linux/kernel/linux-6.2.nix
···
with lib;
buildLinux (args // rec {
-
version = "6.2.1";
+
version = "6.2.2";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
···
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
-
sha256 = "0d154mps5967mgl8sxls6x5nw2ya1pmvxyahiwacx90fr7hhgk1g";
+
sha256 = "1c5zxkpahg92as14h8j2yilc4302w6g98zkjawsfh68fpfi5a9y1";
};
} // (args.argsOverride or { }))
+3 -3
pkgs/os-specific/linux/kernel/linux-rt-5.15.nix
···
, ... } @ args:
let
-
version = "5.15.95-rt60"; # updated by ./update-rt.sh
+
version = "5.15.96-rt61"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
···
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-
sha256 = "06s4aqkk26fph8hm15m7cssjrwa5y7cqy9y2znfnf0w8sbqd2wga";
+
sha256 = "167g34xjbqxr5klqp127j2j15pms4jmgs0y7gr8zipiz2i69g39l";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-
sha256 = "0plz9zcibhpqsrapykvvqqhz0i2sy7wrjd3jsypvia6j3vghrz4s";
+
sha256 = "1s6h80q4sddnsxjx4ilc52j4kvxwbzj638rbh7wwxvknh21vkwvl";
};
}; in [ rt-patch ] ++ kernelPatches;
+3 -3
pkgs/servers/endlessh-go/default.nix
···
buildGoModule rec {
pname = "endlessh-go";
-
version = "20221012";
+
version = "20230211";
src = fetchFromGitHub {
owner = "shizunge";
repo = "endlessh-go";
rev = version;
-
sha256 = "sha256-qgwOaqRyMiN3+vnwzwNet7jMQzgmFb09AVfYFwCAQJI=";
+
sha256 = "sha256-hG+WIp7JzlHVHjVUouPoocRLpwxWl6hpNorMvc4MsWM=";
};
-
vendorSha256 = "sha256-8W0yh+/FPIf6M5JipwbpLseKEdo4uVRmtsYYqfkwENU=";
+
vendorHash = "sha256-zhkQ3v8oN0hu3siu7yVxsFVTnNvJV59tHGpfXZzE+O4=";
ldflags = [ "-s" "-w" ];
+9 -20
pkgs/servers/pleroma/default.nix
···
beamPackages.mixRelease rec {
pname = "pleroma";
-
version = "2.5.0";
+
version = "2.5.1";
src = fetchFromGitLab {
domain = "git.pleroma.social";
owner = "pleroma";
repo = "pleroma";
rev = "v${version}";
-
sha256 = "sha256-Pry3eEUvrGUXK+x4et7DMbSxz9Mh/o5L0/Mh728mv1U=";
+
sha256 = "sha256-3iG2s7jVEnhq1kLLgtaHnFmLYBO2Xr5M5jjZfSNA9z4=";
};
stripDebug = false;
···
majic = prev.majic.override {
buildInputs = [ file ];
};
-
crypt = beamPackages.buildRebar3 rec {
-
name = "crypt";
-
version = "1.0.0";
-
-
src = fetchFromGitHub {
-
owner = "msantos";
-
repo = "crypt";
-
rev = "f75cd55325e33cbea198fb41fe41871392f8fb76";
-
sha256 = "sha256-ZYhZTe7cTITkl8DZ4z2IOlxTX5gnbJImu/lVJ2ZjR1o=";
-
};
-
-
postInstall = "mv $out/lib/erlang/lib/crypt-${version}/priv/{source,crypt}.so";
-
-
beamDeps = with final; [ elixir_make ];
-
-
buildInputs = [ libxcrypt ];
-
};
-
# Some additional build inputs and build fixes
http_signatures = prev.http_signatures.override {
patchPhase = ''
···
mkdir config
cp ${cfgFile} config/config.exs
'';
+
};
+
+
crypt = let
+
version = prev.crypt.version;
+
in prev.crypt.override {
+
buildInputs = [ libxcrypt ];
+
postInstall = "mv $out/lib/erlang/lib/crypt-${version}/priv/{hex-source-crypt-${version},crypt}.so";
};
});
};
+19 -6
pkgs/servers/pleroma/mix.nix
···
beamDeps = [ ecto ];
};
+
crypt = buildRebar3 rec {
+
name = "crypt";
+
version = "1.0.1";
+
+
src = fetchHex {
+
pkg = "${name}";
+
version = "${version}";
+
sha256 = "10ir7nsa0dkn5jr0w9x2m38jc73aym7llz2pnkwxk9f747izz3cn";
+
};
+
+
beamDeps = [];
+
};
+
custom_base = buildMix rec {
name = "custom_base";
version = "0.2.1";
···
earmark = buildMix rec {
name = "earmark";
-
version = "1.4.18";
+
version = "1.4.22";
src = fetchHex {
pkg = "${name}";
version = "${version}";
-
sha256 = "0q15ypgdr94z425dxb3blp6wqzrphsg1b6wscsfd13lmldnkpb2p";
+
sha256 = "1yzx2j48cxny7l8ap1jgq2qiz1kiq6q8cwiismvgshjscr2m3bqw";
};
beamDeps = [ earmark_parser ];
···
earmark_parser = buildMix rec {
name = "earmark_parser";
-
version = "1.4.17";
+
version = "1.4.29";
src = fetchHex {
pkg = "${name}";
version = "${version}";
-
sha256 = "08r06hp1wwfbfpalqqxwpq9lsd42pwvmhjr6bcb1r9pckyfchfpr";
+
sha256 = "00rmqvf3hkxfvkijqd624n0hn1xqims8h211xmm02fdi7qdsy0j9";
};
beamDeps = [];
···
linkify = buildMix rec {
name = "linkify";
-
version = "0.5.2";
+
version = "0.5.3";
src = fetchHex {
pkg = "${name}";
version = "${version}";
-
sha256 = "11mbbqm7yi6rhza5d2hd4fxkhdy3ik5n7sybj0n9bn0q09lsqwcd";
+
sha256 = "0xw14ls480jzha9fx4lxd40dff4xx82w1h87dr82az6lfw9mmwry";
};
beamDeps = [];
+17 -15
pkgs/shells/nushell/default.nix
···
, Security
, nghttp2
, libgit2
-
, withExtraFeatures ? true
+
, doCheck ? true
+
, withDefaultFeatures ? true
+
, additionalFeatures ? (p: p)
, testers
, nushell
, nix-update-script
}:
-
rustPlatform.buildRustPackage rec {
-
pname = "nushell";
-
version = "0.75.0";
+
rustPlatform.buildRustPackage (
+
let
+
version = "0.76.0";
+
pname = "nushell";
+
in {
+
inherit version pname;
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
-
sha256 = "sha256-u8/SvuR/RpJaBX4Dr3Onrk0AVpIAeVb+399+NUpgkfI=";
+
sha256 = "sha256-dGsnbKsg0nQFFXZDRDei2uGhGWEQSeSHGpXJp+8QUC8=";
};
-
cargoSha256 = "sha256-hnSumfZd9ylEx3dkTGW2s4VSv107MHOn21ytOcimhPw=";
-
-
# enable pkg-config feature of zstd
-
cargoPatches = [ ./zstd-pkg-config.patch ];
+
cargoSha256 = "sha256-9oXMojQA4tSoIxY1lwMPGhQz3WHcxEKtwl+4LsAYbDo=";
nativeBuildInputs = [ pkg-config ]
-
++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ]
+
++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ]
++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ];
buildInputs = [ openssl zstd ]
++ lib.optionals stdenv.isDarwin [ zlib libiconv Libsystem Security ]
-
++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ xorg.libX11 ]
-
++ lib.optionals (withExtraFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ];
+
++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ xorg.libX11 ]
+
++ lib.optionals (withDefaultFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ];
-
buildFeatures = lib.optional withExtraFeatures "extra";
+
buildFeatures = additionalFeatures [ (lib.optional withDefaultFeatures "default") ];
# TODO investigate why tests are broken on darwin
# failures show that tests try to write to paths
# outside of TMPDIR
-
doCheck = ! stdenv.isDarwin;
+
doCheck = doCheck && !stdenv.isDarwin;
checkPhase = ''
runHook preCheck
···
};
updateScript = nix-update-script { };
};
-
}
+
})
-31
pkgs/shells/nushell/zstd-pkg-config.patch
···
-
diff --git a/Cargo.lock b/Cargo.lock
-
index 7376ffe6a..a7d3335cc 100644
-
--- a/Cargo.lock
-
+++ b/Cargo.lock
-
@@ -2751,6 +2751,7 @@ dependencies = [
-
"which",
-
"windows",
-
"winreg",
-
+ "zstd",
-
]
-
-
[[package]]
-
@@ -5881,4 +5882,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
-
dependencies = [
-
"cc",
-
"libc",
-
+ "pkg-config",
-
]
-
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
-
index d293f3e39..a462d67dc 100644
-
--- a/crates/nu-command/Cargo.toml
-
+++ b/crates/nu-command/Cargo.toml
-
@@ -93,6 +93,8 @@ wax = { version = "0.5.0", features = ["diagnostics"] }
-
rusqlite = { version = "0.28.0", features = ["bundled"], optional = true }
-
sqlparser = { version = "0.23.0", features = ["serde"], optional = true }
-
-
+zstd = { version = "*", features = [ "pkg-config" ] }
-
+
-
[target.'cfg(windows)'.dependencies]
-
winreg = "0.10.1"
-
+106
pkgs/tools/admin/gimme-aws-creds/default.nix
···
+
{ lib
+
, python3
+
, fetchFromGitHub
+
, nix-update-script
+
, testers
+
, gimme-aws-creds
+
}:
+
+
let
+
python = python3.override {
+
packageOverrides = self: super: {
+
fido2 = super.fido2.overridePythonAttrs (oldAttrs: rec {
+
version = "0.9.3";
+
src = self.fetchPypi {
+
inherit (oldAttrs) pname;
+
inherit version;
+
hash = "sha256-tF6JphCc/Lfxu1E3dqotZAjpXEgi+DolORi5RAg0Zuw=";
+
};
+
});
+
+
okta = super.okta.overridePythonAttrs (oldAttrs: rec {
+
version = "0.0.4";
+
src = self.fetchPypi {
+
inherit (oldAttrs) pname;
+
inherit version;
+
hash = "sha256-U+eSxo02hP9BQLTLHAKvOCEJA2j4EQ/eVMC9tjhEkzI=";
+
};
+
propagatedBuildInputs = [
+
self.six
+
self.python-dateutil
+
self.requests
+
];
+
pythonImportsCheck = [ "okta" ];
+
doCheck = false; # no tests were included with this version
+
});
+
};
+
};
+
in
+
python.pkgs.buildPythonApplication rec {
+
pname = "gimme-aws-creds";
+
version = "2.5.0"; # N.B: if you change this, check if overrides are still up-to-date
+
format = "setuptools";
+
+
src = fetchFromGitHub {
+
owner = "Nike-Inc";
+
repo = "gimme-aws-creds";
+
rev = "v${version}";
+
hash = "sha256-rU4guBXRRJOG3/JilvEF9DwXM5z2IUV80qj3YcV8Z/I=";
+
};
+
+
nativeBuildInputs = with python.pkgs; [
+
pythonRelaxDepsHook
+
];
+
+
pythonRemoveDeps = [
+
"configparser"
+
];
+
+
propagatedBuildInputs = with python.pkgs; [
+
boto3
+
fido2
+
beautifulsoup4
+
ctap-keyring-device
+
requests
+
okta
+
];
+
+
checkInputs = with python.pkgs; [
+
pytestCheckHook
+
nose
+
responses
+
];
+
+
disabledTests = [
+
"test_build_factor_name_webauthn_registered"
+
];
+
+
pythonImportsCheck = [
+
"gimme_aws_creds"
+
];
+
+
postInstall = ''
+
rm $out/bin/gimme-aws-creds.cmd
+
chmod +x $out/bin/gimme-aws-creds
+
'';
+
+
passthru = {
+
inherit python;
+
updateScript = nix-update-script {
+
attrPath = pname;
+
};
+
tests.version = testers.testVersion {
+
package = gimme-aws-creds;
+
command = ''touch tmp.conf && OKTA_CONFIG="tmp.conf" gimme-aws-creds --version'';
+
version = "gimme-aws-creds ${version}";
+
};
+
};
+
+
meta = with lib; {
+
homepage = "https://github.com/Nike-Inc/gimme-aws-creds";
+
changelog = "https://github.com/Nike-Inc/gimme-aws-creds/releases";
+
description = "A CLI that utilizes Okta IdP via SAML to acquire temporary AWS credentials";
+
license = licenses.asl20;
+
maintainers = with maintainers; [ dennajort ];
+
};
+
}
+2 -1
pkgs/tools/admin/google-cloud-sdk/components.nix
···
cp $snapshotPath $out/google-cloud-sdk/.install/${pname}.snapshot.json
'';
nativeBuildInputs = [
-
autoPatchelfHook
python3
stdenv.cc.cc
+
] ++ lib.optionals stdenv.isLinux [
+
autoPatchelfHook
];
passthru = {
dependencies = filterForSystem dependencies;
+3 -3
pkgs/tools/admin/trivy/default.nix
···
buildGoModule rec {
pname = "trivy";
-
version = "0.38.0";
+
version = "0.38.1";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
-
sha256 = "sha256-g4auIbHfS0QCzNq2d+UummhDQlNDl+9LiKzxR78H8b8=";
+
sha256 = "sha256-b5HKYZOitn8opqlrgULEYU6fsmQjWKEHRyM0GwLH9jk=";
};
# hash missmatch on across linux and darwin
proxyVendor = true;
-
vendorHash = "sha256-kQqEhcoAL77Yx25EnnKxDTC0cWEGXarL+BkhkBB/7A8=";
+
vendorHash = "sha256-HBmQOd6uihGJULnHYU+biXRUYJkpL2Dw7S9EswqsbNs=";
excludedPackages = "misc";
+3 -3
pkgs/tools/misc/octosql/default.nix
···
buildGoModule rec {
pname = "octosql";
-
version = "0.12.0";
+
version = "0.12.1";
src = fetchFromGitHub {
owner = "cube2222";
repo = pname;
rev = "v${version}";
-
sha256 = "sha256-UXHNA53ipGybYYAu+Ml8tI+9YZPW18BLsVjkW/UNQag=";
+
sha256 = "sha256-ysp9DLpAvaZVZBWZAzwUuULtnO++M1/DAiYHR+4/7vA=";
};
-
vendorSha256 = "sha256-as8vJmUH0mDPQ8K6D5yRybPV5ibvHEtyQjArXjimGpo=";
+
vendorHash = "sha256-JeVQz6NpekB4boRIxq2JJ3qYHTGj3K3+d5mxSblfvKs=";
ldflags = [ "-s" "-w" "-X github.com/cube2222/octosql/cmd.VERSION=${version}" ];
+15 -6
pkgs/tools/networking/godns/default.nix
···
-
{ buildGoModule, fetchFromGitHub, lib, nix-update-script }:
+
{ lib
+
, buildGoModule
+
, fetchFromGitHub
+
, nix-update-script
+
}:
buildGoModule rec {
pname = "godns";
-
version = "2.9.3";
+
version = "2.9.4";
src = fetchFromGitHub {
owner = "TimothyYe";
repo = "godns";
-
rev = "v${version}";
-
sha256 = "sha256-b83cJUTUbJ9Rwvj7HUIGNNq9RJQLkH1CaaS+4dQ2I2o=";
+
rev = "refs/tags/v${version}";
+
hash = "sha256-7AIr35vsjI5jamvdA1EwTwkr8MiEOjTntFeeg4b7RCw=";
};
-
vendorSha256 = "sha256-PGqknRGtN0XRGPnAsWzQrlJZG5BzQIhlSysGefkxysE=";
+
vendorHash = "sha256-+wnaTrY7Mt6bCNTRZbJDFD75RCHyz5gtFi4DN0ng0/M=";
# Some tests require internet access, broken in sandbox
doCheck = false;
-
ldflags = [ "-s" "-w" "-X main.Version=${version}" ];
+
ldflags = [
+
"-s"
+
"-w"
+
"-X main.Version=${version}"
+
];
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "A dynamic DNS client tool supports AliDNS, Cloudflare, Google Domains, DNSPod, HE.net & DuckDNS & DreamHost, etc";
homepage = "https://github.com/TimothyYe/godns";
+
changelog = "https://github.com/TimothyYe/godns/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ yinfeng ];
};
+3 -3
pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix
···
buildGoModule rec {
pname = "shadowsocks-v2ray-plugin";
-
version = "1.3.2";
+
version = "1.3.1";
src = fetchFromGitHub {
owner = "shadowsocks";
repo = "v2ray-plugin";
rev = "v${version}";
-
sha256 = "sha256-sGsGdJp20mXvJ6Ov1QjztbJxNpDaDEERcRAAyGgenVk=";
+
sha256 = "0aq445gnqk9dxs1hkw7rvk86wg0iyiy0h740lvyh6d9zsqhf61wb";
};
-
vendorSha256 = "sha256-vW8790Z4BacbdqANWO41l5bH5ac/TSZIdVNvOFVTsZ8=";
+
vendorSha256 = "0vzd9v33p4a32f5ic9ir4g5ckis06wpdf07a649h9qalimxnvzfz";
meta = with lib; {
description = "Yet another SIP003 plugin for shadowsocks, based on v2ray";
-1
pkgs/top-level/aliases.nix
···
digikam5 = throw "'digikam5' has been renamed to/replaced by 'digikam'"; # Converted to throw 2022-02-22
dirmngr = throw "dirmngr has been removed: merged into gnupg"; # Added 2022-05-13
disper = throw "disper has been removed: abandoned by upstream"; # Added 2022-03-18
-
displaycal = throw "displaycal has been removed from nixpkgs, as it hasn't migrated to python3"; # Added 2022-01-12
dmtx = throw "'dmtx' has been renamed to/replaced by 'dmtx-utils'"; # Converted to throw 2022-02-22
dnnl = oneDNN; # Added 2020-04-22
docbook5_xsl = throw "'docbook5_xsl' has been renamed to/replaced by 'docbook_xsl_ns'"; # Converted to throw 2022-02-22
+5
pkgs/top-level/all-packages.nix
···
graalvm-ce = graalvm11-ce;
graalvm11-ce = graalvmCEPackages.graalvm11-ce;
graalvm17-ce = graalvmCEPackages.graalvm17-ce;
+
graalvm19-ce = graalvmCEPackages.graalvm19-ce;
buildGraalvmNativeImage = (callPackage ../build-support/build-graalvm-native-image {
graalvmDrv = graalvm-ce;
}).override;
···
jython = callPackage ../development/interpreters/jython {};
gImageReader = callPackage ../applications/misc/gImageReader { };
+
+
gimme-aws-creds = callPackage ../tools/admin/gimme-aws-creds { };
guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { };
···
disk_indicator = callPackage ../os-specific/linux/disk-indicator { };
+
+
displaycal = callPackage ../applications/graphics/displaycal { };
displaylink = callPackage ../os-specific/linux/displaylink {
inherit (linuxPackages) evdi;
+6
pkgs/top-level/python-packages.nix
···
csvw = callPackage ../development/python-modules/csvw { };
+
ctap-keyring-device = callPackage ../development/python-modules/ctap-keyring-device { };
+
cu2qu = callPackage ../development/python-modules/cu2qu { };
cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { };
···
oemthermostat = callPackage ../development/python-modules/oemthermostat { };
+
okta = callPackage ../development/python-modules/okta { };
+
olefile = callPackage ../development/python-modules/olefile { };
oletools = callPackage ../development/python-modules/oletools { };
···
pytest-randomly = callPackage ../development/python-modules/pytest-randomly { };
pytest-random-order = callPackage ../development/python-modules/pytest-random-order { };
+
+
pytest-recording = callPackage ../development/python-modules/pytest-recording { };
pytest-regressions = callPackage ../development/python-modules/pytest-regressions { };