Merge branch 'master' into staging-next

Trivial conflict in pkgs/top-level/aliases.nix
This commit is contained in:
Vladimír Čunát 2022-02-06 10:29:49 +01:00
commit 3dfddd89c6
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
57 changed files with 372 additions and 220 deletions

View file

@ -310,6 +310,13 @@
<literal>writers.writePyPy2</literal> needs to be used.
</para>
</listitem>
<listitem>
<para>
The <literal>gnome-passwordsafe</literal> package updated to
<link xlink:href="https://gitlab.gnome.org/World/secrets/-/tags/6.0">version
6.x</link> and renamed to <literal>gnome-secrets</literal>.
</para>
</listitem>
<listitem>
<para>
If you previously used

View file

@ -102,6 +102,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The `writers.writePython2` and corresponding `writers.writePython2Bin` convenience functions to create executable Python 2 scripts in the store were removed in preparation of removal of the Python 2 interpreter.
Scripts have to be converted to Python 3 for use with `writers.writePython3` or `writers.writePyPy2` needs to be used.
- The `gnome-passwordsafe` package updated to [version 6.x](https://gitlab.gnome.org/World/secrets/-/tags/6.0) and renamed to `gnome-secrets`.
- If you previously used `/etc/docker/daemon.json`, you need to incorporate the changes into the new option `virtualisation.docker.daemon.settings`.
- The backward compatibility in `services.wordpress` to configure sites with

View file

@ -635,9 +635,9 @@ in {
|| cfg.passwordFile != null
|| cfg.openssh.authorizedKeys.keys != []
|| cfg.openssh.authorizedKeys.keyFiles != [])
) cfg.users) ++ [
) cfg.users ++ [
config.security.googleOsLogin.enable
];
]);
message = ''
Neither the root account nor any wheel user has a password or SSH authorized key.
You must set one to prevent being locked out of your system.

View file

@ -84,7 +84,6 @@ in {
interface eth0
{
AdvSendAdvert on;
AdvDefaultLifetime 0;
prefix ${prefix}::/64 {
AdvOnLink on;
AdvAutonomous on;

View file

@ -19,14 +19,14 @@
stdenv.mkDerivation rec {
pname = "fnott";
version = "1.1.2";
version = "1.2.0";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "dnkl";
repo = "fnott";
rev = version;
sha256 = "sha256-+x3uN7Uj0fqO0kpHlOVnsshgEJA1z/6ZElKSTyLzfG4=";
sha256 = "1qmxzpv2xy79aznzzr9fay61mzf1pdzv85ah3w3q2kl2i7pskfxb";
};
nativeBuildInputs = [

View file

@ -23,14 +23,14 @@
stdenv.mkDerivation rec {
pname = "fuzzel";
version = "1.6.5";
version = "1.7.0";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "dnkl";
repo = "fuzzel";
rev = version;
sha256 = "SWt46YSXI6Dsv0ed3H4sN8kbEzQDL4U6jxFSbMyspJ0=";
sha256 = "1261gwxiky37pvzmmbrpml1psa22kkglb141ybj1fbnwg6j7jvlf";
};
nativeBuildInputs = [

View file

@ -5,19 +5,19 @@
, gettext
, fetchFromGitLab
, python3Packages
, libhandy
, libpwquality
, wrapGAppsHook
, gtk3
, wrapGAppsHook4
, gtk4
, glib
, gdk-pixbuf
, gobject-introspection
, desktop-file-utils
, appstream-glib }:
, appstream-glib
, libadwaita }:
python3Packages.buildPythonApplication rec {
pname = "gnome-passwordsafe";
version = "5.1";
pname = "gnome-secrets";
version = "6.1";
format = "other";
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
owner = "World";
repo = "secrets";
rev = version;
sha256 = "sha256-RgpkLoqhwCdaPZxC1Qe0MpLtYLevNCOxbvwEEI0cpE0=";
sha256 = "sha256-TBGNiiR0GW8s/Efi4/Qqvwd87Ir0gCLGPfBmmqqSwQ8=";
};
nativeBuildInputs = [
@ -34,27 +34,39 @@ python3Packages.buildPythonApplication rec {
ninja
gettext
pkg-config
wrapGAppsHook
wrapGAppsHook4
desktop-file-utils
appstream-glib
gobject-introspection
];
buildInputs = [
gtk3
gtk4
glib
gdk-pixbuf
libhandy
libadwaita
];
propagatedBuildInputs = with python3Packages; [
pygobject3
construct
pykeepass
pyotp
] ++ [
libpwquality # using the python bindings
];
postPatch = ''
substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache";
'';
# Prevent double wrapping, let the Python wrapper use the args in preFixup.
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
meta = with lib; {
broken = stdenv.hostPlatform.isStatic; # libpwquality doesn't provide bindings when static
description = "Password manager for GNOME which makes use of the KeePass v.4 format";

View file

@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "hello";
version = "2.12";
version = "2.10";
src = fetchurl {
url = "mirror://gnu/hello/${pname}-${version}.tar.gz";
sha256 = "1ayhp9v4m4rdhjmnl2bq3cibrbqqkgjbl3s7yk2nhlh8vj3ay16g";
sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i";
};
doCheck = true;

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "pueue";
version = "1.0.4";
version = "1.0.6";
src = fetchFromGitHub {
owner = "Nukesor";
repo = pname;
rev = "v${version}";
sha256 = "sha256-tNTKX++LrWwuVGdmAjvBStNYp4p1ai12JwJmozo1GV0=";
sha256 = "sha256-xEbmCVZ28CHVvI6tGCQWzMFrmVyCQ2Xmzh2Lz3tGU14=";
};
cargoSha256 = "sha256-t1d8K0v7kHPjH78lYCRCa4pyPCvyQT1kaQtVpoROZIE=";
cargoSha256 = "sha256-8g/dNCm5I5/qCAPOGQ9a453DND8LoeSpX9Nb8LwUme4=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -31,14 +31,14 @@ let
in
stdenv.mkDerivation rec {
pname = "yambar";
version = "1.7.0";
version = "1.8.0";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "dnkl";
repo = "yambar";
rev = version;
sha256 = "sha256-NzJrlPOkzstMbw37yBTah/uFYezlPB/1hrxCiXduSmc=";
sha256 = "0d8n9hvmxj7759pfqssqcl9wvb986qsph8bnjsjm9bf97mflhy6d";
};
nativeBuildInputs = [

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tanka";
version = "0.19.0";
version = "0.20.0";
src = fetchFromGitHub {
owner = "grafana";
repo = pname;
rev = "v${version}";
sha256 = "sha256-SMPStxqzoeooBoqUJdFK6Zg3dzbNHrB/tv8iwa8GdbM=";
sha256 = "sha256-Wtfn9ffUNKuwByRbeCYq27xvr2DuzxSSQMH9Sv5a7rU=";
};
vendorSha256 = "sha256-1zdXc+Osqy17APcG5ou/UL/3Hcalmb1OZ2kZnWLSVIg=";
vendorSha256 = "sha256-ed6rC+wrZHDViGfJrSBl5VUqX/o6RKytXbTKqxb3ZtU=";
doCheck = false;

View file

@ -2,14 +2,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.2.16";
version = "3.2.18";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "v${version}";
sha256 = "sha256-4CMAkLMVvahKwwBo9epHiVnOtTK3T6Q8pHXAHSEbxvk=";
sha256 = "sha256-68tD7I7MI/Cp94tp6c4lQx+8xwRnJTKTF/3SWz4Ddgg=";
};
postPatch = ''

View file

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "himalaya";
version = "0.5.1";
version = "0.5.4";
src = fetchFromGitHub {
owner = "soywod";
repo = pname;
rev = "v${version}";
sha256 = "sha256-BmV4kekl0QDbX/ueSrWM5jRvqr6WQeZIs7hiXhiHBSI=";
sha256 = "sha256-giEcVyhreD36SgW5rQsKRjgHHAE022Lffmo0QGy/EkI=";
};
cargoSha256 = "sha256-lu5xVuAw9yTeQr3gpiW5g5bdm7Alf0YXmlbSkPaXhk0=";
cargoSha256 = "sha256-Sf4Ze9T8A6n/iuFtQAfW+ORIw2atMt8MgEmpDllnZp8=";
nativeBuildInputs = lib.optionals enableCompletions [ installShellFiles ]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ];

View file

@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "cwltool";
version = "3.1.20220202173120";
version = "3.1.20220204090313";
format = "setuptools";
src = fetchFromGitHub {
owner = "common-workflow-language";
repo = pname;
rev = version;
sha256 = "sha256-TC0jSnjQTQ7HkEky8BZYJlqNn5uuPOnjGRxALcvumao=";
sha256 = "sha256-2+2xTUBzQFaS99Xd3jwWuMrg2pNKCb6ZsMKKdOBRo74=";
};
postPatch = ''

View file

@ -27,7 +27,7 @@
}:
let
version = "1.10.3";
version = "1.11.0";
# build stimuli file for PGO build and the script to generate it
# independently of the foot's build, so we can cache the result
@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
owner = "dnkl";
repo = pname;
rev = version;
sha256 = "13v6xqaw3xn1x84dn4gnkiimcsllb19mrbvcdj2fnm8klnrys3gs";
sha256 = "1d9bk8lhmw5lc8k0mw80g0vbwgxyh3gw5c7ppy3sir07s9y0y0fn";
};
depsBuildBuild = [
@ -163,6 +163,7 @@ stdenv.mkDerivation rec {
# make sure there is _some_ profiling data on all binaries
./footclient --version
./foot --version
./tests/test-config
# generate pgo data of wayland independent code
./pgo ${stimuliFile} ${stimuliFile} ${stimuliFile}
meson configure -Db_pgo=use

View file

@ -0,0 +1,41 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, gtk3
, pcre
, pkg-config
, vte
}:
stdenv.mkDerivation rec {
pname = "kermit";
version = "3.7";
src = fetchFromGitHub {
name = "${pname}-${version}-src";
owner = "orhun";
repo = pname;
rev = version;
hash = "sha256-O5jpiQ+aaOTPst4/Z+H5e7ylA8CNBevqNoH50p4uEA4=";
};
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
gtk3
pcre
vte
];
meta = with lib; {
homepage = "https://github.com/orhun/kermit";
description = "A VTE-based, simple and froggy terminal emulator";
license = licenses.gpl3Only;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; unix;
};
}

View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute2 }:
stdenv.mkDerivation rec {
pname = "x11docker";
version = "6.10.0";
version = "7.0.1";
src = fetchFromGitHub {
owner = "mviereck";
repo = "x11docker";
rev = "v${version}";
sha256 = "sha256-cPCtxfLzg1RDh3vKFfxAkcCMytu0mDsGp9CLJQmXATA=";
sha256 = "sha256-ojKloMFbpBsr8fykMbLIBAzrlVaJDv+4BL0lozXsgC4=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -3,12 +3,12 @@
let
generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-domain-list-community";
version = "20220114024213";
version = "20220201175515";
src = fetchFromGitHub {
owner = "v2fly";
repo = "domain-list-community";
rev = version;
sha256 = "sha256-sF9WvXhyfMUvSXmFjkfGq4cZE/MiAnOKbkpv2CHSV3Q=";
sha256 = "sha256-vgw6i8djBQDV+fmkVe5CuKMwES/PXGoVe8cTgB5tflo=";
};
vendorSha256 = "sha256-QUbnUnxG1tsNbR49HTl55aiLkBM/ae9mCtzWeN4Ju78=";
meta = with lib; {

View file

@ -20,14 +20,14 @@ in
stdenv.mkDerivation rec {
pname = "fcft";
version = "2.5.1";
version = "3.0.1";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "dnkl";
repo = "fcft";
rev = version;
sha256 = "0dn0ic2ddi5qz6nqscsn7nlih67ad8vpclppbqwas6xavdfq6va2";
sha256 = "0jxy92ny8b7s7yvz1mr8zpf7l2zsn506fi9f98pvh9k25jprg0cx";
};
depsBuildBuild = [ pkg-config ];

View file

@ -6,7 +6,7 @@ buildDunePackage rec {
useDune2 = true;
minimalOCamlVersion = "4.03";
minimalOCamlVersion = "4.02";
src = fetchFromGitHub {
owner = "mirage";

View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "adax-local";
version = "0.1.3";
version = "0.1.4";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pyAdaxLocal";
rev = version;
hash = "sha256-SGVXzSjtYNRVJN5fUjjskko55/e0L3P8aB90G4HuBOE=";
hash = "sha256-pzhaBRCn02asT0ZLt1EmnaX2g5wr/CoiItWJ/ZYe0Ok=";
};
propagatedBuildInputs = [

View file

@ -1,21 +1,33 @@
{ aiohttp, buildPythonPackage, fetchPypi, lib, pythonOlder }:
{ lib
, aiohttp
, buildPythonPackage
, fetchPypi
, pythonOlder
}:
buildPythonPackage rec {
pname = "advantage_air";
version = "0.2.5";
pname = "advantage-air";
version = "0.2.6";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit version pname;
sha256 = "sha256-38csg1Cvpz4dkRCwlNc8+af7aJ5xDrZO1D8cCaBlePA=";
pname = "advantage_air";
inherit version;
hash = "sha256-n7Vl5fLEpkAEi4NrsoJlwwdaGcxnXURLdGN0etHgmOE=";
};
propagatedBuildInputs = [ aiohttp ];
propagatedBuildInputs = [
aiohttp
];
# No tests
doCheck = false;
pythonImportsCheck = [ "advantage_air" ];
pythonImportsCheck = [
"advantage_air"
];
meta = with lib; {
description = "API helper for Advantage Air's MyAir and e-zone API";

View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "aioshelly";
version = "1.0.8";
version = "1.0.9";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = version;
sha256 = "0l6qhgpzg082zk9134w2psnzkzf5zr0jyvrkxnhhz5lx9q5k94pc";
hash = "sha256-XGmhLc64efQ1eIgCYN1Wkp4sPXvYXlR7/9WF5cWZyys=";
};
propagatedBuildInputs = [

View file

@ -23,17 +23,17 @@
let
ansible-collections = callPackage ./collections.nix {
version = "5.0.1";
sha256 = "sha256:0xn3lpinmflkxwak7zb36wjs9w2y1k5s295apn3v77xnpc2cfz5l";
version = "5.2.0";
sha256 = "sha256:1jwraha3s15s692d47kgcr7jy1ngbg6ipmkb0ak7fjnb57r4im66";
};
in
buildPythonPackage rec {
pname = "ansible-core";
version = "2.12.1";
version = "2.12.2";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-pFCHByYr4Ru03ZigBvGxSBeHmgVea2xGrZ/KiJT7MHM=";
sha256 = "sha256:1hz7j8gsgxbfjdf9562cbyxia3c4crdv50fm0p0wp4js79rf2ydw";
};
# ansible_connection is already wrapped, so don't pass it through

View file

@ -1,39 +1,75 @@
{ lib, buildPythonPackage, fetchPypi, installShellFiles
, Babel, requests, requests_oauthlib, six, click, markdown, pyyaml, cryptography
, pytest-runner, coverage, flake8, mock, pytestCheckHook, pytest-cov, tox, gntp, sleekxmpp
{ lib
, Babel
, buildPythonPackage
, click
, cryptography
, fetchPypi
, gntp
, installShellFiles
, markdown
, mock
, paho-mqtt
, pytestCheckHook
, pythonOlder
, pyyaml
, requests
, requests_oauthlib
, six
, slixmpp
}:
buildPythonPackage rec {
pname = "apprise";
version = "0.9.6";
version = "0.9.7";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Fe0GIIGXydKP2DzWnnJ7SCgIeaTGEa/Wta6l0N7zl/g=";
hash = "sha256-BOMeSvwmGiZvA95+e2bceCGXRwowU5+zJAl7Sn4wKqM=";
};
nativeBuildInputs = [ Babel installShellFiles ];
nativeBuildInputs = [
Babel
installShellFiles
];
propagatedBuildInputs = [
cryptography requests requests_oauthlib six click markdown pyyaml
click
cryptography
markdown
pyyaml
requests
requests_oauthlib
six
];
checkInputs = [
pytest-runner coverage flake8 mock pytestCheckHook pytest-cov tox gntp sleekxmpp
gntp
mock
paho-mqtt
pytestCheckHook
slixmpp
];
disabledTests = [ "test_apprise_cli_nux_env" ];
disabledTests = [
"test_apprise_cli_nux_env"
"test_plugin_mqtt_general"
];
postInstall = ''
installManPage packaging/man/apprise.1
'';
pythonImportsCheck = [ "apprise" ];
pythonImportsCheck = [
"apprise"
];
meta = with lib; {
description = "Push Notifications that work with just about every platform";
homepage = "https://github.com/caronc/apprise";
description = "Push Notifications that work with just about every platform!";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
maintainers = with maintainers; [ marsam ];
};
}

View file

@ -16,19 +16,23 @@
{ addOpenGLRunpath, autoPatchelfHook, buildPythonPackage, config
, fetchurl, isPy39, lib, stdenv
# propagatedBuildInputs
, absl-py, flatbuffers, scipy, cudatoolkit_11
, absl-py, flatbuffers, scipy, cudatoolkit_11, cudnn
# Options:
, cudaSupport ? config.cudaSupport or false
}:
# Note that these values are tied to the specific version of the GPU wheel that
# we fetch. When updating, try to go for the latest possible versions that are
# still compatible with the cudatoolkit and cudnn versions available in nixpkgs.
assert cudaSupport -> lib.versionAtLeast cudatoolkit_11.version "11.1";
assert cudaSupport -> lib.versionAtLeast cudnn.version "8.0.5";
let
device = if cudaSupport then "gpu" else "cpu";
in
buildPythonPackage rec {
pname = "jaxlib";
version = "0.1.71";
version = "0.1.75";
format = "wheel";
# At the time of writing (8/19/21), there are releases for 3.7-3.9. Supporting
@ -36,14 +40,23 @@ buildPythonPackage rec {
# version.
disabled = !isPy39;
# Find new releases at https://storage.googleapis.com/jax-releases.
src = {
cpu = fetchurl {
url = "https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp39-none-manylinux2010_x86_64.whl";
sha256 = "sha256:0rqhs6qabydizlv5d3rb20dbv6612rr7dqfniy9r6h4kazdinsn6";
sha256 = "1davmx9dvai8dq3h5ac82634gjhv6l46kq6baajrxjqczbp0w7m6";
};
gpu = fetchurl {
url = "https://storage.googleapis.com/jax-releases/cuda111/jaxlib-${version}+cuda111-cp39-none-manylinux2010_x86_64.whl";
sha256 = "sha256:065kyzjsk9m84d138p99iymdiiicm1qz8a3iwxz8rspl43rwrw89";
# Note that there's also a release targeting cuDNN 8.2, but unfortunately
# we don't yet have that packaged at the time of writing (02/03/2022).
# Check pkgs/development/libraries/science/math/cudnn/default.nix for more
# details.
url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp39-none-manylinux2010_x86_64.whl";
sha256 = "1mk618lq1q5x0dc3xbid8bim59l9j6l47xq232gdbn401ykrid7r";
# This is what the cuDNN 8.2 download looks like for future reference:
# url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp39-none-manylinux2010_x86_64.whl";
# sha256 = "000mnm2masm3sx3haddcmgw43j4gxa3m4fcm14p9nb8dnncjkgpb";
};
}.${device};
@ -71,7 +84,7 @@ buildPythonPackage rec {
rpath=$(patchelf --print-rpath $file)
# For some reason `makeLibraryPath` on `cudatoolkit_11` maps to
# <cudatoolkit_11.lib>/lib which is different from <cudatoolkit_11>/lib.
patchelf --set-rpath "$rpath:${cudatoolkit_11}/lib:${lib.makeLibraryPath [ cudatoolkit_11.lib ]}" $file
patchelf --set-rpath "$rpath:${cudatoolkit_11}/lib:${lib.makeLibraryPath [ cudatoolkit_11.lib cudnn ]}" $file
done
'';

View file

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "limnoria";
version = "2022.1.29";
version = "2022.2.3";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-fBIWmFo3uTswLfxmSaYixALeJ89HCpLcooldw1UZwCw=";
hash = "sha256-Jc11hS+WrRnjgYOUpc+GdkRoNV/DUJhQK6rI2lUkEIA=";
};
propagatedBuildInputs = [

View file

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "lupupy";
version = "0.1.3";
version = "0.1.9";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-oKc2x0T8KSSv9OB6U79QacBbvATDPecZFFKhFeBG39E=";
sha256 = "sha256-UclKPuWcIa1nNFKqPIEnqlnJh0aXP50k2nMbHhT1aFs=";
};
propagatedBuildInputs = [

View file

@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "pip-tools";
version = "6.4.0";
version = "6.5.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "65553a15b1ba34be5e43889345062e38fb9b219ffa23b084ca0d4c4039b6f53b";
sha256 = "sha256-0U6k/CwRjbKmr2WkNFqLmzVeeSrtrWv2TdPrl8X8X+4=";
};
checkInputs = [

View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pontos";
version = "22.2.0";
version = "22.2.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "greenbone";
repo = pname;
rev = "v${version}";
hash = "sha256-DDAYpAIpcOziUxv2mLuHQ+MTI5aqlS5GNyGQgtWu6Ug=";
hash = "sha256-VMfvlqpmA2Mg/llVNcY3Enuuq3mwV0G1GYrpbvzo8pU=";
};
nativeBuildInputs = [

View file

@ -2,33 +2,42 @@
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, loguru
, poetry-core
, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "pyaussiebb";
version = "0.0.9";
format = "setuptools";
version = "0.0.11";
format = "pyproject";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "yaleman";
repo = "aussiebb";
rev = "v${version}";
hash = "sha256-DMU29dTqDaPLQS20iuHIph6mhBdj6ni3+MA9KkRMtzg=";
hash = "sha256-aL+n2ut7n6UUyymMEHoFMhRvK9iFRRunYE9ZirKFXhc=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
requests
loguru
];
# Tests require network access
# https://github.com/yaleman/aussiebb/issues/6
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'requests = "^2.27.1"' 'requests = "*"'
'';
# Tests require credentials and requests-testing
doCheck = false;
pythonImportsCheck = [

View file

@ -9,17 +9,21 @@
buildPythonPackage rec {
pname = "pyfritzhome";
version = "0.6.2";
version = "0.6.4";
format = "setuptools";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "hthiery";
repo = "python-fritzhome";
rev = version;
sha256 = "1hwxq9w5qmiky8gpp623nabmydr3yv6hvgzk24fdbmkglfp6ja1v";
sha256 = "sha256-JCaB3E8KCfncwnTKIb0shB2qYpsKwBkrPZdC5lAJ1KQ=";
};
propagatedBuildInputs = [ requests ];
propagatedBuildInputs = [
requests
];
checkInputs = [
mock
@ -30,7 +34,9 @@ buildPythonPackage rec {
nosetests
'';
pythonImportsCheck = [ "pyfritzhome" ];
pythonImportsCheck = [
"pyfritzhome"
];
meta = with lib; {
description = "Python Library to access AVM FRITZ!Box homeautomation";

View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pygit2";
version = "1.7.2";
version = "1.8.0";
src = fetchPypi {
inherit pname version;
sha256 = "70a4536a35452c31f823b59b6fdb665aa3778a43b73ccda3a4f79fa9962ad2bb";
sha256 = "sha256-bixc/1qh5D9DEDSAdhFS9cXWvvQPXB9QyHWKbonmbLY=";
};
preConfigure = lib.optionalString stdenv.isDarwin ''

View file

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "simplisafe-python";
version = "2022.01.0";
version = "2022.02.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
sha256 = "sha256-dU7zyLSqUX4AM1MLaF9zHbbc2EfsJDtzIwmzy/xiLu8=";
sha256 = "sha256-f3kRBqBQQwo74fDFVLE5pZArsmc8iFgU/onifKy2vNQ=";
};
nativeBuildInputs = [

View file

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "soco";
version = "0.26.0";
version = "0.26.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SoCo";
repo = "SoCo";
rev = "v${version}";
sha256 = "sha256-rOJiO8BBbkp3dzy9hk3LV0hqQDLRgrA1kqnhvrseU0o=";
sha256 = "sha256-h9mgL98+MPY9K5sKuRQthQoP8nVL1tIHGslh5ojgLfc=";
};
propagatedBuildInputs = [

View file

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "softlayer";
version = "5.9.8";
version = "5.9.9";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = pname;
repo = "softlayer-python";
rev = "v${version}";
sha256 = "087kyl2yacvh12i4x3357659mgq4xycv8a4y9rl3rj57kp5jc6ah";
sha256 = "sha256-LskPz5KXOi7olb3+DUP9uEFESQeo6ec/ZLx9B/w6Ni0=";
};
propagatedBuildInputs = [

View file

@ -14,12 +14,12 @@
buildPythonPackage rec {
pname = "sqlite-utils";
version = "3.22.1";
version = "3.23";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "35ebb4f7e2b09f1818b36e7da6dc62f1ca57e2c0d99a9cbc8151e634d75a7906";
sha256 = "sha256-BNlOP/gWDERh4Rzth5zjeghHr7ozyAGeRJxoeE6baWY=";
};
propagatedBuildInputs = [

View file

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "systembridge";
version = "2.2.3";
version = "2.3.1";
src = fetchFromGitHub {
owner = "timmo001";
repo = "system-bridge-connector-py";
rev = "v${version}";
sha256 = "sha256-AVMZBhf15eZM9oMUFyiHYs866P1v5z1pbTvX2Qpjzfc=";
sha256 = "sha256-Ts8zPRK6S5iLnl19Y/Uz0YAh6hDeVRNBY6HsvLwdUFw=";
};
propagatedBuildInputs = [

View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "textfsm";
version = "1.1.2";
version = "1.1.3";
format = "setuptools";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "google";
repo = pname;
rev = "v${version}";
sha256 = "1cbczg3h2841v1xk2s2xg540c69vsrkwxljm758fyr65kshrzlhm";
sha256 = "sha256-IHgKG8v0X+LSK6purWBdwDnI/BCs5XA12ZJixuqqXWg=";
};
propagatedBuildInputs = [

View file

@ -22,13 +22,13 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.0.787";
version = "2.0.793";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
hash = "sha256-fnLnVr5WYpEG0qGjKm4JuQCHi3fbv9lu8jWNv/Z+3wM=";
hash = "sha256-puOP0gXPtX67ZT2bANkjJpi4pCBOhK199ukfU2BsnRM=";
};
nativeBuildInputs = with py.pkgs; [

View file

@ -6,11 +6,11 @@ else
stdenv.mkDerivation rec {
pname = "dune";
version = "2.9.2";
version = "2.9.3";
src = fetchurl {
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-site-${version}.tbz";
sha256 = "sha256-uOfMUH+5eLRfb9yDnysyAdLB5hHkqOlyyMjP2FIudEc=";
sha256 = "sha256:1ml8bxym8sdfz25bx947al7cvsi2zg5lcv7x9w6xb01cmdryqr9y";
};
nativeBuildInputs = [ ocaml findlib ];

View file

@ -7,7 +7,7 @@ buildDunePackage {
inherit (js_of_ocaml-compiler) version src meta useDune2;
minimalOCamlVersion = "4.03";
minimalOCamlVersion = "4.02";
propagatedBuildInputs = [ ocamlbuild ];
}

View file

@ -43,16 +43,11 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
buildInputs = toBuildInputs pkgArches (with supportFlags; (pkgs:
[ pkgs.freetype pkgs.perl ]
++ lib.optional stdenv.isLinux pkgs.libcap
++ lib.optional pngSupport pkgs.libpng
++ lib.optional jpegSupport pkgs.libjpeg
++ lib.optional cupsSupport pkgs.cups
++ lib.optional colorManagementSupport pkgs.lcms2
++ lib.optional gettextSupport pkgs.gettext
++ lib.optional dbusSupport pkgs.dbus
++ lib.optional mpg123Support pkgs.mpg123
++ lib.optional openalSupport pkgs.openal
++ lib.optional cairoSupport pkgs.cairo
++ lib.optional tiffSupport pkgs.libtiff
++ lib.optional odbcSupport pkgs.unixODBC
++ lib.optional netapiSupport pkgs.samba4
++ lib.optional cursesSupport pkgs.ncurses
@ -60,7 +55,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
++ lib.optional pcapSupport pkgs.libpcap
++ lib.optional v4lSupport pkgs.libv4l
++ lib.optional saneSupport pkgs.sane-backends
++ lib.optional gsmSupport pkgs.gsm
++ lib.optional gphoto2Support pkgs.libgphoto2
++ lib.optional ldapSupport pkgs.openldap
++ lib.optional fontconfigSupport pkgs.fontconfig
@ -70,14 +64,12 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
++ lib.optional udevSupport pkgs.udev
++ lib.optional vulkanSupport pkgs.vulkan-loader
++ lib.optional sdlSupport pkgs.SDL2
++ lib.optional faudioSupport pkgs.faudio
++ vkd3dArches
++ lib.optionals gstreamerSupport (with pkgs.gst_all_1;
[ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav
(gst-plugins-bad.override { enableZbar = false; }) ])
++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ]
++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ]
++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ]
++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ]
++ lib.optionals (openglSupport && !stdenv.isDarwin) [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ]
++ lib.optionals stdenv.isDarwin (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [

View file

@ -9,9 +9,6 @@
{ lib, stdenv, callPackage,
wineRelease ? "stable",
wineBuild ? if stdenv.hostPlatform.system == "x86_64-linux" then "wineWow" else "wine32",
pngSupport ? false,
jpegSupport ? false,
tiffSupport ? false,
gettextSupport ? false,
fontconfigSupport ? false,
alsaSupport ? false,
@ -20,9 +17,7 @@
tlsSupport ? false,
gstreamerSupport ? false,
cupsSupport ? false,
colorManagementSupport ? false,
dbusSupport ? false,
mpg123Support ? false,
openalSupport ? false,
openclSupport ? false,
cairoSupport ? false,
@ -33,16 +28,13 @@
pcapSupport ? false,
v4lSupport ? false,
saneSupport ? false,
gsmSupport ? false,
gphoto2Support ? false,
ldapSupport ? false,
pulseaudioSupport ? false,
udevSupport ? false,
xineramaSupport ? false,
xmlSupport ? false,
vulkanSupport ? false,
sdlSupport ? false,
faudioSupport ? false,
vkd3dSupport ? false,
mingwSupport ? wineRelease != "stable",
waylandSupport ? wineRelease == "wayland",
@ -53,13 +45,13 @@ let wine-build = build: release:
lib.getAttr build (callPackage ./packages.nix {
wineRelease = release;
supportFlags = {
inherit pngSupport jpegSupport cupsSupport colorManagementSupport gettextSupport
dbusSupport mpg123Support openalSupport cairoSupport tiffSupport odbcSupport
netapiSupport cursesSupport vaSupport pcapSupport v4lSupport saneSupport
gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport
pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport
openglSupport gstreamerSupport udevSupport vulkanSupport sdlSupport faudioSupport
vkd3dSupport mingwSupport waylandSupport embedInstallers;
inherit
cupsSupport gettextSupport dbusSupport openalSupport cairoSupport
odbcSupport netapiSupport cursesSupport vaSupport pcapSupport
v4lSupport saneSupport gphoto2Support ldapSupport fontconfigSupport
alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport
tlsSupport openglSupport gstreamerSupport udevSupport vulkanSupport
sdlSupport vkd3dSupport mingwSupport waylandSupport embedInstallers;
};
});

View file

@ -1,4 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, libseccomp, util-linux, qemu }:
{ lib, stdenv, fetchurl, dosfstools, libseccomp, makeWrapper, mtools, parted
, pkg-config, qemu, syslinux, util-linux }:
let
version = "0.6.9";
@ -15,7 +16,7 @@ in stdenv.mkDerivation {
pname = "solo5";
inherit version;
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ makeWrapper pkg-config ];
buildInputs = lib.optional (stdenv.hostPlatform.isLinux) libseccomp;
src = fetchurl {
@ -47,6 +48,14 @@ in stdenv.mkDerivation {
[ -n "$CONFIG_${lib.toUpper bind}" ] && make install-opam-${bind}
'') targets}
substituteInPlace $out/bin/solo5-virtio-mkimage \
--replace "/usr/lib/syslinux" "${syslinux}/share/syslinux" \
--replace "/usr/share/syslinux" "${syslinux}/share/syslinux" \
--replace "cp " "cp --no-preserve=mode "
wrapProgram $out/bin/solo5-virtio-mkimage \
--prefix PATH : ${lib.makeBinPath [ dosfstools mtools parted syslinux ]}
runHook postInstall
'';

View file

@ -2,19 +2,21 @@
buildGoModule rec {
pname = "unpackerr";
version = "0.9.8";
version = "0.9.9";
src = fetchFromGitHub {
owner = "davidnewhall";
repo = "unpackerr";
rev = "v${version}";
sha256 = "08xcxs4qh25qsjaf6wivhpszl61zdp59hlkd57igf9fv4lywb41q";
sha256 = "sha256-lQqa1YtMLsCEfiC3Ld+lw4SvAD8wctSGi2YdXt9lrTA=";
};
vendorSha256 = "0ilpg7xfll0c5lsv8zf4h3i72yabddkddih4d292hczyz9wi3j4z";
vendorSha256 = "sha256-W9lTIjntaNZSJVt6Jow8uSew+zCaGWU9qzseClNiVUI=";
buildInputs = lib.optionals stdenv.isDarwin [ Cocoa WebKit ];
ldflags = [ "-s" "-w" "-X golift.io/version.Version=${version}" ];
meta = with lib; {
description = "Extracts downloads for Radarr, Sonarr, Lidarr - Deletes extracted files after import";
homepage = "https://github.com/davidnewhall/unpackerr";

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "stripe-cli";
version = "1.7.10";
version = "1.7.11";
src = fetchFromGitHub {
owner = "stripe";
repo = pname;
rev = "v${version}";
sha256 = "sha256-F1+goZURc0f1dWV/PGxSVtqHkuePACq4+UzfMTEVJ0M=";
sha256 = "sha256-a2GoTdt6l6Yayaz1n1VdKxwrziNuFk/MO/6PvjqRxVM=";
};
vendorSha256 = "sha256-AsEem/KuA+jxioG96Ofn0te93fyZ9sebPkLPA+LAUkk=";

View file

@ -0,0 +1,27 @@
{ lib
, python3Packages
}:
python3Packages.buildPythonApplication rec {
pname = "gh2md";
version = "2.0.0";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "7a277939d4781f4ca741eccb74fc70f0aa85811185da52219878129cba7f1d77";
};
propagatedBuildInputs = with python3Packages; [ six requests python-dateutil ];
# uses network
doCheck = false;
pythonImportsCheck = [ "gh2md" ];
meta = with lib; {
description = "Export Github repository issues to markdown files";
homepage = "https://github.com/mattduck/gh2md";
license = licenses.mit;
maintainers = with maintainers; [ artturin ];
};
}

View file

@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
license = licenses.lgpl21Plus;
platforms = platforms.all;
maintainers = with maintainers; [ CRTified ];
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/lottieconverter.x86_64-darwin
};
}

View file

@ -1,7 +1,7 @@
{ lib, stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkg-config
, file, findutils
, gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret
, withGnome ? true, libnma }:
, withGnome ? true, libnma, glib }:
stdenv.mkDerivation rec {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
})
];
buildInputs = [ networkmanager ppp ]
buildInputs = [ networkmanager ppp glib ]
++ lib.optionals withGnome [ gtk3 libsecret libnma ];
nativeBuildInputs = [ autoreconfHook libtool intltool pkg-config file findutils ];

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkg-config, file, networkmanager, libsecret
, gtk3, withGnome ? true, gnome, kmod, libnma }:
, glib, gtk3, withGnome ? true, gnome, kmod, libnma }:
let
pname = "NetworkManager-openvpn";
@ -19,7 +19,7 @@ in stdenv.mkDerivation {
})
];
buildInputs = [ openvpn networkmanager ]
buildInputs = [ openvpn networkmanager glib ]
++ lib.optionals withGnome [ gtk3 libsecret libnma ];
nativeBuildInputs = [ intltool pkg-config file libxml2 ];

View file

@ -378,6 +378,7 @@ mapAliases ({
gmailieer = lieer; # Added 2020-04-19
gmic_krita_qt = gmic-qt-krita; # Added 2019-09-07
gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # Added 2021-03-08
gnome-passwordsafe = gnome-secrets; # added 2022-01-30
gnome-mpv = celluloid; # Added 2019-08-22
gnome-sharp = throw "gnome-sharp has been removed from nixpkgs"; # Added 2022-01-15
gnome-themes-standard = gnome-themes-extra; # Added 2018-03-14

View file

@ -1106,6 +1106,10 @@ with pkgs;
stdenv = clangStdenv;
};
archi = callPackage ../tools/misc/archi { };
breitbandmessung = callPackage ../applications/networking/breitbandmessung { };
### APPLICATIONS/TERMINAL-EMULATORS
alacritty = callPackage ../applications/terminal-emulators/alacritty {
@ -1113,10 +1117,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL;
};
archi = callPackage ../tools/misc/archi { };
breitbandmessung = callPackage ../applications/networking/breitbandmessung { };
contour = libsForQt5.callPackage ../applications/terminal-emulators/contour { };
cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { };
@ -1137,21 +1137,15 @@ with pkgs;
hyper = callPackage ../applications/terminal-emulators/hyper { };
iqueue = callPackage ../development/libraries/iqueue {};
iterm2 = callPackage ../applications/terminal-emulators/iterm2 { };
iterm2 = callPackage ../applications/terminal-emulators/iterm2 {};
kermit-terminal = callPackage ../applications/terminal-emulators/kermit-terminal { };
kitty = callPackage ../applications/terminal-emulators/kitty {
harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; };
inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL;
};
lifecycled = callPackage ../tools/misc/lifecycled { };
lilo = callPackage ../tools/misc/lilo { };
logseq = callPackage ../applications/misc/logseq { };
lxterminal = callPackage ../applications/terminal-emulators/lxterminal { };
microcom = callPackage ../applications/terminal-emulators/microcom { };
@ -1164,16 +1158,8 @@ with pkgs;
mrxvt = callPackage ../applications/terminal-emulators/mrxvt { };
natls = callPackage ../tools/misc/natls { };
nimmm = callPackage ../applications/terminal-emulators/nimmm { };
notion-app-enhanced = callPackage ../applications/office/notion-app-enhanced { };
pikchr = callPackage ../tools/graphics/pikchr { };
popsicle = callPackage ../tools/misc/popsicle { };
roxterm = callPackage ../applications/terminal-emulators/roxterm { };
rxvt = callPackage ../applications/terminal-emulators/rxvt { };
@ -1196,16 +1182,12 @@ with pkgs;
mcaimi-st = callPackage ../applications/terminal-emulators/st/mcaimi-st.nix { };
siduck76-st = callPackage ../applications/terminal-emulators/st/siduck76-st.nix { };
snowflake = callPackage ../tools/networking/snowflake { };
stupidterm = callPackage ../applications/terminal-emulators/stupidterm {
gtk = gtk3;
};
terminator = callPackage ../applications/terminal-emulators/terminator { };
terminal-colors = callPackage ../applications/misc/terminal-colors { };
termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix {
termite = termite-unwrapped;
};
@ -1215,36 +1197,54 @@ with pkgs;
termonad = termonad-with-packages;
termsyn = callPackage ../data/fonts/termsyn { };
tilda = callPackage ../applications/terminal-emulators/tilda {
gtk = gtk3;
};
tilix = callPackage ../applications/terminal-emulators/tilix { };
timedoctor = callPackage ../applications/office/timedoctor { };
tvnamer = callPackage ../tools/misc/tvnamer { };
twine = with python3Packages; toPythonApplication twine;
wayst = callPackage ../applications/terminal-emulators/wayst { };
wezterm = callPackage ../applications/terminal-emulators/wezterm {
inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation;
};
writefreely = callPackage ../applications/misc/writefreely { };
x3270 = callPackage ../applications/terminal-emulators/x3270 { };
xterm = callPackage ../applications/terminal-emulators/xterm { };
xtermcontrol = callPackage ../applications/terminal-emulators/xtermcontrol {};
xtermcontrol = callPackage ../applications/terminal-emulators/xtermcontrol { };
yaft = callPackage ../applications/terminal-emulators/yaft { };
writefreely = callPackage ../applications/misc/writefreely { };
iqueue = callPackage ../development/libraries/iqueue { };
lifecycled = callPackage ../tools/misc/lifecycled { };
lilo = callPackage ../tools/misc/lilo { };
logseq = callPackage ../applications/misc/logseq { };
natls = callPackage ../tools/misc/natls { };
notion-app-enhanced = callPackage ../applications/office/notion-app-enhanced { };
pikchr = callPackage ../tools/graphics/pikchr { };
popsicle = callPackage ../tools/misc/popsicle { };
terminal-colors = callPackage ../applications/misc/terminal-colors { };
termsyn = callPackage ../data/fonts/termsyn { };
timedoctor = callPackage ../applications/office/timedoctor { };
tvnamer = callPackage ../tools/misc/tvnamer { };
twine = with python3Packages; toPythonApplication twine;
aldo = callPackage ../applications/radio/aldo { };
almanah = callPackage ../applications/misc/almanah { };
@ -3183,6 +3183,8 @@ with pkgs;
ghidra-bin = callPackage ../tools/security/ghidra { };
gh2md = callPackage ../tools/backup/gh2md { };
gif-for-cli = callPackage ../tools/misc/gif-for-cli { };
giph = callPackage ../applications/video/giph { };
@ -5074,6 +5076,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security;
};
snowflake = callPackage ../tools/networking/snowflake { };
wsl-open = callPackage ../tools/misc/wsl-open { };
xkcdpass = with python3Packages; toPythonApplication xkcdpass;
@ -5999,7 +6003,7 @@ with pkgs;
gnome-keysign = callPackage ../tools/security/gnome-keysign { };
gnome-passwordsafe = callPackage ../applications/misc/gnome-passwordsafe { };
gnome-secrets = callPackage ../applications/misc/gnome-secrets { };
gnome-podcasts = callPackage ../applications/audio/gnome-podcasts { };

View file

@ -30,12 +30,22 @@ pkgs.runCommand "nixpkgs-release-checks" { src = nixpkgs; buildInputs = [nix]; }
# Relies on impure eval
export NIX_ABORT_ON_WARN=true
nix-env -f $src \
--show-trace --argstr system "$platform" \
--arg config '{ allowAliases = false; }' \
--option experimental-features 'no-url-literals' \
-qa --drv-path --system-filter \* --system \
"''${opts[@]}" 2> eval-warnings.log > packages1
set +e
(
set -x
nix-env -f $src \
--show-trace --argstr system "$platform" \
--arg config '{ allowAliases = false; }' \
--option experimental-features 'no-url-literals' \
-qa --drv-path --system-filter \* --system \
"''${opts[@]}" 2> eval-warnings.log > packages1
)
rc=$?
set -e
if [ "$rc" != "0" ]; then
cat eval-warnings.log
exit $rc
fi
s1=$(sha1sum packages1 | cut -c1-40)
echo $s1

View file

@ -4135,7 +4135,11 @@ in {
jax = callPackage ../development/python-modules/jax { };
jaxlib-bin = callPackage ../development/python-modules/jaxlib/bin.nix { };
jaxlib-bin = callPackage ../development/python-modules/jaxlib/bin.nix {
cudaSupport = pkgs.config.cudaSupport or false;
cudatoolkit_11 = tensorflow_compat_cudatoolkit;
cudnn = tensorflow_compat_cudnn;
};
jaxlib-build = callPackage ../development/python-modules/jaxlib {
# Some platforms don't have `cudaSupport` defined, hence the need for 'or false'.

View file

@ -40,12 +40,10 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; };
diffutils = all;
e2fsprogs = linux;
emacs = linux;
enscript = all;
file = all;
findutils = all;
flex = all;
gcc = all;
gcj = linux;
glibc = linux;
glibcLocales = linux;
gnugrep = all;
@ -59,7 +57,6 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; };
gnutls = linux;
grub = linux;
grub2 = linux;
gsl = linux;
guile = linux; # tests fail on Cygwin
gzip = all;
hddtemp = linux;
@ -71,10 +68,6 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; };
idutils = all;
inetutils = linux;
iputils = linux;
jnettop = linux;
jwhois = linux;
kbd = linux;
keen4 = ["i686-linux"];
kvm = linux;
qemu = linux;
qemu_kvm = linux;
@ -95,16 +88,11 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; };
man = linux;
man-pages = linux;
mc = all;
mcabber = linux;
mcron = linux;
mdadm = linux;
mesa = mesaPlatforms;
midori = linux;
mingetty = linux;
mktemp = all;
mono = linux;
monotone = linux;
mpg321 = linux;
mutt = linux;
mysql = linux;
# netcat broken on darwin
@ -119,24 +107,20 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; };
openssh = linux;
openssl = all;
pan = linux;
par2cmdline = all;
pciutils = linux;
pdf2xml = all;
perl = all;
pkg-config = all;
pmccabe = linux;
procps = linux;
python = unix; # Cygwin builds fail
python3 = unix; # Cygwin builds fail
readline = all;
rlwrap = all;
rpm = linux;
rpcbind = linux;
rsync = linux;
screen = linux ++ darwin;
scrot = linux;
sdparm = linux;
sharutils = all;
sloccount = unix; # Cygwin builds fail
smartmontools = all;
sqlite = unix; # Cygwin builds fail
squid = linux;
@ -147,8 +131,6 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; };
sudo = linux;
sysklogd = linux;
syslinux = ["i686-linux"];
sysvinit = linux;
sysvtools = linux;
tcl = linux;
tcpdump = linux;
texinfo = all;
@ -163,12 +145,10 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; };
webkitgtk = linux;
wget = all;
which = all;
wireshark = linux;
wirelesstools = linux;
wpa_supplicant = linux;
xfsprogs = linux;
xkeyboard_config = linux;
zile = linux;
zip = all;
} ))

View file

@ -8,9 +8,6 @@ rec {
};
base = minimal.override {
pngSupport = true;
jpegSupport = true;
tiffSupport = true;
gettextSupport = true;
fontconfigSupport = true;
alsaSupport = true;
@ -25,7 +22,6 @@ rec {
pulseaudioSupport = config.pulseaudio or stdenv.isLinux;
udevSupport = true;
xineramaSupport = true;
xmlSupport = true;
sdlSupport = true;
mingwSupport = true;
};
@ -33,8 +29,6 @@ rec {
full = base.override {
gtkSupport = true;
gstreamerSupport = true;
colorManagementSupport = true;
mpg123Support = true;
openalSupport = true;
openclSupport = true;
odbcSupport = true;
@ -42,10 +36,8 @@ rec {
vaSupport = true;
pcapSupport = true;
v4lSupport = true;
gsmSupport = true;
gphoto2Support = true;
ldapSupport = true;
faudioSupport = true;
vkd3dSupport = true;
embedInstallers = true;
};