Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-07-27 18:01:01 +00:00 committed by GitHub
commit db6a26db02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
71 changed files with 441 additions and 243 deletions

View file

@ -537,7 +537,13 @@ Note that because the checksum is computed after applying these effects, using o
Tests are important to ensure quality and make reviews and automatic updates easy. Tests are important to ensure quality and make reviews and automatic updates easy.
Nix package tests are a lightweight alternative to [NixOS module tests](https://nixos.org/manual/nixos/stable/#sec-nixos-tests). They can be used to create simple integration tests for packages while the module tests are used to test services or programs with a graphical user interface on a NixOS VM. Unittests that are included in the source code of a package should be executed in the `checkPhase`. The following types of tests exists:
* [NixOS **module tests**](https://nixos.org/manual/nixos/stable/#sec-nixos-tests), which spawn one or more NixOS VMs. They exercise both NixOS modules and the packaged programs used within them. For example, a NixOS module test can start a web server VM running the `nginx` module, and a client VM running `curl` or a graphical `firefox`, and test that they can talk to each other and display the correct content.
* Nix **package tests** are a lightweight alternative to NixOS module tests. They should be used to create simple integration tests for packages, but cannot test NixOS services, and some programs with graphical user interfaces may also be difficult to test with them.
* The **`checkPhase` of a package**, which should execute the unit tests that are included in the source code of a package.
Here in the nixpkgs manual we describe mostly _package tests_; for _module tests_ head over to the corresponding [section in the NixOS manual](https://nixos.org/manual/nixos/stable/#sec-nixos-tests).
### Writing package tests {#ssec-package-tests-writing} ### Writing package tests {#ssec-package-tests-writing}
@ -602,3 +608,23 @@ Here are examples of package tests:
- [Spacy annotation test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/spacy/annotation-test/default.nix) - [Spacy annotation test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/spacy/annotation-test/default.nix)
- [Libtorch test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/science/math/libtorch/test/default.nix) - [Libtorch test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/science/math/libtorch/test/default.nix)
- [Multiple tests for nanopb](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/nanopb/default.nix) - [Multiple tests for nanopb](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/nanopb/default.nix)
### Linking NixOS module tests to a package {#ssec-nixos-tests-linking}
Like [package tests](#ssec-package-tests-writing) as shown above, [NixOS module tests](https://nixos.org/manual/nixos/stable/#sec-nixos-tests) can also be linked to a package, so that the tests can be easily run when changing the related package.
For example, assuming we're packaging `nginx`, we can link its module test via `passthru.tests`:
```nix
{ stdenv, lib, nixosTests }:
stdenv.mkDerivation {
...
passthru.tests = {
nginx = nixosTests.nginx;
};
...
}
```

View file

@ -0,0 +1,6 @@
# Linking NixOS tests to packages {#sec-linking-nixos-tests-to-packages}
You can link NixOS module tests to the packages that they exercised,
so that the tests can be run automatically during code review when the package gets changed.
This is
[described in the nixpkgs manual](https://nixos.org/manual/nixpkgs/stable/#ssec-nixos-tests-linking).

View file

@ -16,4 +16,5 @@ xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/tests">nixos/test
<xi:include href="../from_md/development/writing-nixos-tests.section.xml" /> <xi:include href="../from_md/development/writing-nixos-tests.section.xml" />
<xi:include href="../from_md/development/running-nixos-tests.section.xml" /> <xi:include href="../from_md/development/running-nixos-tests.section.xml" />
<xi:include href="../from_md/development/running-nixos-tests-interactively.section.xml" /> <xi:include href="../from_md/development/running-nixos-tests-interactively.section.xml" />
<xi:include href="../from_md/development/linking-nixos-tests-to-packages.section.xml" />
</chapter> </chapter>

View file

@ -0,0 +1,10 @@
<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-linking-nixos-tests-to-packages">
<title>Linking NixOS tests to packages</title>
<para>
You can link NixOS module tests to the packages that they exercised,
so that the tests can be run automatically during code review when
the package gets changed. This is
<link xlink:href="https://nixos.org/manual/nixpkgs/stable/#ssec-nixos-tests-linking">described
in the nixpkgs manual</link>.
</para>
</section>

View file

@ -35,6 +35,14 @@ in {
''; '';
}; };
hardware.wirelessRegulatoryDatabase = mkOption {
default = false;
type = types.bool;
description = ''
Load the wireless regulatory database at boot.
'';
};
}; };
@ -58,6 +66,7 @@ in {
++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [ ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [
rtl8723bs-firmware rtl8723bs-firmware
]; ];
hardware.wirelessRegulatoryDatabase = true;
}) })
(mkIf cfg.enableAllFirmware { (mkIf cfg.enableAllFirmware {
assertions = [{ assertions = [{
@ -75,5 +84,8 @@ in {
b43FirmwareCutter b43FirmwareCutter
] ++ optional (pkgs.stdenv.hostPlatform.isi686 || pkgs.stdenv.hostPlatform.isx86_64) facetimehd-firmware; ] ++ optional (pkgs.stdenv.hostPlatform.isi686 || pkgs.stdenv.hostPlatform.isx86_64) facetimehd-firmware;
}) })
(mkIf cfg.wirelessRegulatoryDatabase {
hardware.firmware = [ pkgs.wireless-regdb ];
})
]; ];
} }

View file

@ -6,7 +6,6 @@ let
cfg = config.networking.networkmanager; cfg = config.networking.networkmanager;
basePackages = with pkgs; [ basePackages = with pkgs; [
crda
modemmanager modemmanager
networkmanager networkmanager
networkmanager-fortisslvpn networkmanager-fortisslvpn
@ -414,6 +413,8 @@ in {
} }
]; ];
hardware.wirelessRegulatoryDatabase = true;
environment.etc = with pkgs; { environment.etc = with pkgs; {
"NetworkManager/NetworkManager.conf".source = configFile; "NetworkManager/NetworkManager.conf".source = configFile;

View file

@ -241,7 +241,8 @@ in {
environment.systemPackages = [ package ]; environment.systemPackages = [ package ];
services.dbus.packages = [ package ]; services.dbus.packages = [ package ];
services.udev.packages = [ pkgs.crda ];
hardware.wirelessRegulatoryDatabase = true;
# FIXME: start a separate wpa_supplicant instance per interface. # FIXME: start a separate wpa_supplicant instance per interface.
systemd.services.wpa_supplicant = let systemd.services.wpa_supplicant = let

View file

@ -333,15 +333,15 @@ in
set -eu set -eu
# if the pstore module is builtin it will have mounted the persistent store automatically. it may also be already mounted for other reasons. # if the pstore module is builtin it will have mounted the persistent store automatically. it may also be already mounted for other reasons.
${pkgs.util-linux}/bin/mountpoint -q /sys/fs/pstore || ${pkgs.util-linux}/bin/mount -t pstore -o nosuid,noexec,nodev pstore /sys/fs/pstore ${pkgs.util-linux}/bin/mountpoint -q /sys/fs/pstore || ${pkgs.util-linux}/bin/mount -t pstore -o nosuid,noexec,nodev pstore /sys/fs/pstore
# wait up to five seconds (arbitrary, happened within one in testing) for the backend to be registered and the files to appear. a systemd path unit cannot detect this happening; and succeeding after a restart would not start dependent units. # wait up to 1.5 seconds for the backend to be registered and the files to appear. a systemd path unit cannot detect this happening; and succeeding after a restart would not start dependent units.
TRIES=50 TRIES=15
while [ "$(cat /sys/module/pstore/parameters/backend)" = "(null)" ]; do while [ "$(cat /sys/module/pstore/parameters/backend)" = "(null)" ]; do
if (( $TRIES )); then if (( $TRIES )); then
sleep 0.1 sleep 0.1
TRIES=$((TRIES-1)) TRIES=$((TRIES-1))
else else
echo "Persistent Storage backend was not registered in time." >&2 echo "Persistent Storage backend was not registered in time." >&2
exit 1 break
fi fi
done done
''; '';

View file

@ -6,13 +6,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "chia"; pname = "chia";
version = "1.2.2"; version = "1.2.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Chia-Network"; owner = "Chia-Network";
repo = "chia-blockchain"; repo = "chia-blockchain";
rev = version; rev = version;
sha256 = "sha256-ZYncyaX9gqBhDKiC87A2xI7VeU0zGsmm3Sx45lwgnrg="; sha256 = "sha256-yS0/Fy2dj8VIbwv2J9sehP0VN0f/YDxu1k9WkaeEz8M=";
}; };
patches = [ patches = [

View file

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "lndmanage"; pname = "lndmanage";
version = "0.11.0"; version = "0.12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bitromortac"; owner = "bitromortac";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "19sqf7cjslwpfzcdbyq182dx7gnn9hii77sahbnh88v69qxgwzvb"; sha256 = "1p73wdxv3fca2ga4nqpjk5lig7bj2v230lh8niw490p5y7hhnggl";
}; };
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [

View file

@ -0,0 +1,41 @@
{ mkDerivation, lib, fetchFromGitLab, fetchpatch, qtsvg, qtbase, libcsys, libcprime, cmake, ninja, }:
mkDerivation rec {
pname = "coreaction";
version = "4.2.0";
src = fetchFromGitLab {
owner = "cubocore/coreapps";
repo = pname;
rev = "v${version}";
sha256 = "sha256-5qEZNLvbgLoAOXij0wXoVw2iyvytsYZikSJDm6F6ddc=";
};
patches = [
## Fix Plugin Error: "The shared library was not found." "libbatery.so"
(fetchpatch {
url = "https://gitlab.com/cubocore/coreapps/coreaction/-/commit/1d1307363614a117978723eaad2332e6e8c05b28.patch";
sha256 = "039x19rsm23l9vxd5mnbl6gvc3is0igahf47kv54v6apz2q72l3f";
})
];
nativeBuildInputs = [
cmake
ninja
];
buildInputs = [
qtsvg
qtbase
libcsys
libcprime
];
meta = with lib; {
description = "A side bar for showing widgets from the C Suite";
homepage = "https://gitlab.com/cubocore/coreapps/coreaction";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dan4ik605743 ];
platforms = platforms.linux;
};
}

View file

@ -21,13 +21,13 @@
stdenv.mkDerivation rec{ stdenv.mkDerivation rec{
pname = "corectrl"; pname = "corectrl";
version = "1.1.3"; version = "1.1.4";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "corectrl"; owner = "corectrl";
repo = "corectrl"; repo = "corectrl";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-xRyc7FYzG8MnhQ8DjIUHYLeUZCZQdi4j1v1fG7F0+G8="; sha256 = "sha256-o8u9WnkK/6VZ+wlJ9I5Ti6ADjV9VXraRGpSWkDQv5JQ=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -2,11 +2,11 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "gallery_dl"; pname = "gallery_dl";
version = "1.18.1"; version = "1.18.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1e231ed7122a753430d92f8c6240a99defa2b307d57f1a4cc3e48910269331a9"; sha256 = "786772ce774929ef1ba64d8394dbab329a72447fd8b930968bc1fb0aacdba567";
}; };
propagatedBuildInputs = [ requests ]; propagatedBuildInputs = [ requests ];

View file

@ -4,6 +4,7 @@
, autoPatchelfHook , autoPatchelfHook
, wrapGAppsHook , wrapGAppsHook
, gnome2 , gnome2
, gtk2
, nss , nss
, xdg-utils , xdg-utils
, xorg , xorg
@ -77,7 +78,7 @@ stdenv.mkDerivation rec {
gdk-pixbuf gdk-pixbuf
glib glib
gnome2.GConf gnome2.GConf
gnome2.gtk gtk2
gtk3 gtk3
libX11 libX11
libXScrnSaver libXScrnSaver

View file

@ -1,5 +1,14 @@
{ fetchFromGitHub, lib, stdenv, gnome, cmake, pkg-config, { fetchFromGitHub
libappindicator-gtk3, gst_all_1, pcre }: , lib
, stdenv
, gtkmm3
, webkitgtk
, cmake
, pkg-config
, libappindicator-gtk3
, gst_all_1
, pcre
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "whatsapp-for-linux"; pname = "whatsapp-for-linux";
@ -18,8 +27,8 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gnome.gtkmm gtkmm3
gnome.webkitgtk webkitgtk
libappindicator-gtk3 libappindicator-gtk3
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-good

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "juju"; pname = "juju";
version = "2.9.7"; version = "2.9.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "juju"; owner = "juju";
repo = "juju"; repo = "juju";
rev = "juju-${version}"; rev = "juju-${version}";
sha256 = "sha256-jGrN0tsLO8gmkyZ1zNYzZd29mCQgLP7lSF0LkOygbyc="; sha256 = "sha256-36/fatztop2eB1z9DfnseQXw0Di3Wss72IfgdnKpsNU=";
}; };
vendorSha256 = "sha256-0JNoOSNxJrJkph8OGzgQ7sdslnGC36e3Ap0uMpqriX0="; vendorSha256 = "sha256-MH9lZNc9KevovZJCN2nClmqJbRSwYoQ4Jb0CXqBBUd0=";
# Disable tests because it attempts to use a mongodb instance # Disable tests because it attempts to use a mongodb instance
doCheck = false; doCheck = false;

View file

@ -42,11 +42,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "evolution"; pname = "evolution";
version = "3.40.1"; version = "3.40.3";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "07n4sbgsh0y9hrn52ymvy45ah65ll55gglgvqqi3h9nhkyy64y9g"; sha256 = "/SkjomENe/6212+FMLpAJkBOIf0nOrKKLFtQCJIeDVw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -9,8 +9,6 @@ in stdenv.mkDerivation {
inherit (mumble) src; inherit (mumble) src;
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
installPhase = '' installPhase = ''
mkdir -p $out/lib mkdir -p $out/lib
ln -s ${mumble}/lib/libmumble.so.1 $out/lib/ ln -s ${mumble}/lib/libmumble.so.1 $out/lib/

View file

@ -15,13 +15,13 @@
# ^1 https://github.com/NixOS/nixpkgs/issues/69338 # ^1 https://github.com/NixOS/nixpkgs/issues/69338
{ {
# Build dependencies # Build dependencies
appimageTools, autoPatchelfHook, fetchzip, lib, stdenv, appimageTools, autoPatchelfHook, fetchzip, lib, stdenv
# Runtime dependencies; # Runtime dependencies;
# A few additional ones (e.g. Node) are already shipped together with the # A few additional ones (e.g. Node) are already shipped together with the
# AppImage, so we don't have to duplicate them here. # AppImage, so we don't have to duplicate them here.
alsa-lib, dbus-glib, fuse, gnome, gtk3, libdbusmenu-gtk2, libXdamage, nss, udev , alsa-lib, dbus-glib, fuse, gnome, gsettings-desktop-schemas, gtk3, libdbusmenu-gtk2, libXdamage, nss, udev
}: }:
let let
@ -93,7 +93,7 @@ in stdenv.mkDerivation {
# This is required for the file picker dialog - otherwise pcloud just # This is required for the file picker dialog - otherwise pcloud just
# crashes # crashes
export XDG_DATA_DIRS="${gnome.gsettings-desktop-schemas}/share/gsettings-schemas/${gnome.gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" export XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS"
exec "$out/app/pcloud" exec "$out/app/pcloud"
EOF EOF

View file

@ -1,5 +1,5 @@
{ lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more { lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more
, file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, gnome, gtk2-x11, gtk3 , file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk, gtk2-x11, gtk3
, heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2
, gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 , gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2
, libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin , libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
freetype freetype
gdk-pixbuf gdk-pixbuf
gnome2.gtkglext gnome2.gtkglext
gnome.webkitgtk webkitgtk
gtk2 gtk2
gtk2-x11 gtk2-x11
gtk3 gtk3

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mrbayes"; pname = "mrbayes";
version = "3.2.7"; version = "3.2.7a";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NBISweden"; owner = "NBISweden";
repo = "MrBayes"; repo = "MrBayes";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-J0r4CxxQuZ3exvfCMRbLmyEd8ROaXNQG4afwiAs6H+M="; sha256 = "sha256-pkkxZ6YHRn/I1SJpT9A+EK4S5hWGmFdcDBJS0zh5mLA=";
}; };
meta = with lib; { meta = with lib; {

View file

@ -38,7 +38,6 @@ let
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ dpkg ]; buildInputs = [ dpkg ];
phases = [ "unpackPhase" "installPhase" ];
unpackPhase = "dpkg-deb -x ${src} ./"; unpackPhase = "dpkg-deb -x ${src} ./";
installPhase = '' installPhase = ''

View file

@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
# TODO: review if we really need this all # TODO: review if we really need this all
(python3.withPackages (pp: with pp; [ dbus-python setproctitle pygobject3 pycairo xapp pillow pytz tinycss2 pam pexpect distro ])) (python3.withPackages (pp: with pp; [ dbus-python setproctitle pygobject3 pycairo xapp pillow pytz tinycss2 python-pam pexpect distro ]))
atk atk
cacert cacert
cinnamon-control-center cinnamon-control-center

View file

@ -1,7 +1,7 @@
{ fetchFromGitHub, lib, mkDerivation, standard-library }: { fetchFromGitHub, lib, mkDerivation, standard-library }:
mkDerivation rec { mkDerivation rec {
version = "0.3"; version = "0.4";
pname = "functional-linear-algebra"; pname = "functional-linear-algebra";
buildInputs = [ standard-library ]; buildInputs = [ standard-library ];
@ -10,7 +10,7 @@ mkDerivation rec {
repo = "functional-linear-algebra"; repo = "functional-linear-algebra";
owner = "ryanorendorff"; owner = "ryanorendorff";
rev = "v${version}"; rev = "v${version}";
sha256 = "032gl35x1qzaigc3hbg9dc40zr0nyjld175cb9m8b15rlz9xzjn2"; sha256 = "05jk3792k9xf8iiwzm2hwlvd25f2pqqr3gppmqjf8xb9199i8fk0";
}; };
preConfigure = '' preConfigure = ''
@ -18,8 +18,6 @@ mkDerivation rec {
''; '';
meta = with lib; { meta = with lib; {
# Remove if a version compatible with agda 2.6.2 is made
broken = true;
homepage = "https://github.com/ryanorendorff/functional-linear-algebra"; homepage = "https://github.com/ryanorendorff/functional-linear-algebra";
description = '' description = ''
Formalizing linear algebra in Agda by representing matrices as functions Formalizing linear algebra in Agda by representing matrices as functions

View file

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
meta = { meta = with lib; {
description = "Syslog event logger library"; description = "Syslog event logger library";
longDescription = '' longDescription = ''
The EventLog library aims to be a replacement of the simple syslog() API The EventLog library aims to be a replacement of the simple syslog() API
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
combination of description and tag/value pairs. combination of description and tag/value pairs.
''; '';
homepage = "https://www.balabit.com/support/community/products/"; homepage = "https://www.balabit.com/support/community/products/";
license = lib.licenses.bsd3; license = licenses.bsd3;
platforms = lib.platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -0,0 +1,31 @@
{ mkDerivation, lib, fetchFromGitLab, udisks2, qtbase, cmake, ninja, }:
mkDerivation rec {
pname = "libcsys";
version = "4.2.0";
src = fetchFromGitLab {
owner = "cubocore";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9LH95uJJIn4FHfnikGi5UCI6nUNW+1cSZnJ/KpZDI5Y=";
};
nativeBuildInputs = [
cmake
ninja
];
buildInputs = [
qtbase
udisks2
];
meta = with lib; {
description = "Library for managing drive and getting system resource information in real time";
homepage = "https://gitlab.com/cubocore/libcsys";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dan4ik605743 ];
platforms = platforms.linux;
};
}

View file

@ -21,13 +21,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ python ]; nativeBuildInputs = [ python ];
buildInputs = buildInputs = [
[ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff
libwebp proj python sqlite zlib libwebp proj python sqlite zlib
# optional inputs # optional inputs
postgresql postgresql
]; ];
propagatedBuildInputs = [ libxml2 ]; propagatedBuildInputs = [ libxml2 ];

View file

@ -1,21 +1,21 @@
{ lib, buildDunePackage, ocaml, fetchurl, fmt, alcotest }: { lib, buildDunePackage, ocaml, fetchurl, fmt, alcotest, crowbar, astring }:
buildDunePackage rec { buildDunePackage rec {
pname = "pecu"; pname = "pecu";
version = "0.5"; version = "0.6";
useDune2 = true; useDune2 = true;
minimumOCamlVersion = "4.03"; minimumOCamlVersion = "4.03";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/pecu/releases/download/v0.5/pecu-v0.5.tbz"; url = "https://github.com/mirage/pecu/releases/download/v${version}/pecu-v${version}.tbz";
sha256 = "713753cd6ba3f4609a26d94576484e83ffef7de5f2208a2993576a1b22f0e0e7"; sha256 = "a9d2b7da444c83b20f879f6c3b7fc911d08ac1e6245ad7105437504f9394e5c7";
}; };
# fmt availability # crowbar availability
doCheck = lib.versionAtLeast ocaml.version "4.05"; doCheck = lib.versionAtLeast ocaml.version "4.08";
checkInputs = [ fmt alcotest ]; checkInputs = [ fmt alcotest crowbar astring ];
meta = with lib; { meta = with lib; {
description = "Encoder/Decoder of Quoted-Printable (RFC2045 & RFC2047)"; description = "Encoder/Decoder of Quoted-Printable (RFC2045 & RFC2047)";

View file

@ -1,21 +1,26 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, pythonOlder , fetchFromGitHub
, fetchPypi , mock
, protobuf , protobuf
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, zeroconf , zeroconf
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "aioesphomeapi"; pname = "aioesphomeapi";
version = "5.0.1"; version = "5.1.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "esphome";
sha256 = "sha256-2IxXhAysQiqqEd4Mfjgc5vX0+D60rof2nPJDXy9tRVs="; repo = pname;
rev = "v${version}";
sha256 = "09hhkwkphyqa31yd1mmpz8xmyz6hav8vwf36v8xc4v6g1xm9l6f5";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -23,8 +28,11 @@ buildPythonPackage rec {
zeroconf zeroconf
]; ];
# no tests implemented checkInputs = [
doCheck = false; mock
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [ pythonImportsCheck = [
"aioesphomeapi" "aioesphomeapi"

View file

@ -3,23 +3,28 @@
, fetchPypi , fetchPypi
, pythonOlder , pythonOlder
, winacl , winacl
, prompt_toolkit
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiowinreg"; pname = "aiowinreg";
version = "0.0.5"; version = "0.0.6";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "096663ec3db35fdc7ccc1c2d0d64a11cf64f4baa48955088e42b6a649ce418a5"; sha256 = "0h0r9xrz1n8y75f2p21f7phqrlpsymyiipmgzr0lj591irzjmjjy";
}; };
propagatedBuildInputs = [ winacl ]; propagatedBuildInputs = [
prompt_toolkit
winacl
];
# Project doesn't have tests # Project doesn't have tests
doCheck = false; doCheck = false;
pythonImportsCheck = [ "aiowinreg" ]; pythonImportsCheck = [ "aiowinreg" ];
meta = with lib; { meta = with lib; {

View file

@ -4,26 +4,30 @@
, fetchFromGitHub , fetchFromGitHub
, mock , mock
, pytestCheckHook , pytestCheckHook
, pythonOlder
, requests , requests
, responses , responses
, urllib3 , urllib3
, typing-extensions
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "amcrest"; pname = "amcrest";
version = "1.7.2"; version = "1.8.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tchellomello"; owner = "tchellomello";
repo = "python-amcrest"; repo = "python-amcrest";
rev = version; rev = version;
sha256 = "06gbrshf6vqvq3k813d1w37k2kmps0g6msa4lp2f9xvzw3iczshy"; sha256 = "180c0g840vh8dg4f08j0r29pdnhisav93d3axfvicd8fsb2cn36g";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
argcomplete argcomplete
requests requests
urllib3 urllib3
typing-extensions
]; ];
checkInputs = [ checkInputs = [

View file

@ -19,7 +19,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "anyio"; pname = "anyio";
version = "3.2.1"; version = "3.3.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "agronholm"; owner = "agronholm";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0fiqzsgr9c0yicsh1pwhyc6z4qyr2ng42dakyy4a81w9cff38had"; sha256 = "sha256-bMnAijFLXZSgTWsalT/J4sJ0Jrc1kFaQHJArwXnQFaQ=";
}; };
preBuild = '' preBuild = ''
@ -57,8 +57,13 @@ buildPythonPackage rec {
mock mock
]; ];
disabledTests = [
# block devices access
"test_is_block_device"
];
disabledTestPaths = [ disabledTestPaths = [
# lots of DNS lookups # lots of DNS lookups
"tests/test_sockets.py" "tests/test_sockets.py"
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
# darwin sandboxing limitations # darwin sandboxing limitations

View file

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "async-dns"; pname = "async-dns";
version = "1.1.10"; version = "2.0.0";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
format = "pyproject"; format = "pyproject";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "gera2ld"; owner = "gera2ld";
repo = "async_dns"; repo = "async_dns";
rev = "v${version}"; rev = "v${version}";
sha256 = "1yxmdlf2n66kp2mprsd4bvfsf63l4c4cfkjm2rm063pmlifz2fvj"; sha256 = "0vn7hxvpzikd7q61a27fwzal4lwsra2063awyr6fjpy6lh3cjdwf";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -26,7 +26,7 @@ buildPythonPackage rec {
checkPhase = '' checkPhase = ''
export HOME=$TMPDIR export HOME=$TMPDIR
# Test needs network access # Test needs network access
rm tests/test_resolver.py rm -r tests/resolver
${python.interpreter} -m unittest ${python.interpreter} -m unittest
''; '';

View file

@ -13,12 +13,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "blspy"; pname = "blspy";
version = "1.0.2"; version = "1.0.5";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-N1mk83uZrzSty2DyXfKiVp85z/jmztiUSRXKfNBRJV4="; hash = "sha256-uDXzAdGzfyRbsMVllLNd3DK8F/GfovdX293z5Mel6eg=";
}; };
patches = [ patches = [

View file

@ -23,7 +23,7 @@ index faecc61..3272116 100644
-if (DEFINED ENV{RELIC_MAIN}) -if (DEFINED ENV{RELIC_MAIN})
- set(RELIC_GIT_TAG "origin/main") - set(RELIC_GIT_TAG "origin/main")
-else () -else ()
- set(RELIC_GIT_TAG "1885ae3b681c423c72b65ce1fe70910142cf941c") - set(RELIC_GIT_TAG "b7b2266a0e4ee6f628f61d3ab638f524a18b52f1")
-endif () -endif ()
- -
-message(STATUS "Relic will be built from: ${RELIC_GIT_TAG}") -message(STATUS "Relic will be built from: ${RELIC_GIT_TAG}")

View file

@ -1,9 +1,10 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k, { stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k
python, twisted, jinja2, zope_interface, sqlalchemy, , python, twisted, jinja2, zope_interface, sqlalchemy
sqlalchemy_migrate, python-dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq, , sqlalchemy_migrate, python-dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq
txrequests, pypugjs, boto3, moto, mock, python-lz4, setuptoolsTrial, , txrequests, pypugjs, boto3, moto, mock, lz4, setuptoolsTrial
isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins, , isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins
parameterized, git, openssh, glibcLocales, ldap3, nixosTests }: , parameterized, git, openssh, glibcLocales, ldap3, nixosTests
}:
let let
withPlugins = plugins: buildPythonPackage { withPlugins = plugins: buildPythonPackage {
@ -56,7 +57,7 @@ let
boto3 boto3
moto moto
mock mock
python-lz4 lz4
setuptoolsTrial setuptoolsTrial
isort isort
pylint pylint

View file

@ -13,12 +13,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "chiapos"; pname = "chiapos";
version = "1.0.3"; version = "1.0.4";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-2Ye0gaOsv/Hg1363E6+NmezsK9EcLEZVKKUHikM2hr0="; sha256 = "sha256-flI1vwtD0H28UDMcEEELECewkXZ6vf/XEYMqRKy5R6w=";
}; };
patches = [ patches = [

View file

@ -3,7 +3,7 @@ index 9b4a2f5..86f849c 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -18,22 +18,19 @@ include(FetchContent) @@ -18,22 +18,19 @@ include(FetchContent)
else()
FetchContent_Declare( FetchContent_Declare(
pybind11-src pybind11-src
- GIT_REPOSITORY https://github.com/pybind/pybind11.git - GIT_REPOSITORY https://github.com/pybind/pybind11.git
@ -11,6 +11,7 @@ index 9b4a2f5..86f849c 100644
+ SOURCE_DIR @pybind11_src@ + SOURCE_DIR @pybind11_src@
) )
FetchContent_MakeAvailable(pybind11-src) FetchContent_MakeAvailable(pybind11-src)
endif()
FetchContent_Declare( FetchContent_Declare(
cxxopts cxxopts

View file

@ -5,7 +5,7 @@
, stdenv , stdenv
, numpydoc , numpydoc
, pytestCheckHook , pytestCheckHook
, python-lz4 , lz4
, setuptools , setuptools
, sphinx , sphinx
}: }:
@ -22,7 +22,7 @@ buildPythonPackage rec {
}; };
checkInputs = [ sphinx numpydoc pytestCheckHook ]; checkInputs = [ sphinx numpydoc pytestCheckHook ];
propagatedBuildInputs = [ python-lz4 setuptools ]; propagatedBuildInputs = [ lz4 setuptools ];
pytestFlagsArray = [ "joblib/test" ]; pytestFlagsArray = [ "joblib/test" ];
disabledTests = [ disabledTests = [

View file

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pglast"; pname = "pglast";
version = "3.0"; version = "3.3";
# PyPI tarball does not include all the required files # PyPI tarball does not include all the required files
src = fetchFromGitHub { src = fetchFromGitHub {
@ -17,7 +17,7 @@ buildPythonPackage rec {
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "0yi24wj19rzw5dvppm8g3hnfskyzbrqw14q8x9f2q5zi8g6xnnrd"; sha256 = "0l7nvbs1x1qil6mc0rxk7925i5xr3nbqnv0vakx3yv911kj3yhgv";
}; };
disabled = !isPy3k; disabled = !isPy3k;

View file

@ -1,26 +1,29 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub
, isPyPy , isPyPy
, python , python
, pkgs
, pillow , pillow
, pycairo , pycairo
, pkg-config
, boost
, cairo
, harfbuzz
, icu
, libjpeg
, libpng
, libtiff
, libwebp
, mapnik
, proj
, zlib
}: }:
let buildPythonPackage rec {
boost = pkgs.boost.override {
enablePython = true;
inherit python;
};
mapnik = pkgs.mapnik.override {
inherit python boost;
};
in buildPythonPackage rec {
pname = "python-mapnik"; pname = "python-mapnik";
version = "unstable-2020-02-24"; version = "unstable-2020-02-24";
src = pkgs.fetchFromGitHub { src = fetchFromGitHub {
owner = "mapnik"; owner = "mapnik";
repo = "python-mapnik"; repo = "python-mapnik";
rev = "7da019cf9eb12af8f8aa88b7d75789dfcd1e901b"; rev = "7da019cf9eb12af8f8aa88b7d75789dfcd1e901b";
@ -29,10 +32,8 @@ in buildPythonPackage rec {
disabled = isPyPy; disabled = isPyPy;
doCheck = false; # doesn't find needed test data files doCheck = false; # doesn't find needed test data files
preBuild = let preBuild = ''
pythonVersion = with lib.versions; "${major python.version}${minor python.version}"; export BOOST_PYTHON_LIB="boost_python${"${lib.versions.major python.version}${lib.versions.minor python.version}"}"
in ''
export BOOST_PYTHON_LIB="boost_python${pythonVersion}"
export BOOST_THREAD_LIB="boost_thread" export BOOST_THREAD_LIB="boost_thread"
export BOOST_SYSTEM_LIB="boost_system" export BOOST_SYSTEM_LIB="boost_system"
export PYCAIRO=true export PYCAIRO=true
@ -40,7 +41,7 @@ in buildPythonPackage rec {
nativeBuildInputs = [ nativeBuildInputs = [
mapnik # for mapnik_config mapnik # for mapnik_config
pkgs.pkgconfig pkg-config
]; ];
patches = [ patches = [
@ -50,7 +51,6 @@ in buildPythonPackage rec {
buildInputs = [ buildInputs = [
mapnik mapnik
boost boost
] ++ (with pkgs; [
cairo cairo
harfbuzz harfbuzz
icu icu
@ -60,15 +60,16 @@ in buildPythonPackage rec {
libwebp libwebp
proj proj
zlib zlib
]); ];
propagatedBuildInputs = [ pillow pycairo ]; propagatedBuildInputs = [ pillow pycairo ];
pythonImportsCheck = [ "mapnik" ] ; pythonImportsCheck = [ "mapnik" ];
meta = with lib; { meta = with lib; {
description = "Python bindings for Mapnik"; description = "Python bindings for Mapnik";
maintainers = with maintainers; [ ];
homepage = "https://mapnik.org"; homepage = "https://mapnik.org";
license = licenses.lgpl21; license = licenses.lgpl21;
}; };
} }

View file

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pytile"; pname = "pytile";
version = "5.2.2"; version = "5.2.3";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "bachya"; owner = "bachya";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-oVtTR5zucYvnaPO0i4sEBBU4nafq7GUfx3kPdSvptDo="; sha256 = "01gxq6dbqjmsqndjcbqv79wd2wgs7krm0rn47k883gh2xg9sn606";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -0,0 +1,27 @@
{ lib, buildPythonPackage, fetchFromGitHub, requests, mock, httpretty, pytestCheckHook }:
buildPythonPackage rec {
pname = "youtube-transcript-api";
version = "0.4.1";
# PyPI tarball is missing some test files
src = fetchFromGitHub {
owner = "jdepoix";
repo = "youtube-transcript-api";
rev = "v${version}";
sha256 = "1gpk13j1n2bifwsg951gmrfnq8kfxjr15rq46dxn1bhyk9hr1zql";
};
propagatedBuildInputs = [ requests ];
checkInputs = [ mock httpretty pytestCheckHook ];
pythonImportsCheck = [ "youtube_transcript_api" ];
meta = with lib; {
description = "Python API which allows you to get the transcripts/subtitles for a given YouTube video";
homepage = "https://github.com/jdepoix/youtube-transcript-api";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
};
}

View file

@ -17,7 +17,7 @@ let
inherit sha256; inherit sha256;
}; };
phases = "installPhase"; dontUnpack = true;
installPhase = '' installPhase = ''
install -Dm755 $src $out/bin/amm install -Dm755 $src $out/bin/amm

View file

@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec {
click click
colorama colorama
configparser configparser
diff_cover diff-cover
jinja2 jinja2
oyaml oyaml
pathspec pathspec

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
gemset = ./gemset.nix; gemset = ./gemset.nix;
}; };
phases = [ "installPhase" ]; dontUnpack = true;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ env ]; buildInputs = [ env ];

View file

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jdk deps ]; buildInputs = [ jdk deps ];
phases = [ "installPhase" ]; dontUnpack = true;
extraJavaOpts = "-XX:+UseG1GC -XX:+UseStringDeduplication -Xss4m -Xms100m"; extraJavaOpts = "-XX:+UseG1GC -XX:+UseStringDeduplication -Xss4m -Xms100m";

View file

@ -19,8 +19,6 @@ in stdenv.mkDerivation rec {
sha256 = "1894g6fymr8kra9vwhbmnrcr58l022mcd7g9ans4zd3izla2j3gx"; sha256 = "1894g6fymr8kra9vwhbmnrcr58l022mcd7g9ans4zd3izla2j3gx";
}; };
phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ];
patches = lib.optionalString (rubies != null) [ patches = lib.optionalString (rubies != null) [
./env.patch ./env.patch
]; ];

View file

@ -3,7 +3,8 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "distcc-masq-${gccRaw.name}"; name = "distcc-masq-${gccRaw.name}";
phases = [ "installPhase" ]; dontUnpack = true;
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin

View file

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
pname = "watson-ruby"; pname = "watson-ruby";
version = (import ./gemset.nix).watson-ruby.version; version = (import ./gemset.nix).watson-ruby.version;
phases = [ "installPhase" ]; dontUnpack = true;
installPhase = let installPhase = let
env = bundlerEnv { env = bundlerEnv {

View file

@ -30,8 +30,6 @@ in stdenv.mkDerivation rec {
"117gx6yjbcya64yg2vybcfyp591sid209pg8a33k9afbsmgz684c"; "117gx6yjbcya64yg2vybcfyp591sid209pg8a33k9afbsmgz684c";
}; };
phases = [ "unpackPhase" "installPhase" ];
installPhase = '' installPhase = ''
mkdir -p $out/share/nwjs mkdir -p $out/share/nwjs
cp -R * $out/share/nwjs cp -R * $out/share/nwjs

View file

@ -47,8 +47,6 @@ in stdenv.mkDerivation rec {
"0nlpdz76k1p1pq4xygfr2an91m0d7p5fjyg2xhiggyy8b7sp4964"; "0nlpdz76k1p1pq4xygfr2an91m0d7p5fjyg2xhiggyy8b7sp4964";
}; };
phases = [ "unpackPhase" "installPhase" ];
# we have runtime deps like sqlite3 that should remain # we have runtime deps like sqlite3 that should remain
dontPatchELF = true; dontPatchELF = true;

View file

@ -34,7 +34,7 @@ buildDunePackage rec {
buildInputs = [ findlib ] ++ propagatedBuildInputs; buildInputs = [ findlib ] ++ propagatedBuildInputs;
phases = [ "installPhase" ]; dontUnpack = true;
installPhase = '' installPhase = ''
mkdir -p "$out"/${path} mkdir -p "$out"/${path}

View file

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
license = licenses.bsd3; license = licenses.bsd3;
}; };
phases = "installPhase"; dontUnpack = true;
installPhase = '' installPhase = ''
mkdir -p "$out/bin" mkdir -p "$out/bin"

View file

@ -13,7 +13,7 @@ perlPackages.buildPerlPackage rec {
outputs = [ "out" ]; outputs = [ "out" ];
buildInputs = with perlPackages; [ DBI DBDPg TermReadKey JSON LWPUserAgent ]; buildInputs = with perlPackages; [ DBI DBDPg TermReadKey JSON LWP ];
nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
postInstall = lib.optionalString stdenv.isDarwin '' postInstall = lib.optionalString stdenv.isDarwin ''

View file

@ -52,12 +52,6 @@ self: super:
} }
); );
anyio = super.anyio.overridePythonAttrs (old: {
postPatch = ''
substituteInPlace setup.py --replace 'setup()' 'setup(version="${old.version}")'
'';
});
astroid = super.astroid.overridePythonAttrs ( astroid = super.astroid.overridePythonAttrs (
old: rec { old: rec {
buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];

View file

@ -17,21 +17,24 @@ let
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "${baseName}-${version}"; pname = baseName;
inherit version;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jdk deps ]; buildInputs = [ jdk deps ];
doCheck = true; dontUnpack = true;
phases = [ "installPhase" "checkPhase" ];
installPhase = '' installPhase = ''
runHook preInstall
makeWrapper ${jre}/bin/java $out/bin/${baseName} \ makeWrapper ${jre}/bin/java $out/bin/${baseName} \
--add-flags "-cp $CLASSPATH org.scalafmt.cli.Cli" --add-flags "-cp $CLASSPATH org.scalafmt.cli.Cli"
runHook postInstall
''; '';
checkPhase = '' installCheckPhase = ''
$out/bin/${baseName} --version | grep -q "${version}" $out/bin/${baseName} --version | grep -q "${version}"
''; '';

View file

@ -17,15 +17,15 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "deno"; pname = "deno";
version = "1.12.1"; version = "1.12.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "denoland"; owner = "denoland";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-kNwRnoUkX2dmj6ii9fRu/Hv4V3/sz6ag+wUPf93tmTQ="; sha256 = "sha256-xIFJv/roTD7sq7vCy4JDwe8gYDMuZd34vyjS08xeijI=";
}; };
cargoSha256 = "sha256-5ukTSzDFCkBQ1UFfnpz1fFzJSHBYUoZAvhPGMkr/fIs="; cargoSha256 = "sha256-aETAFh5yTE+ZonDC0ITdaZ2YN3/SpYROsXP47aNEICE=";
# Install completions post-install # Install completions post-install
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View file

@ -1,80 +1,82 @@
{stdenv, lib, dict}: { stdenv, lib, dict }:
({dictlist, allowList ? ["127.0.0.1"], denyList ? []}: ({ dictlist, allowList ? [ "127.0.0.1" ], denyList ? [ ] }:
/* /*
dictlist is a list of form dictlist is a list of form
[ { filename = /path/to/files/basename; [ { filename = /path/to/files/basename;
name = "name"; } ] name = "name"; } ]
basename.dict.dz and basename.index should be basename.dict.dz and basename.index should be
dict files. Or look below for other options. dict files. Or look below for other options.
allowList is a list of IP/domain *-wildcarded strings allowList is a list of IP/domain *-wildcarded strings
denyList is the same.. denyList is the same..
*/ */
let let
link_arguments = map link_arguments = map
(x: '' "${x.filename}" '') (x: '' "${x.filename}" '')
dictlist; dictlist;
databases = lib.concatStrings (map (x : databases = lib.concatStrings (map
"${x.name} ${x.filename}\n") dictlist); (x:
allow = lib.concatStrings (map (x: "allow ${x}\n") allowList); "${x.name} ${x.filename}\n")
deny = lib.concatStrings (map (x: "deny ${x}\n") denyList); dictlist);
accessSection = " allow = lib.concatStrings (map (x: "allow ${x}\n") allowList);
access { deny = lib.concatStrings (map (x: "deny ${x}\n") denyList);
${allow} accessSection = "
${deny} access {
} ${allow}
"; ${deny}
installPhase = '' }
mkdir -p $out/share/dictd ";
cd $out/share/dictd installPhase = ''
echo "${databases}" >databases.names mkdir -p $out/share/dictd
echo "${accessSection}" > dictd.conf cd $out/share/dictd
for j in ${toString link_arguments}; do echo "${databases}" >databases.names
name="$(egrep ' '"$j"\$ databases.names)" echo "${accessSection}" > dictd.conf
name=''${name% $j} for j in ${toString link_arguments}; do
if test -d "$j"; then name="$(egrep ' '"$j"\$ databases.names)"
if test -d "$j"/share/dictd ; then name=''${name% $j}
echo "Got store path $j" if test -d "$j"; then
j="$j"/share/dictd if test -d "$j"/share/dictd ; then
fi echo "Got store path $j"
echo "Directory reference: $j" j="$j"/share/dictd
i=$(ls "$j""/"*.index) fi
i="''${i%.index}"; echo "Directory reference: $j"
else i=$(ls "$j""/"*.index)
i="$j"; i="''${i%.index}";
fi else
echo "Basename is $i" i="$j";
locale=$(cat "$(dirname "$i")"/locale) fi
base="$(basename "$i")" echo "Basename is $i"
echo "Locale is $locale" locale=$(cat "$(dirname "$i")"/locale)
export LC_ALL=$locale base="$(basename "$i")"
export LANG=$locale echo "Locale is $locale"
if test -e "$i".dict.dz; then export LC_ALL=$locale
ln -s "$i".dict.dz export LANG=$locale
else if test -e "$i".dict.dz; then
cp "$i".dict . ln -s "$i".dict.dz
dictzip "$base".dict else
fi cp "$i".dict .
ln -s "$i".index . dictzip "$base".dict
dictfmt_index2word --locale $locale < "$base".index > "$base".word || true fi
dictfmt_index2suffix --locale $locale < "$base".index > "$base".suffix || true ln -s "$i".index .
dictfmt_index2word --locale $locale < "$base".index > "$base".word || true
dictfmt_index2suffix --locale $locale < "$base".index > "$base".suffix || true
echo "database $name {" >> dictd.conf echo "database $name {" >> dictd.conf
echo " data $out/share/dictd/$base.dict.dz" >> dictd.conf echo " data $out/share/dictd/$base.dict.dz" >> dictd.conf
echo " index $out/share/dictd/$base.index" >> dictd.conf echo " index $out/share/dictd/$base.index" >> dictd.conf
echo " index_word $out/share/dictd/$base.word" >> dictd.conf echo " index_word $out/share/dictd/$base.word" >> dictd.conf
echo " index_suffix $out/share/dictd/$base.suffix" >> dictd.conf echo " index_suffix $out/share/dictd/$base.suffix" >> dictd.conf
echo "}" >> dictd.conf echo "}" >> dictd.conf
done done
''; '';
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "dictd-dbs"; name = "dictd-dbs";
phases = ["installPhase"]; buildInputs = [ dict ];
buildInputs = [dict];
inherit installPhase; inherit installPhase;
}) })

View file

@ -65,13 +65,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gerbera"; pname = "gerbera";
version = "1.8.1"; version = "1.8.2";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "gerbera"; repo = "gerbera";
owner = "gerbera"; owner = "gerbera";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-bJIT/qQOKTy2l0wsumlGNvaGqzb2mK0hHKG0S6mEG3o="; sha256 = "sha256-RVFzATHNCW4lR9dVrtY2fo2BiJrXPCpelBaUXBwOWyY=";
}; };
postPatch = lib.optionalString enableMysql '' postPatch = lib.optionalString enableMysql ''

View file

@ -1,6 +1,6 @@
{ lib, buildGoModule, fetchFromGitHub { lib, stdenv, buildGoModule, fetchFromGitHub
, pkg-config, taglib, alsa-lib , pkg-config, taglib, alsa-lib
, zlib , zlib, AudioToolbox, AppKit
# Disable on-the-fly transcoding, # Disable on-the-fly transcoding,
# removing the dependency on ffmpeg. # removing the dependency on ffmpeg.
@ -12,16 +12,18 @@
buildGoModule rec { buildGoModule rec {
pname = "gonic"; pname = "gonic";
version = "0.12.2"; version = "0.13.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sentriz"; owner = "sentriz";
repo = pname; repo = pname;
rev = "7d420f61a90739cd82a81c2740274c538405d950"; rev = "v${version}";
sha256 = "0ix33cbhik1580h1jgv6n512dcgip436wmljpiw53c9v438k0ps5"; sha256 = "08zr5cbmn25wfi1sjfsb311ycn1855x57ypyn5165zcz49pcfzxn";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ taglib alsa-lib zlib ]; buildInputs = [ taglib zlib ]
++ lib.optionals stdenv.isLinux [ alsa-lib ]
++ lib.optionals stdenv.isDarwin [ AudioToolbox AppKit ];
vendorSha256 = "0inxlqxnkglz4j14jav8080718a80nqdcl866lkql8r6zcxb4fm9"; vendorSha256 = "0inxlqxnkglz4j14jav8080718a80nqdcl866lkql8r6zcxb4fm9";
# TODO(Profpatsch): write a test for transcoding support, # TODO(Profpatsch): write a test for transcoding support,

View file

@ -6,11 +6,11 @@
let let
self = stdenv.mkDerivation rec { self = stdenv.mkDerivation rec {
pname = "mysql"; pname = "mysql";
version = "8.0.25"; version = "8.0.26";
src = fetchurl { src = fetchurl {
url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz"; url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz";
sha256 = "c16aa9cf621bc028efba2bb11f3c36a323b125fa0d108ff92fab60e46309206e"; sha256 = "sha256-293Nx3L4BscRo3MTY6UPPTWeqsnF0UgAhHKKHCzl2k0=";
}; };
patches = [ patches = [

View file

@ -16,13 +16,13 @@ let
in in
with python.pkgs; buildPythonApplication rec { with python.pkgs; buildPythonApplication rec {
pname = "esphome"; pname = "esphome";
version = "1.20.0"; version = "1.20.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-saLcTiWqpxnE+li9ojfrEAh/vjB1c3K4kQzkrBJW3t4="; sha256 = "sha256-uCMxtMEOWrlOpc8SXDzleLY5VfyizmSh1tWgxTLUjzg=";
}; };
patches = [ patches = [

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "goreleaser"; pname = "goreleaser";
version = "0.173.2"; version = "0.174.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "goreleaser"; owner = "goreleaser";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-X7Tj50A0CwkGUyKGsCj6LBAlNZwMhFk/gDEgG1KNjx0="; sha256 = "sha256-oHH5/w1G0xlhmnUe6/qS0++qtBdDd6dUw6JfWYAWIh8=";
}; };
vendorSha256 = "sha256-yX8Ffdzq22JHA2owtHurH8AEgqPgPjz+N06oD5ZiZmM="; vendorSha256 = "sha256-P91wi2Fqo9+Yccqoqmsx0IbjSGUpiKIh7uOsgsR9c+0=";
buildFlagsArray = [ buildFlagsArray = [
"-ldflags=" "-ldflags="

View file

@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
format = "other"; format = "other";
pythonPath = with python3.pkgs; [ pythonPath = with python3.pkgs; [
dns netaddr lxml dnspython netaddr lxml
]; ];
postPatch = '' postPatch = ''

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "doppler"; pname = "doppler";
version = "3.26.0"; version = "3.31.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dopplerhq"; owner = "dopplerhq";
repo = "cli"; repo = "cli";
rev = version; rev = version;
sha256 = "sha256-x6LQDQ+DRfP4d87OWEppqk4FV7SHuRMog4m0DOWkvF4="; sha256 = "sha256-jmOHr32mDnjY3n9/nU/YaQ/ZuVsCKTo2likM2homToM=";
}; };
vendorSha256 = "sha256-UaR/xYGMI+C9aID85aPSfVzmTWXj4KcjfOJ6TTJ8KoY="; vendorSha256 = "sha256-yb7L4GSKtlwagwdxBMd5aSk9fre1NKKsy6CM4Iv2ya8=";
buildFlagsArray = "-ldflags=-X github.com/DopplerHQ/cli/pkg/version.ProgramVersion=v${version}"; buildFlagsArray = "-ldflags=-X github.com/DopplerHQ/cli/pkg/version.ProgramVersion=v${version}";

View file

@ -5,7 +5,7 @@
buildGoModule rec { buildGoModule rec {
pname = "nuclei"; pname = "nuclei";
version = "2.4.0"; version = "2.4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "projectdiscovery"; owner = "projectdiscovery";
@ -14,7 +14,7 @@ buildGoModule rec {
sha256 = "sha256-nmojx3xX5MZFfd1od2Aq3+dWmHCFgR7+q5C2FIUzq7A="; sha256 = "sha256-nmojx3xX5MZFfd1od2Aq3+dWmHCFgR7+q5C2FIUzq7A=";
}; };
vendorSha256 = "sha256-Ok2VUwtqhlp6NwLbQX9KAaGiZtzmfWG0LcqtBBDk22A="; vendorSha256 = "0q6vwh809bfa5ns62zg6vika588199zl3nq26xx5m1ka1d9rak9s";
modRoot = "./v2"; modRoot = "./v2";
subPackages = [ subPackages = [

View file

@ -6398,6 +6398,8 @@ in
libscrypt = callPackage ../development/libraries/libscrypt { }; libscrypt = callPackage ../development/libraries/libscrypt { };
libcsys = libsForQt5.callPackage ../development/libraries/libcsys { };
libcprime = libsForQt5.callPackage ../development/libraries/libcprime { }; libcprime = libsForQt5.callPackage ../development/libraries/libcprime { };
libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; libcloudproviders = callPackage ../development/libraries/libcloudproviders { };
@ -23492,6 +23494,8 @@ in
copyq = libsForQt5.callPackage ../applications/misc/copyq { }; copyq = libsForQt5.callPackage ../applications/misc/copyq { };
coreaction = libsForQt5.callPackage ../applications/misc/coreaction { };
corectrl = libsForQt5.callPackage ../applications/misc/corectrl { }; corectrl = libsForQt5.callPackage ../applications/misc/corectrl { };
coriander = callPackage ../applications/video/coriander { coriander = callPackage ../applications/video/coriander {
@ -24601,7 +24605,9 @@ in
gollum = callPackage ../applications/misc/gollum { }; gollum = callPackage ../applications/misc/gollum { };
gonic = callPackage ../servers/gonic { }; gonic = callPackage ../servers/gonic {
inherit (darwin.apple_sdk.frameworks) AppKit AudioToolbox;
};
googleearth = callPackage ../applications/misc/googleearth { }; googleearth = callPackage ../applications/misc/googleearth { };

View file

@ -61,6 +61,8 @@ mapAliases ({
pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10
pytestquickcheck = pytest-quickcheck; # added 2021-07-20 pytestquickcheck = pytest-quickcheck; # added 2021-07-20
pytestrunner = pytest-runner; # added 2021-01-04 pytestrunner = pytest-runner; # added 2021-01-04
python-lz4 = lz4; # added 2018-06-01
python-pam = pam; # added 2020-09-07.
pytest_xdist = pytest-xdist; # added 2021-01-04 pytest_xdist = pytest-xdist; # added 2021-01-04
python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 python_simple_hipchat = python-simple-hipchat; # added 2021-07-21
qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09

View file

@ -4260,7 +4260,7 @@ in {
lyricwikia = callPackage ../development/python-modules/lyricwikia { }; lyricwikia = callPackage ../development/python-modules/lyricwikia { };
lz4 = self.python-lz4; # alias 2018-12-05 lz4 = callPackage ../development/python-modules/lz4 { };
lzstring = callPackage ../development/python-modules/lzstring { }; lzstring = callPackage ../development/python-modules/lzstring { };
@ -5085,9 +5085,6 @@ in {
palettable = callPackage ../development/python-modules/palettable { }; palettable = callPackage ../development/python-modules/palettable { };
# Alias. Added 2020-09-07.
pam = self.python-pam;
pamela = callPackage ../development/python-modules/pamela { }; pamela = callPackage ../development/python-modules/pamela { };
pamqp = callPackage ../development/python-modules/pamqp { }; pamqp = callPackage ../development/python-modules/pamqp { };
@ -7069,8 +7066,6 @@ in {
python-ly = callPackage ../development/python-modules/python-ly { }; python-ly = callPackage ../development/python-modules/python-ly { };
python-lz4 = callPackage ../development/python-modules/python-lz4 { };
python-lzf = callPackage ../development/python-modules/python-lzf { }; python-lzf = callPackage ../development/python-modules/python-lzf { };
python-lzo = callPackage ../development/python-modules/python-lzo { python-lzo = callPackage ../development/python-modules/python-lzo {
@ -7079,7 +7074,18 @@ in {
python_magic = callPackage ../development/python-modules/python-magic { }; python_magic = callPackage ../development/python-modules/python-magic { };
python-mapnik = callPackage ../development/python-modules/python-mapnik { }; python-mapnik = let
boost = pkgs.boost.override {
enablePython = true;
inherit python;
};
in callPackage ../development/python-modules/python-mapnik {
inherit (pkgs) pkg-config cairo harfbuzz icu libjpeg libpng libtiff libwebp proj zlib;
inherit boost;
mapnik = pkgs.mapnik.override {
inherit python boost;
};
};
python-markdown-math = callPackage ../development/python-modules/python-markdown-math { }; python-markdown-math = callPackage ../development/python-modules/python-markdown-math { };
@ -9462,6 +9468,8 @@ in {
youtube-search = callPackage ../development/python-modules/youtube-search { }; youtube-search = callPackage ../development/python-modules/youtube-search { };
youtube-transcript-api = callPackage ../development/python-modules/youtube-transcript-api { };
yowsup = callPackage ../development/python-modules/yowsup { }; yowsup = callPackage ../development/python-modules/yowsup { };
yq = callPackage ../development/python-modules/yq { yq = callPackage ../development/python-modules/yq {